diff --git a/.github/workflows/additional_checks.yml b/.github/workflows/additional_checks.yml index 19d26d4959a..e2b4d3a8953 100644 --- a/.github/workflows/additional_checks.yml +++ b/.github/workflows/additional_checks.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout repository contents - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: fetch-depth: 31 diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml index 7c8fb0aa1e6..bc0e6a34e93 100644 --- a/.github/workflows/clang-format-check.yml +++ b/.github/workflows/clang-format-check.yml @@ -16,7 +16,7 @@ jobs: name: Formatting Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false - uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 24ace8a06a2..ebff9c3ecf1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Set up Python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: @@ -56,7 +56,7 @@ jobs: if: ${{ matrix.language == 'c-cpp' }} - name: Initialize CodeQL - uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 + uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 with: languages: ${{ matrix.language }} config-file: ./.github/codeql/codeql-config.yml @@ -81,6 +81,6 @@ jobs: run: .github/workflows/build_ubuntu-22.04.sh "${HOME}/install" - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 + uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index b1dbc8f42c1..382a0406465 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 if: github.repository == 'OSGeo/grass' steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Get dependencies run: | diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create_release_draft.yml index 7e9dfdf1af5..6cd60933cfd 100644 --- a/.github/workflows/create_release_draft.yml +++ b/.github/workflows/create_release_draft.yml @@ -25,7 +25,7 @@ jobs: contents: write steps: - name: Checks-out repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: ref: ${{ github.ref }} fetch-depth: 0 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ac9a36b27bd..897157a0161 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -49,7 +49,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: fetch-depth: 0 - name: Docker meta @@ -70,7 +70,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - name: Login to DockerHub - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 52aff7a5b55..d65748ee2d9 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Get dependencies run: | sudo apt-get update -y diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9b92ad8141d..2ff85928636 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,9 +35,9 @@ jobs: /usr/bin/sudo /usr/bin/find /usr/local /opt/homebrew -mindepth 1 -maxdepth 1 \ -type f -print -delete hash -r - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Setup Mamba - uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 # v1.8.1 + uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 # v1.9.0 with: init-shell: bash environment-file: .github/workflows/macos_dependencies.txt @@ -55,6 +55,7 @@ jobs: - name: Add the bin directory to PATH run: echo "$HOME/install/bin" >> $GITHUB_PATH - name: Check installed version + if: always() shell: bash -l {0} run: source ./.github/workflows/print_versions.sh - name: Run tests diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index 71b875b9f52..7f0ca12e270 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -29,7 +29,7 @@ jobs: run: | git config --global core.autocrlf false git config --global core.eol lf - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: msys2/setup-msys2@d0e80f58dffbc64f6a3a1f43527d469b4fc7b6c8 # v2.23.0 with: path-type: inherit @@ -66,6 +66,11 @@ jobs: shell: msys2 {0} run: .github/workflows/build_osgeo4w.sh + - name: Print installed versions + if: always() + shell: msys2 {0} + run: .github/workflows/print_versions.sh + - name: Test executing of the grass command run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass84.bat' diff --git a/.github/workflows/periodic_update.yml b/.github/workflows/periodic_update.yml index f1c7e5e257e..5bd94c7eb06 100644 --- a/.github/workflows/periodic_update.yml +++ b/.github/workflows/periodic_update.yml @@ -21,7 +21,7 @@ jobs: - name: Create URL to the run output id: vars run: echo "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_OUTPUT - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: "Check that autoconf scripts are up-to-date:" run: | rm -f config.guess config.sub diff --git a/.github/workflows/print_versions.sh b/.github/workflows/print_versions.sh index 0bc91536f31..25b77eae2ec 100755 --- a/.github/workflows/print_versions.sh +++ b/.github/workflows/print_versions.sh @@ -10,6 +10,6 @@ git --version # This will fail if the build failed. grass --version -grass --tmp-location XY --exec g.version -e +grass --tmp-location XY --exec g.version -ergb # Detailed Python version info (in one line thanks to echo) grass --tmp-location XY --exec bash -c "echo Python: \$(\$GRASS_PYTHON -c 'import sys; print(sys.version)')" diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 24e25052b70..5ac822fda17 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -31,7 +31,7 @@ jobs: CLICOLOR_FORCE: 1 # for other software including ninja: https://bixense.com/clicolors/ steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Set up Python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml index 73d0b54ab2f..079df7aaf6d 100644 --- a/.github/workflows/python-code-quality.yml +++ b/.github/workflows/python-code-quality.yml @@ -46,7 +46,7 @@ jobs: echo Pylint: ${{ matrix.pylint-version }} echo Bandit: ${{matrix.bandit-version}} - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Set up Python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 @@ -105,7 +105,7 @@ jobs: path: bandit.sarif - name: Upload SARIF File into Security Tab - uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5 + uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7 with: sarif_file: bandit.sarif diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index 4afe5915f0b..f92fad374fd 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -25,13 +25,13 @@ jobs: statuses: write steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: # super-linter needs the full git history to get the # list of files that changed across commits fetch-depth: 0 - name: Lint code base - uses: super-linter/super-linter/slim@4758be622215d0954c8353ee4877ffd60111cf8e # v6.4.1 + uses: super-linter/super-linter/slim@5b638caee6ba65e25e07143887b669a1233847a0 # v6.5.1 env: DEFAULT_BRANCH: main # To report GitHub Actions status checks diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 86e085027ea..df021bb6312 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -57,7 +57,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Invert inclusion list to an exclusion list id: get-exclude diff --git a/AUTHORS b/AUTHORS index c2fe35635e5..a81f5a75e39 100644 --- a/AUTHORS +++ b/AUTHORS @@ -407,7 +407,7 @@ Contact GRASS Development Team c/o Markus Neteler mundialis GmbH & Co. KG - Kölnstrasse 99 + Koelnstrasse 99 53111 Bonn, Germany neteler AT osgeo.org diff --git a/CHANGES b/CHANGES index 3a41407da88..0ed4ab21f1f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,10 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD CHANGES in GRASS GIS 8.x @@ -31,6 +34,9 @@ https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 List of releases: +======= +<<<<<<< HEAD +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main CHANGES in GRASS GIS 8.x @@ -40,6 +46,7 @@ https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 List of releases: +<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD @@ -81,6 +88,8 @@ https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 List of releases: +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94,6 +103,9 @@ List of releases: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c1eaf47bbb9..70610b918ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -123,11 +123,14 @@ git checkout -b new-feature You can use your favorite tools to change source code or other files <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main in the local copy of the code. When making changes, please follow the [Submitting Guidelines](./doc/development/submitting/submitting.md). @@ -155,6 +158,9 @@ to your code. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -205,6 +211,7 @@ For Python, run `black .` to apply standardized formatting. You can also run linter tools such as Pylint which will suggest different improvements to your code. <<<<<<< HEAD +<<<<<<< HEAD ### Testing changes @@ -228,6 +235,8 @@ also run linter tools such as Pylint which will suggest different improvements to your code. ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ### Committing diff --git a/COPYING b/COPYING index 21779528e32..b21a08c77ba 100644 --- a/COPYING +++ b/COPYING @@ -32,7 +32,7 @@ GRASS Development Team at the following address: GRASS Development Team c/o Markus Neteler mundialis GmbH & Co. KG - Kölnstrasse 99 + Koelnstrasse 99 53111 Bonn, Germany neteler AT osgeo.org diff --git a/Dockerfile b/Dockerfile index 99428b39f8c..353347ce6ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -8,6 +9,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # syntax=docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile. @@ -29,6 +32,9 @@ FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36,6 +42,7 @@ LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis. ENV DEBIAN_FRONTEND noninteractive +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # define versions to be used @@ -49,6 +56,8 @@ ARG LAZ_PERF_VERSION=3.2.0 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main SHELL ["/bin/bash", "-c"] WORKDIR /tmp @@ -75,6 +84,9 @@ ARG LAZ_PERF_VERSION=3.2.0 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -90,6 +102,7 @@ RUN apt-get update && apt-get upgrade -y && \ cmake \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -100,6 +113,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 curl \ flex \ @@ -108,11 +126,14 @@ RUN apt-get update && apt-get upgrade -y && \ gdal-bin \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main geos-bin \ proj-bin \ netcdf-bin \ @@ -166,6 +187,9 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -219,6 +243,7 @@ RUN apt-get update && apt-get upgrade -y && \ subversion \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -229,6 +254,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 \ @@ -236,11 +266,14 @@ RUN apt-get update && apt-get upgrade -y && \ zip \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main zlib1g \ " @@ -425,6 +458,9 @@ WORKDIR /src/grass_build ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -501,6 +537,7 @@ WORKDIR /src/grass_build # Cleanup potentially leftover GISRC file with wrong path to "demolocation" RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -514,6 +551,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" @@ -530,6 +572,7 @@ ENV NUMTHREADS=4 RUN make distclean || echo "nothing to clean" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD RUN /src/grass_build/configure \ --with-cxx \ --enable-largefile \ @@ -557,6 +600,8 @@ RUN /src/grass_build/configure \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RUN ./configure $GRASS_CONFIG \ && make -j $NUMTHREADS \ && make install && ldconfig \ @@ -670,6 +715,9 @@ RUN /src/grass_build/configure \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -728,6 +776,7 @@ WORKDIR /grassdb VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -739,3 +788,8 @@ VOLUME /grassdb ======= >>>>>>> 8422103f4c (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/INSTALL.md b/INSTALL.md index 4c2fb2d26b6..e542ef6161a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -17,11 +17,14 @@ Please read _all_ text below. - (J) DEBUGGING OPTIONS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - (K) SUPPORT - (L) GRASS GIS PROGRAMMER'S MANUAL - (M) CONTRIBUTING CODE AND PATCHES @@ -29,6 +32,9 @@ Please read _all_ text below. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39,6 +45,7 @@ Please read _all_ text below. - (O) DRAFT TUTORIAL <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -50,6 +57,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 @@ -57,6 +69,7 @@ The install order matters. GRASS needs at least two libraries which have to be installed before installing/compiling GRASS: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this directory. ======= @@ -75,6 +88,13 @@ For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this directory. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -95,6 +115,9 @@ directory. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -129,6 +152,7 @@ the GitHub repository), e.g. grass-3.7.git_src_snapshot_2022_04_27.tar.gz from <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Further instructions at ======= <<<<<<< HEAD @@ -136,12 +160,17 @@ Further instructions at >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= Further instructions at >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= Further instructions at >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -160,6 +189,7 @@ The command, explains the options used to disable the compilation of non-mandatory <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies. ======= <<<<<<< HEAD @@ -175,6 +205,12 @@ GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencie GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -190,6 +226,9 @@ GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencie >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -275,6 +314,7 @@ make install <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -285,6 +325,10 @@ make install >>>>>>> osgeo-main ======= >>>>>>> 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: @@ -297,6 +341,7 @@ the following additional parameters are recommended/required: See also CODE OPTIMIZATION below. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -310,6 +355,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 @@ -433,6 +483,7 @@ CFLAGS="-mcpu=pentium" # Intel Pentium processor CFLAGS="-mcpu=pentium4" # Intel Pentium4 processor <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ -minline-all-stringops" # Intel XEON 64bit processor ======= @@ -451,6 +502,13 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ -minline-all-stringops" # Intel XEON 64bit processor ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -468,6 +526,9 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -512,6 +573,7 @@ CFLAGS="-g -Wall" ./configure See also the file ./doc/debugging.txt and the Wiki page +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -519,11 +581,16 @@ See also the file ./doc/debugging.txt and the Wiki page ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ## (K) SUPPORT ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -548,6 +615,7 @@ See also ## (L) SUPPORT <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -559,6 +627,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 @@ -567,6 +640,7 @@ so we can fix it. See If you are interested in helping to develop GRASS, please join the GRASS developers mailing list. See +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ## (M) GRASS PROGRAMMER'S MANUAL @@ -575,6 +649,8 @@ developers mailing list. See ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ## (L) GRASS PROGRAMMER'S MANUAL ======= ## (M) GRASS PROGRAMMER'S MANUAL @@ -583,6 +659,9 @@ developers mailing list. See ## (M) GRASS PROGRAMMER'S MANUAL >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -591,6 +670,7 @@ The Programmer's manual is generated with doxygen from the source code. Please see the README file and the files at: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ## (N) CONTRIBUTING CODE AND PATCHES @@ -599,6 +679,8 @@ Please see the README file and the files at: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ## (M) CONTRIBUTING CODE AND PATCHES ======= ## (N) CONTRIBUTING CODE AND PATCHES @@ -607,6 +689,9 @@ Please see the README file and the files at: ## (N) CONTRIBUTING CODE AND PATCHES >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -618,6 +703,7 @@ Please see ./SUBMITTING in this directory, or better, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -628,10 +714,15 @@ Please see ./SUBMITTING in this directory, or better, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## (O) TUTORIALS +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -645,6 +736,11 @@ Please see ./SUBMITTING in this directory, or better, ======= >>>>>>> 8422103f4c (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 e8d9c0f5473..24c8c8010dc 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ # See INSTALL.md file for usage. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -18,6 +19,9 @@ >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= @@ -33,6 +37,9 @@ # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -77,6 +84,7 @@ DIRS = \ SUBDIRS = $(DIRS) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv @@ -94,6 +102,12 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contri FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv +======= +>>>>>>> osgeo-main FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html contributors.csv contributors_extra.csv translators.csv >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -109,6 +123,9 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contri >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/NEWS b/NEWS index 43c496fb426..fcd870ffb5d 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ NEWS GRASS GIS 8 o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 ======= @@ -19,6 +20,12 @@ GRASS GIS 8 o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -29,6 +36,9 @@ GRASS GIS 8 o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/README.md b/README.md index 342e174898b..efdbba71594 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ [![OSGeo4W](https://github.com/OSGeo/grass/workflows/OSGeo4W/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3AOSGeo4W) <<<<<<< 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) @@ -16,6 +17,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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) @@ -32,27 +35,41 @@ # GRASS GIS Repository >>>>>>> 0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= >>>>>>> osgeo-main ======= +>>>>>>> c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) +======= +>>>>>>> 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) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main ======= +>>>>>>> 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 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) [![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) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= >>>>>>> 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) @@ -65,6 +82,7 @@ a Geographic Information System used for geospatial data management and analysis, image processing, graphics/map production, spatial modeling, and visualization. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Launch this repository in Binder and experiment with GRASS's Python API in @@ -89,6 +107,15 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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 @@ -96,8 +123,11 @@ Jupyter Notebooks by clicking the button below: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 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) @@ -106,6 +136,7 @@ Jupyter Notebooks by clicking the button below: ======= >>>>>>> 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: +<<<<<<< HEAD >>>>>>> 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) @@ -124,6 +155,8 @@ 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 [![Binder](https://camo.githubusercontent.com/581c077bdbc6ca6899c86d0acc6145ae85e9d80e6f805a1071793dbe48917982/68747470733a2f2f6d7962696e6465722e6f72672f62616467655f6c6f676f2e737667)](https://mybinder.org/v2/gh/OSGeo/grass/main?urlpath=lab%2Ftree%2Fdoc%2Fnotebooks%2Fjupyter_example.ipynb) @@ -134,6 +167,9 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt >>>>>>> 4fcbd3f967 (Add Binder badge/button to readme (#1628)) ======= ## Contributing +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -141,6 +177,9 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt ## Contributing >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -158,6 +197,7 @@ Want to become a core developer? See > See the INSTALL.md file. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -165,6 +205,10 @@ Want to become a core developer? See <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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. @@ -174,12 +218,15 @@ in the Wiki. <<<<<<< 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. ======= ======= >>>>>>> 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)) ======= @@ -198,6 +245,9 @@ in the Wiki. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -207,15 +257,21 @@ in the Wiki. Build a docker image using the downloaded source code (run this in the directory containing the source code): +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main A. Docker image **without graphical user interface - wxGUI**. @@ -234,6 +290,7 @@ docker build -t grassgis . <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) A. Docker image **without graphical user interface - wxGUI**. @@ -249,6 +306,8 @@ docker build -t grassgis . ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ``` docker build -t grassgis80 . <<<<<<< HEAD @@ -264,6 +323,9 @@ docker build -t grassgis . docker build -t grassgis . >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -277,6 +339,7 @@ downloaded from # case 1: launching in the grassdata directory in which the location is stored: docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ ======= @@ -292,6 +355,12 @@ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ <<<<<<< HEAD --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + --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)) @@ -305,6 +374,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -314,6 +386,7 @@ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ docker run -it --rm --user=$(id -u):$(id -g) \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -324,6 +397,10 @@ docker run -it --rm --user=$(id -u):$(id -g) \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -332,9 +409,12 @@ docker run -it --rm --user=$(id -u):$(id -g) \ Note that the first `grassgis` is the name of the image while the second <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis80 \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -364,6 +444,9 @@ Note that the first `grassgis` is the name of the image while the second Note that the first `grassgis` is the name of the image while the second >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -375,6 +458,7 @@ To run the tests (again assuming local location): docker run -it --rm --user=$(id -u):$(id -g) \ --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ ======= @@ -390,6 +474,12 @@ docker run -it --rm --user=$(id -u):$(id -g) \ <<<<<<< HEAD grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -403,6 +493,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -438,11 +531,14 @@ make distclean ``` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ## Thanks to all contributors ❤ @@ -493,6 +589,9 @@ make pdfdocs ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md index 9ae1eff8483..a71bb90d137 100644 --- a/REQUIREMENTS.md +++ b/REQUIREMENTS.md @@ -67,11 +67,14 @@ Note: also the respective development packages (commonly named `xxx-dev` or [http://www.libpng.org/pub/png/libpng.html](http://www.libpng.org/pub/png/libpng.html) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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/) ======= @@ -79,6 +82,9 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -89,11 +95,14 @@ Note: also the respective development packages (commonly named `xxx-dev` or [ftp://ftp.gnu.org/gnu/readline](ftp://ftp.gnu.org/gnu/readline) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - **PDAL** ( for LAS import modules `r.in.pdal` and `v.in.pdal`) [https://pdal.io](https://pdal.io) ======= @@ -101,6 +110,9 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -120,6 +132,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -130,12 +143,17 @@ Note: also the respective development packages (commonly named `xxx-dev` or >>>>>>> osgeo-main ======= >>>>>>> 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/) [https://docs.python.org/library/ctypes.html](https://docs.python.org/library/ctypes.html) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -147,6 +165,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) @@ -172,6 +195,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -182,12 +206,17 @@ Note: also the respective development packages (commonly named `xxx-dev` or >>>>>>> osgeo-main ======= >>>>>>> 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) [https://github.com/benjaminp/six](https://github.com/benjaminp/six) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -199,6 +228,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) @@ -227,6 +261,7 @@ MacOSX users may go here to download precompiled libraries etc.: --- +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD © _GRASS Development Team 1997-2023_ @@ -235,6 +270,8 @@ MacOSX users may go here to download precompiled libraries etc.: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main © _GRASS Development Team 1997-2024_ ======= © _GRASS Development Team 1997-2023_ @@ -243,6 +280,9 @@ MacOSX users may go here to download precompiled libraries etc.: © _GRASS Development Team 1997-2023_ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/aclocal.m4 b/aclocal.m4 index eb934ad8e1b..8cb4cde95d9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -217,6 +217,7 @@ CPPFLAGS="$5 $CPPFLAGS" AC_RUN_IFELSE([AC_LANG_SOURCE([[ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include ======= <<<<<<< HEAD @@ -233,6 +234,12 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +#include +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) #include >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -246,6 +253,9 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -444,6 +454,7 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_MSG_RESULT([static]) SHARED_BUILD=0 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) ======= @@ -451,6 +462,8 @@ AC_DEFUN([SC_ENABLE_SHARED], [ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(STATIC_BUILD, 1, [Define to 1 for Windows static build.]) ======= AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) @@ -459,6 +472,9 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -572,6 +588,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Note: If _REENTRANT isn't defined, then Solaris # won't define thread-safe library routines. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -580,6 +597,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.]) ======= @@ -591,6 +610,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -616,6 +638,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Note: If _REENTRANT isn't defined, then Solaris # won't define thread-safe library routines. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -624,6 +647,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.]) ======= @@ -635,6 +660,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -665,6 +693,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ #LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath-link,${LIB_RUNTIME_DIR} -Wl,-rpath,${INST_DIR}/lib' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # TODO: add optional pthread support with any combination of: # CFLAGS="$CFLAGS -pthread" @@ -677,6 +706,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # TODO: add optional pthread support with any combination of: # CFLAGS="$CFLAGS -pthread" @@ -705,6 +737,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -729,6 +764,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # CFLAGS="$CFLAGS -pthread" # LDFLAGS="$LDFLAGS -lpthread" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -737,6 +773,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.]) ======= @@ -748,6 +786,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -895,6 +936,7 @@ AC_DEFUN([LOC_OPENMP], dnl -------------------- / OpenMP --------------------------------------------- +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -902,6 +944,8 @@ dnl -------------------- / OpenMP --------------------------------------------- ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dnl -------------------- OpenMP ----------------------------------------------- dnl OpenMP code borrowed and modified from Autoconf 2.71 (AC_OPENMP) dnl to enable Clang detection @@ -1045,6 +1089,9 @@ dnl -------------------- / OpenMP --------------------------------------------- ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/binder/requirements.txt b/binder/requirements.txt index e375126355e..c5d02bf01df 100644 --- a/binder/requirements.txt +++ b/binder/requirements.txt @@ -5,6 +5,7 @@ Pillow ply <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD PyVirtualDisplay ======= <<<<<<< HEAD @@ -18,6 +19,11 @@ PyVirtualDisplay PyVirtualDisplay ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +PyVirtualDisplay +======= +>>>>>>> osgeo-main folium >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733)) ======= @@ -27,6 +33,9 @@ PyVirtualDisplay PyVirtualDisplay >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/config.guess b/config.guess index e1cd233b76d..78a8d2bd340 100755 --- a/config.guess +++ b/config.guess @@ -2,6 +2,7 @@ # Attempt to guess a canonical system name. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -12,6 +13,8 @@ timestamp='2022-01-09' ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -32,6 +35,9 @@ timestamp='2022-01-09' timestamp='2022-01-09' >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -92,12 +98,15 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Copyright 1992-2022 Free Software Foundation, Inc. ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Copyright 1992-2024 Free Software Foundation, Inc. ======= Copyright 1992-2022 Free Software Foundation, Inc. @@ -106,6 +115,9 @@ Copyright 1992-2022 Free Software Foundation, Inc. Copyright 1992-2022 Free Software Foundation, Inc. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -519,6 +531,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # Japanese Language versions have a version number like `4.1.3-JL'. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -529,6 +542,11 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION 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 SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL @@ -975,6 +993,7 @@ EOF ;; *:FreeBSD:*:*) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD UNAME_PROCESSOR=`/usr/bin/uname -p` ======= @@ -982,6 +1001,8 @@ EOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main UNAME_PROCESSOR=`uname -p` ======= UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -990,6 +1011,9 @@ EOF UNAME_PROCESSOR=`/usr/bin/uname -p` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1056,11 +1080,14 @@ EOF ;; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) GUESS="$UNAME_MACHINE-pc-managarm-mlibc" ;; @@ -1072,6 +1099,9 @@ EOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1080,6 +1110,7 @@ EOF ;; aarch64:Linux:*:*) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ======= @@ -1087,6 +1118,8 @@ EOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main set_cc_for_build CPU=$UNAME_MACHINE LIBCABI=$LIBC @@ -1115,6 +1148,9 @@ EOF GUESS=$UNAME_MACHINE-unknown-linux-$LIBC >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1184,6 +1220,7 @@ EOF GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) ======= @@ -1191,6 +1228,8 @@ EOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main kvx:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -1208,6 +1247,9 @@ EOF loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1358,6 +1400,7 @@ EOF GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1368,6 +1411,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:*:*) @@ -1531,16 +1579,22 @@ EOF ;; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1592,6 +1646,7 @@ EOF GUESS=i586-pc-haiku ;; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD x86_64:Haiku:*:*) GUESS=x86_64-unknown-haiku @@ -1600,6 +1655,8 @@ EOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ppc:Haiku:*:*) # Haiku running on Apple PowerPC GUESS=powerpc-apple-haiku ;; @@ -1614,6 +1671,9 @@ EOF GUESS=x86_64-unknown-haiku >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1790,11 +1850,14 @@ EOF ;; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *:Ironclad:*:*) GUESS=$UNAME_MACHINE-unknown-ironclad ;; @@ -1803,6 +1866,9 @@ EOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/config.sub b/config.sub index 6aebec228e4..9491aba3726 100755 --- a/config.sub +++ b/config.sub @@ -2,6 +2,7 @@ # Configuration validation subroutine script. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -12,6 +13,8 @@ timestamp='2022-01-03' ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -32,6 +35,9 @@ timestamp='2022-01-03' timestamp='2022-01-03' >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -106,6 +112,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Copyright 1992-2022 Free Software Foundation, Inc. @@ -114,6 +121,8 @@ Copyright 1992-2022 Free Software Foundation, Inc. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Copyright 1992-2024 Free Software Foundation, Inc. ======= Copyright 1992-2022 Free Software Foundation, Inc. @@ -122,6 +131,9 @@ Copyright 1992-2022 Free Software Foundation, Inc. Copyright 1992-2022 Free Software Foundation, Inc. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1404,11 +1416,14 @@ EOF os=`echo "$basic_os" | sed -e 's|linux|gnu|'` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ;; managarm*) kernel=managarm @@ -1418,6 +1433,9 @@ EOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1819,6 +1837,7 @@ fi case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD musl* | newlib* | relibc* | uclibc*) ======= @@ -1826,6 +1845,8 @@ case $os in ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main llvm* | musl* | newlib* | relibc* | uclibc*) ======= musl* | newlib* | relibc* | uclibc*) @@ -1834,6 +1855,9 @@ case $os in musl* | newlib* | relibc* | uclibc*) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1889,6 +1913,7 @@ case $os in | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD | fiwix* ) ======= @@ -1896,6 +1921,8 @@ case $os in ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main | fiwix* | mlibc* | cos* | mbr* | ironclad* ) ======= | fiwix* ) @@ -1904,6 +1931,9 @@ case $os in | fiwix* ) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1975,6 +2005,7 @@ case $kernel-$os in | linux-musl* | linux-relibc* | linux-uclibc* ) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1985,11 +2016,17 @@ case $kernel-$os 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 ;; uclinux-uclibc*- ) ;; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) ======= @@ -1997,6 +2034,8 @@ case $kernel-$os in ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main managarm-mlibc*- | managarm-kernel*- ) ;; windows*-msvc*-) @@ -2010,6 +2049,9 @@ case $kernel-$os in -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/configure b/configure index 28312fa800b..775e7b5c4c0 100755 --- a/configure +++ b/configure @@ -2,11 +2,14 @@ # Guess values for system-dependent variables and create Makefiles. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Generated by GNU Autoconf 2.71. # # @@ -16,6 +19,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25,6 +31,7 @@ # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36,6 +43,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 @@ -48,12 +60,15 @@ DUALCASE=1; export DUALCASE # for MKS sh <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : @@ -64,6 +79,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -75,12 +93,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : setopt NO_GLOB_SUBST <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -89,6 +110,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -101,6 +125,7 @@ esac fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -108,6 +133,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Reset variables that may have inherited troublesome values from # the environment. @@ -152,6 +179,9 @@ if ${PATH_SEPARATOR+false} :; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -197,6 +227,7 @@ fi if test "${PATH_SEPARATOR+set}" != set; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -207,6 +238,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 && { @@ -220,6 +256,7 @@ fi <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -230,6 +267,10 @@ fi >>>>>>> osgeo-main ======= >>>>>>> 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. @@ -237,6 +278,7 @@ fi # splitting by setting IFS to empty value.) IFS=" "" $as_nl" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -250,6 +292,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 #(( @@ -259,6 +306,7 @@ for as_dir in $PATH do IFS=$as_save_IFS <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break @@ -267,6 +315,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -282,6 +332,9 @@ do test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -298,11 +351,14 @@ fi if test ! -f "$as_myself"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi @@ -311,6 +367,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -340,6 +399,7 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -351,6 +411,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. @@ -374,6 +439,7 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # out after a failed `exec'. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 as_fn_exit 255 ======= @@ -381,6 +447,8 @@ as_fn_exit 255 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 ======= @@ -392,6 +460,9 @@ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 as_fn_exit 255 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -400,6 +471,7 @@ as_fn_exit 255 { _as_can_reexec=; unset _as_can_reexec;} 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 : ======= @@ -407,6 +479,8 @@ if test "x$CONFIG_SHELL" = x; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_bourne_compatible="as_nop=: if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : @@ -417,6 +491,9 @@ then : 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 @@ -428,12 +505,15 @@ then : setopt NO_GLOB_SUBST <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else \$as_nop ======= else @@ -442,6 +522,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -466,11 +549,14 @@ as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : @@ -484,6 +570,9 @@ test x\"\$blah\" = xblah || exit 1 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -495,6 +584,7 @@ fi test x\$exitcode = x0 || exit 1 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -506,6 +596,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 @@ -514,11 +609,14 @@ test -x / || exit 1" test \$(( 1 + 1 )) = 2 || exit 1" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (eval "$as_required") 2>/dev/null then : as_have_required=yes @@ -533,6 +631,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -546,6 +647,7 @@ fi else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -556,6 +658,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 @@ -563,6 +670,7 @@ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. ======= @@ -570,6 +678,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -582,6 +692,9 @@ do test -z "$as_dir" && as_dir=. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -592,11 +705,14 @@ do # Try only shells that exist, to save several forks. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null @@ -608,6 +724,9 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -618,6 +737,7 @@ then : if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -628,6 +748,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 @@ -638,11 +763,14 @@ fi done <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main IFS=$as_save_IFS if $as_found then : @@ -662,6 +790,9 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -675,6 +806,7 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -685,6 +817,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 @@ -705,11 +842,14 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # out after a failed `exec'. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -727,6 +867,9 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -744,6 +887,7 @@ fi $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -755,6 +899,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." @@ -781,6 +930,7 @@ as_fn_unset () } as_unset=as_fn_unset +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -788,12 +938,17 @@ as_unset=as_fn_unset ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -816,11 +971,14 @@ as_fn_exit () } # as_fn_exit <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # as_fn_nop # --------- # Do nothing but, unlike ":", preserve the value of $?. @@ -834,6 +992,9 @@ as_nop=as_fn_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -852,6 +1013,7 @@ as_fn_mkdir_p () while :; do case $as_dir in #( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= @@ -859,6 +1021,8 @@ as_fn_mkdir_p () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( @@ -867,6 +1031,9 @@ as_fn_mkdir_p () *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -880,12 +1047,15 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$as_dir" | ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" X"$as_dir" | ======= $as_echo X"$as_dir" | @@ -894,6 +1064,9 @@ $as_echo X"$as_dir" | $as_echo X"$as_dir" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -937,12 +1110,15 @@ as_fn_executable_p () # implementations. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null then : ======= @@ -952,6 +1128,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -961,12 +1140,15 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : }' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -975,6 +1157,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -991,12 +1176,15 @@ fi # as_fn_append # must be portable across $(()) and expr. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null then : ======= @@ -1006,6 +1194,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1015,12 +1206,15 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : }' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -1029,6 +1223,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1038,6 +1235,7 @@ else } fi # as_fn_arith +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1045,6 +1243,8 @@ fi # as_fn_arith ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # as_fn_nop # --------- # Do nothing but, unlike ":", preserve the value of $?. @@ -1058,6 +1258,9 @@ as_nop=as_fn_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1073,6 +1276,7 @@ as_fn_error () if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -1082,6 +1286,8 @@ as_fn_error () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi printf "%s\n" "$as_me: error: $2" >&2 @@ -1096,6 +1302,9 @@ as_fn_error () $as_echo "$as_me: error: $2" >&2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1127,12 +1336,15 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X/"$0" | ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" X/"$0" | ======= $as_echo X/"$0" | @@ -1141,6 +1353,9 @@ $as_echo X/"$0" | $as_echo X/"$0" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1188,6 +1403,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ' >$as_me.lineno && chmod +x "$as_me.lineno" || <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } ======= @@ -1195,6 +1411,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } ======= { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } @@ -1203,6 +1421,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1219,6 +1440,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1226,6 +1448,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -1235,6 +1459,9 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1251,6 +1478,7 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1258,6 +1486,8 @@ esac ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -1270,6 +1500,9 @@ as_echo_n='printf %s' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1340,11 +1573,14 @@ MAKEFLAGS= # Identity of this package. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main PACKAGE_NAME='' PACKAGE_TARNAME='' PACKAGE_VERSION='' @@ -1355,6 +1591,9 @@ PACKAGE_URL='' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1366,6 +1605,7 @@ PACKAGE_BUGREPORT= PACKAGE_URL= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1377,17 +1617,25 @@ 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. ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include #ifdef HAVE_STDIO_H # include @@ -1402,6 +1650,9 @@ ac_includes_default="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1431,6 +1682,7 @@ ac_includes_default="\ #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1442,6 +1694,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 @@ -1450,11 +1707,14 @@ ac_includes_default="\ #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #ifdef HAVE_STRINGS_H # include #endif @@ -1469,6 +1729,9 @@ ac_includes_default="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1476,6 +1739,7 @@ ac_includes_default="\ # include #endif" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1483,12 +1747,17 @@ ac_includes_default="\ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_header_c_list= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1506,16 +1775,22 @@ OCLINCPATH USE_OPENMP <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1527,10 +1802,13 @@ OPENMP_CFLAGS ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1554,6 +1832,9 @@ OPENMP_CFLAGS >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1576,11 +1857,14 @@ CAIRO_HAS_XRENDER_SURFACE CAIRO_HAS_XRENDER <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main USE_LIBSVM LIBSVM_LIB LIBSVM_INC @@ -1589,6 +1873,9 @@ LIBSVM_INC ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1638,6 +1925,7 @@ PDAL_CPPFLAGS PDAL_LIBS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD PDAL_CONFIG ======= <<<<<<< HEAD @@ -1645,12 +1933,17 @@ PDAL_CONFIG >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= PDAL_CONFIG >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= PDAL_CONFIG >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1797,17 +2090,23 @@ oldincludedir includedir <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main runstatedir ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1850,17 +2149,23 @@ with_blas with_lapack <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main with_libsvm ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1877,11 +2182,14 @@ with_bzlib with_zstd <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main with_pdal with_libpng with_gdal @@ -1890,6 +2198,9 @@ with_liblas ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1899,6 +2210,7 @@ with_liblas with_pdal <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1910,6 +2222,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 @@ -1943,11 +2260,14 @@ with_lapack_includes with_lapack_libs <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main with_libsvm_includes with_libsvm_libs ======= @@ -1955,6 +2275,9 @@ with_libsvm_libs ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1979,6 +2302,7 @@ with_opencl_libs with_x <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD enable_openmp ======= <<<<<<< HEAD @@ -1994,6 +2318,12 @@ enable_openmp enable_openmp ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +enable_openmp +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2006,6 +2336,9 @@ enable_openmp >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2066,17 +2399,23 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main runstatedir='${localstatedir}/run' ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2113,6 +2452,7 @@ do ======= # Accept the important Cygnus configure options, so we can diagnose typos. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2125,6 +2465,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 --) @@ -2167,6 +2512,7 @@ do # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -2176,6 +2522,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` @@ -2190,6 +2538,9 @@ do ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2217,6 +2568,7 @@ do # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -2226,6 +2578,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` @@ -2240,6 +2594,9 @@ do ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2454,6 +2811,7 @@ do # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -2463,6 +2821,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` @@ -2477,6 +2837,9 @@ do ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2494,6 +2857,7 @@ do # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -2503,6 +2867,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` @@ -2517,6 +2883,9 @@ do ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2564,6 +2933,7 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && @@ -2573,6 +2943,8 @@ Try \`$0 --help' for more information" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 @@ -2587,6 +2959,9 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2606,6 +2981,7 @@ if test -n "$ac_unrecognized_opts"; then no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ======= @@ -2613,6 +2989,8 @@ if test -n "$ac_unrecognized_opts"; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ======= *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; @@ -2621,6 +2999,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2632,6 +3013,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libdir localedir mandir ======= @@ -2639,6 +3021,8 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main libdir localedir mandir runstatedir ======= libdir localedir mandir @@ -2647,6 +3031,9 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ libdir localedir mandir >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2707,12 +3094,15 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$as_myself" | ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" X"$as_myself" | ======= $as_echo X"$as_myself" | @@ -2721,6 +3111,9 @@ $as_echo X"$as_myself" | $as_echo X"$as_myself" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2822,17 +3215,23 @@ Fine tuning of the installation directories: --localstatedir=DIR modifiable single-machine data [PREFIX/var] <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2875,6 +3274,7 @@ Optional Features: --enable-shared build and link with shared libraries --enable-shared --enable-w11 use W11 library for Windows X11 emulation <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD --disable-openmp do not use OpenMP ======= @@ -2891,6 +3291,12 @@ Optional Features: --disable-openmp do not use OpenMP ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + --disable-openmp do not use OpenMP +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2903,6 +3309,9 @@ Optional Features: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2929,17 +3338,23 @@ Optional Packages: --with-lapack support LAPACK functionality (default: no) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main --with-libsvm support LIBSVM functionality (default: no) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2956,17 +3371,23 @@ Optional Packages: --with-zstd support Zstandard functionality (default: yes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main --with-pdal support PDAL functionality (default: yes) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2984,6 +3405,7 @@ Optional Packages: <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -2993,6 +3415,10 @@ Optional Packages: <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main --with-pdal=path/pdal-config enable PDAL support (pdal-config with path, @@ -3000,6 +3426,7 @@ Optional Packages: default: no) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3010,6 +3437,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, @@ -3066,11 +3498,14 @@ Optional Packages: --with-lapack-libs=DIRS LAPACK library files are in DIRS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main --with-libsvm-includes=DIRS LIBSVM include files are in DIRS --with-libsvm-libs=DIRS LIBSVM library files are in DIRS @@ -3079,6 +3514,9 @@ Optional Packages: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3153,6 +3591,7 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -3162,6 +3601,8 @@ case "$ac_dir" in ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` @@ -3176,6 +3617,9 @@ case "$ac_dir" in ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3207,6 +3651,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Check for guested configure. ======= @@ -3214,6 +3659,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Check for configure.gnu first; this name is used for a wrapper for # Metaconfig's "Configure" on case-insensitive file systems. ======= @@ -3223,6 +3670,9 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix # Check for guested configure. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3234,6 +3684,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix $SHELL "$ac_srcdir/configure" --help=recursive else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ======= @@ -3241,6 +3692,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ======= $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 @@ -3249,6 +3702,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3263,6 +3719,7 @@ if $ac_init_version; then configure <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3271,6 +3728,8 @@ Copyright (C) 2012 Free Software Foundation, Inc. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -3285,6 +3744,9 @@ generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3305,6 +3767,7 @@ ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext ======= @@ -3312,6 +3775,8 @@ ac_fn_c_try_compile () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam ======= rm -f conftest.$ac_objext @@ -3320,6 +3785,9 @@ ac_fn_c_try_compile () rm -f conftest.$ac_objext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3331,12 +3799,15 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -3345,6 +3816,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3357,11 +3831,14 @@ $as_echo "$ac_try_echo"; } >&5 fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || @@ -3375,6 +3852,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3388,6 +3868,7 @@ else $as_echo "$as_me: failed program was:" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3399,6 +3880,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 @@ -3415,6 +3901,7 @@ ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext ======= @@ -3422,6 +3909,8 @@ ac_fn_cxx_try_compile () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam ======= rm -f conftest.$ac_objext @@ -3430,6 +3919,9 @@ ac_fn_cxx_try_compile () rm -f conftest.$ac_objext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3441,12 +3933,15 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -3455,6 +3950,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3467,11 +3965,14 @@ $as_echo "$ac_try_echo"; } >&5 fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || @@ -3485,6 +3986,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3498,6 +4002,7 @@ else $as_echo "$as_me: failed program was:" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3509,6 +4014,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 @@ -3522,6 +4032,7 @@ fi # ---------------------- <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes # that executables *can* be run. ======= @@ -3529,6 +4040,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that # executables *can* be run. ======= @@ -3540,6 +4053,9 @@ fi # that executables *can* be run. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3554,11 +4070,14 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? @@ -3567,6 +4086,9 @@ printf "%s\n" "$ac_try_echo"; } >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3576,6 +4098,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3586,6 +4109,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 @@ -3595,11 +4123,14 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? @@ -3614,6 +4145,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3628,6 +4162,7 @@ else $as_echo "$as_me: failed program was:" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3639,6 +4174,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 @@ -3656,6 +4196,7 @@ ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext conftest$ac_exeext ======= @@ -3663,6 +4204,8 @@ ac_fn_c_try_link () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext ======= rm -f conftest.$ac_objext conftest$ac_exeext @@ -3671,6 +4214,9 @@ ac_fn_c_try_link () rm -f conftest.$ac_objext conftest$ac_exeext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3682,12 +4228,15 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -3696,6 +4245,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3707,6 +4259,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= @@ -3714,6 +4267,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -3722,6 +4277,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3733,11 +4291,14 @@ $as_echo "$ac_try_echo"; } >&5 test -x conftest$ac_exeext <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main } then : ac_retval=0 @@ -3747,6 +4308,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3756,6 +4320,7 @@ else $as_echo "$as_me: failed program was:" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3767,6 +4332,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 @@ -3781,6 +4351,7 @@ fi } # ac_fn_c_try_link +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -3788,6 +4359,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -3875,6 +4448,9 @@ printf "%s\n" "$ac_res" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3892,12 +4468,15 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -3906,6 +4485,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3918,11 +4500,14 @@ $as_echo "$ac_try_echo"; } >&5 fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || @@ -3936,6 +4521,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3949,6 +4537,7 @@ else $as_echo "$as_me: failed program was:" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3960,6 +4549,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 @@ -3973,6 +4567,7 @@ fi <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -3983,6 +4578,10 @@ fi >>>>>>> osgeo-main ======= >>>>>>> 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 @@ -4145,6 +4744,7 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4158,6 +4758,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 @@ -4165,6 +4770,7 @@ ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } @@ -4173,6 +4779,8 @@ $as_echo_n "checking for $2... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } ======= @@ -4184,6 +4792,9 @@ $as_echo_n "checking for $2... " >&6; } $as_echo_n "checking for $2... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4197,11 +4808,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* System header to define __stub macros and hopefully few prototypes, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main which can conflict with char $2 (); below. */ #include @@ -4209,6 +4823,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4222,6 +4839,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext # include #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4235,6 +4853,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. @@ -4254,12 +4877,15 @@ choke me int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -4268,6 +4894,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4279,11 +4908,14 @@ return $2 (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" @@ -4299,6 +4931,9 @@ printf "%s\n" "$ac_res" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4314,6 +4949,7 @@ eval ac_res=\$$3 $as_echo "$ac_res" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4324,6 +4960,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 @@ -4336,6 +4977,7 @@ ac_fn_cxx_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext conftest$ac_exeext ======= @@ -4343,6 +4985,8 @@ ac_fn_cxx_try_link () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext ======= rm -f conftest.$ac_objext conftest$ac_exeext @@ -4351,6 +4995,9 @@ ac_fn_cxx_try_link () rm -f conftest.$ac_objext conftest$ac_exeext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4362,12 +5009,15 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -4376,6 +5026,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4387,6 +5040,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= @@ -4394,6 +5048,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -4402,6 +5058,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4413,11 +5072,14 @@ $as_echo "$ac_try_echo"; } >&5 test -x conftest$ac_exeext <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main } then : ac_retval=0 @@ -4427,6 +5089,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4436,6 +5101,7 @@ else $as_echo "$as_me: failed program was:" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4447,6 +5113,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 @@ -4468,6 +5139,7 @@ ac_fn_cxx_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } @@ -4476,6 +5148,8 @@ $as_echo_n "checking for $2... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } ======= @@ -4487,6 +5161,9 @@ $as_echo_n "checking for $2... " >&6; } $as_echo_n "checking for $2... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4500,11 +5177,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* System header to define __stub macros and hopefully few prototypes, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main which can conflict with char $2 (); below. */ #include @@ -4512,6 +5192,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4525,6 +5208,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext # include #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4538,6 +5222,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. @@ -4557,12 +5246,15 @@ choke me int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -4571,6 +5263,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4582,11 +5277,14 @@ return $2 (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_link "$LINENO" then : eval "$3=yes" @@ -4625,6 +5323,9 @@ esac ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4643,6 +5344,7 @@ $as_echo "$ac_res" >&6; } } # ac_fn_cxx_check_func <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4654,6 +5356,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. @@ -4661,6 +5368,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4669,6 +5377,8 @@ generated by GNU Autoconf 2.69. Invocation command line was ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4683,6 +5393,9 @@ generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4719,6 +5432,7 @@ for as_dir in $PATH do IFS=$as_save_IFS <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. $as_echo "PATH: $as_dir" @@ -4727,6 +5441,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -4742,6 +5458,9 @@ do $as_echo "PATH: $as_dir" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4780,6 +5499,7 @@ do continue ;; *\'*) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -4787,6 +5507,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; @@ -4795,6 +5517,9 @@ do ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4834,11 +5559,14 @@ done trap 'exit_status=$? <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Sanitize IFS. IFS=" "" $as_nl" ======= @@ -4846,6 +5574,9 @@ trap 'exit_status=$? ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4853,6 +5584,7 @@ trap 'exit_status=$? { echo +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "## ---------------- ## @@ -4861,6 +5593,8 @@ trap 'exit_status=$? ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "## ---------------- ## ======= $as_echo "## ---------------- ## @@ -4869,6 +5603,9 @@ trap 'exit_status=$? $as_echo "## ---------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4883,6 +5620,7 @@ trap 'exit_status=$? *${as_nl}*) case $ac_var in #( <<<<<<< 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;} ;; @@ -4891,6 +5629,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ;; ======= @@ -4902,6 +5642,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4928,6 +5671,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "## ----------------- ## @@ -4936,6 +5680,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "## ----------------- ## ======= $as_echo "## ----------------- ## @@ -4944,6 +5690,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "## ----------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4955,6 +5704,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; eval ac_val=\$$ac_var case $ac_val in <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -4964,6 +5714,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac printf "%s\n" "$ac_var='\''$ac_val'\''" @@ -4978,6 +5730,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "$ac_var='\''$ac_val'\''" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4986,6 +5741,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; if test -n "$ac_subst_files"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "## ------------------- ## ======= @@ -4993,6 +5749,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "## ------------------- ## ======= $as_echo "## ------------------- ## @@ -5001,6 +5759,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "## ------------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5012,6 +5773,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; eval ac_val=\$$ac_var case $ac_val in <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -5021,6 +5783,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac printf "%s\n" "$ac_var='\''$ac_val'\''" @@ -5035,6 +5799,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "$ac_var='\''$ac_val'\''" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5044,6 +5811,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; if test -s confdefs.h; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "## ----------- ## ======= @@ -5051,6 +5819,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "## ----------- ## ======= $as_echo "## ----------- ## @@ -5059,6 +5829,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "## ----------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5070,6 +5843,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; fi test "$ac_signal" != 0 && <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me: caught signal $ac_signal" $as_echo "$as_me: exit $exit_status" @@ -5078,6 +5852,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me: caught signal $ac_signal" printf "%s\n" "$as_me: exit $exit_status" ======= @@ -5089,6 +5865,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "$as_me: exit $exit_status" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5105,6 +5884,7 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -5112,6 +5892,8 @@ rm -f -r conftest* confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. @@ -5131,6 +5913,9 @@ printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5163,6 +5948,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5174,17 +5960,25 @@ _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. # Prefer an explicitly selected file to automatically selected ones. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test -n "$CONFIG_SITE"; then ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then @@ -5212,6 +6006,9 @@ printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5243,6 +6040,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5254,12 +6052,18 @@ $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 done +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Check that the precious variables saved in the cache have kept the same @@ -5316,6 +6120,8 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -5981,6 +6787,9 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} esac fi <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5993,9 +6802,12 @@ $as_echo "$as_me: error: changes in the environment can compromise the build" >& as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) fi ## -------------------- ## @@ -6027,6 +6839,7 @@ fi ## Main body of script. ## ## -------------------- ## +<<<<<<< HEAD <<<<<<< HEAD ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6034,6 +6847,8 @@ 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 +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -6222,6 +7037,7 @@ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || $as_echo "$ac_cv_build" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6233,6 +7049,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;; @@ -6251,6 +7072,7 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 @@ -6260,6 +7082,8 @@ $as_echo_n "checking host system type... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 printf %s "checking host system type... " >&6; } ======= @@ -6271,6 +7095,9 @@ $as_echo_n "checking host system type... " >&6; } $as_echo_n "checking host system type... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6279,6 +7106,7 @@ if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else <<<<<<< 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 @@ -6291,6 +7119,8 @@ $as_echo "$ac_cv_host" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 fi @@ -6314,6 +7144,9 @@ fi $as_echo "$ac_cv_host" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6335,6 +7168,7 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -6342,6 +7176,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main @@ -6356,6 +7192,9 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6369,6 +7208,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -6376,6 +7216,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -6387,6 +7229,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6400,11 +7245,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -6418,6 +7266,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6428,6 +7279,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6438,6 +7290,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 @@ -6449,6 +7306,7 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -6460,6 +7318,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } else @@ -6480,6 +7340,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6493,6 +7356,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -6500,6 +7364,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -6511,6 +7377,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6524,11 +7393,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -6542,6 +7414,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6552,6 +7427,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6562,6 +7438,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 @@ -6574,11 +7455,14 @@ ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 printf "%s\n" "$ac_ct_CC" >&6; } else @@ -6588,6 +7472,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6598,6 +7485,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6609,6 +7497,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 @@ -6618,6 +7511,7 @@ fi yes:) <<<<<<< 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;} ======= @@ -6625,6 +7519,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -6636,6 +7532,9 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6653,6 +7552,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -6660,6 +7560,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -6671,6 +7573,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6684,11 +7589,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -6702,6 +7610,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6712,6 +7623,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6722,6 +7634,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 @@ -6734,11 +7651,14 @@ CC=$ac_cv_prog_CC if test -n "$CC"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } else @@ -6748,6 +7668,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6758,6 +7681,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6769,6 +7693,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 @@ -6779,6 +7708,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -6786,6 +7716,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -6797,6 +7729,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6811,11 +7746,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -6828,6 +7766,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6837,6 +7778,7 @@ do if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6847,12 +7789,18 @@ 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 fi ac_cv_prog_CC="cc" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ======= @@ -6860,6 +7808,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 ======= $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 @@ -6868,6 +7818,9 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6887,6 +7840,7 @@ if test $ac_prog_rejected = yes; then # first if we set CC to just the basename; use the full file name. shift <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ======= @@ -6894,6 +7848,8 @@ if test $ac_prog_rejected = yes; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" ======= ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" @@ -6902,6 +7858,9 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6911,6 +7870,7 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -6922,6 +7882,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } else @@ -6942,6 +7904,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6957,6 +7922,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -6964,6 +7930,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -6975,6 +7943,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6988,11 +7959,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -7006,6 +7980,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7016,6 +7993,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -7026,6 +8004,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 @@ -7037,6 +8020,7 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -7048,6 +8032,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } else @@ -7068,6 +8054,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7085,6 +8074,7 @@ do set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -7092,6 +8082,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -7103,6 +8095,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7116,11 +8111,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -7134,6 +8132,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7144,6 +8145,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -7154,6 +8156,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 @@ -7166,11 +8173,14 @@ ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 printf "%s\n" "$ac_ct_CC" >&6; } else @@ -7180,6 +8190,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7190,6 +8203,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -7201,6 +8215,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 @@ -7214,6 +8233,7 @@ done yes:) <<<<<<< 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;} ======= @@ -7221,6 +8241,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -7228,6 +8250,9 @@ printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7240,6 +8265,7 @@ fi fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -7413,6 +8439,8 @@ $as_echo "$ac_cv_exeext" >&6; } <<<<<<< HEAD ======= >>>>>>> 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. @@ -8031,6 +9059,9 @@ $as_echo "$ac_cv_exeext" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8043,12 +9074,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -8057,6 +9091,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8073,6 +9110,7 @@ ac_clean_files="$ac_clean_files conftest.out" # the compiler is broken, or we cross compile. <<<<<<< 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; } ======= @@ -8080,6 +9118,8 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -8091,6 +9131,9 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } $as_echo_n "checking whether we are cross compiling... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8103,11 +9146,14 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? @@ -8116,6 +9162,9 @@ printf "%s\n" "$ac_try_echo"; } >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8125,6 +9174,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8135,6 +9185,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' @@ -8145,11 +9200,14 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? @@ -8158,6 +9216,9 @@ printf "%s\n" "$ac_try_echo"; } >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8167,6 +9228,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8177,6 +9239,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 @@ -8185,6 +9252,7 @@ $as_echo "$ac_try_echo"; } >&5 cross_compiling=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -8194,6 +9262,8 @@ as_fn_error $? "cannot run C compiled programs. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} as_fn_error 77 "cannot run C compiled programs. @@ -8208,6 +9278,9 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8218,11 +9291,14 @@ See \`config.log' for more details" "$LINENO" 5; } fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } @@ -8234,6 +9310,9 @@ printf %s "checking for suffix of object files... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8246,6 +9325,7 @@ ac_clean_files=$ac_clean_files_save $as_echo_n "checking for suffix of object files... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8257,6 +9337,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. */ @@ -8264,12 +9349,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -8278,6 +9366,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8296,11 +9387,14 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? @@ -8311,6 +9405,9 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8321,6 +9418,7 @@ $as_echo "$ac_try_echo"; } >&5 test $ac_status = 0; }; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8331,6 +9429,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; @@ -8342,11 +9445,14 @@ $as_echo "$ac_try_echo"; } >&5 done <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8357,6 +9463,9 @@ printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8368,6 +9477,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8379,17 +9489,25 @@ $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 rm -f conftest.$ac_cv_objext conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -8400,6 +9518,9 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8411,6 +9532,7 @@ ac_objext=$OBJEXT $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8422,6 +9544,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. */ @@ -8429,12 +9556,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -8443,6 +9573,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8457,6 +9590,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else @@ -8472,6 +9606,8 @@ $as_echo "$ac_cv_c_compiler_gnu" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes @@ -8510,6 +9646,9 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu $as_echo "$ac_cv_c_compiler_gnu" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8520,11 +9659,14 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -8533,6 +9675,9 @@ printf %s "checking whether $CC accepts -g... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8542,6 +9687,7 @@ ac_save_CFLAGS=$CFLAGS $as_echo_n "checking whether $CC accepts -g... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8553,6 +9699,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 @@ -8564,12 +9715,15 @@ ac_save_c_werror_flag=$ac_c_werror_flag int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -8578,6 +9732,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8589,11 +9746,14 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes @@ -8644,6 +9804,9 @@ if test $ac_test_CFLAGS; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8692,6 +9855,7 @@ $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8702,6 +9866,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 @@ -8719,6 +9888,7 @@ else fi <<<<<<< 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; } @@ -8767,6 +9937,8 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_prog_cc_stdc=no if test x$ac_prog_cc_stdc = xno then : @@ -8961,6 +10133,9 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8988,6 +10163,7 @@ fi rm -f core conftest.err conftest.$ac_objext <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8998,12 +10174,18 @@ 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 rm -f conftest.$ac_ext CC=$ac_save_CC +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -9011,6 +10193,8 @@ CC=$ac_save_CC ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 @@ -9032,6 +10216,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9050,6 +10237,7 @@ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac if test "x$ac_cv_prog_cc_c89" != xno; then : +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -9063,6 +10251,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 @@ -9079,6 +10272,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Check whether --with-cxx was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_cxx+set}" = set; then : withval=$with_cxx; else @@ -9087,6 +10281,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_cxx+y} then : withval=$with_cxx; @@ -9102,6 +10298,9 @@ if test "${with_cxx+set}" = set; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9111,6 +10310,7 @@ fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -9118,6 +10318,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -9126,6 +10328,9 @@ printf "%s\n" "\"$with_cxx\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9135,6 +10340,7 @@ $as_echo_n "checking whether to use C++... " >&6; } $as_echo "\"$with_cxx\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9146,6 +10352,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" ;; @@ -9156,6 +10367,7 @@ esac if test -n "$USE_CXX"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_ext=cpp ======= @@ -9163,6 +10375,8 @@ if test -n "$USE_CXX"; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main @@ -9177,6 +10391,9 @@ ac_ext=cpp ac_ext=cpp >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9191,11 +10408,14 @@ if test -z "$CXX"; then if test -n "$ac_tool_prefix"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -9206,6 +10426,9 @@ printf %s "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9217,6 +10440,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9228,6 +10452,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. @@ -9238,11 +10467,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -9256,6 +10488,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9266,6 +10501,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9276,6 +10512,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 @@ -9288,11 +10529,14 @@ CXX=$ac_cv_prog_CXX if test -n "$CXX"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 printf "%s\n" "$CXX" >&6; } else @@ -9302,6 +10546,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9312,6 +10559,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9323,6 +10571,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 @@ -9333,11 +10586,14 @@ if test -z "$CXX"; then ac_ct_CXX=$CXX <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -9348,6 +10604,9 @@ printf %s "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9359,6 +10618,7 @@ set dummy $ac_prog; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9370,6 +10630,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. @@ -9380,11 +10645,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -9398,6 +10666,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9408,6 +10679,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9418,6 +10690,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 @@ -9430,11 +10707,14 @@ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 printf "%s\n" "$ac_ct_CXX" >&6; } else @@ -9444,6 +10724,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9454,6 +10737,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9465,6 +10749,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 @@ -9478,6 +10767,7 @@ done yes:) <<<<<<< 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;} ======= @@ -9485,6 +10775,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -9496,6 +10788,9 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9510,12 +10805,15 @@ fi # Provide some information about the compiler. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -9524,6 +10822,9 @@ $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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9538,12 +10839,15 @@ esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -9552,6 +10856,9 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9566,11 +10873,14 @@ $as_echo "$ac_try_echo"; } >&5 rm -f conftest.er1 conftest.err <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -9581,6 +10891,9 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9592,6 +10905,7 @@ done $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9603,6 +10917,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. */ @@ -9610,12 +10929,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -9624,6 +10946,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9638,6 +10963,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else @@ -9663,6 +10989,8 @@ $as_echo_n "checking whether $CXX accepts -g... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : ac_compiler_gnu=yes @@ -9728,6 +11056,9 @@ $as_echo_n "checking whether $CXX accepts -g... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9741,12 +11072,15 @@ ac_save_cxx_werror_flag=$ac_cxx_werror_flag int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -9755,6 +11089,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9766,6 +11103,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else @@ -9774,6 +11112,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes @@ -9789,6 +11129,9 @@ if ac_fn_cxx_try_compile "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9799,12 +11142,15 @@ else int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -9813,6 +11159,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9824,6 +11173,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_cxx_try_compile "$LINENO"; then : else @@ -9832,6 +11182,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : @@ -9847,6 +11199,9 @@ if ac_fn_cxx_try_compile "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9858,12 +11213,15 @@ else int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -9872,6 +11230,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9883,11 +11244,14 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes @@ -9905,6 +11269,9 @@ if test $ac_test_CXXFLAGS; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -9922,6 +11289,7 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9932,6 +11300,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 @@ -9949,11 +11322,14 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_prog_cxx_stdcxx=no if test x$ac_prog_cxx_stdcxx = xno then : @@ -10045,6 +11421,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10073,6 +11452,7 @@ case $host_os in *mingw32* ) MINGW32=yes;; esac +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for executable suffix" >&5 @@ -10082,6 +11462,8 @@ $as_echo_n "checking for executable suffix... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for executable suffix" >&5 printf %s "checking for executable suffix... " >&6; } ======= @@ -10093,6 +11475,9 @@ $as_echo_n "checking for executable suffix... " >&6; } $as_echo_n "checking for executable suffix... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10107,6 +11492,7 @@ EXEEXT="" test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_exeext}" >&5 $as_echo "${ac_cv_exeext}" >&6; } ======= @@ -10114,6 +11500,8 @@ $as_echo "${ac_cv_exeext}" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_exeext}" >&5 printf "%s\n" "${ac_cv_exeext}" >&6; } ======= @@ -10125,6 +11513,9 @@ $as_echo "${ac_cv_exeext}" >&6; } $as_echo "${ac_cv_exeext}" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10149,6 +11540,7 @@ PKG_CONFIG=${PKG_CONFIG-pkg-config} IEEEFLAG= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -10156,6 +11548,8 @@ IEEEFLAG= ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -10169,6 +11563,9 @@ printf %s "checking whether \"cc -mieee\" works... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10182,6 +11579,7 @@ $as_echo "unknown (cross-compiling)" >&6; } $as_echo_n "checking whether \"cc -mieee\" works... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10193,6 +11591,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 @@ -10201,12 +11604,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -10215,6 +11621,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10226,11 +11635,14 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -10249,6 +11661,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10267,6 +11682,7 @@ CFLAGS=${ac_save_cflags} else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10277,6 +11693,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. */ @@ -10294,6 +11715,7 @@ int main(void) { _ACEOF <<<<<<< 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; } @@ -10317,6 +11739,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -10378,6 +11802,9 @@ $as_echo "unknown (cross-compiling)" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10397,11 +11824,14 @@ int main(void) { _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -10416,6 +11846,9 @@ printf "%s\n" "$as_me: WARNING: *** Incomplete floating-point support." >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10430,6 +11863,7 @@ $as_echo "no" >&6; } $as_echo "$as_me: WARNING: *** Incomplete floating-point support." >&2;} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10441,6 +11875,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 @@ -10471,6 +11910,7 @@ fi set dummy pwd; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -10478,6 +11918,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -10489,6 +11931,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10504,11 +11949,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -10522,6 +11970,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10532,6 +11983,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10542,6 +11994,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 @@ -10555,6 +12012,7 @@ esac pwd=$ac_cv_path_pwd if test -n "$pwd"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pwd" >&5 $as_echo "$pwd" >&6; } @@ -10566,6 +12024,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pwd" >&5 printf "%s\n" "$pwd" >&6; } else @@ -10586,6 +12046,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10599,6 +12062,7 @@ else winpwd="$pwd" fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for source directory" >&5 @@ -10608,6 +12072,8 @@ $as_echo_n "checking for source directory... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for source directory" >&5 printf %s "checking for source directory... " >&6; } ======= @@ -10619,6 +12085,9 @@ $as_echo_n "checking for source directory... " >&6; } $as_echo_n "checking for source directory... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10629,6 +12098,7 @@ else SRCDIR=`(cd "$srcdir" ; $pwd)` fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$SRCDIR\"" >&5 @@ -10641,6 +12111,8 @@ $as_echo_n "checking for build directory... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$SRCDIR\"" >&5 printf "%s\n" "\"$SRCDIR\"" >&6; } @@ -10661,6 +12133,9 @@ $as_echo "\"$SRCDIR\"" >&6; } $as_echo_n "checking for build directory... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10668,6 +12143,7 @@ $as_echo_n "checking for build directory... " >&6; } DSTDIR=`$pwd` WINDSTDIR=`$winpwd` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$DSTDIR\"" >&5 @@ -10677,6 +12153,8 @@ $as_echo "\"$DSTDIR\"" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$DSTDIR\"" >&5 printf "%s\n" "\"$DSTDIR\"" >&6; } ======= @@ -10688,6 +12166,9 @@ $as_echo "\"$DSTDIR\"" >&6; } $as_echo "\"$DSTDIR\"" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10737,6 +12218,7 @@ GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'` set dummy git; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -10744,6 +12226,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -10755,6 +12239,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10770,11 +12257,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -10788,6 +12278,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10798,6 +12291,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10808,6 +12302,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 @@ -10821,6 +12320,7 @@ esac GIT=$ac_cv_path_GIT if test -n "$GIT"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 $as_echo "$GIT" >&6; } @@ -10835,6 +12335,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 printf "%s\n" "$GIT" >&6; } else @@ -10885,6 +12387,9 @@ fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10929,11 +12434,14 @@ printf "%s\n" "$GRASS_HEADERS_GIT_DATE" >&6; } # Check whether --enable-macosx-app was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${enable_macosx_app+y} then : enableval=$enable_macosx_app; @@ -10942,6 +12450,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10953,6 +12464,7 @@ else fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX App" >&5 @@ -10962,6 +12474,8 @@ $as_echo_n "checking for MacOSX App... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacOSX App" >&5 printf %s "checking for MacOSX App... " >&6; } ======= @@ -10973,6 +12487,9 @@ $as_echo_n "checking for MacOSX App... " >&6; } $as_echo_n "checking for MacOSX App... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10983,6 +12500,7 @@ case "$enable_macosx_app" in esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$enable_macosx_app\"" >&5 $as_echo "\"$enable_macosx_app\"" >&6; } ======= @@ -10990,6 +12508,8 @@ $as_echo "\"$enable_macosx_app\"" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$enable_macosx_app\"" >&5 printf "%s\n" "\"$enable_macosx_app\"" >&6; } ======= @@ -11001,6 +12521,9 @@ $as_echo "\"$enable_macosx_app\"" >&6; } $as_echo "\"$enable_macosx_app\"" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11008,6 +12531,7 @@ $as_echo "\"$enable_macosx_app\"" >&6; } # Check for MacOSX archs +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX architectures" >&5 @@ -11017,6 +12541,8 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacOSX architectures" >&5 printf %s "checking for MacOSX architectures... " >&6; } ======= @@ -11028,6 +12554,9 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } $as_echo_n "checking for MacOSX architectures... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11036,6 +12565,7 @@ MACOSX_ARCHS= if test -z "$with_macosx_archs" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11044,6 +12574,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ======= @@ -11055,6 +12587,9 @@ $as_echo "no" >&6; } $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11069,6 +12604,7 @@ else esac done <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_ARCHS" >&5 $as_echo "$MACOSX_ARCHS" >&6; } @@ -11077,6 +12613,8 @@ $as_echo "$MACOSX_ARCHS" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACOSX_ARCHS" >&5 printf "%s\n" "$MACOSX_ARCHS" >&6; } ======= @@ -11088,6 +12626,9 @@ $as_echo "$MACOSX_ARCHS" >&6; } $as_echo "$MACOSX_ARCHS" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11102,6 +12643,7 @@ fi # Check for MacOSX SDK +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX SDK" >&5 @@ -11111,6 +12653,8 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacOSX SDK" >&5 printf %s "checking for MacOSX SDK... " >&6; } ======= @@ -11122,6 +12666,9 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } $as_echo_n "checking for MacOSX SDK... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11130,6 +12677,7 @@ MACOSX_SDK= if test -z "$with_macosx_sdk" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11142,6 +12690,8 @@ $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -11165,6 +12715,9 @@ else $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11179,11 +12732,14 @@ fi eval ac_res=\$$as_ac_File <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_File"\" = x"yes" @@ -11196,6 +12752,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11206,6 +12765,7 @@ if eval test \"x\$"$as_ac_File"\" = x"yes"; then : MACOSX_SDK="-isysroot $with_macosx_sdk" else +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11218,6 +12778,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 @@ -11244,6 +12809,7 @@ fi # Get flags for building shared libraries +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11251,6 +12817,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5 printf %s "checking how to build libraries... " >&6; } # Check whether --enable-shared was given. @@ -11262,6 +12830,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11285,6 +12856,7 @@ fi if test "$shared_ok" = "yes" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 $as_echo "shared" >&6; } @@ -11301,6 +12873,8 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: shared" >&5 printf "%s\n" "shared" >&6; } SHARED_BUILD=1 @@ -11336,6 +12910,9 @@ $as_echo "static" >&6; } $as_echo "#define STATIC_BUILD 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11396,6 +12973,7 @@ ac_save_ldflags="$LDFLAGS" # Note: If _REENTRANT isn't defined, then Solaris # won't define thread-safe library routines. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11403,6 +12981,8 @@ ac_save_ldflags="$LDFLAGS" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define _REENTRANT 1" >>confdefs.h @@ -11411,6 +12991,9 @@ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11420,6 +13003,7 @@ $as_echo "#define _REENTRANT 1" >>confdefs.h $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11430,6 +13014,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 @@ -11454,6 +13043,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h # Note: If _REENTRANT isn't defined, then Solaris # won't define thread-safe library routines. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11461,6 +13051,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define _REENTRANT 1" >>confdefs.h @@ -11469,6 +13061,9 @@ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11478,6 +13073,7 @@ $as_echo "#define _REENTRANT 1" >>confdefs.h $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11488,6 +13084,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 @@ -11520,6 +13121,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h # CFLAGS="$CFLAGS -pthread" # LDFLAGS="$LDFLAGS -lpthread" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -11528,6 +13130,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.]) ======= @@ -11539,6 +13143,9 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11563,6 +13170,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h # CFLAGS="$CFLAGS -pthread" # LDFLAGS="$LDFLAGS -lpthread" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -11571,6 +13179,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.]) ======= @@ -11582,6 +13192,9 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11631,11 +13244,14 @@ LDFLAGS="${ac_save_ldflags} $LDFLAGS" # Check whether --enable-w11 was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${enable_w11+y} then : enableval=$enable_w11; @@ -11644,6 +13260,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11663,11 +13282,14 @@ fi # Check whether --with-macosx-archs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_macosx_archs+y} then : withval=$with_macosx_archs; @@ -11676,6 +13298,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11690,11 +13315,14 @@ fi # Check whether --with-macosx-sdk was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_macosx_sdk+y} then : withval=$with_macosx_sdk; @@ -11703,6 +13331,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11718,11 +13349,14 @@ fi # Check whether --with-tiff was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_tiff+y} then : withval=$with_tiff; @@ -11731,6 +13365,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11747,11 +13384,14 @@ fi # Check whether --with-postgres was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_postgres+y} then : withval=$with_postgres; @@ -11760,6 +13400,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11776,11 +13419,14 @@ fi # Check whether --with-mysql was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_mysql+y} then : withval=$with_mysql; @@ -11789,6 +13435,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11805,11 +13454,14 @@ fi # Check whether --with-sqlite was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_sqlite+y} then : withval=$with_sqlite; @@ -11818,6 +13470,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11834,11 +13489,14 @@ fi # Check whether --with-opengl was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opengl+y} then : withval=$with_opengl; @@ -11847,6 +13505,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11863,11 +13524,14 @@ fi # Check whether --with-odbc was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_odbc+y} then : withval=$with_odbc; @@ -11876,6 +13540,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11892,11 +13559,14 @@ fi # Check whether --with-fftw was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_fftw+y} then : withval=$with_fftw; @@ -11905,6 +13575,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11921,11 +13594,14 @@ fi # Check whether --with-blas was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_blas+y} then : withval=$with_blas; @@ -11934,6 +13610,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11950,11 +13629,14 @@ fi # Check whether --with-lapack was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_lapack+y} then : withval=$with_lapack; @@ -11963,6 +13645,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11976,6 +13661,7 @@ fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11983,6 +13669,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Check whether --with-libsvm was given. if test ${with_libsvm+y} then : @@ -12003,6 +13691,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12020,11 +13711,14 @@ fi # Check whether --with-freetype was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_freetype+y} then : withval=$with_freetype; @@ -12033,6 +13727,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12049,11 +13746,14 @@ fi # Check whether --with-nls was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_nls+y} then : withval=$with_nls; @@ -12062,6 +13762,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12078,11 +13781,14 @@ fi # Check whether --with-readline was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_readline+y} then : withval=$with_readline; @@ -12091,6 +13797,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12107,11 +13816,14 @@ fi # Check whether --with-opendwg was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opendwg+y} then : withval=$with_opendwg; @@ -12120,6 +13832,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12136,11 +13851,14 @@ fi # Check whether --with-regex was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_regex+y} then : withval=$with_regex; @@ -12149,6 +13867,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12165,11 +13886,14 @@ fi # Check whether --with-pthread was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_pthread+y} then : withval=$with_pthread; @@ -12178,6 +13902,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12194,11 +13921,14 @@ fi # Check whether --with-openmp was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_openmp+y} then : withval=$with_openmp; @@ -12207,6 +13937,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12223,11 +13956,14 @@ fi # Check whether --with-opencl was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opencl+y} then : withval=$with_opencl; @@ -12236,6 +13972,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12252,11 +13991,14 @@ fi # Check whether --with-bzlib was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_bzlib+y} then : withval=$with_bzlib; @@ -12265,6 +14007,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12281,11 +14026,14 @@ fi # Check whether --with-zstd was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_zstd+y} then : withval=$with_zstd; @@ -12294,6 +14042,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12307,6 +14058,7 @@ fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Check whether --with-libpng was given. @@ -12317,6 +14069,8 @@ if test "${with_libpng+set}" = set; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Check whether --with-pdal was given. if test ${with_pdal+y} then : @@ -12334,6 +14088,9 @@ if test "${with_libpng+set}" = set; then : withval=$with_libpng; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12341,6 +14098,7 @@ fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Check whether --with-gdal was given. @@ -12350,6 +14108,8 @@ if test "${with_gdal+set}" = set; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Check whether --with-libpng was given. if test ${with_libpng+y} @@ -12371,6 +14131,9 @@ if test "${with_gdal+set}" = set; then : if test "${with_gdal+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12382,11 +14145,14 @@ fi # Check whether --with-liblas was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_liblas+y} then : withval=$with_liblas; @@ -12395,6 +14161,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12406,6 +14175,7 @@ else fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -12413,6 +14183,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Check whether --with-netcdf was given. if test ${with_netcdf+y} @@ -12423,6 +14195,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12451,11 +14226,14 @@ fi # Check whether --with-geos was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_geos+y} then : withval=$with_geos; @@ -12464,6 +14242,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12479,12 +14260,15 @@ fi # Check whether --with-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_includes+y} then : ======= @@ -12494,6 +14278,9 @@ if test "${with_includes+set}" = set; then : if test "${with_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12505,12 +14292,15 @@ fi # Check whether --with-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_libs+y} then : ======= @@ -12520,6 +14310,9 @@ if test "${with_libs+set}" = set; then : if test "${with_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12532,12 +14325,15 @@ fi # Check whether --with-zlib-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zlib_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_zlib_includes+y} then : ======= @@ -12547,6 +14343,9 @@ if test "${with_zlib_includes+set}" = set; then : if test "${with_zlib_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12559,12 +14358,15 @@ fi # Check whether --with-zlib-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zlib_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_zlib_libs+y} then : ======= @@ -12574,6 +14376,9 @@ if test "${with_zlib_libs+set}" = set; then : if test "${with_zlib_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12587,12 +14392,15 @@ fi # Check whether --with-bzlib-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_bzlib_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_bzlib_includes+y} then : ======= @@ -12602,6 +14410,9 @@ if test "${with_bzlib_includes+set}" = set; then : if test "${with_bzlib_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12614,12 +14425,15 @@ fi # Check whether --with-bzlib-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_bzlib_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_bzlib_libs+y} then : ======= @@ -12629,6 +14443,9 @@ if test "${with_bzlib_libs+set}" = set; then : if test "${with_bzlib_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12642,12 +14459,15 @@ fi # Check whether --with-zstd-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zstd_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_zstd_includes+y} then : ======= @@ -12657,6 +14477,9 @@ if test "${with_zstd_includes+set}" = set; then : if test "${with_zstd_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12669,12 +14492,15 @@ fi # Check whether --with-zstd-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zstd_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_zstd_libs+y} then : ======= @@ -12684,6 +14510,9 @@ if test "${with_zstd_libs+set}" = set; then : if test "${with_zstd_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12697,12 +14526,15 @@ fi # Check whether --with-readline-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_readline_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_readline_includes+y} then : ======= @@ -12712,6 +14544,9 @@ if test "${with_readline_includes+set}" = set; then : if test "${with_readline_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12724,12 +14559,15 @@ fi # Check whether --with-readline-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_readline_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_readline_libs+y} then : ======= @@ -12739,6 +14577,9 @@ if test "${with_readline_libs+set}" = set; then : if test "${with_readline_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12752,12 +14593,15 @@ fi # Check whether --with-tiff-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_tiff_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_tiff_includes+y} then : ======= @@ -12767,6 +14611,9 @@ if test "${with_tiff_includes+set}" = set; then : if test "${with_tiff_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12779,12 +14626,15 @@ fi # Check whether --with-tiff-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_tiff_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_tiff_libs+y} then : ======= @@ -12794,6 +14644,9 @@ if test "${with_tiff_libs+set}" = set; then : if test "${with_tiff_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12807,12 +14660,15 @@ fi # Check whether --with-postgres-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_postgres_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_postgres_includes+y} then : ======= @@ -12822,6 +14678,9 @@ if test "${with_postgres_includes+set}" = set; then : if test "${with_postgres_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12834,12 +14693,15 @@ fi # Check whether --with-postgres-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_postgres_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_postgres_libs+y} then : ======= @@ -12849,6 +14711,9 @@ if test "${with_postgres_libs+set}" = set; then : if test "${with_postgres_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12862,12 +14727,15 @@ fi # Check whether --with-mysql-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_mysql_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_mysql_includes+y} then : ======= @@ -12877,6 +14745,9 @@ if test "${with_mysql_includes+set}" = set; then : if test "${with_mysql_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12889,12 +14760,15 @@ fi # Check whether --with-mysql-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_mysql_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_mysql_libs+y} then : ======= @@ -12904,6 +14778,9 @@ if test "${with_mysql_libs+set}" = set; then : if test "${with_mysql_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12917,12 +14794,15 @@ fi # Check whether --with-sqlite-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_sqlite_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_sqlite_includes+y} then : ======= @@ -12932,6 +14812,9 @@ if test "${with_sqlite_includes+set}" = set; then : if test "${with_sqlite_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12944,12 +14827,15 @@ fi # Check whether --with-sqlite-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_sqlite_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_sqlite_libs+y} then : ======= @@ -12959,6 +14845,9 @@ if test "${with_sqlite_libs+set}" = set; then : if test "${with_sqlite_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12972,12 +14861,15 @@ fi # Check whether --with-opengl-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opengl_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opengl_includes+y} then : ======= @@ -12987,6 +14879,9 @@ if test "${with_opengl_includes+set}" = set; then : if test "${with_opengl_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12999,12 +14894,15 @@ fi # Check whether --with-opengl-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opengl_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opengl_libs+y} then : ======= @@ -13014,6 +14912,9 @@ if test "${with_opengl_libs+set}" = set; then : if test "${with_opengl_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13026,12 +14927,15 @@ fi # Check whether --with-opengl-framework was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opengl_framework+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opengl_framework+y} then : ======= @@ -13041,6 +14945,9 @@ if test "${with_opengl_framework+set}" = set; then : if test "${with_opengl_framework+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13054,12 +14961,15 @@ fi # Check whether --with-odbc-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_odbc_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_odbc_includes+y} then : ======= @@ -13069,6 +14979,9 @@ if test "${with_odbc_includes+set}" = set; then : if test "${with_odbc_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13081,12 +14994,15 @@ fi # Check whether --with-odbc-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_odbc_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_odbc_libs+y} then : ======= @@ -13096,6 +15012,9 @@ if test "${with_odbc_libs+set}" = set; then : if test "${with_odbc_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13109,12 +15028,15 @@ fi # Check whether --with-fftw-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_fftw_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_fftw_includes+y} then : ======= @@ -13124,6 +15046,9 @@ if test "${with_fftw_includes+set}" = set; then : if test "${with_fftw_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13136,12 +15061,15 @@ fi # Check whether --with-fftw-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_fftw_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_fftw_libs+y} then : ======= @@ -13151,6 +15079,9 @@ if test "${with_fftw_libs+set}" = set; then : if test "${with_fftw_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13164,12 +15095,15 @@ fi # Check whether --with-blas-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_blas_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_blas_includes+y} then : ======= @@ -13179,6 +15113,9 @@ if test "${with_blas_includes+set}" = set; then : if test "${with_blas_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13191,12 +15128,15 @@ fi # Check whether --with-blas-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_blas_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_blas_libs+y} then : ======= @@ -13206,6 +15146,9 @@ if test "${with_blas_libs+set}" = set; then : if test "${with_blas_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13219,12 +15162,15 @@ fi # Check whether --with-lapack-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_lapack_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_lapack_includes+y} then : ======= @@ -13234,6 +15180,9 @@ if test "${with_lapack_includes+set}" = set; then : if test "${with_lapack_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13246,12 +15195,15 @@ fi # Check whether --with-lapack-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_lapack_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_lapack_libs+y} then : ======= @@ -13261,6 +15213,9 @@ if test "${with_lapack_libs+set}" = set; then : if test "${with_lapack_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13271,6 +15226,7 @@ fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Check whether --with-cairo-includes was given. @@ -13280,6 +15236,8 @@ if test "${with_cairo_includes+set}" = set; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Check whether --with-libsvm-includes was given. if test ${with_libsvm_includes+y} then : @@ -13311,6 +15269,9 @@ if test "${with_cairo_includes+set}" = set; then : if test "${with_cairo_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13323,12 +15284,15 @@ fi # Check whether --with-cairo-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_cairo_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_cairo_libs+y} then : ======= @@ -13338,6 +15302,9 @@ if test "${with_cairo_libs+set}" = set; then : if test "${with_cairo_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13350,12 +15317,15 @@ fi # Check whether --with-cairo-ldflags was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_cairo_ldflags+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_cairo_ldflags+y} then : ======= @@ -13365,6 +15335,9 @@ if test "${with_cairo_ldflags+set}" = set; then : if test "${with_cairo_ldflags+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13378,12 +15351,15 @@ fi # Check whether --with-freetype-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_freetype_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_freetype_includes+y} then : ======= @@ -13393,6 +15369,9 @@ if test "${with_freetype_includes+set}" = set; then : if test "${with_freetype_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13405,12 +15384,15 @@ fi # Check whether --with-freetype-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_freetype_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_freetype_libs+y} then : ======= @@ -13420,6 +15402,9 @@ if test "${with_freetype_libs+set}" = set; then : if test "${with_freetype_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13433,12 +15418,15 @@ fi # Check whether --with-proj-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_proj_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_proj_includes+y} then : ======= @@ -13448,6 +15436,9 @@ if test "${with_proj_includes+set}" = set; then : if test "${with_proj_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13460,12 +15451,15 @@ fi # Check whether --with-proj-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_proj_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_proj_libs+y} then : ======= @@ -13475,6 +15469,9 @@ if test "${with_proj_libs+set}" = set; then : if test "${with_proj_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13487,12 +15484,15 @@ fi # Check whether --with-proj-share was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_proj_share+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_proj_share+y} then : ======= @@ -13502,6 +15502,9 @@ if test "${with_proj_share+set}" = set; then : if test "${with_proj_share+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13515,12 +15518,15 @@ fi # Check whether --with-opendwg-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opendwg_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opendwg_includes+y} then : ======= @@ -13530,6 +15536,9 @@ if test "${with_opendwg_includes+set}" = set; then : if test "${with_opendwg_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13542,12 +15551,15 @@ fi # Check whether --with-opendwg-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opendwg_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opendwg_libs+y} then : ======= @@ -13557,6 +15569,9 @@ if test "${with_opendwg_libs+set}" = set; then : if test "${with_opendwg_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13570,12 +15585,15 @@ fi # Check whether --with-regex-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_regex_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_regex_includes+y} then : ======= @@ -13585,6 +15603,9 @@ if test "${with_regex_includes+set}" = set; then : if test "${with_regex_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13597,12 +15618,15 @@ fi # Check whether --with-regex-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_regex_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_regex_libs+y} then : ======= @@ -13612,6 +15636,9 @@ if test "${with_regex_libs+set}" = set; then : if test "${with_regex_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13625,12 +15652,15 @@ fi # Check whether --with-pthread-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_pthread_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_pthread_includes+y} then : ======= @@ -13640,6 +15670,9 @@ if test "${with_pthread_includes+set}" = set; then : if test "${with_pthread_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13652,12 +15685,15 @@ fi # Check whether --with-pthread-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_pthread_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_pthread_libs+y} then : ======= @@ -13667,6 +15703,9 @@ if test "${with_pthread_libs+set}" = set; then : if test "${with_pthread_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13680,12 +15719,15 @@ fi # Check whether --with-openmp-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_openmp_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_openmp_includes+y} then : ======= @@ -13695,6 +15737,9 @@ if test "${with_openmp_includes+set}" = set; then : if test "${with_openmp_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13707,12 +15752,15 @@ fi # Check whether --with-openmp-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_openmp_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_openmp_libs+y} then : ======= @@ -13722,6 +15770,9 @@ if test "${with_openmp_libs+set}" = set; then : if test "${with_openmp_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13735,12 +15786,15 @@ fi # Check whether --with-opencl-includes was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opencl_includes+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opencl_includes+y} then : ======= @@ -13750,6 +15804,9 @@ if test "${with_opencl_includes+set}" = set; then : if test "${with_opencl_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13762,12 +15819,15 @@ fi # Check whether --with-opencl-libs was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opencl_libs+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${with_opencl_libs+y} then : ======= @@ -13777,6 +15837,9 @@ if test "${with_opencl_libs+set}" = set; then : if test "${with_opencl_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13794,6 +15857,7 @@ fi #LOC_CHECK_USE(g77, GNU Fortran 77, USE_G77) # Done checking fortran +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional include dirs" >&5 @@ -13803,6 +15867,8 @@ $as_echo_n "checking for additional include dirs... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for additional include dirs" >&5 printf %s "checking for additional include dirs... " >&6; } ======= @@ -13814,6 +15880,9 @@ $as_echo_n "checking for additional include dirs... " >&6; } $as_echo_n "checking for additional include dirs... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13824,6 +15893,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_includes" >&5 $as_echo "$with_includes" >&6; } ======= @@ -13831,6 +15901,8 @@ $as_echo "$with_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_includes" >&5 printf "%s\n" "$with_includes" >&6; } ======= @@ -13842,6 +15914,9 @@ $as_echo "$with_includes" >&6; } $as_echo "$with_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13860,6 +15935,7 @@ fi # With libs option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional library dirs" >&5 @@ -13869,6 +15945,8 @@ $as_echo_n "checking for additional library dirs... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for additional library dirs" >&5 printf %s "checking for additional library dirs... " >&6; } ======= @@ -13880,6 +15958,9 @@ $as_echo_n "checking for additional library dirs... " >&6; } $as_echo_n "checking for additional library dirs... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13890,6 +15971,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libs" >&5 $as_echo "$with_libs" >&6; } ======= @@ -13897,6 +15979,8 @@ $as_echo "$with_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_libs" >&5 printf "%s\n" "$with_libs" >&6; } ======= @@ -13908,6 +15992,9 @@ $as_echo "$with_libs" >&6; } $as_echo "$with_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13943,6 +16030,7 @@ fi # Reject install programs that cannot install multiple files. <<<<<<< 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; } ======= @@ -13950,6 +16038,8 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -13961,6 +16051,9 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } $as_echo_n "checking for a BSD-compatible install... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13972,11 +16065,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -13989,6 +16085,9 @@ case $as_dir in #(( ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13998,6 +16097,7 @@ case $as_dir/ in #(( ./ | .// | /[cC]/* | \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14008,6 +16108,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[\\/]* | \ @@ -14019,6 +16124,7 @@ case $as_dir/ in #(( for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && @@ -14032,6 +16138,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then @@ -14058,6 +16166,9 @@ case $as_dir/ in #(( grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14069,6 +16180,7 @@ case $as_dir/ in #(( echo two > conftest.two mkdir conftest.dir <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ======= @@ -14076,6 +16188,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && ======= if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && @@ -14084,6 +16198,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14092,6 +16209,7 @@ case $as_dir/ in #(( test -s conftest.dir/conftest.two then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ======= @@ -14099,6 +16217,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" ======= ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" @@ -14107,6 +16227,9 @@ case $as_dir/ in #(( ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14123,6 +16246,7 @@ esac ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -14130,6 +16254,9 @@ esac <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main done @@ -14138,11 +16265,14 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if test "${ac_cv_path_install+set}" = set; then ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main if test ${ac_cv_path_install+y}; then @@ -14160,6 +16290,9 @@ rm -rf conftest.one conftest.two conftest.dir if test "${ac_cv_path_install+set}" = set; then >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14174,6 +16307,7 @@ rm -rf conftest.one conftest.two conftest.dir fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } ======= @@ -14181,6 +16315,8 @@ $as_echo "$INSTALL" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 printf "%s\n" "$INSTALL" >&6; } ======= @@ -14192,6 +16328,9 @@ $as_echo "$INSTALL" >&6; } $as_echo "$INSTALL" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14211,6 +16350,7 @@ do set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -14218,6 +16358,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -14229,6 +16371,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14242,11 +16387,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -14260,6 +16408,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14270,6 +16421,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14280,6 +16432,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 @@ -14288,6 +16445,7 @@ done IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD fi LEX=$ac_cv_prog_LEX @@ -14386,6 +16544,8 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fi LEX=$ac_cv_prog_LEX @@ -14720,6 +16880,9 @@ fi $as_echo_n "checking whether yytext is a pointer... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14730,6 +16893,7 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } ac_cv_prog_lex_yytext_pointer=no <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" ======= @@ -14738,6 +16902,8 @@ LIBS="$LEXLIB $ac_save_LIBS" >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14746,6 +16912,9 @@ ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14757,11 +16926,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_lex_yytext_pointer=yes @@ -14779,6 +16951,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14796,6 +16971,7 @@ if test $ac_cv_prog_lex_yytext_pointer = yes; then $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14807,6 +16983,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 @@ -14814,11 +16995,14 @@ rm -f conftest.l $LEX_OUTPUT_ROOT.c fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$LEX" = "x:"; then as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 elif test "$LEX" = "lex"; then @@ -14830,6 +17014,9 @@ printf %s "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14840,6 +17027,7 @@ set dummy lex; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14851,6 +17039,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 [\\/]* | ?:[\\/]*) @@ -14863,11 +17056,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -14881,6 +17077,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14891,6 +17090,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14901,6 +17101,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 @@ -14914,6 +17119,7 @@ esac LEXPATH=$ac_cv_path_LEXPATH if test -n "$LEXPATH"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEXPATH" >&5 $as_echo "$LEXPATH" >&6; } @@ -14925,6 +17131,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEXPATH" >&5 printf "%s\n" "$LEXPATH" >&6; } else @@ -14945,6 +17153,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14953,6 +17164,7 @@ fi if test "$LEXPATH" = "no"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 ======= @@ -14960,6 +17172,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 ======= as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 @@ -14968,6 +17182,9 @@ fi as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14980,6 +17197,7 @@ do set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -14987,6 +17205,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -14998,6 +17218,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15011,11 +17234,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15029,6 +17255,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15039,6 +17268,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15049,6 +17279,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 @@ -15060,6 +17295,7 @@ fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 $as_echo "$YACC" >&6; } @@ -15071,6 +17307,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 printf "%s\n" "$YACC" >&6; } else @@ -15091,6 +17329,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15106,6 +17347,7 @@ if test "$YACC" = "yacc"; then set dummy yacc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -15113,6 +17355,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -15124,6 +17368,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15139,11 +17386,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15157,6 +17407,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15167,6 +17420,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15177,6 +17431,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 @@ -15190,6 +17449,7 @@ esac YACCPATH=$ac_cv_path_YACCPATH if test -n "$YACCPATH"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACCPATH" >&5 $as_echo "$YACCPATH" >&6; } @@ -15201,6 +17461,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACCPATH" >&5 printf "%s\n" "$YACCPATH" >&6; } else @@ -15221,6 +17483,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15237,6 +17502,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}ranlib; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -15244,6 +17510,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -15255,6 +17523,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15268,11 +17539,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15286,6 +17560,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15296,6 +17573,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15306,6 +17584,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 @@ -15317,6 +17600,7 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } @@ -15328,6 +17612,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 printf "%s\n" "$RANLIB" >&6; } else @@ -15348,6 +17634,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15361,6 +17650,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -15368,6 +17658,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -15379,6 +17671,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15392,11 +17687,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15410,6 +17708,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15420,6 +17721,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15430,6 +17732,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 @@ -15442,11 +17749,14 @@ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 printf "%s\n" "$ac_ct_RANLIB" >&6; } else @@ -15456,6 +17766,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15466,6 +17779,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15477,6 +17791,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 @@ -15486,6 +17805,7 @@ fi yes:) <<<<<<< 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;} ======= @@ -15493,6 +17813,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -15504,6 +17826,9 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15521,6 +17846,7 @@ do set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -15528,6 +17854,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -15539,6 +17867,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15552,11 +17883,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15570,6 +17904,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15580,6 +17917,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15590,6 +17928,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 @@ -15601,6 +17944,7 @@ fi AR=$ac_cv_prog_AR if test -n "$AR"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } @@ -15612,6 +17956,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 printf "%s\n" "$AR" >&6; } else @@ -15632,6 +17978,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15647,6 +17996,7 @@ do set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -15654,6 +18004,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -15665,6 +18017,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15678,11 +18033,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15696,6 +18054,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15706,6 +18067,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15716,6 +18078,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 @@ -15727,6 +18094,7 @@ fi ENV=$ac_cv_prog_ENV if test -n "$ENV"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 $as_echo "$ENV" >&6; } @@ -15738,6 +18106,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 printf "%s\n" "$ENV" >&6; } else @@ -15758,6 +18128,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15771,6 +18144,7 @@ done set dummy perl; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -15778,6 +18152,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -15789,6 +18165,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15804,11 +18183,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -15822,6 +18204,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15832,6 +18217,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15842,6 +18228,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 @@ -15855,6 +18246,7 @@ esac PERL=$ac_cv_path_PERL if test -n "$PERL"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } @@ -15869,6 +18261,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 printf "%s\n" "$PERL" >&6; } else @@ -16047,6 +18441,9 @@ fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16057,6 +18454,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu <<<<<<< 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; } ======= @@ -16064,6 +18462,8 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -16075,6 +18475,9 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } $as_echo_n "checking how to run the C preprocessor... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16084,6 +18487,7 @@ if test -n "$CPP" && test -d "$CPP"; then fi if test -z "$CPP"; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Double quotes because CPP needs to be expanded @@ -16093,6 +18497,8 @@ if test -z "$CPP"; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Double quotes because $CC needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp ======= @@ -16104,6 +18510,9 @@ if test -z "$CPP"; then for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16114,6 +18523,7 @@ do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Prefer to if __STDC__ is defined, since # exists even on freestanding compilers. @@ -16122,6 +18532,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= # Prefer to if __STDC__ is defined, since # exists even on freestanding compilers. @@ -16131,6 +18543,9 @@ do # exists even on freestanding compilers. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16140,6 +18555,7 @@ do /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #ifdef __STDC__ # include #else @@ -16160,6 +18576,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include Syntax error _ACEOF @@ -16179,6 +18597,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD <<<<<<< HEAD # Broken: fails on valid input. continue @@ -16215,6 +18634,8 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Broken: fails on valid input. continue @@ -16228,12 +18649,15 @@ rm -f conftest.err conftest.i conftest.$ac_ext #include _ACEOF <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if ac_fn_c_try_cpp "$LINENO"; then : ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_cpp "$LINENO" then : >>>>>>> osgeo-main @@ -16253,6 +18677,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 @@ -16512,6 +18967,9 @@ if test $ac_cv_header_stdc = yes; then ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -16624,6 +19082,7 @@ _ACEOF <<<<<<< HEAD fi +<<<<<<< HEAD <<<<<<< HEAD done @@ -16641,6 +19100,8 @@ _ACEOF <<<<<<< HEAD fi +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -16906,6 +19367,9 @@ _ACEOF ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16913,6 +19377,7 @@ fi done +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for ac_header in sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h @@ -16927,6 +19392,8 @@ _ACEOF ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main for ac_header in limits.h termio.h termios.h unistd.h values.h f2c.h g2c.h do : @@ -16939,6 +19406,9 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16946,6 +19416,7 @@ fi done +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for ac_header in sys/timeb.h sys/types.h sys/utsname.h @@ -16953,11 +19424,16 @@ for ac_header in sys/timeb.h sys/types.h sys/utsname.h <<<<<<< HEAD ======= >>>>>>> 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 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16973,6 +19449,7 @@ fi done +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for ac_header in libintl.h iconv.h @@ -16980,6 +19457,8 @@ for ac_header in libintl.h iconv.h <<<<<<< HEAD ======= >>>>>>> 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" @@ -16989,6 +19468,9 @@ if test "x$ac_cv_header_langinfo_h" = xyes; then : ======= for ac_header in sys/timeb.h sys/types.h sys/utsname.h <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17000,6 +19482,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -17012,6 +19498,7 @@ fi done +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for ac_header in langinfo.h @@ -17026,6 +19513,8 @@ _ACEOF <<<<<<< HEAD ======= >>>>>>> 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; } @@ -17051,10 +19540,13 @@ if test "x$ac_cv_header_langinfo_h" = xyes; then : #define HAVE_LANGINFO_H 1 _ACEOF +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done @@ -17062,6 +19554,7 @@ done { $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; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -17070,6 +19563,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 @@ -17124,6 +19620,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17134,11 +19631,17 @@ 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 rm -rf conftest* +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 @@ -17150,6 +19653,8 @@ if test $ac_cv_type_uid_t = no; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -17170,6 +19675,9 @@ if test $ac_cv_type_uid_t = no; then >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17179,6 +19687,7 @@ $as_echo "#define uid_t int" >>confdefs.h $as_echo "#define gid_t int" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17190,6 +19699,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 @@ -17200,6 +19714,7 @@ case $host_os in * ) CYGWIN=no;; esac +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -17207,6 +19722,8 @@ esac ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime" if test "x$ac_cv_func_ftime" = xyes then : @@ -17233,6 +19750,9 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17246,11 +19766,14 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -17264,6 +19787,9 @@ then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17283,11 +19809,14 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -17301,6 +19830,9 @@ then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17320,11 +19852,14 @@ if test "x$ac_cv_func_drand48" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -17338,6 +19873,9 @@ then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17357,11 +19895,14 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -17375,6 +19916,9 @@ then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17414,11 +19958,14 @@ if test "x$ac_cv_func_nanosleep" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -17480,10 +20027,13 @@ else fi ======= +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done @@ -17515,6 +20065,10 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -17532,6 +20086,7 @@ if test $ac_cv_func_setpgrp_void = yes; then $as_echo "#define SETPGRP_VOID 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17543,6 +20098,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 @@ -17551,6 +20111,7 @@ CROSS_COMPILING=1 fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 @@ -17560,6 +20121,8 @@ $as_echo_n "checking for long long int... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 printf %s "checking for long long int... " >&6; } ======= @@ -17571,6 +20134,9 @@ $as_echo_n "checking for long long int... " >&6; } $as_echo_n "checking for long long int... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17580,12 +20146,15 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -17594,6 +20163,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17605,11 +20177,14 @@ long long int x; _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -17633,6 +20208,9 @@ printf %s "checking for int64_t... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17656,6 +20234,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo_n "checking for int64_t... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17667,18 +20246,26 @@ $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 int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -17687,6 +20274,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17698,11 +20288,14 @@ int64_t x; _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -17729,6 +20322,9 @@ printf "%s\n" "\"$enable_w11\"" >&6; } ;; ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17755,6 +20351,7 @@ case "$enable_w11" in $as_echo "\"$enable_w11\"" >&6; } ;; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17765,6 +20362,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 @@ -17787,6 +20389,7 @@ if test "$enable_w11" = "yes" ; then CFLAGS="$CFLAGS -D__W98__" else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -17799,6 +20402,8 @@ if test "${with_x+set}" = set; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 printf %s "checking for X... " >&6; } @@ -17823,6 +20428,9 @@ $as_echo_n "checking for X... " >&6; } if test "${with_x+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17840,6 +20448,7 @@ else # One or both of the vars are not set, and there is no cached value. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_x_includes=no ac_x_libraries=no rm -f -r conftest.dir ======= @@ -17847,6 +20456,8 @@ rm -f -r conftest.dir ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_x_includes=no ac_x_libraries=no # Do we need to do anything special at all? @@ -17886,6 +20497,9 @@ ac_x_includes=no ac_x_libraries=no rm -f -r conftest.dir >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17927,6 +20541,7 @@ _ACEOF rm -f -r conftest.dir fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Standard set of common directories for X headers. @@ -17935,6 +20550,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Standard set of common directories for X headers. ======= # Standard set of common directories for X headers. @@ -17943,6 +20560,9 @@ fi # Standard set of common directories for X headers. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17972,6 +20592,7 @@ ac_x_header_dirs=' /usr/local/include/X11R5 /usr/local/include/X11R4 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -17979,6 +20600,8 @@ ac_x_header_dirs=' ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /opt/X11/include ======= @@ -17986,6 +20609,9 @@ ac_x_header_dirs=' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18012,11 +20638,14 @@ if test "$ac_x_includes" = no; then _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_cpp "$LINENO" then : # We can compile using X headers with no special include directory. @@ -18026,6 +20655,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18035,6 +20667,7 @@ ac_x_includes= else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18045,6 +20678,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 @@ -18068,12 +20706,15 @@ if test "$ac_x_libraries" = no; then int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -18082,6 +20723,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18093,11 +20737,14 @@ XrmInitialize () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : LIBS=$ac_save_LIBS @@ -18110,6 +20757,9 @@ for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18122,6 +20772,7 @@ else for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18133,6 +20784,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 @@ -18145,6 +20801,7 @@ done fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -18154,6 +20811,8 @@ fi # $ac_x_libraries = no ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -18181,6 +20840,9 @@ fi # $ac_x_libraries = no >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18195,6 +20857,7 @@ case $ac_x_includes,$ac_x_libraries in #( ac_x_libraries='$ac_x_libraries'" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18206,6 +20869,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;; @@ -18215,6 +20883,7 @@ fi # $with_x != no if test "$have_x" != yes; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 $as_echo "$have_x" >&6; } @@ -18223,6 +20892,8 @@ $as_echo "$have_x" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 printf "%s\n" "$have_x" >&6; } ======= @@ -18234,6 +20905,9 @@ $as_echo "$have_x" >&6; } $as_echo "$have_x" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18247,6 +20921,7 @@ else ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" <<<<<<< 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; } @@ -18255,6 +20930,8 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -18266,6 +20943,9 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } $as_echo "libraries $x_libraries, headers $x_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18274,6 +20954,7 @@ fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h @@ -18282,6 +20963,8 @@ $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h ======= $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h @@ -18290,6 +20973,9 @@ $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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18306,6 +20992,7 @@ else # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . <<<<<<< 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; } @@ -18314,6 +21001,8 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -18325,6 +21014,9 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } $as_echo_n "checking whether -R must be followed by a space... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18337,12 +21029,15 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -18351,6 +21046,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18362,11 +21060,14 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -18377,6 +21078,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18387,6 +21091,7 @@ $as_echo "no" >&6; } else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18397,6 +21102,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 @@ -18405,12 +21115,15 @@ else int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -18419,6 +21132,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18430,6 +21146,7 @@ main () _ACEOF <<<<<<< 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; } @@ -18439,6 +21156,8 @@ $as_echo "yes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -18464,6 +21183,9 @@ $as_echo "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18477,6 +21199,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18487,6 +21210,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 @@ -18512,11 +21240,14 @@ rm -f core conftest.err conftest.$ac_objext \ builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char XOpenDisplay (); int main (void) @@ -18524,6 +21255,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18535,6 +21269,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18546,6 +21281,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 (); ; @@ -18554,11 +21294,14 @@ return XOpenDisplay (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -18569,6 +21312,9 @@ printf %s "checking for dnet_ntoa in -ldnet... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18579,6 +21325,7 @@ else $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18590,6 +21337,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" @@ -18601,11 +21353,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char dnet_ntoa (); int main (void) @@ -18613,6 +21368,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18624,6 +21382,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18635,6 +21394,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 (); ; @@ -18643,6 +21407,7 @@ return dnet_ntoa (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes else @@ -18653,6 +21418,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dnet_dnet_ntoa=yes @@ -18680,6 +21447,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18691,6 +21461,7 @@ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18701,12 +21472,18 @@ 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 if test $ac_cv_lib_dnet_dnet_ntoa = no; then <<<<<<< 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; } @@ -18715,6 +21492,8 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -18726,6 +21505,9 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18740,11 +21522,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char dnet_ntoa (); int main (void) @@ -18752,6 +21537,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18763,6 +21551,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18774,6 +21563,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 (); ; @@ -18782,6 +21576,7 @@ return dnet_ntoa (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -18792,6 +21587,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dnet_stub_dnet_ntoa=yes @@ -18819,6 +21616,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18830,6 +21630,7 @@ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18840,6 +21641,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 @@ -18848,12 +21654,15 @@ fi fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -18862,6 +21671,9 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18879,12 +21691,15 @@ rm -f core conftest.err conftest.$ac_objext \ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_gethostbyname" = xyes; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_gethostbyname" = xyes then : ======= @@ -18894,6 +21709,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18902,6 +21720,7 @@ fi if test $ac_cv_func_gethostbyname = no; then <<<<<<< 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; } @@ -18910,6 +21729,8 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 printf %s "checking for gethostbyname in -lnsl... " >&6; } ======= @@ -18921,6 +21742,9 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18935,11 +21759,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char gethostbyname (); int main (void) @@ -18947,6 +21774,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -18958,6 +21788,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18969,6 +21800,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 (); ; @@ -18977,6 +21813,7 @@ return gethostbyname (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes else @@ -18987,6 +21824,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_nsl_gethostbyname=yes @@ -19014,6 +21853,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19025,6 +21867,7 @@ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19035,12 +21878,18 @@ 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 if test $ac_cv_lib_nsl_gethostbyname = no; then <<<<<<< 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; } @@ -19049,6 +21898,8 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 printf %s "checking for gethostbyname in -lbsd... " >&6; } ======= @@ -19060,6 +21911,9 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19074,11 +21928,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char gethostbyname (); int main (void) @@ -19086,6 +21943,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19097,6 +21957,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19108,6 +21969,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 (); ; @@ -19116,11 +21982,14 @@ return gethostbyname (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bsd_gethostbyname=yes @@ -19138,6 +22007,9 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19154,6 +22026,7 @@ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19164,6 +22037,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 @@ -19181,12 +22059,15 @@ fi ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_connect" = xyes; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_connect" = xyes then : ======= @@ -19196,6 +22077,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19204,6 +22088,7 @@ fi if test $ac_cv_func_connect = no; then <<<<<<< 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; } @@ -19212,6 +22097,8 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 printf %s "checking for connect in -lsocket... " >&6; } ======= @@ -19223,6 +22110,9 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } $as_echo_n "checking for connect in -lsocket... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19237,11 +22127,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char connect (); int main (void) @@ -19249,6 +22142,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19260,6 +22156,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19271,6 +22168,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 (); ; @@ -19279,6 +22181,7 @@ return connect (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_connect=yes else @@ -19289,6 +22192,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_socket_connect=yes @@ -19316,6 +22221,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19327,6 +22235,7 @@ $as_echo "$ac_cv_lib_socket_connect" >&6; } if test "x$ac_cv_lib_socket_connect" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19337,6 +22246,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 @@ -19347,12 +22261,15 @@ fi ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_remove" = xyes; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_remove" = xyes then : ======= @@ -19362,6 +22279,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19370,6 +22290,7 @@ fi if test $ac_cv_func_remove = no; then <<<<<<< 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; } @@ -19378,6 +22299,8 @@ $as_echo_n "checking for remove in -lposix... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 printf %s "checking for remove in -lposix... " >&6; } ======= @@ -19389,6 +22312,9 @@ $as_echo_n "checking for remove in -lposix... " >&6; } $as_echo_n "checking for remove in -lposix... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19403,11 +22329,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char remove (); int main (void) @@ -19415,6 +22344,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19426,6 +22358,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19437,6 +22370,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 (); ; @@ -19445,6 +22383,7 @@ return remove (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix_remove=yes else @@ -19455,6 +22394,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_posix_remove=yes @@ -19482,6 +22423,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19493,6 +22437,7 @@ $as_echo "$ac_cv_lib_posix_remove" >&6; } if test "x$ac_cv_lib_posix_remove" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19503,6 +22448,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 @@ -19513,12 +22463,15 @@ fi ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_shmat" = xyes; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_shmat" = xyes then : ======= @@ -19528,6 +22481,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19536,6 +22492,7 @@ fi if test $ac_cv_func_shmat = no; then <<<<<<< 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; } @@ -19544,6 +22501,8 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 printf %s "checking for shmat in -lipc... " >&6; } ======= @@ -19555,6 +22514,9 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } $as_echo_n "checking for shmat in -lipc... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19569,11 +22531,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char shmat (); int main (void) @@ -19581,6 +22546,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19592,6 +22560,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19603,6 +22572,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 (); ; @@ -19611,6 +22585,7 @@ return shmat (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes else @@ -19621,6 +22596,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ipc_shmat=yes @@ -19648,6 +22625,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19659,6 +22639,7 @@ $as_echo "$ac_cv_lib_ipc_shmat" >&6; } if test "x$ac_cv_lib_ipc_shmat" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19669,6 +22650,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 @@ -19686,6 +22672,7 @@ fi # libraries we check for below, so use a different variable. # John Interrante, Karl Berry <<<<<<< 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; } @@ -19694,6 +22681,8 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 printf %s "checking for IceConnectionNumber in -lICE... " >&6; } ======= @@ -19705,6 +22694,9 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19719,11 +22711,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char IceConnectionNumber (); int main (void) @@ -19731,6 +22726,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19742,6 +22740,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19753,6 +22752,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 (); ; @@ -19761,6 +22765,7 @@ return IceConnectionNumber (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -19771,6 +22776,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ICE_IceConnectionNumber=yes @@ -19798,6 +22805,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19809,6 +22819,7 @@ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19819,6 +22830,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 @@ -19844,6 +22860,7 @@ ac_save_libs="$LIBS" LIBS="" <<<<<<< 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; } ======= @@ -19851,6 +22868,8 @@ $as_echo_n "checking for library containing cuserid... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing cuserid" >&5 printf %s "checking for library containing cuserid... " >&6; } ======= @@ -19862,6 +22881,9 @@ $as_echo_n "checking for library containing cuserid... " >&6; } $as_echo_n "checking for library containing cuserid... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19875,11 +22897,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char cuserid (); int main (void) @@ -19887,6 +22912,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19898,6 +22926,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19909,6 +22938,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 (); ; @@ -19917,12 +22951,15 @@ return cuserid (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for ac_lib in '' compat; do ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_lib in '' compat do ======= @@ -19932,6 +22969,9 @@ for ac_lib in '' compat; do for ac_lib in '' compat; do >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19942,6 +22982,7 @@ for ac_lib in '' compat; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_cuserid=$ac_res @@ -19964,6 +23005,8 @@ LIBS=$ac_func_search_save_LIBS ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_search_cuserid=$ac_res @@ -20023,6 +23066,9 @@ rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20032,6 +23078,7 @@ ac_res=$ac_cv_search_cuserid if test "$ac_res" != no; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20042,6 +23089,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" @@ -20051,6 +23103,7 @@ DBMIEXTRALIB="$LIBS" LIBS="$ac_save_libs" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for ac_func in asprintf @@ -20066,6 +23119,8 @@ _ACEOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" if test "x$ac_cv_func_asprintf" = xyes then : @@ -20092,6 +23147,9 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20105,11 +23163,14 @@ done ac_fn_c_check_func "$LINENO" "atan" "ac_cv_func_atan" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_atan" = xyes then : MATHLIB= @@ -20121,6 +23182,9 @@ printf %s "checking for atan in -lm... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20132,6 +23196,7 @@ else $as_echo_n "checking for atan in -lm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20143,6 +23208,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" @@ -20154,11 +23224,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char atan (); int main (void) @@ -20166,6 +23239,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20177,6 +23253,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20188,6 +23265,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 (); ; @@ -20196,6 +23278,7 @@ return atan (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_atan=yes else @@ -20206,6 +23289,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_m_atan=yes @@ -20235,6 +23320,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20248,6 +23336,7 @@ if test "x$ac_cv_lib_m_atan" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20258,6 +23347,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 @@ -20271,11 +23365,14 @@ fi ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_dlsym" = xyes then : DLLIB= @@ -20287,6 +23384,9 @@ printf %s "checking for dlsym in -ldl... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20298,6 +23398,7 @@ else $as_echo_n "checking for dlsym in -ldl... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20309,6 +23410,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" @@ -20320,11 +23426,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char dlsym (); int main (void) @@ -20332,6 +23441,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20343,6 +23455,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20354,6 +23467,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 (); ; @@ -20362,6 +23480,7 @@ return dlsym (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlsym=yes else @@ -20372,6 +23491,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlsym=yes @@ -20401,6 +23522,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20414,6 +23538,7 @@ if test "x$ac_cv_lib_dl_dlsym" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20424,6 +23549,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= @@ -20437,11 +23567,14 @@ fi ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_iconv" = xyes then : ICONVLIB= @@ -20453,6 +23586,9 @@ printf %s "checking for iconv in -liconv... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20464,6 +23600,7 @@ else $as_echo_n "checking for iconv in -liconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20475,6 +23612,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" @@ -20486,11 +23628,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char iconv (); int main (void) @@ -20498,6 +23643,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20509,6 +23657,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20520,6 +23669,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 (); ; @@ -20528,6 +23682,7 @@ return iconv (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iconv_iconv=yes else @@ -20538,6 +23693,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_iconv=yes @@ -20570,6 +23727,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20586,6 +23746,7 @@ else $as_echo_n "checking for iconv in -lgiconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20597,6 +23758,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" @@ -20608,11 +23774,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char iconv (); int main (void) @@ -20620,6 +23789,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20631,6 +23803,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20642,6 +23815,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 (); ; @@ -20650,6 +23828,7 @@ return iconv (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_giconv_iconv=yes else @@ -20660,6 +23839,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_giconv_iconv=yes @@ -20698,6 +23879,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20719,6 +23903,7 @@ else $as_echo_n "checking for libiconv in -liconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20730,6 +23915,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" @@ -20741,11 +23931,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char libiconv (); int main (void) @@ -20753,6 +23946,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20764,6 +23960,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20775,6 +23972,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 (); ; @@ -20783,6 +23985,7 @@ return libiconv (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iconv_libiconv=yes else @@ -20793,6 +23996,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_libiconv=yes @@ -20825,6 +24030,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20841,6 +24049,7 @@ else $as_echo_n "checking for libiconv in -lgiconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20852,6 +24061,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" @@ -20863,11 +24077,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char libiconv (); int main (void) @@ -20875,6 +24092,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20886,6 +24106,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20897,6 +24118,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 (); ; @@ -20905,6 +24131,7 @@ return libiconv (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_giconv_libiconv=yes else @@ -20915,6 +24142,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_giconv_libiconv=yes @@ -20947,6 +24176,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -20963,6 +24195,7 @@ else $as_echo "$as_me: WARNING: *** Unable to locate iconv() function." >&2;} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -20973,6 +24206,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= @@ -20994,11 +24232,14 @@ have_socket=1 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_socket" = xyes then : SOCKLIB= @@ -21010,6 +24251,9 @@ printf %s "checking for socket in -lsocket... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21021,6 +24265,7 @@ else $as_echo_n "checking for socket in -lsocket... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21032,6 +24277,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" @@ -21043,11 +24293,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char socket (); int main (void) @@ -21055,6 +24308,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21066,6 +24322,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21077,6 +24334,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 (); ; @@ -21085,6 +24347,7 @@ return socket (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else @@ -21107,6 +24370,8 @@ $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_socket_socket=yes @@ -21165,6 +24430,9 @@ else $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21177,6 +24445,7 @@ fi if test "$have_socket" = 1 ; then HAVE_SOCKET=1 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_SOCKET 1" >>confdefs.h @@ -21185,6 +24454,8 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h ======= $as_echo "#define HAVE_SOCKET 1" >>confdefs.h @@ -21193,6 +24464,9 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h $as_echo "#define HAVE_SOCKET 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21212,6 +24486,7 @@ ZLIB= # With zlib includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zlib includes" >&5 @@ -21221,6 +24496,8 @@ $as_echo_n "checking for location of zlib includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -21232,6 +24509,9 @@ $as_echo_n "checking for location of zlib includes... " >&6; } $as_echo_n "checking for location of zlib includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21242,6 +24522,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib_includes" >&5 $as_echo "$with_zlib_includes" >&6; } ======= @@ -21249,6 +24530,8 @@ $as_echo "$with_zlib_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zlib_includes" >&5 printf "%s\n" "$with_zlib_includes" >&6; } ======= @@ -21260,6 +24543,9 @@ $as_echo "$with_zlib_includes" >&6; } $as_echo "$with_zlib_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21280,11 +24566,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$ZLIBINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in zlib.h do : ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" @@ -21297,6 +24586,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21311,6 +24603,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21321,6 +24614,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 @@ -21334,6 +24632,7 @@ CPPFLAGS=$ac_save_cppflags # With zlib library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zlib library" >&5 @@ -21343,6 +24642,8 @@ $as_echo_n "checking for location of zlib library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -21354,6 +24655,9 @@ $as_echo_n "checking for location of zlib library... " >&6; } $as_echo_n "checking for location of zlib library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21364,6 +24668,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib_libs" >&5 $as_echo "$with_zlib_libs" >&6; } ======= @@ -21371,6 +24676,8 @@ $as_echo "$with_zlib_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zlib_libs" >&5 printf "%s\n" "$with_zlib_libs" >&6; } ======= @@ -21382,6 +24689,9 @@ $as_echo "$with_zlib_libs" >&6; } $as_echo "$with_zlib_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21402,6 +24712,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$ZLIBLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 @@ -21411,6 +24722,8 @@ $as_echo_n "checking for deflate in -lz... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 printf %s "checking for deflate in -lz... " >&6; } ======= @@ -21422,6 +24735,9 @@ $as_echo_n "checking for deflate in -lz... " >&6; } $as_echo_n "checking for deflate in -lz... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21436,11 +24752,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char deflate (); int main (void) @@ -21448,6 +24767,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21459,6 +24781,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21470,6 +24793,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 (); ; @@ -21478,6 +24806,7 @@ return deflate (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_z_deflate=yes else @@ -21488,6 +24817,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_deflate=yes @@ -21517,6 +24848,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21530,6 +24864,7 @@ if test "x$ac_cv_lib_z_deflate" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21541,6 +24876,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} @@ -21569,6 +24909,7 @@ BZIP2INCPATH= BZIP2LIB= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -21576,6 +24917,8 @@ BZIP2LIB= ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -21584,6 +24927,9 @@ printf "%s\n" "\"$with_bzlib\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21593,6 +24939,7 @@ $as_echo_n "checking whether to use bzlib... " >&6; } $as_echo "\"$with_bzlib\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21604,6 +24951,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" ;; @@ -21617,6 +24969,7 @@ if test -n "$USE_BZIP2"; then # With bzip2 includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of bzlib includes" >&5 @@ -21626,6 +24979,8 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -21637,6 +24992,9 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } $as_echo_n "checking for location of bzlib includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21647,6 +25005,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_includes" >&5 $as_echo "$with_bzlib_includes" >&6; } ======= @@ -21654,6 +25013,8 @@ $as_echo "$with_bzlib_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_includes" >&5 printf "%s\n" "$with_bzlib_includes" >&6; } ======= @@ -21665,6 +25026,9 @@ $as_echo "$with_bzlib_includes" >&6; } $as_echo "$with_bzlib_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21685,11 +25049,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$BZIP2INCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in bzlib.h do : ac_fn_c_check_header_compile "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" @@ -21702,6 +25069,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21716,6 +25086,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21726,6 +25097,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 @@ -21739,6 +25115,7 @@ CPPFLAGS=$ac_save_cppflags # With bzip2 library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of bzlib library" >&5 @@ -21748,6 +25125,8 @@ $as_echo_n "checking for location of bzlib library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -21759,6 +25138,9 @@ $as_echo_n "checking for location of bzlib library... " >&6; } $as_echo_n "checking for location of bzlib library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21769,6 +25151,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_libs" >&5 $as_echo "$with_bzlib_libs" >&6; } ======= @@ -21776,6 +25159,8 @@ $as_echo "$with_bzlib_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_libs" >&5 printf "%s\n" "$with_bzlib_libs" >&6; } ======= @@ -21787,6 +25172,9 @@ $as_echo "$with_bzlib_libs" >&6; } $as_echo "$with_bzlib_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21807,6 +25195,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$BZIP2LIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5 @@ -21816,6 +25205,8 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -21827,6 +25218,9 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21841,11 +25235,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char BZ2_bzBuffToBuffCompress (); int main (void) @@ -21853,6 +25250,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21864,6 +25264,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21875,6 +25276,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 (); ; @@ -21883,6 +25289,7 @@ return BZ2_bzBuffToBuffCompress (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes else @@ -21893,6 +25300,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes @@ -21922,6 +25331,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -21935,6 +25347,7 @@ if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21946,6 +25359,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} @@ -21976,6 +25394,7 @@ ZSTDINCPATH= ZSTDLIB= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -21983,6 +25402,8 @@ ZSTDLIB= ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -21991,6 +25412,9 @@ printf "%s\n" "\"$with_zstd\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22000,6 +25424,7 @@ $as_echo_n "checking whether to use zstd... " >&6; } $as_echo "\"$with_zstd\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22011,6 +25436,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" ;; @@ -22024,6 +25454,7 @@ if test -n "$USE_ZSTD"; then # With zstd includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zstd includes" >&5 @@ -22033,6 +25464,8 @@ $as_echo_n "checking for location of zstd includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -22044,6 +25477,9 @@ $as_echo_n "checking for location of zstd includes... " >&6; } $as_echo_n "checking for location of zstd includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22054,6 +25490,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zstd_includes" >&5 $as_echo "$with_zstd_includes" >&6; } ======= @@ -22061,6 +25498,8 @@ $as_echo "$with_zstd_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zstd_includes" >&5 printf "%s\n" "$with_zstd_includes" >&6; } ======= @@ -22072,6 +25511,9 @@ $as_echo "$with_zstd_includes" >&6; } $as_echo "$with_zstd_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22091,11 +25533,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$ZSTDINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in zstd.h do : ac_fn_c_check_header_compile "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default" @@ -22108,6 +25553,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22122,6 +25570,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22132,6 +25581,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 @@ -22145,6 +25599,7 @@ CPPFLAGS=$ac_save_cppflags # With zstd library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zstd library" >&5 @@ -22154,6 +25609,8 @@ $as_echo_n "checking for location of zstd library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -22165,6 +25622,9 @@ $as_echo_n "checking for location of zstd library... " >&6; } $as_echo_n "checking for location of zstd library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22175,6 +25635,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zstd_libs" >&5 $as_echo "$with_zstd_libs" >&6; } ======= @@ -22182,6 +25643,8 @@ $as_echo "$with_zstd_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zstd_libs" >&5 printf "%s\n" "$with_zstd_libs" >&6; } ======= @@ -22193,6 +25656,9 @@ $as_echo "$with_zstd_libs" >&6; } $as_echo "$with_zstd_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22213,6 +25679,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$ZSTDLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5 @@ -22222,6 +25689,8 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -22233,6 +25702,9 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22247,11 +25719,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char ZSTD_compress (); int main (void) @@ -22259,6 +25734,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22270,6 +25748,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22281,6 +25760,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 (); ; @@ -22289,6 +25773,7 @@ return ZSTD_compress (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_zstd_ZSTD_compress=yes else @@ -22299,6 +25784,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_zstd_ZSTD_compress=yes @@ -22328,6 +25815,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22341,6 +25831,7 @@ if test "x$ac_cv_lib_zstd_ZSTD_compress" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22352,6 +25843,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} @@ -22386,6 +25882,7 @@ PROJMAJOR=4 # With PROJ includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ includes" >&5 @@ -22395,6 +25892,8 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -22406,6 +25905,9 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } $as_echo_n "checking for location of External PROJ includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22416,6 +25918,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_includes" >&5 $as_echo "$with_proj_includes" >&6; } ======= @@ -22423,6 +25926,8 @@ $as_echo "$with_proj_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_includes" >&5 printf "%s\n" "$with_proj_includes" >&6; } ======= @@ -22434,6 +25939,9 @@ $as_echo "$with_proj_includes" >&6; } $as_echo "$with_proj_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22455,11 +25963,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$PROJINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in proj.h do : ac_fn_c_check_header_compile "$LINENO" "proj.h" "ac_cv_header_proj_h" "$ac_includes_default" @@ -22472,6 +25983,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22486,6 +26000,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22496,6 +26011,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 @@ -22506,6 +26026,7 @@ CPPFLAGS=$ac_save_cppflags if test $PROJ4API = 0 ; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ major version" >&5 @@ -22522,6 +26043,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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" @@ -22555,6 +26078,9 @@ $as_echo "unknown (cross-compiling)" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22572,6 +26098,7 @@ int main(void) { _ACEOF <<<<<<< 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 @@ -22582,6 +26109,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver_major=`cat conftestdata` @@ -22603,6 +26132,9 @@ $as_echo "$proj_ver_major" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22615,6 +26147,7 @@ fi CPPFLAGS=$ac_save_cppflags +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ minor version" >&5 @@ -22631,6 +26164,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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" @@ -22664,6 +26199,9 @@ $as_echo "unknown (cross-compiling)" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22681,6 +26219,7 @@ int main(void) { _ACEOF <<<<<<< 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 @@ -22691,6 +26230,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver_minor=`cat conftestdata` @@ -22712,6 +26253,9 @@ $as_echo "$proj_ver_minor" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22724,6 +26268,7 @@ fi CPPFLAGS=$ac_save_cppflags +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ patch version" >&5 @@ -22740,6 +26285,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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" @@ -22773,6 +26320,9 @@ $as_echo "unknown (cross-compiling)" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22790,6 +26340,7 @@ int main(void) { _ACEOF <<<<<<< 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 @@ -22800,6 +26351,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver_patch=`cat conftestdata` @@ -22821,6 +26374,9 @@ $as_echo "$proj_ver_patch" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22832,6 +26388,7 @@ fi CPPFLAGS=$ac_save_cppflags +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&5 @@ -22846,6 +26403,8 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } PROJMAJOR=${proj_ver_major} @@ -22872,6 +26431,9 @@ $as_echo "found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_pa $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the new API " >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22879,6 +26441,7 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n fi else +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 @@ -22895,6 +26458,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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" @@ -22928,6 +26493,9 @@ $as_echo "unknown (cross-compiling)" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22945,6 +26513,7 @@ int main(void) { _ACEOF <<<<<<< 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 @@ -22955,6 +26524,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver=`cat conftestdata` @@ -22976,6 +26547,9 @@ $as_echo "$proj_ver" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22995,6 +26569,7 @@ CPPFLAGS=$ac_save_cppflags PROJMAJOR=4 fi <<<<<<< 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; } @@ -23008,6 +26583,8 @@ $as_echo "using new PROJ version 5+ API" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } fi @@ -23034,6 +26611,9 @@ if test $PROJ4API = 0 ; then $as_echo "using new PROJ version 5+ API" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23041,6 +26621,7 @@ $as_echo "using new PROJ version 5+ API" >&6; } # With PROJ library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ library" >&5 @@ -23050,6 +26631,8 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -23061,6 +26644,9 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } $as_echo_n "checking for location of External PROJ library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23071,6 +26657,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 $as_echo "$with_proj_libs" >&6; } ======= @@ -23078,6 +26665,8 @@ $as_echo "$with_proj_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 printf "%s\n" "$with_proj_libs" >&6; } ======= @@ -23089,6 +26678,9 @@ $as_echo "$with_proj_libs" >&6; } $as_echo "$with_proj_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23108,6 +26700,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$PROJLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj_pj_info in -lproj" >&5 @@ -23117,6 +26710,8 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -23128,6 +26723,9 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23142,11 +26740,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char proj_pj_info (); int main (void) @@ -23154,6 +26755,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23165,6 +26769,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23176,6 +26781,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 (); ; @@ -23184,6 +26794,7 @@ return proj_pj_info (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_proj_pj_info=yes else @@ -23194,6 +26805,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_proj_proj_pj_info=yes @@ -23223,6 +26836,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23236,6 +26852,7 @@ if test "x$ac_cv_lib_proj_proj_pj_info" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23247,6 +26864,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} @@ -23262,11 +26884,14 @@ LDFLAGS=${ac_save_ldflags} else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } @@ -23275,6 +26900,9 @@ printf "%s\n" "#define USE_PROJ4API 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23284,6 +26912,7 @@ $as_echo "using old PROJ version 4 API" >&6; } $as_echo "#define USE_PROJ4API 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23295,6 +26924,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 @@ -23302,11 +26936,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$PROJINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in proj_api.h do : ac_fn_c_check_header_compile "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default" @@ -23319,6 +26956,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23333,6 +26973,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23343,6 +26984,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 @@ -23356,6 +27002,7 @@ CPPFLAGS=$ac_save_cppflags if test "$cross_compiling" = yes; then <<<<<<< 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;} @@ -23375,6 +27022,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -23420,6 +27069,9 @@ $as_echo "unknown (cross-compiling)" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23437,6 +27089,7 @@ int main(void) { _ACEOF <<<<<<< 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 @@ -23447,6 +27100,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver=`cat conftestdata` @@ -23468,6 +27123,9 @@ $as_echo "$proj_ver" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23488,6 +27146,7 @@ CPPFLAGS=$ac_save_cppflags # With PROJ library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ.4 library" >&5 @@ -23497,6 +27156,8 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -23508,6 +27169,9 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } $as_echo_n "checking for location of External PROJ.4 library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23518,6 +27182,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 $as_echo "$with_proj_libs" >&6; } ======= @@ -23525,6 +27190,8 @@ $as_echo "$with_proj_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 printf "%s\n" "$with_proj_libs" >&6; } ======= @@ -23536,6 +27203,9 @@ $as_echo "$with_proj_libs" >&6; } $as_echo "$with_proj_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23555,6 +27225,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$PROJLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_get_def in -lproj" >&5 @@ -23564,6 +27235,8 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -23575,6 +27248,9 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } $as_echo_n "checking for pj_get_def in -lproj... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23589,11 +27265,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char pj_get_def (); int main (void) @@ -23601,6 +27280,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23612,6 +27294,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23623,6 +27306,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 (); ; @@ -23631,6 +27319,7 @@ return pj_get_def (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_pj_get_def=yes else @@ -23641,6 +27330,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_proj_pj_get_def=yes @@ -23670,6 +27361,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23683,6 +27377,7 @@ if test "x$ac_cv_lib_proj_pj_get_def" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23694,6 +27389,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} @@ -23711,6 +27411,7 @@ fi # With PROJ share directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ data files" >&5 @@ -23720,6 +27421,8 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -23731,6 +27434,9 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } $as_echo_n "checking for location of External PROJ data files... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23741,6 +27447,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_share" >&5 $as_echo "$with_proj_share" >&6; } ======= @@ -23748,6 +27455,8 @@ $as_echo "$with_proj_share" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_share" >&5 printf "%s\n" "$with_proj_share" >&6; } ======= @@ -23759,6 +27468,9 @@ $as_echo "$with_proj_share" >&6; } $as_echo "$with_proj_share" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23773,6 +27485,7 @@ fi if test -z "$PROJSHARE" ; then <<<<<<< 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;} @@ -23781,6 +27494,8 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -23792,6 +27507,9 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default will be used" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23803,6 +27521,7 @@ if test `expr ${PROJMAJOR} \< 6` = 1 ; then # LOC_CHECK_SHARE does not work when cross compiling if test "$cross_compiling" = "yes" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epsg" >&5 $as_echo_n "checking for epsg... " >&6; } @@ -23819,6 +27538,8 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epsg" >&5 printf %s "checking for epsg... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 @@ -23853,6 +27574,9 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23866,11 +27590,14 @@ fi eval ac_res=\$$as_ac_File <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_File"\" = x"yes" @@ -23883,6 +27610,9 @@ printf "%s\n" "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23895,6 +27625,7 @@ else $as_echo "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23906,6 +27637,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 @@ -23922,6 +27658,7 @@ fi # Enable regex option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -23929,6 +27666,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -23937,6 +27676,9 @@ printf "%s\n" "\"$with_regex\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23946,6 +27688,7 @@ $as_echo_n "checking whether to use regex... " >&6; } $as_echo "\"$with_regex\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23957,6 +27700,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" ;; @@ -23974,6 +27722,7 @@ if test -n "$USE_REGEX"; then # With regex includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of regex includes" >&5 @@ -23983,6 +27732,8 @@ $as_echo_n "checking for location of regex includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -23994,6 +27745,9 @@ $as_echo_n "checking for location of regex includes... " >&6; } $as_echo_n "checking for location of regex includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24004,6 +27758,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_regex_includes" >&5 $as_echo "$with_regex_includes" >&6; } ======= @@ -24011,6 +27766,8 @@ $as_echo "$with_regex_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_regex_includes" >&5 printf "%s\n" "$with_regex_includes" >&6; } ======= @@ -24022,6 +27779,9 @@ $as_echo "$with_regex_includes" >&6; } $as_echo "$with_regex_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24042,11 +27802,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$REGEXINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in regex.h do : ac_fn_c_check_header_compile "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default" @@ -24059,6 +27822,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24073,6 +27839,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24083,6 +27850,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 @@ -24096,6 +27868,7 @@ CPPFLAGS=$ac_save_cppflags # With regex library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of regex library" >&5 @@ -24105,6 +27878,8 @@ $as_echo_n "checking for location of regex library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -24116,6 +27891,9 @@ $as_echo_n "checking for location of regex library... " >&6; } $as_echo_n "checking for location of regex library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24126,6 +27904,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_regex_libs" >&5 $as_echo "$with_regex_libs" >&6; } ======= @@ -24133,6 +27912,8 @@ $as_echo "$with_regex_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_regex_libs" >&5 printf "%s\n" "$with_regex_libs" >&6; } ======= @@ -24144,6 +27925,9 @@ $as_echo "$with_regex_libs" >&6; } $as_echo "$with_regex_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24167,12 +27951,15 @@ LDFLAGS=" $LDFLAGS" ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_regcomp" = xyes; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_regcomp" = xyes then : ======= @@ -24182,6 +27969,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24196,6 +27986,7 @@ else $as_nop else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24207,12 +27998,18 @@ 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" LDFLAGS="$REGEXLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lregex" >&5 @@ -24222,6 +28019,8 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lregex" >&5 printf %s "checking for regcomp in -lregex... " >&6; } ======= @@ -24233,6 +28032,9 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } $as_echo_n "checking for regcomp in -lregex... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24247,11 +28049,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char regcomp (); int main (void) @@ -24259,6 +28064,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24270,6 +28078,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24281,6 +28090,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 (); ; @@ -24289,6 +28103,7 @@ return regcomp (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_regex_regcomp=yes else @@ -24299,6 +28114,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_regex_regcomp=yes @@ -24328,6 +28145,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24341,6 +28161,7 @@ if test "x$ac_cv_lib_regex_regcomp" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24352,6 +28173,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} @@ -24384,6 +28210,7 @@ fi # $USE_REGEX # Enable Readline option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -24391,6 +28218,8 @@ fi # $USE_REGEX ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -24399,6 +28228,9 @@ printf "%s\n" "\"$with_readline\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24408,6 +28240,7 @@ $as_echo_n "checking whether to use Readline... " >&6; } $as_echo "\"$with_readline\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24419,6 +28252,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" ;; @@ -24437,6 +28275,7 @@ if test -n "$USE_READLINE"; then # With Readline includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Readline includes" >&5 @@ -24446,6 +28285,8 @@ $as_echo_n "checking for location of Readline includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -24457,6 +28298,9 @@ $as_echo_n "checking for location of Readline includes... " >&6; } $as_echo_n "checking for location of Readline includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24467,6 +28311,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline_includes" >&5 $as_echo "$with_readline_includes" >&6; } ======= @@ -24474,6 +28319,8 @@ $as_echo "$with_readline_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_readline_includes" >&5 printf "%s\n" "$with_readline_includes" >&6; } ======= @@ -24485,6 +28332,9 @@ $as_echo "$with_readline_includes" >&6; } $as_echo "$with_readline_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24505,11 +28355,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$READLINEINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in readline/readline.h do : ac_fn_c_check_header_compile "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" @@ -24522,6 +28375,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24536,6 +28392,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24546,6 +28403,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 @@ -24560,11 +28422,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$READLINEINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for ac_header in readline/history.h do : ac_fn_c_check_header_compile "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" @@ -24577,6 +28442,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24591,6 +28459,7 @@ _ACEOF else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24601,6 +28470,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 @@ -24614,6 +28488,7 @@ CPPFLAGS=$ac_save_cppflags # With Readline library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Readline library" >&5 @@ -24623,6 +28498,8 @@ $as_echo_n "checking for location of Readline library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -24634,6 +28511,9 @@ $as_echo_n "checking for location of Readline library... " >&6; } $as_echo_n "checking for location of Readline library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24644,6 +28524,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline_libs" >&5 $as_echo "$with_readline_libs" >&6; } ======= @@ -24651,6 +28532,8 @@ $as_echo "$with_readline_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_readline_libs" >&5 printf "%s\n" "$with_readline_libs" >&6; } ======= @@ -24662,6 +28545,9 @@ $as_echo "$with_readline_libs" >&6; } $as_echo "$with_readline_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24682,6 +28568,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$READLINELIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 @@ -24691,6 +28578,8 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 printf %s "checking for readline in -lreadline... " >&6; } ======= @@ -24702,6 +28591,9 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } $as_echo_n "checking for readline in -lreadline... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24716,11 +28608,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char readline (); int main (void) @@ -24728,6 +28623,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24739,6 +28637,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24750,6 +28649,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 (); ; @@ -24758,6 +28662,7 @@ return readline (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_readline=yes else @@ -24768,6 +28673,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_readline_readline=yes @@ -24797,6 +28704,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24810,6 +28720,7 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24821,6 +28732,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} @@ -24838,6 +28754,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$READLINELIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_history in -lhistory" >&5 @@ -24847,6 +28764,8 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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; } ======= @@ -24858,6 +28777,9 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } $as_echo_n "checking for add_history in -lhistory... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24872,11 +28794,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext builtin and then its argument prototype would still apply. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char add_history (); int main (void) @@ -24884,6 +28809,9 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24895,6 +28823,7 @@ int main () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24906,6 +28835,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 (); ; @@ -24914,6 +28848,7 @@ return add_history (); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_history_add_history=yes else @@ -24924,6 +28859,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_history_add_history=yes @@ -24953,6 +28890,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -24966,6 +28906,7 @@ if test "x$ac_cv_lib_history_add_history" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24977,6 +28918,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} @@ -25001,6 +28947,7 @@ fi # $USE_READLINE # PNG option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PNG" >&5 @@ -25010,6 +28957,8 @@ $as_echo_n "checking whether to use PNG... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use PNG" >&5 printf %s "checking whether to use PNG... " >&6; } ======= @@ -25021,6 +28970,9 @@ $as_echo_n "checking whether to use PNG... " >&6; } $as_echo_n "checking whether to use PNG... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25036,11 +28988,14 @@ fi if test "$with_libpng" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -25054,6 +29009,9 @@ printf %s "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25068,6 +29026,7 @@ set dummy libpng-config; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25079,6 +29038,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 [\\/]* | ?:[\\/]*) @@ -25091,11 +29055,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -25109,6 +29076,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25119,6 +29089,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25129,6 +29100,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 @@ -25143,11 +29119,14 @@ LIBPNG_CONFIG=$ac_cv_path_LIBPNG_CONFIG if test -n "$LIBPNG_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBPNG_CONFIG" >&5 printf "%s\n" "$LIBPNG_CONFIG" >&6; } else @@ -25157,6 +29136,9 @@ printf "%s\n" "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25167,6 +29149,7 @@ else $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25178,6 +29161,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 @@ -25204,12 +29192,15 @@ fi int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -25218,6 +29209,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25229,6 +29223,7 @@ png_read_image(NULL, NULL); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -25237,6 +29232,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -25252,6 +29249,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25262,12 +29262,15 @@ else int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -25276,6 +29279,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25287,6 +29293,7 @@ png_read_image(NULL, NULL); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : PNGLIB="$PNGLIB" else @@ -25295,6 +29302,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : PNGLIB="$PNGLIB" @@ -25310,6 +29319,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25319,11 +29331,14 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -25333,6 +29348,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25343,6 +29361,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25353,12 +29372,18 @@ 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} CFLAGS=${ac_save_cflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_PNG_H 1" >>confdefs.h @@ -25367,6 +29392,8 @@ $as_echo "#define HAVE_PNG_H 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_PNG_H 1" >>confdefs.h ======= $as_echo "#define HAVE_PNG_H 1" >>confdefs.h @@ -25375,6 +29402,9 @@ $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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25387,6 +29417,7 @@ fi # GDAL option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GDAL" >&5 @@ -25396,6 +29427,8 @@ $as_echo_n "checking whether to use GDAL... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use GDAL" >&5 printf %s "checking whether to use GDAL... " >&6; } ======= @@ -25407,6 +29440,9 @@ $as_echo_n "checking whether to use GDAL... " >&6; } $as_echo_n "checking whether to use GDAL... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25422,6 +29458,7 @@ fi if test "$with_gdal" = "no" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -25437,6 +29474,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -25469,6 +29508,9 @@ set dummy gdal-config; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25484,11 +29526,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -25502,6 +29547,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25512,6 +29560,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25522,6 +29571,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 @@ -25535,6 +29589,7 @@ esac GDAL_CONFIG=$ac_cv_path_GDAL_CONFIG if test -n "$GDAL_CONFIG"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDAL_CONFIG" >&5 $as_echo "$GDAL_CONFIG" >&6; } @@ -25546,6 +29601,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GDAL_CONFIG" >&5 printf "%s\n" "$GDAL_CONFIG" >&6; } else @@ -25566,6 +29623,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25584,6 +29644,7 @@ fi USE_GDAL=1 if test `"$GDAL_CONFIG" --ogr-enabled` = "yes" ; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_OGR 1" >>confdefs.h @@ -25592,6 +29653,8 @@ $as_echo "#define HAVE_OGR 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_OGR 1" >>confdefs.h ======= $as_echo "#define HAVE_OGR 1" >>confdefs.h @@ -25600,6 +29663,9 @@ $as_echo "#define HAVE_OGR 1" >>confdefs.h $as_echo "#define HAVE_OGR 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25619,12 +29685,15 @@ $as_echo "#define HAVE_OGR 1" >>confdefs.h int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -25633,6 +29702,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25644,6 +29716,7 @@ GDALOpen("foo", GA_ReadOnly); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -25652,6 +29725,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -25667,6 +29742,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25678,12 +29756,15 @@ else int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -25692,6 +29773,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25703,6 +29787,7 @@ GDALOpen("foo", GA_ReadOnly); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" else @@ -25711,6 +29796,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" @@ -25726,6 +29813,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25735,6 +29825,7 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -25746,6 +29837,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -25768,6 +29861,9 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25775,6 +29871,7 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS=${ac_save_cflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_GDAL 1" >>confdefs.h @@ -25783,6 +29880,8 @@ $as_echo "#define HAVE_GDAL 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_GDAL 1" >>confdefs.h ======= $as_echo "#define HAVE_GDAL 1" >>confdefs.h @@ -25791,6 +29890,9 @@ $as_echo "#define HAVE_GDAL 1" >>confdefs.h $as_echo "#define HAVE_GDAL 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25804,6 +29906,7 @@ fi # libLAS option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libLAS" >&5 @@ -25813,6 +29916,8 @@ $as_echo_n "checking whether to use libLAS... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use libLAS" >&5 printf %s "checking whether to use libLAS... " >&6; } ======= @@ -25824,6 +29929,9 @@ $as_echo_n "checking whether to use libLAS... " >&6; } $as_echo_n "checking whether to use libLAS... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25838,6 +29946,7 @@ fi if test "$with_liblas" = "no" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -25853,6 +29962,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -25885,6 +29996,9 @@ set dummy liblas-config; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25900,11 +30014,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -25918,6 +30035,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25928,6 +30048,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25938,6 +30059,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 @@ -25951,6 +30077,7 @@ esac LIBLAS_CONFIG=$ac_cv_path_LIBLAS_CONFIG if test -n "$LIBLAS_CONFIG"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBLAS_CONFIG" >&5 $as_echo "$LIBLAS_CONFIG" >&6; } @@ -25962,6 +30089,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBLAS_CONFIG" >&5 printf "%s\n" "$LIBLAS_CONFIG" >&6; } else @@ -25982,6 +30111,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26008,6 +30140,7 @@ fi CFLAGS="$CFLAGS $LIBLAS_CFLAGS" CPPFLAGS="$CPPFLAGS $LIBLAS_INC" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for ac_header in liblas/capi/liblas.h do : @@ -26022,6 +30155,8 @@ _ACEOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 then : @@ -26048,6 +30183,9 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26062,12 +30200,15 @@ done int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -26076,6 +30217,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26087,6 +30231,7 @@ LASReader_Create("foo"); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -26095,6 +30240,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -26110,6 +30257,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26120,12 +30270,15 @@ else int <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -26134,6 +30287,9 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26145,6 +30301,7 @@ LASReader_Create("foo"); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : LAS_LIBS="$LAS_LIBS" else @@ -26153,6 +30310,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : LAS_LIBS="$LAS_LIBS" @@ -26168,6 +30327,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26177,6 +30339,7 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -26188,6 +30351,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -26210,6 +30375,9 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26218,6 +30386,7 @@ rm -f core conftest.err conftest.$ac_objext \ CPPFLAGS=${ac_save_cppflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h @@ -26226,6 +30395,8 @@ $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBLAS 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h @@ -26234,6 +30405,9 @@ $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26247,6 +30421,7 @@ fi # PDAL option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PDAL" >&5 @@ -26256,6 +30431,8 @@ $as_echo_n "checking whether to use PDAL... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use PDAL" >&5 printf %s "checking whether to use PDAL... " >&6; } ======= @@ -26267,6 +30444,9 @@ $as_echo_n "checking whether to use PDAL... " >&6; } $as_echo_n "checking whether to use PDAL... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26285,6 +30465,7 @@ pdal="pdal" if test "$with_pdal" = "no" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -26294,6 +30475,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -26312,6 +30495,9 @@ $as_echo "no" >&6; } else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26360,6 +30546,7 @@ fi as_fn_error $? "*** could not find pdal-config" "$LINENO" 5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26370,6 +30557,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 @@ -26392,11 +30584,14 @@ fi CFLAGS="$CFLAGS $PDAL_CFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" @@ -26412,6 +30607,9 @@ fi >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26423,6 +30621,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext class St:public pdal::Streamable {}; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int main () ======= @@ -26430,6 +30629,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int main (void) @@ -26438,6 +30639,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26449,10 +30653,13 @@ pdal::PointTable table; _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_link "$LINENO" then : PDAL_LIBS="$PDAL_LIBS" @@ -26475,6 +30682,9 @@ _ACEOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26499,6 +30709,7 @@ if ac_fn_cxx_try_link "$LINENO"; then : PDAL_LIBS="$PDAL_LIBS" else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5 @@ -26520,6 +30731,8 @@ $as_echo "#define HAVE_PDAL 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -26573,6 +30786,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5 <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26622,6 +30838,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # NetCDF option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NetCDF" >&5 @@ -26631,6 +30848,8 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NetCDF" >&5 printf %s "checking whether to use NetCDF... " >&6; } @@ -26647,6 +30866,9 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } $as_echo_n "checking whether to use NetCDF... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26661,6 +30883,7 @@ fi if test "$with_netcdf" = "no" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -26676,6 +30899,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -26713,6 +30938,9 @@ set dummy nc-config; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26728,11 +30956,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -26746,6 +30977,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26756,6 +30990,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26766,6 +31001,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 @@ -26779,6 +31019,7 @@ esac NETCDF_CONFIG=$ac_cv_path_NETCDF_CONFIG if test -n "$NETCDF_CONFIG"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NETCDF_CONFIG" >&5 $as_echo "$NETCDF_CONFIG" >&6; } @@ -26790,6 +31031,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NETCDF_CONFIG" >&5 printf "%s\n" "$NETCDF_CONFIG" >&6; } else @@ -26810,6 +31053,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26834,9 +31080,13 @@ fi CFLAGS="$CFLAGS $NETCDF_CFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26845,6 +31095,7 @@ fi #line 7289 "configure" #include "confdefs.h" >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD #include int main () @@ -26861,6 +31112,8 @@ nc_create("foo", NC_CLOBBER, NULL); #line 7289 "configure" #include "confdefs.h" >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> osgeo-main #include int main (void) @@ -26886,6 +31139,9 @@ main () nc_create("foo", NC_CLOBBER, NULL); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26895,6 +31151,7 @@ nc_create("foo", NC_CLOBBER, NULL); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -26911,6 +31168,8 @@ nc_create("foo", NC_CLOBBER, NULL); ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -26965,6 +31224,9 @@ main () nc_create("foo", NC_CLOBBER, NULL); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26974,6 +31236,7 @@ nc_create("foo", NC_CLOBBER, NULL); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : NETCDF_LIBS="$NETCDF_LIBS" else @@ -26982,6 +31245,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ======= @@ -27003,6 +31268,9 @@ if ac_fn_c_try_link "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27012,6 +31280,7 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -27023,6 +31292,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -27045,6 +31316,9 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27052,6 +31326,7 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS=${ac_save_cflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_NETCDF 1" >>confdefs.h @@ -27060,6 +31335,8 @@ $as_echo "#define HAVE_NETCDF 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_NETCDF 1" >>confdefs.h ======= $as_echo "#define HAVE_NETCDF 1" >>confdefs.h @@ -27068,6 +31345,9 @@ $as_echo "#define HAVE_NETCDF 1" >>confdefs.h $as_echo "#define HAVE_NETCDF 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27080,6 +31360,7 @@ fi # GEOS option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GEOS" >&5 @@ -27089,6 +31370,8 @@ $as_echo_n "checking whether to use GEOS... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use GEOS" >&5 printf %s "checking whether to use GEOS... " >&6; } @@ -27105,6 +31388,9 @@ $as_echo_n "checking whether to use GEOS... " >&6; } $as_echo_n "checking whether to use GEOS... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27120,6 +31406,7 @@ fi if test "$with_geos" = "no" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -27135,6 +31422,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } else @@ -27172,6 +31461,9 @@ set dummy geos-config; ac_word=$2 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27187,11 +31479,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -27205,6 +31500,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27215,6 +31513,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27225,6 +31524,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 @@ -27238,6 +31542,7 @@ esac GEOS_CONFIG=$ac_cv_path_GEOS_CONFIG if test -n "$GEOS_CONFIG"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEOS_CONFIG" >&5 $as_echo "$GEOS_CONFIG" >&6; } @@ -27249,6 +31554,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GEOS_CONFIG" >&5 printf "%s\n" "$GEOS_CONFIG" >&6; } else @@ -27269,6 +31576,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27291,11 +31601,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$GEOS_CFLAGS $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in geos_c.h do : @@ -27317,6 +31630,9 @@ echo "configure:7408: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27329,11 +31645,14 @@ if test "x$ac_cv_header_geos_c_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate GEOS includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -27356,6 +31675,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate GEOS includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -27377,6 +31699,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -27424,6 +31747,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -27437,12 +31762,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$GEOS_LIBS $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initGEOS in -lgeos_c" >&5 $as_echo_n "checking for initGEOS in -lgeos_c... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initGEOS in -lgeos_c" >&5 printf %s "checking for initGEOS in -lgeos_c... " >&6; } @@ -27451,11 +31779,15 @@ echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6 echo "configure:7455: checking for initGEOS in -lgeos_c" >&5 ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lgeos_c $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27474,6 +31806,8 @@ ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lgeos_c $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27523,6 +31857,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27545,6 +31882,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_geos_c_initGEOS=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_geos_c_initGEOS=no fi @@ -27553,6 +31891,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -27576,6 +31916,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27589,6 +31932,7 @@ if test "x$ac_cv_lib_geos_c_initGEOS" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27600,6 +31944,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} @@ -27614,6 +31963,7 @@ LDFLAGS=${ac_save_ldflags} # fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_GEOS 1" >>confdefs.h @@ -27622,6 +31972,8 @@ $as_echo "#define HAVE_GEOS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_GEOS 1" >>confdefs.h ======= $as_echo "#define HAVE_GEOS 1" >>confdefs.h @@ -27630,6 +31982,9 @@ $as_echo "#define HAVE_GEOS 1" >>confdefs.h $as_echo "#define HAVE_GEOS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27643,6 +31998,7 @@ fi # Enable TIFF option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -27650,6 +32006,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use TIFF" >&5 printf %s "checking whether to use TIFF... " >&6; } @@ -27664,6 +32022,9 @@ echo "$ac_t"""$with_tiff"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27673,6 +32034,7 @@ $as_echo_n "checking whether to use TIFF... " >&6; } $as_echo "\"$with_tiff\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27684,6 +32046,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" ;; @@ -27701,6 +32068,7 @@ if test -n "$USE_TIFF"; then # With TIFF includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF includes" >&5 @@ -27710,6 +32078,8 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of TIFF includes" >&5 printf %s "checking for location of TIFF includes... " >&6; } @@ -27726,6 +32096,9 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } $as_echo_n "checking for location of TIFF includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27736,6 +32109,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tiff_includes" >&5 $as_echo "$with_tiff_includes" >&6; } ======= @@ -27743,6 +32117,8 @@ $as_echo "$with_tiff_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tiff_includes" >&5 printf "%s\n" "$with_tiff_includes" >&6; } ======= @@ -27754,6 +32130,9 @@ $as_echo "$with_tiff_includes" >&6; } $as_echo "$with_tiff_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27774,11 +32153,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$TIFF_INCLUDE_DIRS $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in tiffio.h do : @@ -27800,6 +32182,9 @@ echo "configure:7562: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27812,11 +32197,14 @@ if test "x$ac_cv_header_tiffio_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate TIFF includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -27839,6 +32227,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate TIFF includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -27860,6 +32251,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -27907,6 +32299,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -27915,6 +32309,7 @@ CPPFLAGS=$ac_save_cppflags # With TIFF library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF library" >&5 @@ -27924,6 +32319,8 @@ $as_echo_n "checking for location of TIFF library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of TIFF library" >&5 printf %s "checking for location of TIFF library... " >&6; } @@ -27940,6 +32337,9 @@ $as_echo_n "checking for location of TIFF library... " >&6; } $as_echo_n "checking for location of TIFF library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27950,6 +32350,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tiff_libs" >&5 $as_echo "$with_tiff_libs" >&6; } ======= @@ -27957,6 +32358,8 @@ $as_echo "$with_tiff_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tiff_libs" >&5 printf "%s\n" "$with_tiff_libs" >&6; } ======= @@ -27968,6 +32371,9 @@ $as_echo "$with_tiff_libs" >&6; } $as_echo "$with_tiff_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27994,12 +32400,15 @@ LDFLAGS="$TIFF_LIBRARY_DIRS $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 $as_echo_n "checking for TIFFOpen in -ltiff... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } @@ -28008,11 +32417,15 @@ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 echo "configure:7635: checking for TIFFOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28031,6 +32444,8 @@ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28080,6 +32495,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28102,6 +32520,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tiff_TIFFOpen=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_tiff_TIFFOpen=no fi @@ -28110,6 +32529,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28174,6 +32595,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28195,6 +32619,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28206,6 +32631,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 @@ -28227,11 +32657,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28292,6 +32725,9 @@ char TIFFOpen(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28315,6 +32751,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28326,6 +32763,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 @@ -28347,11 +32789,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28412,6 +32857,9 @@ char TIFFOpen(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28435,6 +32883,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28446,6 +32895,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 @@ -28467,11 +32921,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28532,6 +32989,9 @@ char TIFFOpen(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28555,6 +33015,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28566,6 +33027,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 @@ -28587,11 +33053,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28652,6 +33121,9 @@ char TIFFOpen(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28675,6 +33147,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28686,6 +33159,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 @@ -28707,11 +33185,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28772,6 +33253,9 @@ char TIFFOpen(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28795,6 +33279,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28806,6 +33291,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 @@ -28827,11 +33317,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28892,6 +33385,9 @@ char TIFFOpen(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28915,6 +33411,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28926,6 +33423,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 @@ -28946,6 +33448,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_tiff_TIFFOpen=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_tiff_TIFFOpen=no fi @@ -28954,6 +33457,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -28977,6 +33482,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28990,6 +33498,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29001,6 +33510,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} @@ -29078,6 +33592,7 @@ fi # $USE_TIFF # Done checking TIFF +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Enable PostgreSQL option @@ -29088,6 +33603,8 @@ fi # $USE_TIFF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD # Enable PostgreSQL option @@ -29285,6 +33802,9 @@ echo "$ac_t"""$with_postgres"" 1>&6 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29294,6 +33814,7 @@ $as_echo_n "checking whether to use PostgreSQL... " >&6; } $as_echo "\"$with_postgres\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29305,6 +33826,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" ;; @@ -29315,6 +33841,7 @@ esac if test -n "$USE_POSTGRES"; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h @@ -29323,6 +33850,8 @@ $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_POSTGRES 1" >>confdefs.h ======= $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h @@ -29331,6 +33860,9 @@ $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29346,6 +33878,7 @@ if test -n "$USE_POSTGRES"; then # With PostgreSQL includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL includes" >&5 @@ -29355,6 +33888,8 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL includes" >&5 printf %s "checking for location of PostgreSQL includes... " >&6; } @@ -29371,6 +33906,9 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } $as_echo_n "checking for location of PostgreSQL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29381,6 +33919,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_postgres_includes" >&5 $as_echo "$with_postgres_includes" >&6; } ======= @@ -29388,6 +33927,8 @@ $as_echo "$with_postgres_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_postgres_includes" >&5 printf "%s\n" "$with_postgres_includes" >&6; } ======= @@ -29399,6 +33940,9 @@ $as_echo "$with_postgres_includes" >&6; } $as_echo "$with_postgres_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29419,11 +33963,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$PQINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in libpq-fe.h do : @@ -29445,6 +33992,9 @@ echo "configure:8226: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29457,11 +34007,14 @@ if test "x$ac_cv_header_libpq_fe_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate PostgreSQL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -29484,6 +34037,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate PostgreSQL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -29505,6 +34061,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -29552,6 +34109,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -29564,6 +34123,7 @@ if test -n "$USE_POSTGRES"; then # With PostgreSQL library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL library" >&5 @@ -29573,6 +34133,8 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL library" >&5 printf %s "checking for location of PostgreSQL library... " >&6; } @@ -29589,6 +34151,9 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } $as_echo_n "checking for location of PostgreSQL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29599,6 +34164,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_postgres_libs" >&5 $as_echo "$with_postgres_libs" >&6; } ======= @@ -29606,6 +34172,8 @@ $as_echo "$with_postgres_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_postgres_libs" >&5 printf "%s\n" "$with_postgres_libs" >&6; } ======= @@ -29617,6 +34185,9 @@ $as_echo "$with_postgres_libs" >&6; } $as_echo "$with_postgres_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29641,12 +34212,15 @@ LDFLAGS="$PQLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 $as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 printf %s "checking for PQsetdbLogin in -lpq... " >&6; } @@ -29655,11 +34229,15 @@ echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6 echo "configure:8301: checking for PQsetdbLogin in -lpq" >&5 ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29678,6 +34256,8 @@ ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29727,6 +34307,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29749,6 +34332,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQsetdbLogin=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_pq_PQsetdbLogin=no fi @@ -29757,6 +34341,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -29821,6 +34407,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29842,6 +34431,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29853,6 +34443,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 @@ -29874,11 +34469,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -29939,6 +34537,9 @@ char PQsetdbLogin(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29962,6 +34563,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29973,6 +34575,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 @@ -29994,11 +34601,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -30059,6 +34669,9 @@ char PQsetdbLogin(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30082,6 +34695,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30093,6 +34707,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 @@ -30113,6 +34732,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQsetdbLogin=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_pq_PQsetdbLogin=no fi @@ -30121,6 +34741,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -30144,6 +34766,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30157,6 +34782,7 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30168,6 +34794,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} @@ -30209,10 +34840,13 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS $PQLIBPATH" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 $as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 printf %s "checking for PQcmdTuples in -lpq... " >&6; } @@ -30221,11 +34855,15 @@ echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 echo "configure:8483: checking for PQcmdTuples in -lpq" >&5 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30244,6 +34882,119 @@ ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* 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. */ +char PQcmdTuples (); +int +main (void) +{ +return PQcmdTuples (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_pq_PQcmdTuples=yes +else $as_nop + ac_cv_lib_pq_PQcmdTuples=no +======= +cat > conftest.$ac_ext <&5 +$as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) + +======= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 +$as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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. */ +#ifdef __cplusplus +extern "C" +#endif +char PQcmdTuples (); +int +main () +{ +return PQcmdTuples (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pq_PQcmdTuples=yes +else +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD + ac_cv_lib_pq_PQcmdTuples=no +======= +<<<<<<< HEAD + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +>>>>>>> osgeo-main +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5 +$as_echo "$ac_cv_lib_pq_PQcmdTuples" >&6; } +if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes; then : + +$as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h + +else + +<<<<<<< HEAD +======= +<<<<<<< HEAD +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 +printf %s "checking for PQcmdTuples in -lpq... " >&6; } +======= +echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 +echo "configure:8522: checking for PQcmdTuples in -lpq" >&5 +ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq -lcrypt $LIBS" +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30266,36 +35017,35 @@ else $as_nop ac_cv_lib_pq_PQcmdTuples=no ======= cat > conftest.$ac_ext <&5 -$as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } + ac_cv_lib_pq_PQcmdTuples=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5 +$as_echo "$ac_cv_lib_pq_PQcmdTuples" >&6; } +if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes; then : -ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +$as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h + +else -======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 $as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } ac_check_lib_save_LIBS=$LIBS -LIBS="-lpq $LIBS" +LIBS="-lpq -lcrypt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> 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. */ @@ -30315,16 +35065,28 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQcmdTuples=yes else <<<<<<< HEAD -<<<<<<< HEAD - ac_cv_lib_pq_PQcmdTuples=no ======= -<<<<<<< HEAD +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ->>>>>>> osgeo-main +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5 +printf "%s\n" "$ac_cv_lib_pq_PQcmdTuples" >&6; } +if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes +then : + +printf "%s\n" "#define HAVE_PQCMDTUPLES 1" >>confdefs.h +======= + ac_cv_lib_pq_PQcmdTuples=no +fi +======= + ac_cv_lib_pq_PQcmdTuples=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -30335,9 +35097,10 @@ if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes; then : $as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h +<<<<<<< HEAD else -<<<<<<< HEAD +>>>>>>> osgeo-main ======= <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 @@ -30469,6 +35232,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern "C" #endif <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main char PQcmdTuples (); int main () @@ -30483,6 +35249,7 @@ if ac_fn_c_try_link "$LINENO"; then : else ac_cv_lib_pq_PQcmdTuples=no fi +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -30493,14 +35260,21 @@ fi >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +rm -f core conftest.err conftest.$ac_objext \ +>>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5 -printf "%s\n" "$ac_cv_lib_pq_PQcmdTuples" >&6; } -if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5 +$as_echo "$ac_cv_lib_pq_PQcmdTuples" >&6; } +if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes; then : -printf "%s\n" "#define HAVE_PQCMDTUPLES 1" >>confdefs.h +$as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) else $as_nop @@ -30693,6 +35467,7 @@ fi # $USE_POSTGRES # Enable MySQL option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -30700,6 +35475,8 @@ fi # $USE_POSTGRES ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use MySQL" >&5 printf %s "checking whether to use MySQL... " >&6; } @@ -30714,6 +35491,9 @@ echo "$ac_t"""$with_mysql"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30723,6 +35503,7 @@ $as_echo_n "checking whether to use MySQL... " >&6; } $as_echo "\"$with_mysql\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30734,6 +35515,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" ;; @@ -30751,6 +35537,7 @@ if test -n "$USE_MYSQL"; then # With MySQL includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL includes" >&5 @@ -30760,6 +35547,8 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of MySQL includes" >&5 printf %s "checking for location of MySQL includes... " >&6; } @@ -30776,6 +35565,9 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } $as_echo_n "checking for location of MySQL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30786,6 +35578,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mysql_includes" >&5 $as_echo "$with_mysql_includes" >&6; } ======= @@ -30793,6 +35586,8 @@ $as_echo "$with_mysql_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_mysql_includes" >&5 printf "%s\n" "$with_mysql_includes" >&6; } ======= @@ -30804,6 +35599,9 @@ $as_echo "$with_mysql_includes" >&6; } $as_echo "$with_mysql_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30824,11 +35622,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$MYSQLINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in mysql.h do : @@ -30850,6 +35651,9 @@ echo "configure:8628: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30862,11 +35666,14 @@ if test "x$ac_cv_header_mysql_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate MySQL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -30889,6 +35696,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate MySQL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -30910,6 +35720,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -30957,6 +35768,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -30969,6 +35782,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL library" >&5 $as_echo_n "checking for location of MySQL library... " >&6; } @@ -30977,6 +35791,8 @@ $as_echo_n "checking for location of MySQL library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of MySQL library" >&5 @@ -30997,6 +35813,9 @@ $as_echo_n "checking for location of MySQL library... " >&6; } $as_echo_n "checking for location of MySQL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31007,6 +35826,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mysql_libs" >&5 $as_echo "$with_mysql_libs" >&6; } ======= @@ -31014,6 +35834,8 @@ $as_echo "$with_mysql_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_mysql_libs" >&5 printf "%s\n" "$with_mysql_libs" >&6; } ======= @@ -31025,6 +35847,9 @@ $as_echo "$with_mysql_libs" >&6; } $as_echo "$with_mysql_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31051,12 +35876,15 @@ LDFLAGS="$MYSQLLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 $as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } @@ -31065,11 +35893,15 @@ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6 echo "configure:8704: checking for mysql_query in -lmysqlclient" >&5 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lmysqlclient $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31088,6 +35920,8 @@ ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lmysqlclient $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31137,6 +35971,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31159,6 +35996,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mysqlclient_mysql_query=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_mysqlclient_mysql_query=no fi @@ -31167,6 +36005,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -31231,6 +36071,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31252,6 +36095,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31263,6 +36107,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 @@ -31284,11 +36133,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -31339,7 +36191,139 @@ else $as_nop ac_cv_lib_mysqlclient_mysql_query=no ======= cat > conftest.$ac_ext <>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main + ac_cv_lib_mysqlclient_mysql_query=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5 +$as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; } +if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : + MYSQLLIB="$MYSQLLIB -lmysqlclient $MATHLIB" +else + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 +$as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlclient $SOCKLIB $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (); +int +main () +{ +return mysql_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mysqlclient_mysql_query=yes +else +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5 +printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } +if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes +then : + MYSQLLIB="$MYSQLLIB -lmysqlclient $SOCKLIB" +else $as_nop + +<<<<<<< HEAD +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 +printf %s "checking for mysql_query in -lmysqlclient... " >&6; } +======= +echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6 +echo "configure:8812: checking for mysql_query in -lmysqlclient" >&5 +ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'` +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlclient $SOCKLIB $MATHLIB $LIBS" +<<<<<<< HEAD +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* 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. */ +char mysql_query (); +int +main (void) +{ +return mysql_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_mysqlclient_mysql_query=yes +else $as_nop + ac_cv_lib_mysqlclient_mysql_query=no +======= +cat > conftest.$ac_ext <>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main - ac_cv_lib_mysqlclient_mysql_query=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5 -$as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; } -if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : - MYSQLLIB="$MYSQLLIB -lmysqlclient $MATHLIB" -else - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 -$as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } - -ac_check_lib_save_LIBS=$LIBS -LIBS="-lmysqlclient $SOCKLIB $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -<<<<<<< HEAD -<<<<<<< HEAD -======= <<<<<<< HEAD ->>>>>>> 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 - -/* 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. */ -#ifdef __cplusplus -extern "C" -#endif -char mysql_query (); -int -main () -{ -return mysql_query (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mysqlclient_mysql_query=yes -else -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" ->>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5 -printf "%s\n" "$ac_cv_lib_mysqlclient_mysql_query" >&6; } -if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes -then : - MYSQLLIB="$MYSQLLIB -lmysqlclient $SOCKLIB" -else $as_nop - -<<<<<<< HEAD -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 -printf %s "checking for mysql_query in -lmysqlclient... " >&6; } -======= -echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6 -echo "configure:8812: checking for mysql_query in -lmysqlclient" >&5 -ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'` ->>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) - -ac_check_lib_save_LIBS=$LIBS -LIBS="-lmysqlclient $SOCKLIB $MATHLIB $LIBS" -<<<<<<< HEAD -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* 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. */ -char mysql_query (); -int -main (void) -{ -return mysql_query (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_mysqlclient_mysql_query=yes -else $as_nop - ac_cv_lib_mysqlclient_mysql_query=no -======= -cat > conftest.$ac_ext <>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31492,6 +36359,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31503,6 +36371,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 @@ -31524,11 +36397,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -31589,6 +36465,9 @@ char mysql_query(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31612,6 +36491,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31623,6 +36503,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 @@ -31644,11 +36529,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -31709,6 +36597,9 @@ char mysql_query(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31732,6 +36623,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31743,6 +36635,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 @@ -31764,11 +36661,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -31829,6 +36729,9 @@ char mysql_query(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31852,6 +36755,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31863,6 +36767,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 @@ -31884,11 +36793,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -31949,6 +36861,9 @@ char mysql_query(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31972,6 +36887,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31983,6 +36899,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 @@ -32003,6 +36924,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_mysqlclient_mysql_query=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_mysqlclient_mysql_query=no fi @@ -32011,6 +36933,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -32034,6 +36958,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32047,6 +36974,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32058,6 +36986,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} @@ -32132,6 +37065,7 @@ LDFLAGS=${ac_save_ldflags} set dummy mysql_config; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -32139,6 +37073,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } @@ -32155,6 +37091,9 @@ $as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32170,11 +37109,14 @@ do IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -32188,6 +37130,9 @@ do ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32198,6 +37143,7 @@ do $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32208,6 +37154,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 @@ -32221,6 +37172,7 @@ esac MYSQLD_CONFIG=$ac_cv_path_MYSQLD_CONFIG if test -n "$MYSQLD_CONFIG"; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLD_CONFIG" >&5 $as_echo "$MYSQLD_CONFIG" >&6; } @@ -32232,6 +37184,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQLD_CONFIG" >&5 printf "%s\n" "$MYSQLD_CONFIG" >&6; } else @@ -32252,6 +37206,9 @@ else $as_echo "no" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32266,11 +37223,14 @@ fi if test "$MYSQLD_CONFIG" != "" ; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main mysql_version=`"$MYSQLD_CONFIG" --version` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using MySQL/MariaDB version \"$mysql_version\"" >&5 printf "%s\n" "using MySQL/MariaDB version \"$mysql_version\"" >&6; } @@ -32279,6 +37239,9 @@ printf "%s\n" "using MySQL/MariaDB version \"$mysql_version\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32293,6 +37256,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu LIBS="$MYSQLDLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 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 : @@ -32306,6 +37270,8 @@ $as_echo "$as_me: WARNING: libmysqld not found" >&2;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD 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 @@ -32355,6 +37321,9 @@ else $as_echo "$as_me: WARNING: libmysqld not found" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32383,6 +37352,7 @@ fi # $USE_MYSQL # Enable SQLite option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -32390,6 +37360,8 @@ fi # $USE_MYSQL ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use SQLite" >&5 printf %s "checking whether to use SQLite... " >&6; } @@ -32404,6 +37376,9 @@ echo "$ac_t"""$with_sqlite"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32413,6 +37388,7 @@ $as_echo_n "checking whether to use SQLite... " >&6; } $as_echo "\"$with_sqlite\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32424,6 +37400,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" ;; @@ -32441,6 +37422,7 @@ if test -n "$USE_SQLITE"; then # With SQLite includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite includes" >&5 @@ -32450,6 +37432,8 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of SQLite includes" >&5 printf %s "checking for location of SQLite includes... " >&6; } @@ -32466,6 +37450,9 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } $as_echo_n "checking for location of SQLite includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32476,6 +37463,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_includes" >&5 $as_echo "$with_sqlite_includes" >&6; } ======= @@ -32483,6 +37471,8 @@ $as_echo "$with_sqlite_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_includes" >&5 printf "%s\n" "$with_sqlite_includes" >&6; } ======= @@ -32494,6 +37484,9 @@ $as_echo "$with_sqlite_includes" >&6; } $as_echo "$with_sqlite_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32514,11 +37507,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$SQLITEINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in sqlite3.h do : @@ -32540,6 +37536,9 @@ echo "configure:9239: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32552,11 +37551,14 @@ if test "x$ac_cv_header_sqlite3_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate SQLite includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -32579,6 +37581,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate SQLite includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -32600,6 +37605,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -32647,12 +37653,15 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_SQLITE 1" >>confdefs.h @@ -32661,6 +37670,8 @@ $as_echo "#define HAVE_SQLITE 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_SQLITE 1" >>confdefs.h ======= $as_echo "#define HAVE_SQLITE 1" >>confdefs.h @@ -32669,6 +37680,9 @@ $as_echo "#define HAVE_SQLITE 1" >>confdefs.h $as_echo "#define HAVE_SQLITE 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32681,6 +37695,7 @@ if test -n "$USE_SQLITE"; then # With SQLite library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite library" >&5 @@ -32690,6 +37705,8 @@ $as_echo_n "checking for location of SQLite library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of SQLite library" >&5 printf %s "checking for location of SQLite library... " >&6; } @@ -32706,6 +37723,9 @@ $as_echo_n "checking for location of SQLite library... " >&6; } $as_echo_n "checking for location of SQLite library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32716,6 +37736,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_libs" >&5 $as_echo "$with_sqlite_libs" >&6; } ======= @@ -32723,6 +37744,8 @@ $as_echo "$with_sqlite_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_libs" >&5 printf "%s\n" "$with_sqlite_libs" >&6; } ======= @@ -32734,6 +37757,9 @@ $as_echo "$with_sqlite_libs" >&6; } $as_echo "$with_sqlite_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32758,12 +37784,15 @@ LDFLAGS="$SQLITELIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 printf %s "checking for sqlite3_open in -lsqlite3... " >&6; } @@ -32772,11 +37801,15 @@ echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6 echo "configure:9319: checking for sqlite3_open in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32795,6 +37828,8 @@ ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -32844,6 +37879,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32866,6 +37904,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_open=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -32874,6 +37913,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -32938,6 +37979,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32959,6 +38003,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32970,6 +38015,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 @@ -32991,11 +38041,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -33056,6 +38109,9 @@ char sqlite3_open(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33079,6 +38135,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33090,6 +38147,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 @@ -33111,11 +38173,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -33176,6 +38241,9 @@ char sqlite3_open(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33199,6 +38267,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33210,6 +38279,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 @@ -33230,6 +38304,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sqlite3_sqlite3_open=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -33238,6 +38313,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -33261,6 +38338,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33274,6 +38354,7 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33285,6 +38366,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} @@ -33342,6 +38428,7 @@ OPENGL_X11= OPENGL_AQUA= OPENGL_WINDOWS= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -33349,6 +38436,8 @@ OPENGL_WINDOWS= ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use OpenGL" >&5 printf %s "checking whether to use OpenGL... " >&6; } @@ -33363,6 +38452,9 @@ echo "$ac_t"""$with_opengl"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33372,6 +38464,7 @@ $as_echo_n "checking whether to use OpenGL... " >&6; } $as_echo "\"$with_opengl\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33383,6 +38476,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 @@ -33414,6 +38512,7 @@ if test "$OPENGL_X11" = 1 ; then # With OpenGL includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 @@ -33423,6 +38522,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 printf %s "checking for location of OpenGL includes... " >&6; } @@ -33439,6 +38540,9 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33449,6 +38553,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 $as_echo "$with_opengl_includes" >&6; } ======= @@ -33456,6 +38561,8 @@ $as_echo "$with_opengl_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 printf "%s\n" "$with_opengl_includes" >&6; } ======= @@ -33467,6 +38574,9 @@ $as_echo "$with_opengl_includes" >&6; } $as_echo "$with_opengl_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33487,11 +38597,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENGLINC $X_CFLAGS $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in GL/gl.h GL/glu.h do : @@ -33516,6 +38629,9 @@ echo "configure:9579: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33529,11 +38645,14 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate OpenGL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -33556,6 +38675,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate OpenGL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -33577,6 +38699,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -33624,6 +38747,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -33632,6 +38757,7 @@ CPPFLAGS=$ac_save_cppflags # With OpenGL library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 @@ -33641,6 +38767,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 printf %s "checking for location of OpenGL library... " >&6; } @@ -33657,6 +38785,9 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33667,6 +38798,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 $as_echo "$with_opengl_libs" >&6; } ======= @@ -33674,6 +38806,8 @@ $as_echo "$with_opengl_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 printf "%s\n" "$with_opengl_libs" >&6; } ======= @@ -33685,6 +38819,9 @@ $as_echo "$with_opengl_libs" >&6; } $as_echo "$with_opengl_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33709,12 +38846,15 @@ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 $as_echo_n "checking for glBegin in -lGL... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 printf %s "checking for glBegin in -lGL... " >&6; } @@ -33723,11 +38863,15 @@ echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6 echo "configure:9650: checking for glBegin in -lGL" >&5 ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33746,6 +38890,8 @@ ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33795,6 +38941,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33817,6 +38966,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_GL_glBegin=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_GL_glBegin=no fi @@ -33825,6 +38975,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -33889,6 +39041,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33910,6 +39065,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33921,6 +39077,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 @@ -33942,11 +39103,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -34007,6 +39171,9 @@ char glBegin(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34030,6 +39197,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34041,6 +39209,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 @@ -34062,11 +39235,14 @@ if ac_fn_c_try_link "$LINENO"; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -34127,6 +39303,9 @@ char glBegin(); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34150,6 +39329,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34161,6 +39341,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 @@ -34181,6 +39366,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_GL_glBegin=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_GL_glBegin=no fi @@ -34189,6 +39375,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -34212,6 +39400,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34225,6 +39416,7 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34236,6 +39428,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} @@ -34280,12 +39477,15 @@ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 $as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 printf %s "checking for gluBeginCurve in -lGLU... " >&6; } @@ -34294,11 +39494,15 @@ 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)) +<<<<<<< HEAD +>>>>>>> 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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34317,6 +39521,8 @@ ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34366,6 +39572,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34388,6 +39597,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_GLU_gluBeginCurve=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_GLU_gluBeginCurve=no fi @@ -34396,6 +39606,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -34460,6 +39672,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34481,6 +39696,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34492,6 +39708,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 @@ -34512,6 +39733,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_GLU_gluBeginCurve=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_GLU_gluBeginCurve=no fi @@ -34520,6 +39742,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -34543,6 +39767,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34556,6 +39783,7 @@ if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34567,6 +39795,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} @@ -34598,6 +39831,7 @@ LIBS=" $OPENGLLIB $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "glXCreatePbuffer" "ac_cv_func_glXCreatePbuffer" if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : @@ -34607,6 +39841,8 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "glXCreatePbuffer" "ac_cv_func_glXCreatePbuffer" if test "x$ac_cv_func_glXCreatePbuffer" = xyes @@ -34668,6 +39904,9 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34677,6 +39916,7 @@ $as_echo "#define HAVE_PBUFFERS 1" >>confdefs.h else +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -34690,6 +39930,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 @@ -34705,6 +39950,7 @@ LIBS=" $OPENGLLIB $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "glXCreateGLXPixmap" "ac_cv_func_glXCreateGLXPixmap" if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : @@ -34714,6 +39960,8 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "glXCreateGLXPixmap" "ac_cv_func_glXCreateGLXPixmap" if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes @@ -34775,6 +40023,9 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34784,6 +40035,7 @@ $as_echo "#define HAVE_PIXMAPS 1" >>confdefs.h else +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -34797,6 +40049,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 @@ -34807,6 +40064,7 @@ LDFLAGS=${ac_save_ldflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define OPENGL_X11 1" >>confdefs.h @@ -34815,6 +40073,8 @@ $as_echo "#define OPENGL_X11 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define OPENGL_X11 1" >>confdefs.h ======= $as_echo "#define OPENGL_X11 1" >>confdefs.h @@ -34823,6 +40083,9 @@ $as_echo "#define OPENGL_X11 1" >>confdefs.h $as_echo "#define OPENGL_X11 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34833,6 +40096,7 @@ fi # $OPENGL_X11 if test "$OPENGL_AQUA" = 1 ; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL framework" >&5 @@ -34842,6 +40106,8 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL framework" >&5 printf %s "checking for location of OpenGL framework... " >&6; } @@ -34858,6 +40124,9 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } $as_echo_n "checking for location of OpenGL framework... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34868,6 +40137,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_framework" >&5 $as_echo "$with_opengl_framework" >&6; } ======= @@ -34875,6 +40145,8 @@ $as_echo "$with_opengl_framework" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_framework" >&5 printf "%s\n" "$with_opengl_framework" >&6; } ======= @@ -34886,6 +40158,9 @@ $as_echo "$with_opengl_framework" >&6; } $as_echo "$with_opengl_framework" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34904,11 +40179,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENGLPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in OpenGL/gl.h OpenGL/glu.h do : @@ -34933,6 +40211,9 @@ echo "configure:10093: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -34946,11 +40227,14 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate OpenGL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -34973,6 +40257,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate OpenGL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -34994,6 +40281,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -35041,6 +40329,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -35053,6 +40343,7 @@ LIBS="-framework OpenGL -framework AGL -framework ApplicationServices $LIBS" LDFLAGS="$OPENGLPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "glBegin" "ac_cv_func_glBegin" if test "x$ac_cv_func_glBegin" = xyes; then : @@ -35061,6 +40352,8 @@ if test "x$ac_cv_func_glBegin" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "glBegin" "ac_cv_func_glBegin" if test "x$ac_cv_func_glBegin" = xyes @@ -35120,6 +40413,9 @@ if test "x$ac_cv_func_glBegin" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35133,6 +40429,7 @@ else $as_nop else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35144,6 +40441,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 @@ -35162,6 +40464,7 @@ LIBS=" $OPENGLLIB $LIBS" LDFLAGS="$OPENGLPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "gluBeginCurve" "ac_cv_func_gluBeginCurve" if test "x$ac_cv_func_gluBeginCurve" = xyes; then : @@ -35170,6 +40473,8 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "gluBeginCurve" "ac_cv_func_gluBeginCurve" if test "x$ac_cv_func_gluBeginCurve" = xyes @@ -35229,6 +40534,9 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35242,6 +40550,7 @@ else $as_nop else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35253,6 +40562,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 @@ -35269,6 +40583,7 @@ OPENGLINC="$OPENGLPATH" OPENGLLIBPATH="$OPENGLPATH" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define OPENGL_AQUA 1" >>confdefs.h @@ -35277,6 +40592,8 @@ $as_echo "#define OPENGL_AQUA 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define OPENGL_AQUA 1" >>confdefs.h ======= $as_echo "#define OPENGL_AQUA 1" >>confdefs.h @@ -35285,6 +40602,9 @@ $as_echo "#define OPENGL_AQUA 1" >>confdefs.h $as_echo "#define OPENGL_AQUA 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35297,6 +40617,7 @@ if test "$OPENGL_WINDOWS" = 1 ; then # With OpenGL includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 @@ -35306,6 +40627,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 printf %s "checking for location of OpenGL includes... " >&6; } @@ -35322,6 +40645,9 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35332,6 +40658,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 $as_echo "$with_opengl_includes" >&6; } ======= @@ -35339,6 +40666,8 @@ $as_echo "$with_opengl_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 printf "%s\n" "$with_opengl_includes" >&6; } ======= @@ -35350,6 +40679,9 @@ $as_echo "$with_opengl_includes" >&6; } $as_echo "$with_opengl_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35370,11 +40702,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENGLINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in GL/gl.h GL/glu.h do : @@ -35399,6 +40734,9 @@ echo "configure:10300: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35412,11 +40750,14 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate OpenGL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -35439,6 +40780,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate OpenGL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -35460,6 +40804,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -35507,6 +40852,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -35515,6 +40862,7 @@ CPPFLAGS=$ac_save_cppflags # With OpenGL library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 @@ -35524,6 +40872,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 printf %s "checking for location of OpenGL library... " >&6; } @@ -35540,6 +40890,9 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35550,6 +40903,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 $as_echo "$with_opengl_libs" >&6; } ======= @@ -35557,6 +40911,8 @@ $as_echo "$with_opengl_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 printf "%s\n" "$with_opengl_libs" >&6; } ======= @@ -35568,6 +40924,9 @@ $as_echo "$with_opengl_libs" >&6; } $as_echo "$with_opengl_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35590,6 +40949,7 @@ ac_save_ldflags="$LDFLAGS" ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 $as_echo_n "checking for OpenGL library... " >&6; } ======= @@ -35619,6 +40979,8 @@ glEnd(); ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 printf %s "checking for OpenGL library... " >&6; } @@ -35668,6 +41030,9 @@ main () glEnd(); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35677,11 +41042,14 @@ glEnd(); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -35702,6 +41070,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35714,6 +41085,7 @@ OPENGLLIB="$OPENGLLIB -lopengl32 " else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35724,6 +41096,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 @@ -35733,12 +41110,15 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -35747,6 +41127,9 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35759,6 +41142,7 @@ ac_save_ldflags="$LDFLAGS" ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU library" >&5 $as_echo_n "checking for GLU library... " >&6; } ======= @@ -35788,6 +41172,8 @@ gluNewQuadric(); ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLU library" >&5 printf %s "checking for GLU library... " >&6; } @@ -35837,6 +41223,9 @@ main () gluNewQuadric(); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35846,11 +41235,14 @@ gluNewQuadric(); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -35871,6 +41263,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35883,6 +41278,7 @@ OPENGLULIB="$OPENGLULIB -lglu32 " else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35893,6 +41289,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 @@ -35902,12 +41303,15 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -35916,6 +41320,9 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35929,6 +41336,7 @@ OPENGLLIB="$OPENGL_LIB_PATH $OPENGLLIB" OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h @@ -35937,6 +41345,8 @@ $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define OPENGL_WINDOWS 1" >>confdefs.h ======= $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h @@ -35945,6 +41355,9 @@ $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35968,6 +41381,7 @@ fi # $USE_OPENGL # Enable ODBC option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -35975,6 +41389,8 @@ fi # $USE_OPENGL ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use ODBC" >&5 printf %s "checking whether to use ODBC... " >&6; } @@ -35989,6 +41405,9 @@ echo "$ac_t"""$with_odbc"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -35998,6 +41417,7 @@ $as_echo_n "checking whether to use ODBC... " >&6; } $as_echo "\"$with_odbc\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36009,6 +41429,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" ;; @@ -36025,6 +41450,7 @@ if test -n "$USE_ODBC"; then # With ODBC includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC includes" >&5 @@ -36034,6 +41460,8 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of ODBC includes" >&5 printf %s "checking for location of ODBC includes... " >&6; } @@ -36050,6 +41478,9 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } $as_echo_n "checking for location of ODBC includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36060,6 +41491,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_odbc_includes" >&5 $as_echo "$with_odbc_includes" >&6; } ======= @@ -36067,6 +41499,8 @@ $as_echo "$with_odbc_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_odbc_includes" >&5 printf "%s\n" "$with_odbc_includes" >&6; } ======= @@ -36078,6 +41512,9 @@ $as_echo "$with_odbc_includes" >&6; } $as_echo "$with_odbc_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36093,6 +41530,7 @@ if test -n "$with_odbc_includes" ; then fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" @@ -36117,6 +41555,8 @@ if test "x$ac_cv_header_sql_h" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 : @@ -36190,6 +41630,7 @@ if test "x$ac_cv_header_windows_h" = xyes; then : $as_echo "#define HAVE_WINDOWS_H 1" >>confdefs.h <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main $as_echo "#define HAVE_SQL_H 1" >>confdefs.h @@ -36204,6 +41645,11 @@ fi fi +>>>>>>> osgeo-main +======= + +fi + >>>>>>> osgeo-main @@ -36245,6 +41691,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36254,6 +41703,7 @@ CPPFLAGS=$ac_save_cppflags # With ODBC library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC library" >&5 @@ -36263,6 +41713,8 @@ $as_echo_n "checking for location of ODBC library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of ODBC library" >&5 printf %s "checking for location of ODBC library... " >&6; } @@ -36279,6 +41731,9 @@ $as_echo_n "checking for location of ODBC library... " >&6; } $as_echo_n "checking for location of ODBC library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36289,6 +41744,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_odbc_libs" >&5 $as_echo "$with_odbc_libs" >&6; } ======= @@ -36296,6 +41752,8 @@ $as_echo "$with_odbc_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_odbc_libs" >&5 printf "%s\n" "$with_odbc_libs" >&6; } ======= @@ -36307,6 +41765,9 @@ $as_echo "$with_odbc_libs" >&6; } $as_echo "$with_odbc_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36327,12 +41788,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$ODBCLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5 $as_echo_n "checking for SQLConnect in -lodbc... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5 printf %s "checking for SQLConnect in -lodbc... " >&6; } @@ -36341,11 +41805,15 @@ echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6 echo "configure:10574: checking for SQLConnect in -lodbc" >&5 ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lodbc $ICONVLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36364,6 +41832,8 @@ ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lodbc $ICONVLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36413,6 +41883,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36435,6 +41908,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_odbc_SQLConnect=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_odbc_SQLConnect=no fi @@ -36443,6 +41917,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -36466,6 +41942,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36479,6 +41958,7 @@ if test "x$ac_cv_lib_odbc_SQLConnect" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36490,6 +41970,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} @@ -36497,12 +41982,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$ODBCLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5 $as_echo_n "checking for SQLConnect in -liodbc... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5 printf %s "checking for SQLConnect in -liodbc... " >&6; } @@ -36511,11 +41999,15 @@ echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6 echo "configure:10616: checking for SQLConnect in -liodbc" >&5 ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-liodbc $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36534,6 +42026,8 @@ ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-liodbc $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36583,6 +42077,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36605,6 +42102,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iodbc_SQLConnect=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_iodbc_SQLConnect=no fi @@ -36613,6 +42111,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -36636,6 +42136,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36649,6 +42152,7 @@ if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36660,6 +42164,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" @@ -36669,10 +42178,13 @@ ac_save_ldflags="$LDFLAGS" ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 $as_echo_n "checking for ODBC library... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 printf %s "checking for ODBC library... " >&6; } @@ -36704,11 +42216,35 @@ 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 main () <<<<<<< HEAD +<<<<<<< HEAD { SQLAllocEnv((SQLHENV *)0); ======= @@ -36754,6 +42290,10 @@ SQLAllocEnv((SQLHENV *)0); { SQLAllocEnv((SQLHENV *)0); >>>>>>> osgeo-main +======= +{ +SQLAllocEnv((SQLHENV *)0); +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 @@ -36770,6 +42310,9 @@ main () SQLAllocEnv((SQLHENV *)0); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36779,11 +42322,14 @@ SQLAllocEnv((SQLHENV *)0); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -36804,6 +42350,9 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36816,6 +42365,7 @@ ODBCLIB="$ODBCLIB -lodbc32 " else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36826,6 +42376,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 @@ -36835,12 +42390,15 @@ else fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -36849,6 +42407,9 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36884,6 +42445,7 @@ fi # $USE_ODBC # Enable FFTW option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -36891,6 +42453,8 @@ fi # $USE_ODBC ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use FFTW" >&5 printf %s "checking whether to use FFTW... " >&6; } @@ -36905,6 +42469,9 @@ echo "$ac_t"""$with_fftw"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36914,6 +42481,7 @@ $as_echo_n "checking whether to use FFTW... " >&6; } $as_echo "\"$with_fftw\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36925,6 +42493,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" ;; @@ -36941,6 +42514,7 @@ if test -n "$USE_FFTW"; then # With FFTW includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW includes" >&5 @@ -36950,6 +42524,8 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FFTW includes" >&5 printf %s "checking for location of FFTW includes... " >&6; } @@ -36966,6 +42542,9 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } $as_echo_n "checking for location of FFTW includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36976,6 +42555,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_fftw_includes" >&5 $as_echo "$with_fftw_includes" >&6; } ======= @@ -36983,6 +42563,8 @@ $as_echo "$with_fftw_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_fftw_includes" >&5 printf "%s\n" "$with_fftw_includes" >&6; } ======= @@ -36994,6 +42576,9 @@ $as_echo "$with_fftw_includes" >&6; } $as_echo "$with_fftw_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37014,11 +42599,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$FFTWINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in fftw3.h do : @@ -37062,6 +42650,9 @@ echo "configure:10764: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37074,6 +42665,7 @@ if test "x$ac_cv_header_fftw3_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37085,6 +42677,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 @@ -37112,11 +42709,14 @@ _ACEOF else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "*** Unable to locate FFTW includes." "$LINENO" 5 ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -37135,6 +42735,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate FFTW includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -37154,6 +42757,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -37196,6 +42800,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -37204,6 +42810,7 @@ CPPFLAGS=$ac_save_cppflags fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -37217,6 +42824,10 @@ done ======= ======= >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> osgeo-main done >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37231,6 +42842,7 @@ CPPFLAGS=$ac_save_cppflags fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -37244,6 +42856,10 @@ done ======= ======= >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> osgeo-main done >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37258,6 +42874,7 @@ CPPFLAGS=$ac_save_cppflags # With FFTW library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW library" >&5 @@ -37267,6 +42884,8 @@ $as_echo_n "checking for location of FFTW library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FFTW library" >&5 printf %s "checking for location of FFTW library... " >&6; } @@ -37283,6 +42902,9 @@ $as_echo_n "checking for location of FFTW library... " >&6; } $as_echo_n "checking for location of FFTW library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37293,6 +42915,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_fftw_libs" >&5 $as_echo "$with_fftw_libs" >&6; } ======= @@ -37300,6 +42923,8 @@ $as_echo "$with_fftw_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_fftw_libs" >&5 printf "%s\n" "$with_fftw_libs" >&6; } ======= @@ -37311,6 +42936,9 @@ $as_echo "$with_fftw_libs" >&6; } $as_echo "$with_fftw_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37331,12 +42959,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$FFTWLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 $as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 printf %s "checking for fftw_execute in -lfftw3... " >&6; } @@ -37345,11 +42976,15 @@ echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6 echo "configure:10915: checking for fftw_execute in -lfftw3" >&5 ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 $MATHLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37368,6 +43003,8 @@ ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37417,6 +43054,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37439,6 +43079,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_fftw3_fftw_execute=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_fftw3_fftw_execute=no fi @@ -37447,6 +43088,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -37470,6 +43113,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37483,6 +43129,7 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37494,6 +43141,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} @@ -37501,12 +43153,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$FFTWLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -lfftw" >&5 $as_echo_n "checking for fftwnd_one in -lfftw... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -lfftw" >&5 printf %s "checking for fftwnd_one in -lfftw... " >&6; } @@ -37515,11 +43170,15 @@ echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6 echo "configure:10957: checking for fftwnd_one in -lfftw" >&5 ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw $MATHLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37538,6 +43197,8 @@ ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37587,6 +43248,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37609,6 +43273,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_fftw_fftwnd_one=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_fftw_fftwnd_one=no fi @@ -37617,6 +43282,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -37640,6 +43307,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37653,6 +43323,7 @@ if test "x$ac_cv_lib_fftw_fftwnd_one" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37664,6 +43335,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} @@ -37671,12 +43347,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$FFTWLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -ldfftw" >&5 $as_echo_n "checking for fftwnd_one in -ldfftw... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -ldfftw" >&5 printf %s "checking for fftwnd_one in -ldfftw... " >&6; } @@ -37685,11 +43364,15 @@ echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6 echo "configure:10999: checking for fftwnd_one in -ldfftw" >&5 ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ldfftw $MATHLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37708,6 +43391,8 @@ ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-ldfftw $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -37757,6 +43442,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37779,6 +43467,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dfftw_fftwnd_one=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_dfftw_fftwnd_one=no fi @@ -37787,6 +43476,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -37810,6 +43501,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37823,6 +43517,7 @@ if test "x$ac_cv_lib_dfftw_fftwnd_one" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37834,6 +43529,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} @@ -37873,6 +43573,7 @@ fi # $USE_FFTW # Enable BLAS option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37880,6 +43581,8 @@ fi # $USE_FFTW ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use BLAS" >&5 printf %s "checking whether to use BLAS... " >&6; } @@ -37894,6 +43597,9 @@ echo "$ac_t"""$with_blas"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37903,6 +43609,7 @@ $as_echo_n "checking whether to use BLAS... " >&6; } $as_echo "\"$with_blas\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37914,6 +43621,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" ;; @@ -37932,6 +43644,7 @@ if test -n "$USE_BLAS"; then # With BLAS library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS includes" >&5 @@ -37941,6 +43654,8 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of BLAS includes" >&5 printf %s "checking for location of BLAS includes... " >&6; } @@ -37957,6 +43672,9 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } $as_echo_n "checking for location of BLAS includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37967,6 +43685,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_blas_includes" >&5 $as_echo "$with_blas_includes" >&6; } ======= @@ -37974,6 +43693,8 @@ $as_echo "$with_blas_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_blas_includes" >&5 printf "%s\n" "$with_blas_includes" >&6; } ======= @@ -37985,6 +43706,9 @@ $as_echo "$with_blas_includes" >&6; } $as_echo "$with_blas_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38000,6 +43724,7 @@ if test -n "$with_blas_includes" ; then fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS library" >&5 @@ -38009,6 +43734,8 @@ $as_echo_n "checking for location of BLAS library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of BLAS library" >&5 printf %s "checking for location of BLAS library... " >&6; } @@ -38025,6 +43752,9 @@ $as_echo_n "checking for location of BLAS library... " >&6; } $as_echo_n "checking for location of BLAS library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38035,6 +43765,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_blas_libs" >&5 $as_echo "$with_blas_libs" >&6; } ======= @@ -38042,6 +43773,8 @@ $as_echo "$with_blas_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_blas_libs" >&5 printf "%s\n" "$with_blas_libs" >&6; } ======= @@ -38053,6 +43786,9 @@ $as_echo "$with_blas_libs" >&6; } $as_echo "$with_blas_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38073,6 +43809,7 @@ save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$BLASINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for ac_header in cblas.h do : ac_fn_c_check_header_mongrel "$LINENO" "cblas.h" "ac_cv_header_cblas_h" "$ac_includes_default" @@ -38086,6 +43823,8 @@ _ACEOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_header_compile "$LINENO" "cblas.h" "ac_cv_header_cblas_h" "$ac_includes_default" if test "x$ac_cv_header_cblas_h" = xyes @@ -38138,6 +43877,9 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38155,12 +43897,15 @@ LDFLAGS="$BLASLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnrm2_ in -lblas" >&5 $as_echo_n "checking for dnrm2_ in -lblas... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnrm2_ in -lblas" >&5 printf %s "checking for dnrm2_ in -lblas... " >&6; } @@ -38169,11 +43914,15 @@ echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6 echo "configure:11183: checking for dnrm2_ in -lblas" >&5 ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $MATHLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38192,6 +43941,8 @@ ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38241,6 +43992,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38263,6 +44017,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_blas_dnrm2_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_dnrm2_=no fi @@ -38271,6 +44026,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -38335,6 +44092,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38356,6 +44116,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38367,6 +44128,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 @@ -38387,6 +44153,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_blas_dnrm2_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_dnrm2_=no fi @@ -38395,6 +44162,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -38418,6 +44187,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38431,6 +44203,7 @@ if test "x$ac_cv_lib_blas_dnrm2_" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38442,6 +44215,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} @@ -38470,10 +44248,13 @@ save_LDFLAGS="$LDFLAGS" LDFLAGS="$BLASLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 $as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 printf %s "checking for ATL_xerbla in -latlas... " >&6; } @@ -38482,11 +44263,15 @@ echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6 echo "configure:11280: checking for ATL_xerbla in -latlas" >&5 ac_lib_var=`echo atlas'_'ATL_xerbla | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-latlas $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38505,6 +44290,8 @@ ac_lib_var=`echo atlas'_'ATL_xerbla | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-latlas $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -38554,6 +44341,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38576,6 +44366,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_atlas_ATL_xerbla=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_atlas_ATL_xerbla=no fi @@ -38593,6 +44384,8 @@ $as_echo_n "checking for sgemm_ in -lf77blas... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -38624,6 +44417,9 @@ $as_echo_n "checking for sgemm_ in -lf77blas... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38633,11 +44429,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 @@ -38686,6 +44485,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38708,6 +44510,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_f77blas_sgemm_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_f77blas_sgemm_=no fi @@ -38725,6 +44528,8 @@ $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -38756,6 +44561,9 @@ $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38765,11 +44573,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 @@ -38818,6 +44629,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38840,6 +44654,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_cblas_cblas_dgemm=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_cblas_cblas_dgemm=no fi @@ -38848,6 +44663,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -38869,6 +44686,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38880,6 +44700,7 @@ $as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } if test "x$ac_cv_lib_cblas_cblas_dgemm" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38890,6 +44711,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 @@ -38904,6 +44730,7 @@ LDFLAGS="$save_LDFLAGS" # Do we have ATLAS? if test $blas_ok = yes; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h @@ -38912,6 +44739,8 @@ $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBATLAS 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h @@ -38920,6 +44749,9 @@ $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38934,6 +44766,7 @@ if test $blas_ok = no; then save_LIBS="$LIBS" LIBS="$vlib_flags $LIBS" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm in $vlib_flags" >&5 $as_echo_n "checking for sgemm in $vlib_flags... " >&6; } @@ -38949,6 +44782,8 @@ sgemm ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sgemm in $vlib_flags" >&5 printf %s "checking for sgemm in $vlib_flags... " >&6; } @@ -38990,6 +44825,9 @@ main () sgemm >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38999,6 +44837,7 @@ sgemm _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : blas_ok=yes; BLASLIB="$vlib_flags" else @@ -39009,6 +44848,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ======= @@ -39039,6 +44880,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39048,6 +44892,7 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "$blas_ok" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39058,6 +44903,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 @@ -39066,11 +44916,14 @@ fi # BLAS in PhiPACK libraries? (requires generic BLAS, too) if test $blas_ok = no; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 $as_echo_n "checking for sgemm_ in -lblas... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 printf %s "checking for sgemm_ in -lblas... " >&6; } @@ -39079,11 +44932,15 @@ printf %s "checking for sgemm_ in -lblas... " >&6; } echo "configure:11434: checking for sgemm_ in -lblas" >&5 ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39102,6 +44959,8 @@ ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39151,6 +45010,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39173,6 +45035,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_blas_sgemm_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_sgemm_=no fi @@ -39190,6 +45053,8 @@ $as_echo_n "checking for dgemm_ in -ldgemm... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -39221,6 +45086,9 @@ $as_echo_n "checking for dgemm_ in -ldgemm... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39230,11 +45098,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 @@ -39283,6 +45154,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39305,6 +45179,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dgemm_dgemm_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_dgemm_dgemm_=no fi @@ -39322,6 +45197,8 @@ $as_echo_n "checking for sgemm_ in -lsgemm... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -39353,6 +45230,9 @@ $as_echo_n "checking for sgemm_ in -lsgemm... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39362,11 +45242,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 @@ -39415,6 +45298,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39437,6 +45323,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sgemm_sgemm_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sgemm_sgemm_=no fi @@ -39445,6 +45332,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -39466,6 +45355,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39477,6 +45369,7 @@ $as_echo "$ac_cv_lib_sgemm_sgemm_" >&6; } if test "x$ac_cv_lib_sgemm_sgemm_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39487,6 +45380,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 @@ -39502,11 +45400,14 @@ fi if test $blas_ok = no; then if test "x$GCC" != xyes; then # only works with Sun CC <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 $as_echo_n "checking for acosp in -lsunmath... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 printf %s "checking for acosp in -lsunmath... " >&6; } @@ -39515,11 +45416,15 @@ printf %s "checking for acosp in -lsunmath... " >&6; } echo "configure:11549: checking for acosp in -lsunmath" >&5 ac_lib_var=`echo sunmath'_'acosp | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsunmath $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39538,6 +45443,8 @@ ac_lib_var=`echo sunmath'_'acosp | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lsunmath $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39587,6 +45494,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39609,6 +45519,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sunmath_acosp=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sunmath_acosp=no fi @@ -39626,6 +45537,8 @@ $as_echo_n "checking for sgemm_ in -lsunperf... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -39657,6 +45570,9 @@ $as_echo_n "checking for sgemm_ in -lsunperf... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39666,11 +45582,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 @@ -39719,6 +45638,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39741,6 +45663,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_sunperf_sgemm_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sunperf_sgemm_=no fi @@ -39749,6 +45672,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -39770,6 +45695,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39781,6 +45709,7 @@ $as_echo "$ac_cv_lib_sunperf_sgemm_" >&6; } if test "x$ac_cv_lib_sunperf_sgemm_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39791,6 +45720,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 @@ -39804,11 +45738,14 @@ fi # Generic BLAS library if test $blas_ok = no; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 $as_echo_n "checking for sgemm_ in -lblas... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 printf %s "checking for sgemm_ in -lblas... " >&6; } @@ -39817,11 +45754,15 @@ printf %s "checking for sgemm_ in -lblas... " >&6; } echo "configure:11628: checking for sgemm_ in -lblas" >&5 ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39840,6 +45781,8 @@ ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39889,6 +45832,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39911,6 +45857,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_blas_sgemm_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_sgemm_=no fi @@ -39919,6 +45866,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -39940,6 +45889,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39951,6 +45903,7 @@ $as_echo "$ac_cv_lib_blas_sgemm_" >&6; } if test "x$ac_cv_lib_blas_sgemm_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39961,6 +45914,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 @@ -39969,6 +45927,7 @@ fi if test $blas_ok = yes; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h @@ -39977,6 +45936,8 @@ $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBBLAS 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h @@ -39985,6 +45946,9 @@ $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40001,6 +45965,7 @@ fi # $USE_BLAS # Enable LAPACK option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -40008,6 +45973,8 @@ fi # $USE_BLAS ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use LAPACK" >&5 printf %s "checking whether to use LAPACK... " >&6; } @@ -40022,6 +45989,9 @@ echo "$ac_t"""$with_lapack"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40031,6 +46001,7 @@ $as_echo_n "checking whether to use LAPACK... " >&6; } $as_echo "\"$with_lapack\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40042,6 +46013,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" ;; @@ -40064,6 +46040,7 @@ if test -n "$USE_LAPACK"; then lapack_ok=no +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK includes" >&5 @@ -40073,6 +46050,8 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK includes" >&5 printf %s "checking for location of LAPACK includes... " >&6; } @@ -40089,6 +46068,9 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } $as_echo_n "checking for location of LAPACK includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40099,6 +46081,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lapack_includes" >&5 $as_echo "$with_lapack_includes" >&6; } ======= @@ -40106,6 +46089,8 @@ $as_echo "$with_lapack_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lapack_includes" >&5 printf "%s\n" "$with_lapack_includes" >&6; } ======= @@ -40117,6 +46102,9 @@ $as_echo "$with_lapack_includes" >&6; } $as_echo "$with_lapack_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40132,6 +46120,7 @@ if test -n "$with_lapack_includes" ; then fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK library" >&5 @@ -40141,6 +46130,8 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK library" >&5 printf %s "checking for location of LAPACK library... " >&6; } @@ -40157,6 +46148,9 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } $as_echo_n "checking for location of LAPACK library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40167,6 +46161,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lapack_libs" >&5 $as_echo "$with_lapack_libs" >&6; } ======= @@ -40174,6 +46169,8 @@ $as_echo "$with_lapack_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lapack_libs" >&5 printf "%s\n" "$with_lapack_libs" >&6; } ======= @@ -40185,6 +46182,9 @@ $as_echo "$with_lapack_libs" >&6; } $as_echo "$with_lapack_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40205,6 +46205,7 @@ save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$LAPACKINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for ac_header in clapack.h do : ac_fn_c_check_header_mongrel "$LINENO" "clapack.h" "ac_cv_header_clapack_h" "$ac_includes_default" @@ -40218,6 +46219,8 @@ _ACEOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD 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 @@ -40270,6 +46273,9 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40285,6 +46291,7 @@ if test lapack_ok=no; then save_LIBS="$LIBS"; LIBS="$LIBS $BLASLIB $MATHLIB $FLIBS" save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "dsegv_" "ac_cv_func_dsegv_" if test "x$ac_cv_func_dsegv_" = xyes; then : @@ -40293,6 +46300,8 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "dsegv_" "ac_cv_func_dsegv_" if test "x$ac_cv_func_dsegv_" = xyes @@ -40348,6 +46357,9 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : if test "x$ac_cv_func_dsegv_" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40363,11 +46375,14 @@ if test $lapack_ok = no; then save_libs="$LIBS"; LIBS="$BLASLIB $MATHLIB $LIBS" save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for desgv_ in -llapack" >&5 $as_echo_n "checking for desgv_ in -llapack... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for desgv_ in -llapack" >&5 printf %s "checking for desgv_ in -llapack... " >&6; } @@ -40376,11 +46391,15 @@ printf %s "checking for desgv_ in -llapack... " >&6; } echo "configure:11848: checking for desgv_ in -llapack" >&5 ac_lib_var=`echo lapack'_'desgv_ | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-llapack $FLIBS $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40399,6 +46418,8 @@ ac_lib_var=`echo lapack'_'desgv_ | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-llapack $FLIBS $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40448,6 +46469,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40470,6 +46494,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_lapack_desgv_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_lapack_desgv_=no fi @@ -40478,6 +46503,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -40499,6 +46526,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40510,6 +46540,7 @@ $as_echo "$ac_cv_lib_lapack_desgv_" >&6; } if test "x$ac_cv_lib_lapack_desgv_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40520,6 +46551,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 @@ -40536,12 +46572,15 @@ LDFLAGS="$LAPACKLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgesv_ in -llapack" >&5 $as_echo_n "checking for dgesv_ in -llapack... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dgesv_ in -llapack" >&5 printf %s "checking for dgesv_ in -llapack... " >&6; } @@ -40550,11 +46589,15 @@ echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6 echo "configure:11897: checking for dgesv_ in -llapack" >&5 ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-llapack $BLASLIB $MATHLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40573,6 +46616,8 @@ ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-llapack $BLASLIB $MATHLIB $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40622,6 +46667,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40644,6 +46692,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_lapack_dgesv_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_lapack_dgesv_=no fi @@ -40652,6 +46701,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -40716,6 +46767,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40737,6 +46791,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40748,6 +46803,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 @@ -40768,6 +46828,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_lapack_dgesv_=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_lapack_dgesv_=no fi @@ -40776,6 +46837,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -40799,6 +46862,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40812,6 +46878,7 @@ if test "x$ac_cv_lib_lapack_dgesv_" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40823,6 +46890,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} @@ -40846,6 +46918,7 @@ LDFLAGS=${ac_save_ldflags} fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h @@ -40854,6 +46927,8 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBLAPACK 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h @@ -40862,6 +46937,9 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41037,6 +47115,7 @@ fi # Enable Cairo display driver option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -41044,6 +47123,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use Cairo" >&5 printf %s "checking whether to use Cairo... " >&6; } @@ -41058,6 +47139,9 @@ echo "$ac_t"""$with_cairo"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41067,6 +47151,7 @@ $as_echo_n "checking whether to use Cairo... " >&6; } $as_echo "\"$with_cairo\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -41078,6 +47163,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" ;; @@ -41107,6 +47197,7 @@ done CAIROINC=`$PKG_CONFIG --cflags $cairo` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo includes" >&5 @@ -41116,6 +47207,8 @@ $as_echo_n "checking for location of cairo includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of cairo includes" >&5 printf %s "checking for location of cairo includes... " >&6; } @@ -41132,6 +47225,9 @@ $as_echo_n "checking for location of cairo includes... " >&6; } $as_echo_n "checking for location of cairo includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41142,6 +47238,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_includes" >&5 $as_echo "$with_cairo_includes" >&6; } ======= @@ -41149,6 +47246,8 @@ $as_echo "$with_cairo_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cairo_includes" >&5 printf "%s\n" "$with_cairo_includes" >&6; } ======= @@ -41160,6 +47259,9 @@ $as_echo "$with_cairo_includes" >&6; } $as_echo "$with_cairo_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41180,11 +47282,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$CAIROINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in cairo.h do : @@ -41206,6 +47311,9 @@ echo "configure:12064: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41218,11 +47326,14 @@ if test "x$ac_cv_header_cairo_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate Cairo includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -41245,6 +47356,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate Cairo includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -41266,6 +47380,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -41313,6 +47428,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -41323,6 +47440,7 @@ CPPFLAGS=$ac_save_cppflags CAIROLIB=`$PKG_CONFIG --libs $cairo` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo library" >&5 @@ -41332,6 +47450,8 @@ $as_echo_n "checking for location of cairo library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of cairo library" >&5 printf %s "checking for location of cairo library... " >&6; } @@ -41348,6 +47468,9 @@ $as_echo_n "checking for location of cairo library... " >&6; } $as_echo_n "checking for location of cairo library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41358,6 +47481,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_libs" >&5 $as_echo "$with_cairo_libs" >&6; } ======= @@ -41365,6 +47489,8 @@ $as_echo "$with_cairo_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cairo_libs" >&5 printf "%s\n" "$with_cairo_libs" >&6; } ======= @@ -41376,6 +47502,9 @@ $as_echo "$with_cairo_libs" >&6; } $as_echo "$with_cairo_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41391,6 +47520,7 @@ if test -n "$with_cairo_libs"; then fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo linking flags" >&5 @@ -41400,6 +47530,8 @@ $as_echo_n "checking for cairo linking flags... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cairo linking flags" >&5 printf %s "checking for cairo linking flags... " >&6; } @@ -41416,6 +47548,9 @@ $as_echo_n "checking for cairo linking flags... " >&6; } $as_echo_n "checking for cairo linking flags... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41426,6 +47561,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_ldflags" >&5 $as_echo "$with_cairo_ldflags" >&6; } ======= @@ -41433,6 +47569,8 @@ $as_echo "$with_cairo_ldflags" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cairo_ldflags" >&5 printf "%s\n" "$with_cairo_ldflags" >&6; } ======= @@ -41444,6 +47582,9 @@ $as_echo "$with_cairo_ldflags" >&6; } $as_echo "$with_cairo_ldflags" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41457,6 +47598,7 @@ LIBS=" $CAIROLIB $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "cairo_create" "ac_cv_func_cairo_create" if test "x$ac_cv_func_cairo_create" = xyes; then : @@ -41468,6 +47610,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "cairo_create" "ac_cv_func_cairo_create" if test "x$ac_cv_func_cairo_create" = xyes @@ -41536,6 +47680,9 @@ if test "x$ac_cv_func_cairo_create" = xyes; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41556,6 +47703,7 @@ LIBS=" $CAIROLIB $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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 : @@ -41567,6 +47715,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD 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 @@ -41635,6 +47785,9 @@ CAIRO_HAS_XRENDER=1 else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41654,6 +47807,7 @@ LIBS=" $CAIROLIB $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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 : @@ -41665,6 +47819,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD 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 @@ -41733,6 +47889,9 @@ CAIRO_HAS_XRENDER_SURFACE=1 else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41759,6 +47918,7 @@ fi # $USE_CAIRO # Enable FreeType option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -41766,6 +47926,8 @@ fi # $USE_CAIRO ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use FreeType" >&5 printf %s "checking whether to use FreeType... " >&6; } @@ -41780,6 +47942,9 @@ echo "$ac_t"""$with_freetype"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41789,6 +47954,7 @@ $as_echo_n "checking whether to use FreeType... " >&6; } $as_echo "\"$with_freetype\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -41800,6 +47966,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" ;; @@ -41817,6 +47988,7 @@ if test -n "$USE_FREETYPE"; then FTINC=`$PKG_CONFIG --cflags freetype2` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -41827,6 +47999,8 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FreeType includes" >&5 @@ -41846,6 +48020,9 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } $as_echo_n "checking for location of FreeType includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41856,6 +48033,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_includes" >&5 $as_echo "$with_freetype_includes" >&6; } ======= @@ -41863,6 +48041,8 @@ $as_echo "$with_freetype_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_freetype_includes" >&5 printf "%s\n" "$with_freetype_includes" >&6; } ======= @@ -41874,6 +48054,9 @@ $as_echo "$with_freetype_includes" >&6; } $as_echo "$with_freetype_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41894,11 +48077,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$FTINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in ft2build.h do : @@ -41920,6 +48106,9 @@ echo "configure:12376: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41932,11 +48121,14 @@ if test "x$ac_cv_header_ft2build_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate FreeType includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -41959,6 +48151,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate FreeType includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -41980,6 +48175,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -42027,6 +48223,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -42036,6 +48234,7 @@ CPPFLAGS=$ac_save_cppflags FTLIB=`$PKG_CONFIG --libs freetype2` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -42046,6 +48245,8 @@ $as_echo_n "checking for location of FreeType library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FreeType library" >&5 @@ -42065,6 +48266,9 @@ $as_echo_n "checking for location of FreeType library... " >&6; } $as_echo_n "checking for location of FreeType library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42075,6 +48279,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_libs" >&5 $as_echo "$with_freetype_libs" >&6; } ======= @@ -42082,6 +48287,8 @@ $as_echo "$with_freetype_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_freetype_libs" >&5 printf "%s\n" "$with_freetype_libs" >&6; } ======= @@ -42093,6 +48300,9 @@ $as_echo "$with_freetype_libs" >&6; } $as_echo "$with_freetype_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42113,12 +48323,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$FTLIB $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $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; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -42127,11 +48340,15 @@ echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6 echo "configure:12443: checking for FT_Init_FreeType in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42150,6 +48367,8 @@ ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42199,6 +48418,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42221,6 +48443,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_freetype_FT_Init_FreeType=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_freetype_FT_Init_FreeType=no fi @@ -42229,6 +48452,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -42252,6 +48477,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42265,6 +48493,7 @@ if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42276,6 +48505,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} @@ -42299,6 +48533,7 @@ fi # $USE_FREETYPE # Enable NLS option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -42306,6 +48541,8 @@ fi # $USE_FREETYPE ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 printf %s "checking whether to use NLS... " >&6; } @@ -42320,6 +48557,9 @@ echo "$ac_t"""$with_nls"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42329,6 +48569,7 @@ $as_echo_n "checking whether to use NLS... " >&6; } $as_echo "\"$with_nls\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42340,6 +48581,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" ;; @@ -42353,11 +48599,14 @@ HAVE_NLS= if test -n "${USE_NLS}" ; then +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD $as_echo "#define USE_NLS 1" >>confdefs.h ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "#define USE_NLS 1" >>confdefs.h >>>>>>> osgeo-main @@ -42372,6 +48621,7 @@ then : ======= echo $ac_n "checking for gettext""... $ac_c" 1>&6 echo "configure:12521: checking for gettext" >&5 +<<<<<<< HEAD cat > conftest.$ac_ext <&5 $as_echo_n "checking for gettext in -lintl... " >&6; } ======= +======= + +cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gettext(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gettext) || defined (__stub___gettext) +choke me +#else +gettext(); +#endif + +; return 0; } +EOF +if { (eval echo configure:12547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gettext=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gettext=no" +fi +rm -f conftest* + +if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then + echo "$ac_t""yes" 1>&6 +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) + INTLLIB= +else $as_nop + +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5 printf %s "checking for gettext in -lintl... " >&6; } @@ -42427,11 +48721,15 @@ echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 echo "configure:12565: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42522,6 +48820,8 @@ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -42644,6 +48944,9 @@ else fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42657,6 +48960,7 @@ if test "x$ac_cv_lib_intl_gettext" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42667,6 +48971,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 @@ -42682,6 +48991,7 @@ fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Enable openDWG option @@ -42692,6 +49002,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD # Enable openDWG option @@ -42876,6 +49188,9 @@ echo "$ac_t"""$with_opendwg"" 1>&6 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42885,6 +49200,7 @@ $as_echo_n "checking whether to use openDWG... " >&6; } $as_echo "\"$with_opendwg\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42896,6 +49212,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" ;; @@ -42913,6 +49234,7 @@ if test -n "${USE_OPENDWG}"; then # With OPENDWG includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5 @@ -42922,6 +49244,8 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5 printf %s "checking for location of openDGW includes... " >&6; } @@ -42938,6 +49262,9 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } $as_echo_n "checking for location of openDGW includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42948,6 +49275,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_includes" >&5 $as_echo "$with_opendwg_includes" >&6; } ======= @@ -42955,6 +49283,8 @@ $as_echo "$with_opendwg_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_includes" >&5 printf "%s\n" "$with_opendwg_includes" >&6; } ======= @@ -42966,6 +49296,9 @@ $as_echo "$with_opendwg_includes" >&6; } $as_echo "$with_opendwg_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42986,11 +49319,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OPENDWGINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in ad2.h do : @@ -43012,6 +49348,9 @@ echo "configure:12821: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43024,11 +49363,14 @@ if test "x$ac_cv_header_ad2_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate openDWG includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -43051,6 +49393,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate openDWG includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -43072,6 +49417,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -43119,6 +49465,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -43127,6 +49475,7 @@ CPPFLAGS=$ac_save_cppflags # With OPENDWG library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5 @@ -43136,6 +49485,8 @@ $as_echo_n "checking for location of openDWG library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5 printf %s "checking for location of openDWG library... " >&6; } @@ -43152,6 +49503,9 @@ $as_echo_n "checking for location of openDWG library... " >&6; } $as_echo_n "checking for location of openDWG library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43162,6 +49516,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_libs" >&5 $as_echo "$with_opendwg_libs" >&6; } ======= @@ -43169,6 +49524,8 @@ $as_echo "$with_opendwg_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_libs" >&5 printf "%s\n" "$with_opendwg_libs" >&6; } ======= @@ -43180,6 +49537,9 @@ $as_echo "$with_opendwg_libs" >&6; } $as_echo "$with_opendwg_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43216,6 +49576,7 @@ fi # $USE_OPENDWG # Enable pthread option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -43223,6 +49584,8 @@ fi # $USE_OPENDWG ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use POSIX threads" >&5 printf %s "checking whether to use POSIX threads... " >&6; } @@ -43237,6 +49600,9 @@ echo "$ac_t"""$with_pthread"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43246,6 +49612,7 @@ $as_echo_n "checking whether to use POSIX threads... " >&6; } $as_echo "\"$with_pthread\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -43257,6 +49624,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" ;; @@ -43274,6 +49646,7 @@ if test -n "$USE_PTHREAD"; then # With pthread includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads includes" >&5 @@ -43283,6 +49656,8 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -43299,6 +49674,9 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } $as_echo_n "checking for location of POSIX threads includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43309,6 +49687,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pthread_includes" >&5 $as_echo "$with_pthread_includes" >&6; } ======= @@ -43316,6 +49695,8 @@ $as_echo "$with_pthread_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_pthread_includes" >&5 printf "%s\n" "$with_pthread_includes" >&6; } ======= @@ -43327,6 +49708,9 @@ $as_echo "$with_pthread_includes" >&6; } $as_echo "$with_pthread_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43347,11 +49731,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$PTHREADINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in pthread.h do : @@ -43373,6 +49760,9 @@ echo "configure:12950: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43385,11 +49775,14 @@ if test "x$ac_cv_header_pthread_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate POSIX threads includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -43412,6 +49805,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate POSIX threads includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -43433,6 +49829,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -43480,6 +49877,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -43488,6 +49887,7 @@ CPPFLAGS=$ac_save_cppflags # With pthread library directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads library" >&5 @@ -43497,6 +49897,8 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -43513,6 +49915,9 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } $as_echo_n "checking for location of POSIX threads library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43523,6 +49928,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pthread_libs" >&5 $as_echo "$with_pthread_libs" >&6; } ======= @@ -43530,6 +49936,8 @@ $as_echo "$with_pthread_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_pthread_libs" >&5 printf "%s\n" "$with_pthread_libs" >&6; } ======= @@ -43541,6 +49949,9 @@ $as_echo "$with_pthread_libs" >&6; } $as_echo "$with_pthread_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43563,6 +49974,7 @@ LIBS=" $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes; then : @@ -43571,6 +49983,8 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes @@ -43630,6 +50044,9 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43643,6 +50060,7 @@ else $as_nop else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -43654,18 +50072,26 @@ 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" LDFLAGS="$PTHREADLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 printf %s "checking for pthread_create in -lpthread... " >&6; } @@ -43674,11 +50100,15 @@ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 echo "configure:13070: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43697,6 +50127,8 @@ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -43746,6 +50178,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43768,6 +50203,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pthread_pthread_create=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_pthread_pthread_create=no fi @@ -43776,6 +50212,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -43799,6 +50237,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43812,6 +50253,7 @@ if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -43823,6 +50265,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} @@ -43855,6 +50302,7 @@ fi # $USE_PTHREAD # Enable OpenMP option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -43862,6 +50310,8 @@ fi # $USE_PTHREAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use OpenMP" >&5 printf %s "checking whether to use OpenMP... " >&6; } @@ -43876,6 +50326,9 @@ echo "$ac_t"""$with_openmp"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43885,6 +50338,7 @@ $as_echo_n "checking whether to use OpenMP... " >&6; } $as_echo "\"$with_openmp\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -43896,6 +50350,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" ;; @@ -43914,6 +50373,7 @@ OPENMP_LIB= OPENMP_CFLAGS= +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP includes" >&5 @@ -43923,6 +50383,8 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP includes" >&5 printf %s "checking for location of OpenMP includes... " >&6; } @@ -43939,6 +50401,9 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } $as_echo_n "checking for location of OpenMP includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43949,6 +50414,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openmp_includes" >&5 $as_echo "$with_openmp_includes" >&6; } ======= @@ -43956,6 +50422,8 @@ $as_echo "$with_openmp_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_openmp_includes" >&5 printf "%s\n" "$with_openmp_includes" >&6; } ======= @@ -43967,6 +50435,9 @@ $as_echo "$with_openmp_includes" >&6; } $as_echo "$with_openmp_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -43982,6 +50453,7 @@ if test -n "$with_openmp_includes" ; then fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -43989,6 +50461,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP library" >&5 printf %s "checking for location of OpenMP library... " >&6; } @@ -43997,6 +50471,9 @@ printf %s "checking for location of OpenMP library... " >&6; } ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44020,6 +50497,7 @@ if test -n "$with_openmp_libs"; then done fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -44029,6 +50507,8 @@ CPPFLAGS="$OPENMP_INCPATH $CPPFLAGS" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ac_save_cppflags="$CPPFLAGS" @@ -44043,6 +50523,9 @@ CPPFLAGS="$OPENMP_INCPATH $CPPFLAGS" >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44066,6 +50549,7 @@ CPPFLAGS=$ac_save_cppflags +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ac_save_ldflags="$LDFLAGS" @@ -44075,6 +50559,8 @@ LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD @@ -44152,6 +50638,7 @@ cat > conftest.$ac_ext <>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for omp_get_num_threads in -lomp" >&5 @@ -44171,6 +50658,8 @@ extern "C" <<<<<<< HEAD ======= ======= +======= +>>>>>>> osgeo-main int main() { @@ -44182,6 +50671,9 @@ choke me #else GOMP_parallel_start(); #endif +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -44211,6 +50703,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext extern "C" #endif <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44227,6 +50722,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_omp_omp_get_num_threads=yes <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ac_cv_lib_omp_omp_get_num_threads=no fi @@ -44242,6 +50738,8 @@ else ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else ac_cv_lib_omp_omp_get_num_threads=no fi @@ -44314,6 +50812,9 @@ else ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44323,6 +50824,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5 @@ -44338,6 +50840,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -44441,6 +50945,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44463,6 +50970,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gomp_GOMP_parallel_start=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_gomp_GOMP_parallel_start=no fi @@ -44471,6 +50979,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -44494,6 +51004,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44506,6 +51019,7 @@ if test "x$ac_cv_lib_gomp_GOMP_parallel_start" = xyes; then : <<<<<<< HEAD OPENMP_LIB="$OPENMP_LIB -lgomp " <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -44513,6 +51027,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD OMPLIB="$OMPLIB -lgomp " ======= @@ -44525,6 +51041,9 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44552,11 +51071,14 @@ loc_save_cflags="$CFLAGS" CFLAGS="${CFLAGS} ${OPENMP_INCPATH} ${OPENMP_LIBPATH} ${OPENMP_LIB}" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -44565,6 +51087,9 @@ if test ${enable_openmp+y} then : ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44573,6 +51098,7 @@ then : # Check whether --enable-openmp was given. if test "${enable_openmp+set}" = set; then : <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD enableval=$enable_openmp; fi @@ -44591,6 +51117,12 @@ fi enableval=$enable_openmp; fi +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) + enableval=$enable_openmp; +fi + >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD @@ -44685,6 +51217,9 @@ $as_echo_n "checking for $CC option to support OpenMP... " >&6; } >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44739,6 +51274,7 @@ $as_echo "$ac_cv_prog_c_openmp" >&6; } esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -44749,6 +51285,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 @@ -44780,6 +51321,7 @@ fi # enable_openmp # Enable OpenCL option +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -44787,6 +51329,8 @@ fi # enable_openmp ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use OpenCL" >&5 printf %s "checking whether to use OpenCL... " >&6; } @@ -44801,6 +51345,9 @@ echo "$ac_t"""$with_opencl"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44810,6 +51357,7 @@ $as_echo_n "checking whether to use OpenCL... " >&6; } $as_echo "\"$with_opencl\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -44821,6 +51369,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" ;; @@ -44838,6 +51391,7 @@ if test -n "$USE_OPENCL"; then # With OpenCL includes directory +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL includes" >&5 @@ -44847,6 +51401,8 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL includes" >&5 printf %s "checking for location of OpenCL includes... " >&6; } @@ -44863,6 +51419,9 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } $as_echo_n "checking for location of OpenCL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44873,6 +51432,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opencl_includes" >&5 $as_echo "$with_opencl_includes" >&6; } ======= @@ -44880,6 +51440,8 @@ $as_echo "$with_opencl_includes" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opencl_includes" >&5 printf "%s\n" "$with_opencl_includes" >&6; } ======= @@ -44891,6 +51453,9 @@ $as_echo "$with_opencl_includes" >&6; } $as_echo "$with_opencl_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44912,11 +51477,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OCLINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in OpenCL/opencl.h do : @@ -44938,6 +51506,9 @@ echo "configure:13445: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44950,11 +51521,14 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate OpenCL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -44977,6 +51551,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate OpenCL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -44998,6 +51575,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -45045,6 +51623,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -45061,6 +51641,7 @@ LIBS="-framework OpenCL $LIBS" LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_func "$LINENO" "clGetPlatformInfo" "ac_cv_func_clGetPlatformInfo" if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : @@ -45069,6 +51650,8 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ac_fn_c_check_func "$LINENO" "clGetPlatformInfo" "ac_cv_func_clGetPlatformInfo" if test "x$ac_cv_func_clGetPlatformInfo" = xyes @@ -45128,6 +51711,9 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45141,6 +51727,7 @@ else $as_nop else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -45152,6 +51739,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 @@ -45169,11 +51761,14 @@ ac_save_cppflags="$CPPFLAGS" CPPFLAGS="$OCLINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD for ac_header in CL/cl.h do : @@ -45195,6 +51790,9 @@ echo "configure:13558: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45207,11 +51805,14 @@ if test "x$ac_cv_header_CL_cl_h" = xyes; then : _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else as_fn_error $? "*** Unable to locate OpenCL includes." "$LINENO" 5 ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -45234,6 +51835,9 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: *** Unable to locate OpenCL includes." 1>&2; exit 1; } >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi @@ -45255,6 +51859,7 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD done ======= @@ -45302,6 +51907,8 @@ fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -45310,6 +51917,7 @@ CPPFLAGS=$ac_save_cppflags # With OpenCL library directory <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL library" >&5 $as_echo_n "checking for location of OpenCL library... " >&6; } @@ -45318,6 +51926,8 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL library" >&5 @@ -45338,6 +51948,9 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } $as_echo_n "checking for location of OpenCL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45348,6 +51961,7 @@ y | ye | yes | n | no) esac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opencl_libs" >&5 $as_echo "$with_opencl_libs" >&6; } ======= @@ -45355,6 +51969,8 @@ $as_echo "$with_opencl_libs" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opencl_libs" >&5 printf "%s\n" "$with_opencl_libs" >&6; } ======= @@ -45366,6 +51982,9 @@ $as_echo "$with_opencl_libs" >&6; } $as_echo "$with_opencl_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45385,12 +52004,15 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$OCLLIBPATH $LDFLAGS" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 $as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; } ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 printf %s "checking for clGetPlatformInfo in -lOpenCL... " >&6; } @@ -45399,11 +52021,15 @@ echo $ac_n "checking for clGetPlatformInfo in -lOpenCL""... $ac_c" 1>&6 echo "configure:13623: checking for clGetPlatformInfo in -lOpenCL" >&5 ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'` >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lOpenCL $LIBS" <<<<<<< HEAD +<<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45422,6 +52048,8 @@ ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'` ac_check_lib_save_LIBS=$LIBS LIBS="-lOpenCL $LIBS" <<<<<<< HEAD +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45471,6 +52099,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45493,6 +52124,7 @@ if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_OpenCL_clGetPlatformInfo=yes else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_OpenCL_clGetPlatformInfo=no fi @@ -45501,6 +52133,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -45524,6 +52158,9 @@ fi fi >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45537,6 +52174,7 @@ if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes; then : else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -45548,6 +52186,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} @@ -45579,12 +52222,15 @@ fi # $USE_OPENCL # Check whether --enable-largefile was given. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${enable_largefile+set}" = set; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test ${enable_largefile+y} then : ======= @@ -45594,6 +52240,9 @@ if test "${enable_largefile+set}" = set; then : if test "${enable_largefile+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45608,6 +52257,7 @@ fi CFLAGS="$LFS_CFLAGS $ac_save_cflags" fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 @@ -45617,6 +52267,8 @@ $as_echo_n "checking for special C compiler options needed for large files... " ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -45633,6 +52285,9 @@ $as_echo_n "checking for special C compiler options needed for large files... " $as_echo_n "checking for special C compiler options needed for large files... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45643,6 +52298,7 @@ ac_cv_sys_largefile_CC=no # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -45659,6 +52315,12 @@ ac_cv_sys_largefile_CC=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +======= >>>>>>> osgeo-main cat > conftest.$ac_ext <>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45686,6 +52351,7 @@ ac_cv_sys_largefile_CC=no && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int @@ -45695,6 +52361,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int main (void) @@ -45707,6 +52375,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45718,6 +52389,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : else @@ -45726,6 +52398,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -45736,6 +52410,9 @@ if ac_fn_c_try_compile "$LINENO"; then : else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45747,7 +52424,10 @@ else ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ; return 0; } @@ -45773,6 +52453,9 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45786,6 +52469,7 @@ else && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int @@ -45795,6 +52479,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int main (void) @@ -45807,6 +52493,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45818,6 +52507,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32' fi @@ -45833,6 +52523,8 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -45875,6 +52567,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo "$ac_cv_sys_largefile_CC" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45890,6 +52585,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } fi fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 @@ -45903,6 +52599,8 @@ ac_cv_sys_file_offset_bits=no ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -45936,6 +52634,9 @@ ac_cv_sys_file_offset_bits=no /* end confdefs.h. */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45949,6 +52650,7 @@ ac_cv_sys_file_offset_bits=no && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int @@ -45958,6 +52660,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int main (void) @@ -45970,6 +52674,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45981,6 +52688,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : else @@ -45991,6 +52699,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -46025,6 +52735,9 @@ else /* end confdefs.h. */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46041,6 +52754,7 @@ else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int main () @@ -46049,6 +52763,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int @@ -46064,6 +52780,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46075,6 +52794,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64 fi @@ -46093,6 +52813,8 @@ _ACEOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -46142,6 +52864,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46155,6 +52880,7 @@ _ACEOF fi <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $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; } @@ -46167,6 +52893,8 @@ ac_cv_sys_large_files=no ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -46200,6 +52928,9 @@ ac_cv_sys_large_files=no /* end confdefs.h. */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46213,6 +52944,7 @@ ac_cv_sys_large_files=no && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int @@ -46222,6 +52954,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int main (void) @@ -46234,6 +52968,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46245,6 +52982,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : else @@ -46255,6 +52993,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -46289,6 +53029,9 @@ else /* end confdefs.h. */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46305,6 +53048,7 @@ else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int main () @@ -46313,6 +53057,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD int @@ -46328,6 +53074,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46339,6 +53088,7 @@ main () _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1 fi @@ -46357,6 +53107,8 @@ _ACEOF ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -46406,6 +53158,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46419,6 +53174,7 @@ _ACEOF fi <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $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; } @@ -46450,6 +53206,8 @@ return !fseeko; ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -46460,6 +53218,7 @@ ac_cv_sys_largefile_source=no ======= echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6 echo "configure:13918: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46469,11 +53228,35 @@ $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6 ac_cv_sys_largefile_source=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +======= + +ac_cv_sys_largefile_source=no + cat > conftest.$ac_ext <>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +>>>>>>> osgeo-main #include int main () { return !fseeko; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= + { $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; } + +ac_cv_sys_largefile_source=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return !fseeko; +>>>>>>> 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 @@ -46539,6 +53322,7 @@ rm -f conftest* fi rm -f conftest* >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD >>>>>>> osgeo-main ac_cv_sys_largefile_source=no @@ -46652,6 +53436,8 @@ rm -f conftest* fi rm -f conftest* >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> osgeo-main int main (void) @@ -46665,6 +53451,9 @@ main () int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { return !fseeko; @@ -46673,6 +53462,7 @@ return !fseeko; } _ACEOF <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_source=1 fi @@ -46690,6 +53480,8 @@ _ACEOF <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD if ac_fn_c_try_compile "$LINENO" then : @@ -46734,6 +53526,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -46754,6 +53549,7 @@ ac_save_cflags=${CFLAGS} CFLAGS="$LFS_CFLAGS ${ac_save_cflags}" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $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; } ======= @@ -46784,6 +53580,8 @@ return !fseeko; ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { 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; } @@ -46794,6 +53592,30 @@ ac_cv_sys_largefile_source=no ======= echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6 echo "configure:13977: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +{ $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; } + +ac_cv_sys_largefile_source=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +======= + +ac_cv_sys_largefile_source=no + cat > conftest.$ac_ext <>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +>>>>>>> osgeo-main +#include +int +main () +{ +return !fseeko; +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46808,6 +53630,7 @@ int main () { return !fseeko; +>>>>>>> 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 @@ -46873,6 +53696,7 @@ rm -f conftest* fi rm -f conftest* >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +<<<<<<< HEAD >>>>>>> osgeo-main ac_cv_sys_largefile_source=no @@ -46986,6 +53810,8 @@ rm -f conftest* fi rm -f conftest* >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> osgeo-main int main (void) @@ -46999,6 +53825,9 @@ main () int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { return !fseeko; @@ -47007,6 +53836,7 @@ return !fseeko; } _ACEOF <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_source=1 fi @@ -47024,6 +53854,8 @@ _ACEOF <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD if ac_fn_c_try_compile "$LINENO" then : @@ -47068,6 +53900,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47084,6 +53919,7 @@ _ACEOF # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 @@ -47115,6 +53951,8 @@ return fseeko && fseeko (stdin, 0, 0); ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 printf %s "checking for fseeko... " >&6; } @@ -47164,6 +54002,9 @@ main () return fseeko && fseeko (stdin, 0, 0); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47173,6 +54014,7 @@ return fseeko && fseeko (stdin, 0, 0); _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_fseeko=yes fi @@ -47199,6 +54041,8 @@ main () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ======= @@ -47283,6 +54127,9 @@ int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47314,17 +54161,23 @@ return !ftello; #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47334,6 +54187,7 @@ return !ftello; _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_largefiles=yes else @@ -47350,6 +54204,8 @@ $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -47395,6 +54251,9 @@ $as_echo "$ac_cv_largefiles" >&6; } $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47436,6 +54295,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_i=`$as_echo "$ac_i" | sed "$ac_script"` ======= @@ -47443,6 +54303,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` ======= ac_i=`$as_echo "$ac_i" | sed "$ac_script"` @@ -47451,6 +54313,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47471,6 +54336,7 @@ ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ======= @@ -47478,6 +54344,8 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} ======= @@ -47489,6 +54357,9 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47516,12 +54387,15 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 DUALCASE=1; export DUALCASE # for MKS sh <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : @@ -47532,6 +54406,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47543,12 +54420,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : setopt NO_GLOB_SUBST <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -47557,6 +54437,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47569,6 +54452,7 @@ esac fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -47576,6 +54460,8 @@ fi ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Reset variables that may have inherited troublesome values from # the environment. @@ -47620,6 +54506,9 @@ if ${PATH_SEPARATOR+false} :; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47665,6 +54554,7 @@ fi if test "${PATH_SEPARATOR+set}" != set; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47675,6 +54565,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 && { @@ -47688,6 +54583,7 @@ fi <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -47698,6 +54594,10 @@ fi >>>>>>> osgeo-main ======= >>>>>>> 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. @@ -47705,6 +54605,7 @@ fi # splitting by setting IFS to empty value.) IFS=" "" $as_nl" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -47718,6 +54619,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 #(( @@ -47727,6 +54633,7 @@ for as_dir in $PATH do IFS=$as_save_IFS <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break @@ -47735,6 +54642,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; */) ;; @@ -47750,6 +54659,9 @@ do test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47766,11 +54678,14 @@ fi if test ! -f "$as_myself"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi @@ -47779,6 +54694,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47808,6 +54726,7 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47819,6 +54738,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] @@ -47832,6 +54756,7 @@ as_fn_error () if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -47841,6 +54766,8 @@ as_fn_error () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi printf "%s\n" "$as_me: error: $2" >&2 @@ -47855,6 +54782,9 @@ as_fn_error () $as_echo "$as_me: error: $2" >&2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47862,6 +54792,7 @@ as_fn_error () } # as_fn_error +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -47869,12 +54800,17 @@ as_fn_error () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47906,17 +54842,23 @@ as_fn_unset () as_unset=as_fn_unset <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47928,12 +54870,15 @@ as_unset=as_fn_unset # implementations. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null then : ======= @@ -47943,6 +54888,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47952,12 +54900,15 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : }' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -47966,6 +54917,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47982,12 +54936,15 @@ fi # as_fn_append # must be portable across $(()) and expr. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null then : ======= @@ -47997,6 +54954,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48006,12 +54966,15 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : }' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -48020,6 +54983,9 @@ else else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48055,12 +55021,15 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X/"$0" | ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" X/"$0" | ======= $as_echo X/"$0" | @@ -48069,6 +55038,9 @@ $as_echo X/"$0" | $as_echo X/"$0" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48093,6 +55065,7 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -48100,6 +55073,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -48109,6 +55084,9 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48125,6 +55103,7 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -48132,6 +55111,8 @@ esac ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -48143,6 +55124,9 @@ as_echo_n='printf %s' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48188,6 +55172,7 @@ as_fn_mkdir_p () while :; do case $as_dir in #( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= @@ -48195,6 +55180,8 @@ as_fn_mkdir_p () ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( @@ -48203,6 +55190,9 @@ as_fn_mkdir_p () *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48216,12 +55206,15 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$as_dir" | ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" X"$as_dir" | ======= $as_echo X"$as_dir" | @@ -48230,6 +55223,9 @@ $as_echo X"$as_dir" | $as_echo X"$as_dir" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48297,12 +55293,15 @@ ac_log=" This file was extended by $as_me, which was <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD generated by GNU Autoconf 2.69. Invocation command line was ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main generated by GNU Autoconf 2.71. Invocation command line was ======= generated by GNU Autoconf 2.69. Invocation command line was @@ -48311,6 +55310,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48373,11 +55375,14 @@ Report bugs to the package provider." _ACEOF <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -48392,6 +55397,9 @@ Copyright (C) 2021 Free Software Foundation, Inc. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48405,6 +55413,7 @@ configured by $0, generated by GNU Autoconf 2.69, Copyright (C) 2012 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -48416,6 +55425,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." @@ -48454,6 +55468,7 @@ do ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) @@ -48463,6 +55478,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) printf "%s\n" "$ac_cs_config"; exit ;; @@ -48477,6 +55494,9 @@ do $as_echo "$ac_cs_config"; exit ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48486,6 +55506,7 @@ do $ac_shift case $ac_optarg in <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -48493,6 +55514,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; @@ -48501,6 +55524,9 @@ do *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48512,6 +55538,7 @@ do $ac_shift case $ac_optarg in <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -48519,6 +55546,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; @@ -48527,6 +55556,9 @@ do *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48539,6 +55571,7 @@ do Try \`$0 --help' for more information.";; --help | --hel | -h ) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$ac_cs_usage"; exit ;; ======= @@ -48546,6 +55579,8 @@ Try \`$0 --help' for more information.";; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_cs_usage"; exit ;; ======= $as_echo "$ac_cs_usage"; exit ;; @@ -48554,6 +55589,9 @@ Try \`$0 --help' for more information.";; $as_echo "$ac_cs_usage"; exit ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48585,6 +55623,7 @@ if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ======= @@ -48592,6 +55631,8 @@ if \$ac_cs_recheck; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 ======= \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 @@ -48600,6 +55641,9 @@ if \$ac_cs_recheck; then \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48617,6 +55661,7 @@ exec 5>>config.log ## Running $as_me. ## _ASBOX <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$ac_log" ======= @@ -48624,6 +55669,8 @@ _ASBOX ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_log" ======= $as_echo "$ac_log" @@ -48632,6 +55679,9 @@ _ASBOX $as_echo "$ac_log" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48665,6 +55715,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers @@ -48673,6 +55724,8 @@ if $ac_need_defaults; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers ======= @@ -48684,6 +55737,9 @@ if $ac_need_defaults; then test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49023,6 +56079,7 @@ do as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ======= @@ -49030,6 +56087,8 @@ do ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ======= case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac @@ -49038,6 +56097,9 @@ do case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49050,11 +56112,14 @@ do configure_input='Generated from '` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then @@ -49065,6 +56130,9 @@ printf "%s\n" "$as_me: creating $ac_file" >&6;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49076,6 +56144,7 @@ printf "%s\n" "$as_me: creating $ac_file" >&6;} $as_echo "$as_me: creating $ac_file" >&6;} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49086,12 +56155,18 @@ $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. case $configure_input in #( *\&* | *\|* | *\\* ) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_sed_conf_input=`$as_echo "$configure_input" | ======= @@ -49099,6 +56174,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_sed_conf_input=`printf "%s\n" "$configure_input" | ======= ac_sed_conf_input=`$as_echo "$configure_input" | @@ -49107,6 +56184,9 @@ $as_echo "$as_me: creating $ac_file" >&6;} ac_sed_conf_input=`$as_echo "$configure_input" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49128,12 +56208,15 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$ac_file" | ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" X"$ac_file" | ======= $as_echo X"$ac_file" | @@ -49142,6 +56225,9 @@ $as_echo X"$ac_file" | $as_echo X"$ac_file" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49169,6 +56255,7 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -49178,6 +56265,8 @@ case "$ac_dir" in ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` @@ -49192,6 +56281,9 @@ case "$ac_dir" in ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49252,6 +56344,7 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) <<<<<<< 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;} @@ -49260,6 +56353,8 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -49271,6 +56366,9 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49317,6 +56415,7 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && <<<<<<< 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 @@ -49326,6 +56425,8 @@ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datar ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' @@ -49340,6 +56441,9 @@ which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49359,6 +56463,7 @@ which seems to be undefined. Please make sure it is defined" >&2;} if test x"$ac_file" != x-; then { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "/* $configure_input */" \ ======= @@ -49366,6 +56471,8 @@ which seems to be undefined. Please make sure it is defined" >&2;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "/* $configure_input */" >&1 \ ======= $as_echo "/* $configure_input */" \ @@ -49374,6 +56481,9 @@ which seems to be undefined. Please make sure it is defined" >&2;} $as_echo "/* $configure_input */" \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49382,6 +56492,7 @@ which seems to be undefined. Please make sure it is defined" >&2;} || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} @@ -49390,6 +56501,8 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -49401,6 +56514,9 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} $as_echo "$as_me: $ac_file is unchanged" >&6;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49411,6 +56527,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} fi else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "/* $configure_input */" \ ======= @@ -49418,6 +56535,8 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf "%s\n" "/* $configure_input */" >&1 \ ======= $as_echo "/* $configure_input */" \ @@ -49426,6 +56545,9 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} $as_echo "/* $configure_input */" \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49470,6 +56592,7 @@ if test "$no_create" != yes; then fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then <<<<<<< 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;} @@ -49478,6 +56601,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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;} ======= @@ -49489,6 +56614,9 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49618,6 +56746,7 @@ echo "" if test $PROJ4API = 0 ; then <<<<<<< 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 @@ -49628,6 +56757,8 @@ $as_echo " using old PROJ 4 API" >&6; } ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -49648,6 +56779,9 @@ else $as_echo " using old PROJ 4 API" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/configure.ac b/configure.ac index e2774498dbd..e569c7dc1d7 100755 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ # configuration variables for compilation and installation. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -18,6 +19,9 @@ >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= @@ -33,6 +37,9 @@ # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -59,6 +66,7 @@ AC_INIT AC_CONFIG_SRCDIR([configure.ac]) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_PREREQ([2.69]) AC_CONFIG_HEADER(include/grass/config.h) ======= @@ -66,6 +74,8 @@ AC_CONFIG_HEADER(include/grass/config.h) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_PREREQ([2.71]) AC_CONFIG_HEADERS([include/grass/config.h]) ======= @@ -77,6 +87,9 @@ AC_PREREQ([2.69]) AC_CONFIG_HEADER(include/grass/config.h) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -193,17 +206,23 @@ AC_SUBST(GRASS_BIN) GRASS_VERSION_FILE=include/VERSION <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GRASS_VERSION_GIT_FILE=include/VERSION_GIT ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -225,11 +244,14 @@ GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'` AC_PATH_PROG(GIT, git, no) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_CHECK_FILE([$GRASS_VERSION_GIT_FILE]) AC_MSG_CHECKING(for GRASS GIS headers commit date) ======= @@ -237,6 +259,9 @@ AC_MSG_CHECKING(for GRASS GIS headers commit date) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -250,6 +275,7 @@ if test "$GIT" != "no" ; then GRASS_HEADERS_GIT_HASH="${GRASS_VERSION_NUMBER}" fi <<<<<<< 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 ======= @@ -257,6 +283,8 @@ if test "$GIT" != "no" ; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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/') ======= @@ -266,6 +294,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -275,11 +306,14 @@ if test "$GIT" != "no" ; then fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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}") @@ -292,6 +326,9 @@ AC_MSG_RESULT($GRASS_HEADERS_GIT_DATE) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -419,17 +456,23 @@ LOC_ARG_WITH(blas, BLAS, no) LOC_ARG_WITH(lapack, LAPACK, no) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main LOC_ARG_WITH(libsvm, LIBSVM, no) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -446,17 +489,23 @@ LOC_ARG_WITH(bzlib, BZIP2, no) LOC_ARG_WITH(zstd, Zstandard) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main LOC_ARG_WITH(pdal, PDAL) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -481,6 +530,7 @@ AC_ARG_WITH(liblas, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -491,12 +541,17 @@ AC_ARG_WITH(liblas, >>>>>>> osgeo-main ======= >>>>>>> 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, e.g. '--with-pdal=/usr/local/bin/pdal-config', default: no)],, with_pdal="no") +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -510,6 +565,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, @@ -570,6 +630,7 @@ LOC_ARG_WITH_LIB(blas, BLAS) LOC_ARG_WITH_INC(lapack, LAPACK) LOC_ARG_WITH_LIB(lapack, LAPACK) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -577,6 +638,8 @@ LOC_ARG_WITH_LIB(lapack, LAPACK) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main LOC_ARG_WITH_INC(libsvm, LIBSVM) LOC_ARG_WITH_LIB(libsvm, LIBSVM) @@ -585,6 +648,9 @@ LOC_ARG_WITH_LIB(libsvm, LIBSVM) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -669,6 +735,7 @@ AC_SUBST(LIBRARY_DIRS) AC_PROG_INSTALL +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -676,6 +743,8 @@ AC_PROG_INSTALL ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_PROG_LEX(noyywrap) if test "x$LEX" = "x:"; then AC_MSG_ERROR([*** Unable to locate lex.]) @@ -687,6 +756,9 @@ elif test "$LEX" = "lex"; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -697,6 +769,7 @@ if test "$LEX" = "lex"; then AC_MSG_ERROR([*** Unable to locate lex.]) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -707,6 +780,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 @@ -725,12 +803,15 @@ AC_CHECK_PROGS(ENV, env) AC_PATH_PROG(PERL, perl, no) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_HEADER_STDC ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= AC_HEADER_STDC @@ -739,6 +820,9 @@ AC_HEADER_STDC AC_HEADER_STDC >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -750,12 +834,15 @@ AC_CHECK_HEADERS(libintl.h iconv.h) AC_CHECK_HEADERS(langinfo.h) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_HEADER_TIME ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= AC_HEADER_TIME @@ -764,6 +851,9 @@ AC_HEADER_TIME AC_HEADER_TIME >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -793,12 +883,15 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long int x;]])],[ AC_MSG_RESULT(yes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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]) @@ -807,6 +900,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -819,12 +915,15 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[int64_t x;]])], AC_MSG_RESULT(yes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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]) @@ -833,6 +932,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1064,6 +1166,7 @@ if test $PROJ4API = 0 ; then else AC_MSG_RESULT([using old PROJ version 4 API]) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) ======= @@ -1071,6 +1174,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(USE_PROJ4API, 1, [Define to 1 if using old PROJ version 4 API.]) ======= AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) @@ -1079,6 +1184,9 @@ else AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1232,6 +1340,7 @@ else AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[png_read_image(NULL, NULL);]])],[],[ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ ======= @@ -1239,6 +1348,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[png_read_image(NULL, NULL);]])],[PNGLIB="$PNGLIB"],[ ======= AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ @@ -1247,6 +1358,9 @@ else AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1293,6 +1407,7 @@ else USE_GDAL=1 if test `"$GDAL_CONFIG" --ogr-enabled` = "yes" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) ======= @@ -1300,6 +1415,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_OGR, 1, [Define to 1 if OGR is to be used.]) ======= AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) @@ -1308,6 +1425,9 @@ else AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1323,6 +1443,7 @@ else AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[GDALOpen("foo", GA_ReadOnly);]])],[],[ LIBS="$LIBS $GDAL_DEP_LIBS" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ ======= @@ -1330,6 +1451,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[GDALOpen("foo", GA_ReadOnly);]])],[GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS"],[ ======= AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ @@ -1338,6 +1461,9 @@ else AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1347,6 +1473,7 @@ else LIBS=${ac_save_libs} CFLAGS=${ac_save_cflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) @@ -1355,6 +1482,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_GDAL, 1, [Define to 1 if GDAL is to be used.]) ======= AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) @@ -1363,6 +1492,9 @@ else AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1412,6 +1544,7 @@ else AC_CHECK_HEADERS(liblas/capi/liblas.h) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[LASReader_Create("foo");]])],[],[ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ ======= @@ -1419,6 +1552,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[LASReader_Create("foo");]])],[LAS_LIBS="$LAS_LIBS"],[ ======= AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ @@ -1427,6 +1562,9 @@ else AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1437,6 +1575,7 @@ else CFLAGS=${ac_save_cflags} CPPFLAGS=${ac_save_cppflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) @@ -1445,6 +1584,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_LIBLAS, 1, [Define to 1 if liblas exists.]) ======= AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) @@ -1453,6 +1594,9 @@ else AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1474,16 +1618,22 @@ PDAL_CPPFLAGS= USE_PDAL= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main pdal="pdal" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1493,6 +1643,7 @@ if test "`basename xx/$with_pdal`" = "pdal-config" ; then fi <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1504,6 +1655,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) @@ -1511,11 +1667,14 @@ else AC_MSG_RESULT(yes) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if test -s "${PKG_CONFIG} --exists ${pdal}" ; then AC_MSG_ERROR([*** Unable to locate PDAL package.]) @@ -1528,6 +1687,9 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1540,6 +1702,7 @@ else if test "$PDAL_CONFIG" != "" ; then PDAL_LIBS=`"$PDAL_CONFIG" --libs` <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD PDAL_INC=`"$PDAL_CONFIG" --includes` USE_PDAL=1 @@ -1549,6 +1712,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` ======= @@ -1562,6 +1727,9 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1571,13 +1739,17 @@ else ac_save_cflags="$CFLAGS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= ac_save_cppflags="$CPPFLAGS" >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD >>>>>>> osgeo-main LIBS="$LIBS $PDAL_LIBS" CFLAGS="$CFLAGS $PDAL_CFLAGS" @@ -1596,6 +1768,11 @@ else LIBS="$LIBS $PDAL_LIBS" CFLAGS="$CFLAGS $PDAL_CFLAGS" <<<<<<< HEAD:configure.ac +======= + LIBS="$LIBS $PDAL_LIBS" + CFLAGS="$CFLAGS $PDAL_CFLAGS" +<<<<<<< HEAD:configure.ac +>>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include #include class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])], @@ -1604,6 +1781,7 @@ else ======= CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<<< HEAD:configure.in AC_TRY_LINK([#include #include @@ -1612,6 +1790,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_TRY_LINK([#include #include class St:public pdal::Streamable {};],[pdal::PointTable table;],,[ @@ -1637,9 +1817,12 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>>> osgeo-main:configure.ac >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_TRY_LINK([#include #include @@ -1647,6 +1830,7 @@ else AC_MSG_ERROR([*** Unable to locate suitable (>=1.7.1) PDAL library.]) ]) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ]) LIBS=${ac_save_libs} @@ -1658,6 +1842,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)):configure.in ]) @@ -1695,6 +1881,9 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1742,6 +1931,7 @@ else CFLAGS="$CFLAGS $NETCDF_CFLAGS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nc_create("foo", NC_CLOBBER, NULL);]])],[],[ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ ======= @@ -1749,6 +1939,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nc_create("foo", NC_CLOBBER, NULL);]])],[NETCDF_LIBS="$NETCDF_LIBS"],[ ======= AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ @@ -1757,6 +1949,9 @@ else AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1766,6 +1961,7 @@ else LIBS=${ac_save_libs} CFLAGS=${ac_save_cflags} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) @@ -1774,6 +1970,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_NETCDF, 1, [Define to 1 if NetCDF exists.]) ======= AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) @@ -1782,6 +1980,9 @@ else AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1828,6 +2029,7 @@ else LOC_CHECK_LIBS(geos_c,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS) # fi <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) ======= @@ -1835,6 +2037,8 @@ else ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_GEOS, 1, [Define to 1 if GEOS is to be used.]) ======= AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) @@ -1843,6 +2047,9 @@ else AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1889,12 +2096,15 @@ LOC_CHECK_USE(postgres,PostgreSQL,USE_POSTGRES) if test -n "$USE_POSTGRES"; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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]) @@ -1903,6 +2113,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1934,6 +2147,7 @@ ac_save_ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS $PQLIBPATH" <<<<<<< 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])], [ ======= @@ -1941,6 +2155,8 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.])], [ ======= @@ -1952,6 +2168,9 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTuples in lpq])], [ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2004,11 +2223,14 @@ if test -n "$USE_MYSQL"; then if test "$MYSQLD_CONFIG" != "" ; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main mysql_version=`"$MYSQLD_CONFIG" --version` AC_MSG_RESULT([using MySQL/MariaDB version "$mysql_version"]) ======= @@ -2016,6 +2238,9 @@ if test -n "$USE_MYSQL"; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2025,6 +2250,7 @@ if test -n "$USE_MYSQL"; then LIBS="$MYSQLDLIB $LIBS" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_CHECK_FUNC(mysql_server_init,,[MYSQLDLIB=""; AC_MSG_WARN([libmysqld not found])] ) @@ -2033,6 +2259,8 @@ if test -n "$USE_MYSQL"; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_CHECK_FUNC(mysql_server_init, AC_MSG_RESULT([libmysqld found]), [MYSQLDLIB=""; AC_MSG_WARN([libmysqld not found])]) @@ -2045,6 +2273,9 @@ if test -n "$USE_MYSQL"; then AC_MSG_WARN([libmysqld not found])] ) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2079,6 +2310,7 @@ LOC_CHECK_INC_PATH(sqlite,SQLite,SQLITEINCPATH) LOC_CHECK_INCLUDES(sqlite3.h,SQLite,$SQLITEINCPATH) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) @@ -2087,6 +2319,8 @@ AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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]) @@ -2095,6 +2329,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2176,6 +2413,7 @@ LOC_CHECK_LIBS(GLU,gluBeginCurve,GLU,$OPENGL_LIB_PATH,OPENGLULIB,$OPENGLLIB $X_L OPENGLLIB="$OPENGL_LIB_PATH $OPENGLLIB" OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2183,6 +2421,8 @@ OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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.])]) @@ -2191,6 +2431,9 @@ AC_DEFINE(OPENGL_X11, 1, [Define to 1 if OpenGL uses X11.]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2200,6 +2443,7 @@ LOC_CHECK_FUNC(glXCreateGLXPixmap,,,,,$OPENGLLIB,[AC_DEFINE(HAVE_PIXMAPS, 1, [de AC_DEFINE(OPENGL_X11, 1, [define if OpenGL uses X11]) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2211,6 +2455,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 @@ -2226,6 +2475,7 @@ LOC_CHECK_FUNC(gluBeginCurve,GLU library,OPENGLLIB,,$OPENGLPATH,$OPENGLLIB) OPENGLINC="$OPENGLPATH" OPENGLLIBPATH="$OPENGLPATH" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) @@ -2234,6 +2484,8 @@ AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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)]) @@ -2242,6 +2494,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2269,6 +2524,7 @@ CFLAGS="${ac_save_cflags}" OPENGLLIB="$OPENGL_LIB_PATH $OPENGLLIB" OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) @@ -2277,6 +2533,8 @@ AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(OPENGL_WINDOWS, 1, [Define to 1 if OpenGL uses Windows.]) ======= AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) @@ -2285,6 +2543,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2428,6 +2689,7 @@ LDFLAGS="$save_LDFLAGS" # Do we have ATLAS? if test $blas_ok = yes; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) ======= @@ -2435,6 +2697,8 @@ if test $blas_ok = yes; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_LIBATLAS, 1, [Define to 1 if ATLAS exists.]) ======= AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) @@ -2443,6 +2707,9 @@ if test $blas_ok = yes; then AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2492,12 +2759,15 @@ fi if test $blas_ok = yes; then <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_LIBBLAS, 1, [Define to 1 if BLAS exists.]) ======= AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) @@ -2506,6 +2776,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2567,6 +2840,7 @@ if test $lapack_ok = no; then LOC_CHECK_LIBS(lapack,dgesv_,LAPACK,$LAPACKLIB,LAPACKLIB,$BLASLIB $MATHLIB,,,-lg2c) fi +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) @@ -2575,6 +2849,8 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_LIBLAPACK, 1, [Define to 1 if LAPACK exists.]) ======= AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) @@ -2583,6 +2859,9 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2595,6 +2874,7 @@ AC_SUBST(LAPACKINC) # Done checking LAPACK +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2602,6 +2882,8 @@ AC_SUBST(LAPACKINC) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # libsvm option LIBSVM_INC= LIBSVM_LIB= @@ -2629,6 +2911,9 @@ AC_SUBST(USE_LIBSVM) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2726,6 +3011,7 @@ HAVE_NLS= if test -n "${USE_NLS}" ; then <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(USE_NLS, 1, [define if NLS requested]) ======= @@ -2733,6 +3019,8 @@ if test -n "${USE_NLS}" ; then ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main AC_DEFINE(USE_NLS, 1, [Define to 1 if NLS requested.]) ======= AC_DEFINE(USE_NLS, 1, [define if NLS requested]) @@ -2741,6 +3029,9 @@ if test -n "${USE_NLS}" ; then AC_DEFINE(USE_NLS, 1, [define if NLS requested]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2831,6 +3122,7 @@ AC_SUBST(USE_PTHREAD) LOC_CHECK_USE(openmp,OpenMP,USE_OPENMP) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2844,6 +3136,10 @@ LOC_CHECK_USE(openmp,OpenMP,USE_OPENMP) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main if test "$enable_openmp" != no; then if test -n "${USE_OPENMP}"; then @@ -2881,12 +3177,15 @@ USE_OPENMP= fi # enable_openmp +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2990,6 +3289,9 @@ fi # enable_openmp >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3103,17 +3405,23 @@ LOC_MSG_USE(Large File support (LFS), USE_LARGEFILES) LOC_MSG_USE(libLAS support,USE_LIBLAS) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main LOC_MSG_USE(LIBSVM support,USE_LIBSVM) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/contributors.csv b/contributors.csv index fa2f620e586..09bac40f33e 100644 --- a/contributors.csv +++ b/contributors.csv @@ -1,12 +1,15 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD -,Ivan Shmakov,,Russia,1gray,yes,- ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main -,Ivan Shmakov,,Russia,1gray,yes,- ======= -,Ivan Shmakov,,Russia,1gray,yes,- @@ -15,6 +18,9 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid -,Ivan Shmakov,,Russia,1gray,yes,- >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25,12 +31,15 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid -,Marco Pasetti,,Italy,marcopx,yes,- <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD -,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main -,Yann Chemin,,France,ychemin,yes,0000-0001-9232-5512 ======= -,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 @@ -39,6 +48,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -55,12 +67,15 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid -,Stefan Blumentrath,,Norway,sbl,yes,0000-0001-6675-1331 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD -,Ondřej Pešek,,Czech Republic,pesekon2,yes,- ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main -,Ondřej Pešek,,Czech Republic,pesekon2,yes,0000-0002-2363-8002 ======= -,Ondřej Pešek,,Czech Republic,pesekon2,yes,- @@ -69,6 +84,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/dbf/cursor.c b/db/drivers/dbf/cursor.c index 24b9cd1fcde..4e8f70b40df 100644 --- a/db/drivers/dbf/cursor.c +++ b/db/drivers/dbf/cursor.c @@ -35,6 +35,7 @@ int db__driver_close_cursor(dbCursor *dbc) return DB_OK; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD cursor *alloc_cursor(void) @@ -53,6 +54,12 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -66,6 +73,9 @@ cursor *alloc_cursor(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/dbf/dbfexe.c b/db/drivers/dbf/dbfexe.c index 120367c9eb9..f0b860b0488 100644 --- a/db/drivers/dbf/dbfexe.c +++ b/db/drivers/dbf/dbfexe.c @@ -343,6 +343,7 @@ void get_col_def(SQLPSTMT *st, int col, int *type, int *width, int *decimals) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) @@ -351,6 +352,8 @@ void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void eval_val(int tab, int row, int col UNUSED, SQLPVALUE *inval, SQLPVALUE *val) ======= @@ -360,6 +363,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/dbf/listtab.c b/db/drivers/dbf/listtab.c index ffdc31b2bce..71cc6459cc3 100644 --- a/db/drivers/dbf/listtab.c +++ b/db/drivers/dbf/listtab.c @@ -18,6 +18,7 @@ #include "globals.h" #include "proto.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int db__driver_list_tables(dbString **tlist, int *tcount, int system) @@ -26,6 +27,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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) @@ -34,6 +37,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/dbf/table.c b/db/drivers/dbf/table.c index 1db702fd614..ce1bc899d49 100644 --- a/db/drivers/dbf/table.c +++ b/db/drivers/dbf/table.c @@ -59,6 +59,7 @@ int add_table(char *table, char *name) res = snprintf(db.tables[db.ntables].file, buf_s, "%s/%s", db.name, name); #endif <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (res < 0 || (size_t)res >= buf_s) { ======= @@ -74,6 +75,12 @@ int add_table(char *table, char *name) <<<<<<< HEAD if (res < 0 || (size_t)res >= buf_s) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (res < 0 || (size_t)res >= buf_s) { +======= >>>>>>> osgeo-main if (res >= buf_s) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -90,6 +97,9 @@ int add_table(char *table, char *name) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/mysql/cursor.c b/db/drivers/mysql/cursor.c index 481c4b00c67..0ae10013452 100644 --- a/db/drivers/mysql/cursor.c +++ b/db/drivers/mysql/cursor.c @@ -32,6 +32,7 @@ int db__driver_close_cursor(dbCursor *dbc) return DB_OK; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD cursor *alloc_cursor(void) @@ -50,6 +51,12 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63,6 +70,9 @@ cursor *alloc_cursor(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c index 617787b9899..3f5900e245f 100644 --- a/db/drivers/mysql/db.c +++ b/db/drivers/mysql/db.c @@ -55,6 +55,7 @@ int db__driver_open_database(dbHandle *handle) connection = mysql_init(NULL); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD res = mysql_real_connect(connection, host, user, password, connpar.dbname, port, NULL, 0); @@ -63,6 +64,8 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main res = mysql_real_connect(connection, host, user, password, connpar.dbname, port != NULL ? atoi(port) : 0, NULL, 0); @@ -75,6 +78,9 @@ int db__driver_open_database(dbHandle *handle) connpar.dbname, port, NULL, 0); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -87,11 +93,14 @@ int db__driver_open_database(dbHandle *handle) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main db_init_string(&sql); db_set_string(&sql, "SET SQL_MODE=ANSI_QUOTES;"); @@ -116,6 +125,9 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/mysql/fetch.c b/db/drivers/mysql/fetch.c index c55d53220f5..a8c38f2e077 100644 --- a/db/drivers/mysql/fetch.c +++ b/db/drivers/mysql/fetch.c @@ -257,6 +257,7 @@ int db__driver_get_num_rows(cn) dbCursor *cn; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -268,6 +269,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 efa7996c2ee..2d12d049bdc 100644 --- a/db/drivers/mysql/grass-mesql.html +++ b/db/drivers/mysql/grass-mesql.html @@ -91,6 +91,7 @@

AUTHOR

Main index - Database index - Topics index - Keywords Index - Full index

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

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

======= <<<<<<< HEAD @@ -106,6 +107,12 @@

AUTHOR

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

======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +

© 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)) ======= @@ -118,6 +125,9 @@

AUTHOR

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

>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/mysql/grass-mysql.html b/db/drivers/mysql/grass-mysql.html index 502400908b6..4d8ebc0e2ec 100644 --- a/db/drivers/mysql/grass-mysql.html +++ b/db/drivers/mysql/grass-mysql.html @@ -71,6 +71,7 @@

Indexes

Privileges

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Because MySQL does not support groups of users and because @@ -89,6 +90,12 @@

Privileges

======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -102,6 +109,9 @@

Privileges

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -121,6 +131,7 @@

Privileges

Schemas

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Because MySQL does not support database schemas the parameter @@ -139,6 +150,12 @@

Schemas

======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -152,6 +169,9 @@

Schemas

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -162,6 +182,7 @@

Schemas

Groups

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD MySQL does not support user groups. Any settings specified @@ -180,6 +201,12 @@

Groups

======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -193,6 +220,9 @@

Groups

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -214,6 +244,7 @@

SEE ALSO

Credits

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Development of the driver was sponsored by @@ -232,6 +263,12 @@

Credits

======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -245,6 +282,9 @@

Credits

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/mysql/listtab.c b/db/drivers/mysql/listtab.c index 0ab45b0e0f6..a9f504f5f1c 100644 --- a/db/drivers/mysql/listtab.c +++ b/db/drivers/mysql/listtab.c @@ -18,6 +18,7 @@ #include "globals.h" #include "proto.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int db__driver_list_tables(dbString **tlist, int *tcount, int system) @@ -26,6 +27,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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) @@ -34,6 +37,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -51,6 +57,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) if (res == NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD db_d_append_error("%s\%s", _("Unable get list of tables:"), ======= @@ -58,6 +65,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main db_d_append_error("%s\n%s", _("Unable get list of tables:"), ======= db_d_append_error("%s\%s", _("Unable get list of tables:"), @@ -66,6 +75,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/odbc/cursor.c b/db/drivers/odbc/cursor.c index a24983856d7..22c52720217 100644 --- a/db/drivers/odbc/cursor.c +++ b/db/drivers/odbc/cursor.c @@ -21,6 +21,7 @@ int db__driver_close_cursor(dbCursor *dbc) return DB_OK; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD cursor *alloc_cursor(void) @@ -39,6 +40,12 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -52,6 +59,9 @@ cursor *alloc_cursor(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/odbc/db.c b/db/drivers/odbc/db.c index 83b1653cbcb..98557f44c80 100644 --- a/db/drivers/odbc/db.c +++ b/db/drivers/odbc/db.c @@ -40,11 +40,14 @@ int db__driver_open_database(dbHandle *handle) return DB_FAILED; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main } /* Find ODBC DB driver */ @@ -91,6 +94,9 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/odbc/proto.h b/db/drivers/odbc/proto.h index c5f9cb25c50..eb94fa4d9d2 100644 --- a/db/drivers/odbc/proto.h +++ b/db/drivers/odbc/proto.h @@ -8,6 +8,7 @@ int close_connection(); /* cursor.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD cursor *alloc_cursor(void); ======= <<<<<<< HEAD @@ -21,6 +22,11 @@ cursor *alloc_cursor(void); cursor *alloc_cursor(void); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +cursor *alloc_cursor(void); +======= +>>>>>>> osgeo-main cursor *alloc_cursor(); <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36,6 +42,9 @@ cursor *alloc_cursor(void); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/ogr/cursor.c b/db/drivers/ogr/cursor.c index 2f7afb2f9b5..513265561ef 100644 --- a/db/drivers/ogr/cursor.c +++ b/db/drivers/ogr/cursor.c @@ -57,6 +57,7 @@ int db__driver_close_cursor(dbCursor *dbc) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD cursor *alloc_cursor(void) ======= <<<<<<< HEAD @@ -73,6 +74,12 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86,6 +93,9 @@ cursor *alloc_cursor(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/ogr/db.c b/db/drivers/ogr/db.c index 3daa05570f9..c0b7c5cdc8f 100644 --- a/db/drivers/ogr/db.c +++ b/db/drivers/ogr/db.c @@ -75,6 +75,7 @@ int db__driver_open_database(dbHandle *handle) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int db__driver_close_database(void) ======= <<<<<<< HEAD @@ -91,6 +92,12 @@ int db__driver_close_database(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -104,6 +111,9 @@ int db__driver_close_database(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/ogr/describe.c b/db/drivers/ogr/describe.c index cbff66750ac..f3c7d9d3488 100644 --- a/db/drivers/ogr/describe.c +++ b/db/drivers/ogr/describe.c @@ -105,6 +105,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ogrType = OGR_Fld_GetType(hFieldDefn); fieldName = OGR_Fld_GetNameRef(hFieldDefn); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -112,11 +113,16 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (ogrType != OFTInteger && ogrType != OFTInteger64 && ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -126,6 +132,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -136,6 +143,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) { @@ -204,11 +216,14 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) case OFTInteger: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main case OFTInteger64: sqlType = DB_SQL_TYPE_INTEGER; size = OGR_Fld_GetWidth(hFieldDefn); /* OK ? */ @@ -217,6 +232,9 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -235,6 +253,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) fieldName); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #endif ======= <<<<<<< HEAD @@ -242,12 +261,17 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #endif >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= #endif >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/ogr/driver.c b/db/drivers/ogr/driver.c index 62fd031e241..295f603a067 100644 --- a/db/drivers/ogr/driver.c +++ b/db/drivers/ogr/driver.c @@ -27,16 +27,22 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int db__driver_init(int argc UNUSED, char *argv[] UNUSED) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -54,6 +60,7 @@ int db__driver_init(int argc, char *argv[]) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int db__driver_finish(void) ======= <<<<<<< HEAD @@ -70,6 +77,12 @@ int db__driver_finish(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -83,6 +96,9 @@ int db__driver_finish(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/ogr/execute.c b/db/drivers/ogr/execute.c index 4e8be63efa3..5345cb32b0f 100644 --- a/db/drivers/ogr/execute.c +++ b/db/drivers/ogr/execute.c @@ -100,16 +100,22 @@ int db__driver_execute_immediate(dbString *sql) if ((cols[i].type != OFTInteger || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main cols[i].type != OFTInteger64 || cols[i].type != OFTReal) && ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -119,6 +125,7 @@ int db__driver_execute_immediate(dbString *sql) cols[i].type != OFTReal) && <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -129,6 +136,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 36996ecab23..683a75ca1d2 100644 --- a/db/drivers/ogr/fetch.c +++ b/db/drivers/ogr/fetch.c @@ -151,6 +151,7 @@ int db__driver_fetch(dbCursor *cn, int position, int *more) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -161,6 +162,10 @@ int db__driver_fetch(dbCursor *cn, int position, int *more) >>>>>>> osgeo-main ======= >>>>>>> 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 0537b09cb22..a2378ecd2b1 100644 --- a/db/drivers/ogr/listtab.c +++ b/db/drivers/ogr/listtab.c @@ -32,12 +32,15 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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) @@ -46,6 +49,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/db/drivers/sqlite/cursor.c b/db/drivers/sqlite/cursor.c index 819530f9d54..beabf10db52 100644 --- a/db/drivers/sqlite/cursor.c +++ b/db/drivers/sqlite/cursor.c @@ -35,6 +35,7 @@ int db__driver_close_cursor(dbCursor *dbc) return DB_OK; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD cursor *alloc_cursor(void) @@ -53,6 +54,12 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -66,6 +73,9 @@ cursor *alloc_cursor(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/Makefile b/display/Makefile index 990348c8359..824fc00c01f 100644 --- a/display/Makefile +++ b/display/Makefile @@ -27,6 +27,7 @@ SUBDIRS = \ d.rast \ d.rast.arrow \ d.rast.num \ + d.redraw \ d.rgb \ d.rhumbline \ d.text \ diff --git a/display/d.colortable/main.c b/display/d.colortable/main.c index 2895378c418..a5c98f68d3b 100644 --- a/display/d.colortable/main.c +++ b/display/d.colortable/main.c @@ -254,6 +254,7 @@ int main(int argc, char **argv) /* Color ramp box */ /* get separate color for each pixel */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* fisrt 5 pixels draw null color */ ======= @@ -261,6 +262,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* first 5 pixels draw null color */ ======= /* fisrt 5 pixels draw null color */ @@ -269,6 +272,9 @@ int main(int argc, char **argv) /* fisrt 5 pixels draw null color */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.geodesic/d.geodesic.html b/display/d.geodesic/d.geodesic.html index c89c864af77..e2c4f05ee76 100644 --- a/display/d.geodesic/d.geodesic.html +++ b/display/d.geodesic/d.geodesic.html @@ -39,6 +39,7 @@

EXAMPLE

NOTES

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD This program works only in GRASS locations with longitude/latitude @@ -47,6 +48,8 @@

NOTES

======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main This program works only with longitude/latitude ======= This program works only in GRASS locations with longitude/latitude @@ -55,6 +58,9 @@

NOTES

This program works only in GRASS locations with longitude/latitude >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.grid/d.grid.html b/display/d.grid/d.grid.html index dbbf9d079d1..18e8c415363 100644 --- a/display/d.grid/d.grid.html +++ b/display/d.grid/d.grid.html @@ -84,6 +84,7 @@

AUTHORS

Text and RGB support: Hamish Bowman
<<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague ======= <<<<<<< HEAD @@ -97,6 +98,11 @@

AUTHORS

Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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)) @@ -112,6 +118,9 @@

AUTHORS

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.grid/plot.c b/display/d.grid/plot.c index c8bad5274b9..50ff3863aa1 100644 --- a/display/d.grid/plot.c +++ b/display/d.grid/plot.c @@ -569,6 +569,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, * initialze projection stuff and return proj structures <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -579,6 +580,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 e2fb53f5f9f..694610c4187 100644 --- a/display/d.histogram/bar.h +++ b/display/d.histogram/bar.h @@ -10,6 +10,7 @@ #include "options.h" #include "dhist.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD float rem(long int, long int); /* remainder function */ @@ -27,6 +28,12 @@ float rem(long int, long int); /* remainder function */ float rem(long int, long int); /* remainder function */ ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +float rem(long int, long int); /* remainder function */ +======= +>>>>>>> osgeo-main float rem(); /* remainder function */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -42,6 +49,9 @@ float rem(long int, long int); /* remainder function */ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.histogram/pie.h b/display/d.histogram/pie.h index 6a78f216112..cb25dbc7d16 100644 --- a/display/d.histogram/pie.h +++ b/display/d.histogram/pie.h @@ -39,6 +39,7 @@ ******************************************************************* */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD float rem(long int, long int); /* remainder function */ @@ -56,6 +57,12 @@ float rem(long int, long int); /* remainder function */ float rem(long int, long int); /* remainder function */ ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +float rem(long int, long int); /* remainder function */ +======= +>>>>>>> osgeo-main float rem(); /* remainder function */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -71,6 +78,9 @@ float rem(long int, long int); /* remainder function */ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.labels/d.labels.html b/display/d.labels/d.labels.html index 3456767cf2c..6ec50724c99 100644 --- a/display/d.labels/d.labels.html +++ b/display/d.labels/d.labels.html @@ -8,12 +8,15 @@

DESCRIPTION

by the user as an ASCII file (using a text editor) and placed in the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD appropriate directory under the user's current mapset and location ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main appropriate directory under the user's current mapset and project ======= appropriate directory under the user's current mapset and location @@ -22,6 +25,9 @@

DESCRIPTION

appropriate directory under the user's current mapset and location >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.labels/do_labels.c b/display/d.labels/do_labels.c index 1c0eccb1d27..2292ee66693 100644 --- a/display/d.labels/do_labels.c +++ b/display/d.labels/do_labels.c @@ -457,6 +457,7 @@ int scan_ref(char *buf) if (!(xmatch(word2) || ymatch(word2))) return 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD case 1: if (xmatch(word1) || ymatch(word1)) @@ -466,6 +467,8 @@ int scan_ref(char *buf) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main FALLTHROUGH; case 1: if (xmatch(word1) || ymatch(word1)) @@ -482,6 +485,9 @@ int scan_ref(char *buf) return 1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.legend.vect/draw.c b/display/d.legend.vect/draw.c index fbb13e5a9ea..5ccd4602486 100644 --- a/display/d.legend.vect/draw.c +++ b/display/d.legend.vect/draw.c @@ -2,6 +2,7 @@ * * With do_bg=1 compute position of all legend graphic item and draw only <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * background. Eith do_bg=0 compute position of all legend graphic item and draw ======= @@ -9,6 +10,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * background. With do_bg=0 compute position of all legend graphic item and draw ======= * background. Eith do_bg=0 compute position of all legend graphic item and draw @@ -17,6 +20,9 @@ * background. Eith do_bg=0 compute position of all legend graphic item and draw >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.legend/draw.c b/display/d.legend/draw.c index 1ca311b914a..39e2e17a0b6 100644 --- a/display/d.legend/draw.c +++ b/display/d.legend/draw.c @@ -263,6 +263,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, /* center really tiny legends */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (opt_at->answer == NULL) { /* if defualt scaling */ ======= @@ -270,6 +271,8 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (opt_at->answer == NULL) { /* if default scaling */ ======= if (opt_at->answer == NULL) { /* if defualt scaling */ @@ -278,6 +281,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -302,6 +308,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, size_t b_s = sizeof(DispFormat); int log_maxCat = (int)(log10(fabs(maxCat))) + 1; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= (int)b_s) ======= @@ -317,6 +324,12 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= (int)b_s) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -333,6 +346,9 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1139,6 +1155,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, /* scale text to fit in window if position not manually set */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (opt_at->answer == NULL) { /* ie defualt scaling */ ======= @@ -1146,6 +1163,8 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (opt_at->answer == NULL) { /* ie default scaling */ ======= if (opt_at->answer == NULL) { /* ie defualt scaling */ @@ -1154,6 +1173,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.mon/main.c b/display/d.mon/main.c index a886c6a43d1..ca9cb7607bc 100644 --- a/display/d.mon/main.c +++ b/display/d.mon/main.c @@ -17,11 +17,15 @@ d.mon delegates rendering to Python script [1] through GRASS_RENDER_COMMAND [2]. See also document [3]. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main [1] display/d.mon/render_cmd.py [2] lib/display/r_raster.c @@ -30,12 +34,15 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD [1] display/d.mon/render_cmd.py [2] lib/display/r_raster.c [3] https://grass.osgeo.org/grass-devel/manuals/displaydrivers.html ======= ======= +>>>>>>> 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 @@ -55,6 +62,9 @@ [3] https://grass.osgeo.org/grass-devel/manuals/displaydrivers.html >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.mon/render_cmd.py b/display/d.mon/render_cmd.py index e9af69e673c..bdad7404e4d 100644 --- a/display/d.mon/render_cmd.py +++ b/display/d.mon/render_cmd.py @@ -1,12 +1,41 @@ #!/usr/bin/env python3 import os import sys +import glob import tempfile +from pathlib import Path from grass.script import core as grass from grass.script import task as gtask from grass.exceptions import CalledModuleError +non_rendering_modules = ( + "d.colorlist", + "d.font", + "d.fontlist", + "d.frame", + "d.info", + "d.mon", + "d.out.file", + "d.to.rast", + "d.what.rast", + "d.what.vect", + "d.where", +) + + +# remove empty mapfile from non-rendering modules +def remove_mapfile(mapfile): + # adopted from Map.DeleteLayer() in gui/wxpython/core/render.py + base = os.path.split(mapfile)[0] + mapfile = os.path.split(mapfile)[1] + tempbase = mapfile.split(".")[0] + if base == "" or tempbase == "": + return + basefile = os.path.join(base, tempbase) + r".*" + for f in glob.glob(basefile): + os.remove(f) + # read environment variables from file def read_env_file(env_file): @@ -42,26 +71,18 @@ def render(cmd, mapfile): env["GRASS_RENDER_FILE"] = mapfile try: grass.run_command(cmd[0], env=env, **cmd[1]) + # display driver can generate a blank map file unnecessarily for + # non-rendering modules; delete it + if cmd[0] in non_rendering_modules and os.path.exists(mapfile): + remove_mapfile(mapfile) + except CalledModuleError as e: grass.debug("Unable to render: {0}".format(e), 1) # update cmd file def update_cmd_file(cmd_file, cmd, mapfile): - if cmd[0] in ( - "d.colorlist", - "d.font", - "d.fontlist", - "d.frame", - "d.info", - "d.mon", - "d.out.file", - "d.redraw", - "d.to.rast", - "d.what.rast", - "d.what.vect", - "d.where", - ): + if cmd[0] in non_rendering_modules: return mode = "w" if cmd[0] == "d.erase" else "a" @@ -157,13 +178,22 @@ def read_stdin(cmd): mapfile += ".png" else: mapfile += ".ppm" + # to force rendering by wx monitors, but don't create a map file for + # non-rendering modules + if cmd[0] not in non_rendering_modules: + Path(mapfile).touch() else: mapfile = None adjust_region(width, height) read_stdin(cmd) - render(cmd, mapfile) + # wx monitors will render new layers internally so don't render them here; + # also, some display modules print information to the terminal rather than + # rendering any contents on the monitor so allow them to run here + if not mon.startswith("wx") or cmd[0] in non_rendering_modules: + render(cmd, mapfile) + update_cmd_file(os.path.join(path, "cmd"), cmd, mapfile) if cmd[0] == "d.erase" and os.path.exists(legfile): os.remove(legfile) diff --git a/display/d.mon/start.c b/display/d.mon/start.c index 41b8430935d..5b6fe74e694 100644 --- a/display/d.mon/start.c +++ b/display/d.mon/start.c @@ -188,6 +188,7 @@ int start_mon(const char *name, const char *output, int select, int width, from wxGUI */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -198,6 +199,10 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) G_fatal_error(_("Failed to write to file <%s>"), env_file); @@ -208,7 +213,10 @@ int start_mon(const char *name, const char *output, int select, int width, if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -235,6 +243,9 @@ int start_mon(const char *name, const char *output, int select, int width, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -244,12 +255,15 @@ int start_mon(const char *name, const char *output, int select, int width, sprintf(buf, "GRASS_RENDER_IMMEDIATE=%s\n", name); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main ======= <<<<<<< HEAD +>>>>>>> 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); @@ -269,12 +283,15 @@ int start_mon(const char *name, const char *output, int select, int width, sprintf(buf, "GRASS_LEGEND_FILE=%s\n", leg_file); if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Failed to write to file <%s>"), env_file); ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) if (write(fd, buf, strlen(buf)) != strlen(buf)) @@ -353,6 +370,9 @@ int start_mon(const char *name, const char *output, int select, int width, G_fatal_error(_("Failed to write to file <%s>"), env_file); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -363,6 +383,7 @@ int start_mon(const char *name, const char *output, int select, int width, else sprintf(buf, "GRASS_RENDER_BACKGROUNDCOLOR=%s\n", bgcolor); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) ======= @@ -378,6 +399,12 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -394,6 +421,9 @@ int start_mon(const char *name, const char *output, int select, int width, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -402,6 +432,7 @@ int start_mon(const char *name, const char *output, int select, int width, if (truecolor) { sprintf(buf, "GRASS_RENDER_TRUECOLOR=TRUE\n"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) ======= @@ -417,6 +448,12 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -433,6 +470,9 @@ int start_mon(const char *name, const char *output, int select, int width, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.path/select.c b/display/d.path/select.c index 4a60679cbec..f647df95adc 100644 --- a/display/d.path/select.c +++ b/display/d.path/select.c @@ -17,6 +17,7 @@ int display(struct Map_info *Map UNUSED, struct line_pnts *Points, int display(struct Map_info *Map, struct line_pnts *Points, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27,6 +28,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 fb6f2c160cf..296025cf410 100644 --- a/display/d.rast.arrow/main.c +++ b/display/d.rast.arrow/main.c @@ -5,16 +5,22 @@ * PURPOSE: Draw arrows on slope/aspect maps. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * COPYRIGHT: (C) 2000, 2010, 2023 by the GRASS Development Team ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30,6 +36,7 @@ /* some minor cleanup done by Andreas Lange, andreas.lange@rhein-main.de * Update to handle NULLs and floating point aspect maps: Hamish Bowman, Aug <<<<<<< 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 @@ -39,6 +46,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 * type: Huidae Cho, Sep 2015; Terraflow type: Huidae Cho, May 2023 @@ -53,6 +62,9 @@ * type: Huidae Cho, Sep 2015 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -240,11 +252,14 @@ int main(int argc, char **argv) map_type = 5; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else if (strcmp("terraflow", opt2->answer) == 0) map_type = 6; ======= @@ -252,6 +267,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -435,6 +453,7 @@ int main(int argc, char **argv) /* treat AGNPS and ANSWERS data like old zero-as-null CELL */ /* TODO: update models */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (map_type == 2 || map_type == 3 || map_type == 5) { ======= @@ -442,6 +461,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (map_type == 2 || map_type == 3 || map_type == 5 || map_type == 6) { ======= @@ -451,6 +472,9 @@ int main(int argc, char **argv) if (map_type == 2 || map_type == 3 || map_type == 5) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -633,6 +657,7 @@ int main(int argc, char **argv) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -640,6 +665,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* case switch for r.terraflow direction type aspect map */ else if (map_type == 6) { D_use_color(arrow_color); @@ -692,6 +719,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.rast.num/main.c b/display/d.rast.num/main.c index 4dea02a9752..9c0061e374c 100644 --- a/display/d.rast.num/main.c +++ b/display/d.rast.num/main.c @@ -36,6 +36,7 @@ * models such AGNPS which uses the cell number for all its correspondance. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -46,6 +47,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 * */ @@ -154,11 +160,14 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Setup driver and check important information */ D_open_driver(); @@ -167,6 +176,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -261,6 +273,7 @@ int main(int argc, char **argv) D_open_driver(); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -273,6 +286,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.redraw/Makefile b/display/d.redraw/Makefile new file mode 100644 index 00000000000..00038c24a1e --- /dev/null +++ b/display/d.redraw/Makefile @@ -0,0 +1,11 @@ + +MODULE_TOPDIR = ../.. + +PGM = d.redraw + +LIBES = $(DISPLAYLIB) $(GISLIB) +DEPENDENCIES = $(DISPLAYDEP) $(GISDEP) + +include $(MODULE_TOPDIR)/include/Make/Module.make + +default: cmd diff --git a/display/d.redraw/d.redraw.html b/display/d.redraw/d.redraw.html new file mode 100644 index 00000000000..923cbbde44f --- /dev/null +++ b/display/d.redraw/d.redraw.html @@ -0,0 +1,18 @@ +

DESCRIPTION

+ +d.redraw redraws the content of the currently selected monitor. The +active monitor can be selected with d.mon. + +

SEE ALSO

+ + + d.erase, + d.rast, + d.vect, + d.mon + + +

AUTHOR

+ +Huidae Cho, New Mexico State University
+Based on the d.redraw script by Martin Landa, Czech Republic diff --git a/display/d.redraw/main.c b/display/d.redraw/main.c new file mode 100644 index 00000000000..1f52757e315 --- /dev/null +++ b/display/d.redraw/main.c @@ -0,0 +1,108 @@ +/**************************************************************************** + * + * MODULE: d.redraw + * AUTHOR(S): Huidae Cho + * Based on scripts/d.redraw/d.redraw.py by Martin Landa + * PURPOSE: Redraws the content of currently selected monitor + * COPYRIGHT: (C) 2024 by the GRASS Development Team + * + * This program is free software under the GNU General + * Public License (>=v2). Read the file COPYING that + * comes with GRASS for details. + * + *****************************************************************************/ + +#include +#include +#include +#include +#include +#include + +#define LINES_SIZE_INC 1024 +#define LINE_LEN 1024 + +int main(int argc, char **argv) +{ + struct GModule *module; + const char *mon; + char element[GPATH_MAX], cmd_file[GPATH_MAX]; + FILE *fp; + int lines_size, num_lines, num_comment_lines; + char **lines, line[LINE_LEN]; + char **cmd_argv; + int i; + + G_gisinit(argv[0]); + + module = G_define_module(); + G_add_keyword(_("display")); + G_add_keyword(_("graphics")); + G_add_keyword(_("monitors")); + module->description = + _("Redraws the content of currently selected monitor."); + + if (G_parser(argc, argv)) + exit(EXIT_FAILURE); + + if (!(mon = G_getenv_nofatal("MONITOR"))) + G_fatal_error(_("No graphics device selected. Use d.mon to select " + "graphics device.")); + + D_open_driver(); + D_close_driver(); + + G_temp_element(element); + strcat(element, "/MONITORS/"); + strcat(element, mon); + G_file_name(cmd_file, element, "cmd", G_mapset()); + + if (!(fp = fopen(cmd_file, "r"))) + G_fatal_error(_("Unable to open file '%s' for reading."), cmd_file); + + lines_size = num_lines = num_comment_lines = 0; + lines = NULL; + + /* read and save cmd lines; run display commands now */ + while (G_getl2(line, LINE_LEN, fp)) { + /* don't add d.redraw this time */ + if (strcmp(line, "d.redraw") == 0) { + /* remove its comment lines above */ + num_lines -= num_comment_lines; + continue; + } + if (lines_size == num_lines) { + lines_size += LINES_SIZE_INC; + lines = G_realloc(lines, sizeof(char *) * lines_size); + } + lines[num_lines++] = G_store(line); + + if (*line == '#') { + num_comment_lines++; + /* render next command into the same existing file */ + if (strstr(line, "# GRASS_RENDER_") == line) + putenv(G_store(line + 2)); + continue; + } + num_comment_lines = 0; + + /* split line by space; double-quote delimiters protect spaces */ + cmd_argv = G_tokenize2(line, " ", "\""); + /* run display command */ + G_vspawn_ex(cmd_argv[0], (const char **)cmd_argv); + G_free_tokens(cmd_argv); + } + + fclose(fp); + + /* write out cmd file without d.redraw */ + if (!(fp = fopen(cmd_file, "w"))) + G_fatal_error(_("Unable to open file '%s' for writing."), cmd_file); + + for (i = 0; i < num_lines; i++) + fprintf(fp, "%s\n", lines[i]); + + fclose(fp); + + exit(EXIT_SUCCESS); +} diff --git a/display/d.rhumbline/d.rhumbline.html b/display/d.rhumbline/d.rhumbline.html index 8979da94cc7..109d74106fa 100644 --- a/display/d.rhumbline/d.rhumbline.html +++ b/display/d.rhumbline/d.rhumbline.html @@ -40,6 +40,7 @@

EXAMPLE

NOTES

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD This program works only in GRASS locations with longitude/latitude @@ -48,6 +49,8 @@

NOTES

======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main This program works only with longitude/latitude ======= This program works only in GRASS locations with longitude/latitude @@ -56,6 +59,9 @@

NOTES

This program works only in GRASS locations with longitude/latitude >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.rhumbline/plot.c b/display/d.rhumbline/plot.c index 24aa6f55e4f..e5dab28f899 100644 --- a/display/d.rhumbline/plot.c +++ b/display/d.rhumbline/plot.c @@ -6,6 +6,7 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int text_color) ======= @@ -13,6 +14,8 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int text_color UNUSED) ======= int text_color) @@ -21,6 +24,9 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, int text_color) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.text/d.text.html b/display/d.text/d.text.html index 8fc6aaef07a..65ba4923447 100644 --- a/display/d.text/d.text.html +++ b/display/d.text/d.text.html @@ -114,6 +114,7 @@

SEE ALSO

AUTHORS

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD James Westervelt, @@ -135,6 +136,13 @@

AUTHORS

======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +James Westervelt, +U.S. Army Construction Engineering +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) James Westervelt, U.S. Army Construction Engineering @@ -152,6 +160,9 @@

AUTHORS

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.text/main.c b/display/d.text/main.c index ec0aad4e924..2fc51822e46 100644 --- a/display/d.text/main.c +++ b/display/d.text/main.c @@ -564,6 +564,7 @@ static void set_color(char *tcolor) if (r >= 0 && r < 256 && g >= 0 && g < 256 && b >= 0 && b < 256) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -574,6 +575,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 713d32d5434..3881536d4a6 100644 --- a/display/d.title/d.title.html +++ b/display/d.title/d.title.html @@ -14,6 +14,7 @@

DESCRIPTION

NOTES

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -28,6 +29,11 @@

NOTES

>>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main The text created with d.text will not necessarily fit within the @@ -37,7 +43,10 @@

NOTES

======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -64,6 +73,9 @@

NOTES

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -98,6 +110,7 @@

SEE ALSO

AUTHOR

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD James Westervelt, @@ -119,6 +132,13 @@

AUTHOR

======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +James Westervelt, +U.S. Army Construction Engineering +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) James Westervelt, U.S. Army Construction Engineering @@ -136,6 +156,9 @@

AUTHOR

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect.thematic/area.c b/display/d.vect.thematic/area.c index 218f0268eb7..86fdf33cef5 100644 --- a/display/d.vect.thematic/area.c +++ b/display/d.vect.thematic/area.c @@ -17,6 +17,7 @@ int dareatheme(struct Map_info *Map, struct cat_list *Clist, dbCatValArray *cvarr, double *breaks, int nbreaks, const struct color_rgb *colors, const struct color_rgb *bcolor, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int chcat, struct Cell_head *window, int default_width) ======= @@ -24,6 +25,8 @@ int dareatheme(struct Map_info *Map, struct cat_list *Clist, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int chcat, struct Cell_head *window, int default_width UNUSED) ======= int chcat, struct Cell_head *window, int default_width) @@ -32,6 +35,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect.thematic/display.c b/display/d.vect.thematic/display.c index ab286c280ad..49f3b8eaef1 100644 --- a/display/d.vect.thematic/display.c +++ b/display/d.vect.thematic/display.c @@ -140,6 +140,7 @@ int display_lines(struct Map_info *Map, struct cat_list *Clist, int chcat, int draw_line(int ltype, int line, const struct line_pnts *Points, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const struct line_cats *Cats, int chcat, double size, ======= @@ -147,6 +148,8 @@ int draw_line(int ltype, int line, const struct line_pnts *Points, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const struct line_cats *Cats, int chcat, double size UNUSED, ======= const struct line_cats *Cats, int chcat, double size, @@ -155,6 +158,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect.thematic/legend.c b/display/d.vect.thematic/legend.c index 069eb123433..27fefe2dc0c 100644 --- a/display/d.vect.thematic/legend.c +++ b/display/d.vect.thematic/legend.c @@ -21,6 +21,7 @@ void write_into_legend_file(const char *legfile, const char *icon, int size, struct color_rgb bcolor, struct color_rgb *colors, int default_width, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int *frequencies, const char *topo) ======= @@ -28,6 +29,8 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int *frequencies, int c_type, const char *topo) ======= int *frequencies, const char *topo) @@ -36,6 +39,9 @@ void write_into_legend_file(const char *legfile, const char *icon, int *frequencies, const char *topo) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -58,16 +64,22 @@ void write_into_legend_file(const char *legfile, const char *icon, if (stats_min > breakpoints[0]) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(fd, "< %.*f|", n_places, breakpoints[0]); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -98,11 +110,14 @@ void write_into_legend_file(const char *legfile, const char *icon, fprintf(fd, "%s|%d|ps|%d:%d:%d|%d:%d:%d|%d|%s|%d\n", icon, size, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main colors[0].r, colors[0].g, colors[0].b, bcolor.r, bcolor.g, bcolor.b, default_width, topo, frequencies[0]); /* Middle lines */ @@ -126,6 +141,9 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect.thematic/local_proto.h b/display/d.vect.thematic/local_proto.h index db30401e1f0..42283ceb611 100644 --- a/display/d.vect.thematic/local_proto.h +++ b/display/d.vect.thematic/local_proto.h @@ -29,6 +29,7 @@ int display_lines(struct Map_info *, struct cat_list *, int, const char *, void write_into_legend_file(const char *, const char *, const char *, double, double, double *, int, int, struct color_rgb, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct color_rgb *, int, int *, const char *); ======= @@ -36,6 +37,8 @@ void write_into_legend_file(const char *, const char *, const char *, double, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct color_rgb *, int, int *, int, const char *); ======= struct color_rgb *, int, int *, const char *); @@ -44,6 +47,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect.thematic/main.c b/display/d.vect.thematic/main.c index 5e2acd1d572..8322b99324b 100644 --- a/display/d.vect.thematic/main.c +++ b/display/d.vect.thematic/main.c @@ -405,6 +405,7 @@ int main(int argc, char **argv) nclass = atoi(nbclass_opt->answer); nbreaks = nclass - 1; /* we need one less classbreaks (min and <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * max exluded) than classes */ ======= @@ -412,6 +413,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * max excluded) than classes */ ======= * max exluded) than classes */ @@ -420,6 +423,9 @@ int main(int argc, char **argv) * max exluded) than classes */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -553,11 +559,14 @@ int main(int argc, char **argv) if (nfeatures > 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main write_into_legend_file( "stdout", icon_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, default_width, @@ -566,6 +575,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -575,6 +587,7 @@ int main(int argc, char **argv) default_width, frequencies, "point"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -585,6 +598,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; } @@ -592,11 +610,14 @@ int main(int argc, char **argv) if (nfeatures > 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main write_into_legend_file( "stdout", icon_line_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, @@ -605,6 +626,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -614,6 +638,7 @@ int main(int argc, char **argv) default_width, frequencies, "line"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -624,6 +649,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; } @@ -631,11 +661,14 @@ int main(int argc, char **argv) if (nfeatures > 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main write_into_legend_file( "stdout", icon_area_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, @@ -644,6 +677,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -653,6 +689,7 @@ int main(int argc, char **argv) default_width, frequencies, "area"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -663,6 +700,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; } @@ -677,11 +719,14 @@ int main(int argc, char **argv) if (nfeatures > 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main write_into_legend_file( leg_file, icon_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, default_width, @@ -690,6 +735,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -699,6 +747,7 @@ int main(int argc, char **argv) default_width, frequencies, "point"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -709,6 +758,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; } @@ -716,11 +770,14 @@ int main(int argc, char **argv) if (nfeatures > 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main write_into_legend_file( leg_file, icon_line_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, @@ -729,6 +786,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -738,6 +798,7 @@ int main(int argc, char **argv) default_width, frequencies, "line"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -748,6 +809,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; } @@ -755,11 +821,14 @@ int main(int argc, char **argv) if (nfeatures > 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main write_into_legend_file( leg_file, icon_area_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, @@ -768,6 +837,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -777,6 +849,7 @@ int main(int argc, char **argv) default_width, frequencies, "area"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -787,6 +860,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; } @@ -803,6 +881,7 @@ int main(int argc, char **argv) legend_file_opt->answer, icon_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, colors, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD default_width, frequencies, "point"); ======= @@ -810,6 +889,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main default_width, frequencies, ctype, "point"); ======= default_width, frequencies, "point"); @@ -818,6 +899,9 @@ int main(int argc, char **argv) default_width, frequencies, "point"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -829,6 +913,7 @@ int main(int argc, char **argv) legend_file_opt->answer, icon_line_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD colors, default_width, frequencies, "line"); ======= @@ -836,6 +921,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main colors, default_width, frequencies, ctype, "line"); ======= colors, default_width, frequencies, "line"); @@ -844,6 +931,9 @@ int main(int argc, char **argv) colors, default_width, frequencies, "line"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -855,6 +945,7 @@ int main(int argc, char **argv) legend_file_opt->answer, icon_area_opt->answer, title, stats.min, stats.max, breakpoints, nbreaks, size, bcolor, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD colors, default_width, frequencies, "area"); ======= @@ -862,6 +953,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main colors, default_width, frequencies, ctype, "area"); ======= colors, default_width, frequencies, "area"); @@ -870,6 +963,9 @@ int main(int argc, char **argv) colors, default_width, frequencies, "area"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect.thematic/plot1.c b/display/d.vect.thematic/plot1.c index 56ee8c6cc13..6b877e185a5 100644 --- a/display/d.vect.thematic/plot1.c +++ b/display/d.vect.thematic/plot1.c @@ -49,6 +49,7 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist, int chcat, SYMBOL *Symb, int size, int id_flag, int table_colors_flag, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -59,6 +60,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 b64b783a196..cdd420e49b9 100644 --- a/display/d.vect/d.vect.html +++ b/display/d.vect/d.vect.html @@ -10,6 +10,7 @@

NOTES

which allow the user to specify vector type, colors, data fields, SQL queries, label size and justification, etc. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -17,6 +18,8 @@

NOTES

======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 < > ( ) & | , ; ". @@ -29,6 +32,9 @@

NOTES

======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect/label.c b/display/d.vect/label.c index fe89da824c8..5854575b3b8 100644 --- a/display/d.vect/label.c +++ b/display/d.vect/label.c @@ -191,6 +191,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -200,6 +201,10 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (lattr->yref == LCENTER) Yoffset = -(B - T) / 2; @@ -207,6 +212,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text) Yoffset = -(B - T); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -217,12 +223,18 @@ 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) { xarr[0] = xarr[1] = xarr[4] = L + Xoffset; xarr[2] = xarr[3] = R + Xoffset; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD yarr[0] = yarr[3] = yarr[4] = B + Yoffset; yarr[1] = yarr[2] = T + Yoffset; @@ -231,6 +243,8 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main yarr[0] = yarr[3] = yarr[4] = B; yarr[1] = yarr[2] = T; ======= @@ -242,6 +256,9 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text) yarr[1] = yarr[2] = T + Yoffset; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/display/d.vect/shape.c b/display/d.vect/shape.c index 1477b307129..227b9015863 100644 --- a/display/d.vect/shape.c +++ b/display/d.vect/shape.c @@ -49,6 +49,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist, db_set_error_handler_driver(driver); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* fisrt search for color table */ @@ -57,6 +58,8 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* first search for color table */ ======= /* fisrt search for color table */ @@ -65,6 +68,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/rfc/PSC_guidelines.md b/doc/development/rfc/PSC_guidelines.md index 065b0c56c89..c4aee14a076 100644 --- a/doc/development/rfc/PSC_guidelines.md +++ b/doc/development/rfc/PSC_guidelines.md @@ -8,6 +8,7 @@ Status: Adopted (6 April 2007) ## Summary +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -15,11 +16,16 @@ Status: Adopted (6 April 2007) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31,9 +37,12 @@ as low as possible. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 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. @@ -57,6 +66,9 @@ as low as possible. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -92,6 +104,7 @@ currently include: * Granting write access to the source code repository for new developers. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Enforcing the submitter guidelines, with the ultimate sanction against non-compliance being removal of write access to the source code repository. ======= @@ -110,6 +123,13 @@ currently include: non-compliance being removal of write access to the source code repository. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +* 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)) ======= @@ -127,6 +147,9 @@ currently include: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -149,6 +172,7 @@ quality of the GRASS project. Removal of write access to the source code repository is handled as a <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD proposal to the committee as described below in the [Operation of the PSC](#operation-of-the-psc) section. ======= @@ -167,6 +191,13 @@ proposal to the committee as described below in the [Operation of the PSC](#operation-of-the-psc) section. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -184,6 +215,9 @@ proposal to the committee as described below in the >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -222,12 +256,15 @@ mailing list in the form of a proposal. A decision will then be achieved by discussion of the proposal on the mailing list until a consensus is <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD reached. Voting on issues is also permissable and may be used as a means ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -236,6 +273,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/rfc/PSC_voting_procedures.md b/doc/development/rfc/PSC_voting_procedures.md index bcd46deb6a7..8627fdddc7b 100644 --- a/doc/development/rfc/PSC_voting_procedures.md +++ b/doc/development/rfc/PSC_voting_procedures.md @@ -8,6 +8,7 @@ Status: Adopted (6 Oct 2014) ## Introduction +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD In brief, the PSC members vote on proposals on the dedicated @@ -28,6 +29,13 @@ 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 +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -45,6 +53,9 @@ In brief, the PSC members vote on proposals on the dedicated >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -57,16 +68,22 @@ of committee members can pass a proposal. Proposals: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -87,11 +104,14 @@ Proposals: applies). <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Voting: @@ -117,7 +137,10 @@ Voting: all eligible voters, not just those who actively vote. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -191,6 +214,9 @@ Voting: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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 5aa6ab612a9..459d9f0e5ac 100644 --- a/doc/development/rfc/language_standards_support.md +++ b/doc/development/rfc/language_standards_support.md @@ -7,17 +7,23 @@ Status: Motion passed, 29 March 2021 ## Introduction <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -67,10 +73,13 @@ done to C in the 2000’s. Nevertheless, conforming to newer standards may provide better cross platform support and possibly safer code. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 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. @@ -171,6 +180,9 @@ provide better cross platform support and possibly safer code. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -192,6 +204,7 @@ hand, doesn’t add new features compared to C11. Its difference is more interesting from compiler point of view, whereas code “good for C11” is good for C17. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -199,11 +212,16 @@ good for C17. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -216,9 +234,12 @@ the GRASS GIS project. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 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)) ======= @@ -237,6 +258,9 @@ the GRASS GIS project. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -246,6 +270,7 @@ the GRASS GIS project. ### C Language <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -261,6 +286,13 @@ the GRASS GIS project. <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main @@ -276,11 +308,14 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11) ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -310,6 +345,9 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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 19f5c50f6da..d4675970683 100644 --- a/doc/development/rfc/legal_aspects_of_code_contributions.md +++ b/doc/development/rfc/legal_aspects_of_code_contributions.md @@ -54,10 +54,15 @@ source repository: from a file. If a copyright holder wishes to give up copyright they <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 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 @@ -67,12 +72,15 @@ source repository: <<<<<<< HEAD <<<<<<< 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 (written in email is ok) of the copyright holders. ======= ======= +>>>>>>> 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 @@ -98,6 +106,9 @@ source repository: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -115,11 +126,14 @@ GRASS Development Team at the following address: Internet: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -136,6 +150,9 @@ Internet: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/rfc/migration_github.md b/doc/development/rfc/migration_github.md index 348c60b2040..3378adac604 100644 --- a/doc/development/rfc/migration_github.md +++ b/doc/development/rfc/migration_github.md @@ -6,6 +6,7 @@ Status: Motion passed Apr 22, 2019 ## Introduction +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -13,11 +14,16 @@ Status: Motion passed Apr 22, 2019 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27,11 +33,14 @@ translators, people who write documentation, those who report bugs and wishes an more are involved. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 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 @@ -42,10 +51,13 @@ base from SVN kindly hosted by OSGeo to GitHub.com, a widely adopted development platform. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 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. @@ -80,6 +92,9 @@ platform. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96,6 +111,7 @@ platform. ## New GitHub repositories +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -103,6 +119,8 @@ platform. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -172,6 +190,9 @@ in time since they contain different branches: ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -201,6 +222,11 @@ in time since they contain different branches: branches-like layout (master == grass7, grass6, ...) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) @@ -216,6 +242,7 @@ The final destination of these repositories will be under >>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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)). @@ -232,12 +263,15 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra <<<<<<< 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)). ======= ======= >>>>>>> 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)) ======= @@ -256,6 +290,9 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -267,11 +304,14 @@ The following circumstances could be identified: * user present in both with identical name <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD * user present in both with different name as some were changed in the CVS to @@ -333,6 +373,9 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -357,6 +400,11 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex commit log message which had to be parsed accordingly. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) @@ -371,6 +419,7 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex Labels are preserved by transferring: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -384,6 +433,10 @@ Labels are preserved by transferring: <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main * "operating system" trac label into the GitHub issue text itself (following the new issue reporting template) * converting milestones/tickets/comments/labels @@ -392,7 +445,10 @@ Labels are preserved by transferring: commits) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -423,6 +479,9 @@ Labels are preserved by transferring: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -430,6 +489,7 @@ Labels are preserved by transferring: **New labels in the GitHub issue tracker:** +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The trac component of the bug reports have been cleaned up following other OSGeo @@ -450,6 +510,13 @@ 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 +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -467,6 +534,9 @@ projects like GDAL and QGIS, leading to the following categories: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -494,6 +564,7 @@ projects like GDAL and QGIS, leading to the following categories: * unittests * Windows specific +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -501,6 +572,8 @@ projects like GDAL and QGIS, leading to the following categories: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD Note that "normal" bugs reported will not carry a label in order to not overload @@ -550,6 +623,9 @@ practices for dealing with the following: ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -568,6 +644,11 @@ practices for dealing with the following: fork? <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) @@ -580,6 +661,7 @@ practices for dealing with the following: ## Turning SVN/trac into readonly mode +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -587,11 +669,16 @@ practices for dealing with the following: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -603,7 +690,10 @@ aforementioned converted commit messages and issues in the issue tracker. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> 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. @@ -623,6 +713,9 @@ aforementioned converted commit messages and issues in the issue tracker. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -634,6 +727,7 @@ aforementioned converted commit messages and issues in the issue tracker. ## Mirror or Exit strategy +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -641,6 +735,10 @@ aforementioned converted commit messages and issues in the issue tracker. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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. @@ -650,12 +748,15 @@ start asking unreasonable fees, a backup strategy is needed. <<<<<<< 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. ======= ======= >>>>>>> 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)) ======= @@ -674,6 +775,9 @@ start asking unreasonable fees, a backup strategy is needed. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -686,11 +790,14 @@ The proposed solution is * The mirroring is only for the repository, not the issues or wiki. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -713,6 +820,9 @@ The proposed solution is >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/submitting/docs.md b/doc/development/submitting/docs.md index 33e706b8abf..de6648aac2c 100644 --- a/doc/development/submitting/docs.md +++ b/doc/development/submitting/docs.md @@ -179,12 +179,15 @@ Adding the image to the HTML page (r.viewshed example, the screenshot is shown with a width of 600 pixel but it is clickable in the manual page). If a larger <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD image is displayed as shrinked, both **width** and **height** HTML parameters ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main image is displayed as shrunk, both **width** and **height** HTML parameters ======= image is displayed as shrinked, both **width** and **height** HTML parameters @@ -193,6 +196,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/submitting/general.md b/doc/development/submitting/general.md index 8f80e36926d..ecd3ceffa79 100644 --- a/doc/development/submitting/general.md +++ b/doc/development/submitting/general.md @@ -147,6 +147,7 @@ available), and compilation of the whole source tree (ideally after the the original commit to "main". Also note that not all these steps have to be done manually, you can take an advantage of our [​CI](https://github.com/OSGeo/grass/actions). +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -154,6 +155,8 @@ done manually, you can take an advantage of our [​CI](https://github.com/OSGeo ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -164,6 +167,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -174,6 +180,7 @@ branch you are backporting to. For example, let's say we have "main" and branche You can also choose to backport only to the closest branch, in our example 8.2. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -185,6 +192,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 @@ -228,12 +240,15 @@ If you need to add support for a different library in the 'configure' script, yo should first seek consent in the grass-dev mailing list (see below), then you need <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -242,6 +257,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/submitting/python.md b/doc/development/submitting/python.md index 39f0dc0842a..90dce80ef91 100644 --- a/doc/development/submitting/python.md +++ b/doc/development/submitting/python.md @@ -99,6 +99,7 @@ For example like this: flake8 --config lib/python/.flake8 lib/python/temporal/register.py ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -106,6 +107,8 @@ flake8 --config lib/python/.flake8 lib/python/temporal/register.py ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -115,6 +118,9 @@ to do both Black formatting and Flake8 file validation. ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -124,6 +130,7 @@ The correct editor settings for Python indentation - [​Geany](https://www.geany.org/) editor: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD - Edit > Preferences > Editor > Intentation tab > Type: Spaces ======= @@ -131,6 +138,8 @@ The correct editor settings for Python indentation ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - Edit > Preferences > Editor > Indentation tab > Type: Spaces ======= - Edit > Preferences > Editor > Intentation tab > Type: Spaces @@ -139,6 +148,9 @@ The correct editor settings for Python indentation - Edit > Preferences > Editor > Intentation tab > Type: Spaces >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -336,12 +348,15 @@ output. This is reserved for standard module output if it has one. To enable translating of messages to other languages (than English), use full <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD strings, e.g. ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strings, e.g. (good example): ======= strings, e.g. @@ -350,6 +365,9 @@ strings, e.g. strings, e.g. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -361,6 +379,7 @@ else: win.SetLabel(_("Name for new raster map to create")) ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD instead of constructing string from several parts: @@ -369,6 +388,8 @@ instead of constructing string from several parts: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main instead of constructing string from several parts (bad example): ======= instead of constructing string from several parts: @@ -377,6 +398,9 @@ instead of constructing string from several parts: instead of constructing string from several parts: >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/submitting/submitting.md b/doc/development/submitting/submitting.md index 04117687d9d..700f606a790 100644 --- a/doc/development/submitting/submitting.md +++ b/doc/development/submitting/submitting.md @@ -19,6 +19,7 @@ Be sure to check your code against these rules: - [User message standardization](./message_standardization.md): formatting, standard phrases, i18N etc. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -26,6 +27,8 @@ Be sure to check your code against these rules: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ### Use pre-commit It is highly recommended to install and use [pre-commit](https://pre-commit.com) @@ -92,6 +95,9 @@ pre-commit install ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/development/submitting/submitting_c.md b/doc/development/submitting/submitting_c.md index 157d0b05efb..9797d9845bd 100644 --- a/doc/development/submitting/submitting_c.md +++ b/doc/development/submitting/submitting_c.md @@ -162,6 +162,7 @@ first) Use function names which fulfill the official GNU naming convention: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Instead of naming a function like: MyNewFunction() use underscores for seperation @@ -170,6 +171,8 @@ Instead of naming a function like: MyNewFunction() use underscores for seperatio ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Instead of naming a function like: MyNewFunction() use underscores for separation ======= Instead of naming a function like: MyNewFunction() use underscores for seperation @@ -178,6 +181,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -279,6 +285,7 @@ sent to any of these functions will be printed to stderr. G_message() output is not expected to be sent to pipe or file. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Always use the gettext macros with _("") for user messages, example: @@ -287,6 +294,8 @@ Always use the gettext macros with _("") for user messages, example: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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: @@ -303,6 +312,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -315,12 +327,15 @@ It is suggested to add a comment line before translatable user message to give a hint to translators about meaning or use of cumbersome or obscure message. First <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD word in the comment must be GTC - GRASS translation comment, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main word in the comment must be GTC: GRASS translation comment, ======= word in the comment must be GTC - GRASS translation comment, @@ -329,6 +344,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -338,12 +356,15 @@ Example: ```c <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /* GTC A name of a projection */ ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* GTC: Name of a projection */ ======= /* GTC A name of a projection */ @@ -352,6 +373,9 @@ Example: /* GTC A name of a projection */ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -361,11 +385,14 @@ G_message(_("State Plane")); Any message with a noun in plural form has to pass `n_()` macro, even if for the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main English language is not required! The syntax is `n_("English singular", "English plural", count)` @@ -391,6 +418,9 @@ G_message( n_("Remove map", "Remove maps", count)); ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -402,6 +432,7 @@ G_message(n_("One map", "%d maps", number), number); See [locale/README](../../../locale/README) for details. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -415,6 +446,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: @@ -472,6 +508,7 @@ Notes: These index manual pages are autogenerated during the build process of GRASS GIS. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -479,6 +516,8 @@ These index manual pages are autogenerated during the build process of GRASS GIS ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ## Source Code Formatting C and C++ code is formatted with [ClangFormat](https://clang.llvm.org/docs/ClangFormat.html). @@ -518,6 +557,9 @@ GRASS_CLANG_FORMAT="clang-format-15" ./utils/grass_clang_format.sh ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -549,6 +591,7 @@ See ​[GRASS Wiki](https://grasswiki.osgeo.org/wiki/Development#Explanation_of_ or `man indent` for explanation of individual switches. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -560,6 +603,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 46727370380..dcab0445029 100644 --- a/doc/git/investigating_history.md +++ b/doc/git/investigating_history.md @@ -31,6 +31,7 @@ ignored with `git blame`, please open an issue. <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -41,6 +42,10 @@ ignored with `git blame`, please open an issue. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## On GitHub @@ -49,6 +54,7 @@ easy to move over a revision by pressing "View blame prior to this change" which is the icon between commit info and line numbers. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 392c6e8e0b (pygrass: Add update parameters method to Module (#1712)) @@ -60,3 +66,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 ad518969e25..7f373e9ca1f 100644 --- a/doc/grass_database.html +++ b/doc/grass_database.html @@ -53,6 +53,7 @@

GRASS GIS Database

inside in a specific format and is accessible by specific tools. GRASS GIS Databases is in GRASS GIS often called GISDBASE or DATABASE. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -60,6 +61,8 @@

GRASS GIS Database

======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

GRASS Projects

A project is further organized into mapsets which are subdirectories of @@ -71,6 +74,9 @@

GRASS Projects

======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -206,6 +212,7 @@

Importing, exporting and linking data

setups a format and directory where the actual data will be stored, however in GRASS Database the data will be created as standard maps. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -213,6 +220,8 @@

Importing, exporting and linking data

======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

Starting GRASS GIS

After launching GRASS GIS for the first time, @@ -222,6 +231,9 @@

Starting GRASS GIS

======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -278,11 +290,14 @@

Starting GRASS GIS using command line

# Linux, Mac, *BSD, ...: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main grass -c EPSG:5514:3 ~/grassdata/myproject # Windows @@ -291,6 +306,9 @@

Starting GRASS GIS using command line

======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -300,6 +318,7 @@

Starting GRASS GIS using command line

grass -c EPSG:5514:3 D:\grassdata\mylocation <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD See grass command manual for more details. @@ -307,6 +326,8 @@

Starting GRASS GIS using command line

<<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -367,11 +388,16 @@

See also

<<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main GRASS GIS Reference Manual
GRASS GIS startup program manual page @@ -381,12 +407,15 @@

See also

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD GRASS GIS Reference Manual
GRASS GIS startup program manual page ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS GIS 8 Reference Manual
GRASS GIS 8 startup program manual page @@ -407,6 +436,9 @@

See also

GRASS GIS startup program manual page >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/gui/wxpython/example/frame.py b/doc/gui/wxpython/example/frame.py index 0b42d764042..4f468b43769 100644 --- a/doc/gui/wxpython/example/frame.py +++ b/doc/gui/wxpython/example/frame.py @@ -358,6 +358,7 @@ class ExampleMapDisplay(FrameMixin, ExampleMapPanel): def __init__(self, parent, giface, **kwargs): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -365,12 +366,17 @@ def __init__(self, parent, giface, **kwargs): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/gui/wxpython/example/toolbars.py b/doc/gui/wxpython/example/toolbars.py index da630539742..ea056c7c29e 100644 --- a/doc/gui/wxpython/example/toolbars.py +++ b/doc/gui/wxpython/example/toolbars.py @@ -114,11 +114,14 @@ def _toolbarData(self): ( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ( ("addRaster", BaseIcons["addRast"].label), BaseIcons["addRast"], @@ -129,6 +132,9 @@ def _toolbarData(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -138,6 +144,7 @@ def _toolbarData(self): ), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -148,6 +155,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 ) @@ -170,11 +182,14 @@ def _toolbarData(self): ( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ( ("help", icons["help"].label), icons["help"], @@ -190,6 +205,9 @@ def _toolbarData(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -204,6 +222,7 @@ def _toolbarData(self): ), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -214,5 +233,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 2ceb507405f..a1dc0ea28c0 100644 --- a/doc/howto_release.md +++ b/doc/howto_release.md @@ -8,6 +8,7 @@ - You have already cloned the repo with Git. <<<<<<< 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. @@ -21,6 +22,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -49,6 +52,9 @@ _Note: Some later steps in this text are to be done by the development coordinat >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -59,12 +65,15 @@ Update your remotes and switch to branch: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD git fetch --all --prune && git checkout releasebranch_8_2 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main git fetch --prune upstream && git checkout releasebranch_8_4 ======= git fetch --all --prune && git checkout releasebranch_8_2 @@ -73,6 +82,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -90,6 +102,7 @@ git diff --staged # Should give no output: <<<<<<< 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 @@ -166,6 +179,8 @@ eval $(./utils/update_version.py status --bash) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -401,6 +416,9 @@ eval $(./utils/update_version.py status --bash) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -427,12 +445,15 @@ Check on GitHub or use GitHub CLI: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD gh run list --branch releasebranch_8_2 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main gh run list --branch releasebranch_8_4 ======= gh run list --branch releasebranch_8_2 @@ -441,6 +462,9 @@ gh run list --branch releasebranch_8_2 gh run list --branch releasebranch_8_2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -457,11 +481,14 @@ git log --max-count=5 Create an annotated tag (a lightweight tag is okay too, but there is more metadata <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main stored for annotated tags including a date; message is suggested by the `./utils/update_version.py` script): @@ -471,6 +498,9 @@ git tag $TAG -a -m "..." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -480,6 +510,7 @@ stored for annotated tags including a date; message is suggested by the version git tag $TAG -a -m "GRASS GIS 8.2.0RC1" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -491,6 +522,11 @@ git tag $TAG -a -m "GRASS GIS 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 ``` List all tags (annotated will be at the top of both lists): @@ -500,6 +536,7 @@ git tag -n --sort=-creatordate git tag -n --sort=-taggerdate ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Now push the tag upstream - this will trigger the automated workflows linked to tags: @@ -508,6 +545,8 @@ Now push the tag upstream - this will trigger the automated workflows linked to ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Now push the tag upstream - this will trigger the [automated workflows](https://github.com/OSGeo/grass/actions) linked to tags: ======= @@ -517,6 +556,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -534,10 +576,13 @@ Generate a draft of release notes using a script. The script the script needs to run from the top directory and will expect its configuration files <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main to be in the *utils* directory. ======= <<<<<<< HEAD @@ -579,6 +624,9 @@ new contributors, so use with the *api* backend, e.g.: new contributors, so use with the _api_ backend, e.g.: ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -589,6 +637,11 @@ release candidate because it contains contributor handles and can identify new contributors, so use with the *api* backend, e.g.: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) @@ -609,17 +662,23 @@ The *git log* command operates on commits, so use use the *log* backend: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD The *git log* command operates on commits, so use use the *log* backend: ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> 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: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -628,6 +687,7 @@ The *git log* command operates on commits, so use use the *log* backend: python ./generate_release_notes.py log releasebranch_8_2 8.2.0 $VERSION ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD In between RCs and between last RC and final release, the *log* backend is useful @@ -678,6 +738,25 @@ 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 +======= +<<<<<<< HEAD +>>>>>>> 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 @@ -745,6 +824,9 @@ added manually to the result from the *api* backend. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -762,15 +844,21 @@ in the GitHub web interface. You can copy-paste the created release notes to GitHub and further modify as needed. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -786,6 +874,7 @@ If RC, mark it as a pre-release, check: Save the modified draft, but do not publish the release yet. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -793,6 +882,8 @@ Save the modified draft, but do not publish the release yet. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ## Update include/VERSION file Use the dedicated `update_version.py` script to edit the VERSION file. @@ -802,6 +893,9 @@ After a RC, update to development version: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -812,6 +906,7 @@ Use a dedicated script to edit the VERSION file. After an RC, switch to development version: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -823,11 +918,17 @@ 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 ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD After a final release, switch to development version for the next micro, minor, @@ -838,6 +939,9 @@ or major version, e.g., for micro version, use: >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD 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: @@ -862,6 +966,9 @@ or major version, e.g., for micro version, use: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -873,6 +980,7 @@ or major version, e.g., for micro version, use: <<<<<<< HEAD Use *major* and *minor* operations for the other version updates. <<<<<<< HEAD +<<<<<<< HEAD Use `--help` for details about the options. ======= @@ -897,6 +1005,17 @@ Use *major* and *minor* operations for the other version updates. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) Use `--help` for details about the options. +>>>>>>> osgeo-main +======= +======= +<<<<<<< HEAD +Use _major_ and _minor_ operations for the other version updates. +======= +Use *major* and *minor* operations for the other version updates. +>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +Use `--help` for details about the options. + >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD @@ -935,6 +1054,9 @@ development coordinators. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -948,6 +1070,7 @@ git push upstream ## Upload to OSGeo servers +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD This part requires extra permissions and needs to be done by one of the @@ -956,6 +1079,8 @@ development coordinators. <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main This part requires extra permissions and needs to be done by one of the development coordinators. <<<<<<< HEAD <<<<<<< HEAD @@ -973,6 +1098,9 @@ development coordinators. >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -986,6 +1114,7 @@ First, update the repo to get the tag locally: git fetch upstream ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -993,6 +1122,8 @@ git fetch upstream ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Get the tagged source code, e.g. (modify the tag as needed): ```bash @@ -1001,6 +1132,9 @@ git checkout 8.4.0RC1 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1010,6 +1144,7 @@ Get the tagged source code, e.g.: git checkout 8.2.0RC1 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1021,6 +1156,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: @@ -1044,6 +1184,7 @@ linked to the tag: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ -O ChangeLog_${VERSION}.gz ======= @@ -1062,6 +1203,13 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ -O ChangeLog_${VERSION}.gz ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -1079,6 +1227,9 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1097,6 +1248,7 @@ md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum Note: servers 'osgeo8-grass' and 'osgeo7-download' only reachable via <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD jumphost (managed by OSGeo-SAC) - see ======= @@ -1104,6 +1256,8 @@ Note: servers 'osgeo8-grass' and 'osgeo7-download' only reachable via ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main jumphost (managed by OSGeo-SAC) - see ======= jumphost (managed by OSGeo-SAC) - see @@ -1112,6 +1266,9 @@ jumphost (managed by OSGeo-SAC) - see >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1130,6 +1287,7 @@ echo $SERVER2:$SERVER2DIR scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1140,6 +1298,10 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main INSTALL.md REQUIREMENTS.md CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR @@ -1147,6 +1309,13 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ INSTALL.md REQUIREMENTS.md CONTRIBUTING.md $USER@$SERVER2:$SERVER2DIR <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD + +======= +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) + INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR ======= ======= @@ -1154,6 +1323,7 @@ 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 +>>>>>>> osgeo-main ======= ======= ======= @@ -1185,6 +1355,9 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1199,6 +1372,7 @@ ssh $USER@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.md5sum grass-$MAJO echo "https://grass.osgeo.org/grass$MAJOR$MINOR/source/" ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ## Update winGRASS related files @@ -1211,6 +1385,8 @@ Update the winGRASS version at >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ### Update redirects For final minor and major releases (not release candidates and micro releases), @@ -1263,6 +1439,9 @@ Update the winGRASS version at >>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1276,12 +1455,15 @@ vim wingrass-maintenance-scripts/cronjob.sh # major/minor release only Add the new version to repos which build or test addons: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - (currently, for new branches only) - (add new release related line for new branches and final releases) <<<<<<< HEAD @@ -1293,6 +1475,9 @@ Add the new version to repos which build or test addons: >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1302,15 +1487,21 @@ Add the new version to repos which build or test addons: (add new release related line for new branches and final releases) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1322,12 +1513,15 @@ For a final release (not release candidate), close the related milestone at If there are any open issues or PRs, move them to another milestone <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD in the milestone view (all can be moved at once). ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main in the milestone view (all can be moved at once by selecting the open issues and PRs and reassigning the next milestone). ======= @@ -1337,6 +1531,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1350,6 +1547,7 @@ Release is done. ## Improve release description +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD For final releases only, go to Zenodo a get a Markdown badge for the release @@ -1359,6 +1557,8 @@ which Zenodo creates with a DOI for the published released. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -1527,6 +1727,9 @@ Write announcement and publish it: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1539,6 +1742,7 @@ Write announcement and publish it: ## Packaging notes <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### WinGRASS notes ======= @@ -1548,6 +1752,9 @@ Write announcement and publish it: ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main ### WinGRASS notes >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1584,6 +1791,7 @@ For new branches and final releases (see additional instructions in the repo): ```bash set MAJOR=8 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD set MINOR=2 ======= @@ -1591,6 +1799,8 @@ For new branches and final releases (see additional instructions in the repo): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main set MINOR=4 ======= set MINOR=2 @@ -1599,6 +1809,9 @@ For new branches and final releases (see additional instructions in the repo): set MINOR=2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1609,6 +1822,7 @@ For new branches and final releases (see additional instructions in the repo): ```bash <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD compile $GIT_PATH/grass8 $GISBASE_PATH/grass820RC1 $ADDON_PATH/grass820RC1/addons ======= @@ -1616,6 +1830,8 @@ For new branches and final releases (see additional instructions in the repo): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main compile $GIT_PATH/grass8 $GISBASE_PATH/grass840RC1 $ADDON_PATH/grass840RC1/addons ======= compile $GIT_PATH/grass8 $GISBASE_PATH/grass820RC1 $ADDON_PATH/grass820RC1/addons @@ -1624,6 +1840,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1633,6 +1852,7 @@ For new branches and final releases (see additional instructions in the repo): ```bash <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD copy_addon 820RC1 8.2.0RC1 ``` @@ -1642,6 +1862,8 @@ For new branches and final releases (see additional instructions in the repo): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main copy_addon 840RC1 8.4.0RC1 ``` @@ -1671,6 +1893,9 @@ Add release to history page: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1679,6 +1904,7 @@ Add release to history page: - Create milestone and release: - Upload tarball for created release +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1692,6 +1918,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 - @@ -1701,6 +1932,7 @@ Add release to history page: ## Tell others about release <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD - If release candidate: - @@ -1724,6 +1956,8 @@ Via Web / Social media: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - If release candidate (just a short invitation to test): - @@ -1784,6 +2018,9 @@ Via Web / Social media: - See: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1806,6 +2043,7 @@ git commit include/VERSION -m "version: GRASS GIS 8.2.1" ``` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1817,3 +2055,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 0bf5c4000ca..139dbd0f98a 100644 --- a/doc/infrastructure.md +++ b/doc/infrastructure.md @@ -12,10 +12,13 @@ Related Wiki documents: * (historical document) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD @@ -25,6 +28,9 @@ Related Wiki documents: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40,6 +46,7 @@ than in SVN). The GitHub repositories are: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * GRASS GIS core (7.x): @@ -61,6 +68,8 @@ Issues: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - GRASS GIS core (7+): - GRASS GIS legacy (3.x-6.x): - GRASS GIS Add-ons: @@ -113,6 +122,9 @@ Issues: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -127,12 +139,15 @@ Trac related notes: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * For easier linking in the Trac Wiki, some macro definitions are used for manual page refs (G7:modulename) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * For easier linking in the Trac Wiki, some macro definitions are used for manual page refs (G7:modulename) ======= * For easier linking in the Trac Wiki, some macro definitions are used for manual @@ -140,6 +155,9 @@ Trac related notes: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -158,10 +176,13 @@ Statistics: * <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD @@ -171,6 +192,9 @@ Statistics: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -181,6 +205,7 @@ Statistics: Maintainer: M. Neteler +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * @@ -230,6 +255,8 @@ Maintainer: M. Neteler ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - - osgeo7-grass: LXD container on osgeo7 () @@ -407,6 +434,9 @@ Maintainer: M. Neteler >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -428,6 +458,7 @@ Maintainer: M. Neteler * cronjob script: /osgeo/scripts/update_logs.sh <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -439,11 +470,17 @@ Maintainer: M. Neteler ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Summary: The system should run almost autonomously. ## WinGRASS maintenance scripts +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * @@ -452,6 +489,8 @@ Summary: The system should run almost autonomously. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main See ======= ======= @@ -467,6 +506,9 @@ See >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -479,6 +521,7 @@ Maintainer: Markus Neteler Available lists: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * at OSGeo.org (): @@ -507,6 +550,8 @@ Notes: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - at OSGeo.org (): - grass-abm: Integration of GRASS with JAVA based agent based modeling (ABM) @@ -608,6 +653,9 @@ Notes: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -624,6 +672,10 @@ Notes: at Ecole Polytechnique de Montreal, Canada. Not open for other postings. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main @@ -635,6 +687,7 @@ Notes: Maintainer: Martin Landa, Markus Neteler +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -642,6 +695,8 @@ Maintainer: Martin Landa, Markus Neteler ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - - Mediawiki software - requires registration to keep spammers out @@ -649,6 +704,9 @@ Maintainer: Martin Landa, Markus Neteler ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -658,6 +716,7 @@ Maintainer: Martin Landa, Markus Neteler * requires registration to keep spammers out >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Summary: The system should run almost autonomous. An eye must be be kept on people @@ -670,6 +729,8 @@ Macros for manual pages (src, cmd, API, ...): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -713,6 +774,9 @@ Macros for manual pages (src, cmd, API, ...): >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -732,6 +796,7 @@ Web based client: See * Brad ("bdouglas") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -743,17 +808,25 @@ 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 Current bugtracker (Jan 2020 - today): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - @@ -764,6 +837,9 @@ Old bugtrackers: see ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -782,16 +858,22 @@ Old tracsvn (OSGeo server) (Dec 2007 * Mai 2019) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -819,11 +901,14 @@ Very old bugtracker (Jan 2007 * Dec 2008): Very very old bugtracker (Dec 2000 * Dec 2006): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * * webRT, sponsored by Intevation GmbH, Germany @@ -832,6 +917,11 @@ Very very old bugtracker (Dec 2000 * Dec 2006): * TODO: migrate to trac <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -857,6 +947,7 @@ Maintainer: Martin Landa and Markus Neteler Details: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * Windows-addons: grass-addons/utils/addons/README.txt @@ -867,6 +958,8 @@ Details: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD - Windows-addons: grass-addons/utils/addons/README.txt - Addon manual pages cronjob: @@ -890,6 +983,9 @@ Details: * Rendered manuals: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -900,6 +996,7 @@ The redirect to the latest grassX directory is defined on grass.osgeo.org: Procedure building of binaries (Windows): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * 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. @@ -916,6 +1013,8 @@ Procedure of granting write access to Addons repo: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD - Addons module are compiled on winGRASS build server, at the CTU in Prague) and @@ -980,10 +1079,13 @@ XML file for g.extension: Procedure of granting write access to Addons repo: +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * Request procedure: * Adding OSGeo-ID: * Adding contributor: @@ -993,12 +1095,15 @@ Procedure of granting write access to Addons repo: XML file for g.extension: +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * generated in grass-addons/utils/addons/grass-addons-publish.sh ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) * generated in grass-addons/utils/addons/grass-addons-publish.sh @@ -1007,6 +1112,9 @@ XML file for g.extension: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1015,6 +1123,7 @@ XML file for g.extension: Maintainer: Martin Landa +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1022,12 +1131,17 @@ Maintainer: Martin Landa ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - - ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1048,16 +1162,22 @@ Maintenance script: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1065,6 +1185,7 @@ Maintenance script: The github update is run as a cronjob on server "geo102" (CTU, CZ). +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1072,6 +1193,8 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1079,6 +1202,9 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1088,6 +1214,7 @@ Started in Apr. 2020 Maintainer: Vaclav Petras +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1095,6 +1222,8 @@ Maintainer: Vaclav Petras ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - - Details: - CI workflow with: @@ -1117,6 +1246,9 @@ Helper files placed in .github/workflows/ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1126,9 +1258,12 @@ Helper files placed in .github/workflows/ * CI workflow with: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= +>>>>>>> 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.) @@ -1144,6 +1279,9 @@ Helper files placed in .github/workflows/ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1162,21 +1300,28 @@ Helper files placed in .github/workflows/ the future. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main ## GRASS docker images +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1184,6 +1329,8 @@ Helper files placed in .github/workflows/ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Maintainer: Carmen Tawalika, Vaclav Petras + OSGeo-SAC Docker images are created with a GitHub action. Subsequently, login is done @@ -1225,6 +1372,9 @@ Explanations: ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1232,6 +1382,7 @@ Explanations: Maintainer: Markus Neteler +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD * @@ -1240,6 +1391,8 @@ Maintainer: Markus Neteler ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Coverity Scan is a service to find security issues. At time the service is used only occasionally. ======= @@ -1255,6 +1408,9 @@ is used only occasionally. ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1270,6 +1426,7 @@ is used only occasionally. Messages are extracted with `gettext` message macros. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1277,11 +1434,16 @@ Messages are extracted with `gettext` message macros. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Translations may be done using the OSGeo Weblate platform: ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1296,12 +1458,15 @@ Translations may be done using the OSGeo Weblate platform: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1361,6 +1526,7 @@ Further notification/functionality test systems: * posts into #osgeo-commits IRC channel <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1372,6 +1538,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 @@ -1381,6 +1552,7 @@ Source Lab (OSUOSL), Oregon, USA Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth (list of master site hosting): +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1388,6 +1560,8 @@ Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main - 1997-1999: Institut fuer Landschaftspflege und Naturschutz (ILN), Universitaet Hannover, Germany - 1999-2001: Institut fuer Physische Geographie und Landschaftsoekologie, @@ -1399,6 +1573,9 @@ Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/notebooks/README.md b/doc/notebooks/README.md index 19bc07ae20f..32bfb225338 100644 --- a/doc/notebooks/README.md +++ b/doc/notebooks/README.md @@ -4,6 +4,7 @@ ### Using the notebooks locally +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11,6 +12,10 @@ <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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: @@ -20,12 +25,15 @@ the `*.ipynb` files with: <<<<<<< 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: ======= ======= >>>>>>> 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)) @@ -47,6 +55,9 @@ the `*.ipynb` files with: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -71,11 +82,14 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n * Hydrology with GRASS GIS: [hydrology.ipynb](hydrology.ipynb) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -92,6 +106,9 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/notebooks/example_notebook.ipynb b/doc/notebooks/example_notebook.ipynb index a30ea1a8f7f..18fee498bc9 100644 --- a/doc/notebooks/example_notebook.ipynb +++ b/doc/notebooks/example_notebook.ipynb @@ -1,5 +1,6 @@ { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "cells": [ { @@ -7,6 +8,8 @@ "metadata": {}, ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "metadata": { "language_info": { @@ -28,6 +31,9 @@ "cells": [ { <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49,6 +55,7 @@ "\n", "There are several ways to use GRASS GIS. When using Python in a notebook, we usually find GRASS GIS Python packages first, import them, initialize GRASS GIS session, and set several variables useful for using GRASS GIS in a notebook." <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ] ======= @@ -56,6 +63,11 @@ "cell_type": "markdown", "metadata": {} >>>>>>> osgeo-main +======= + ], + "cell_type": "markdown", + "metadata": {} +>>>>>>> osgeo-main ======= ], "cell_type": "markdown", @@ -101,12 +113,15 @@ }, { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "cell_type": "markdown", "metadata": {}, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "source": [ "## Raster buffer\n", @@ -114,6 +129,7 @@ "Set computational region and create multiple buffers in given distances\n", "around lakes represented as raster:" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ] ======= @@ -121,6 +137,11 @@ "cell_type": "markdown", "metadata": {} >>>>>>> osgeo-main +======= + ], + "cell_type": "markdown", + "metadata": {} +>>>>>>> osgeo-main ======= ], "cell_type": "markdown", @@ -143,12 +164,15 @@ }, { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "cell_type": "markdown", "metadata": {}, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "source": [ "## Vector buffer\n", @@ -157,6 +181,7 @@ "Vector modules typically don't follow computational region,\n", "but we set it to inform display modules about our area of interest." <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ] ======= @@ -164,6 +189,11 @@ "cell_type": "markdown", "metadata": {} >>>>>>> osgeo-main +======= + ], + "cell_type": "markdown", + "metadata": {} +>>>>>>> osgeo-main ======= ], "cell_type": "markdown", @@ -186,6 +216,7 @@ "Image(filename=\"map.png\")" ] <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD }, { @@ -261,4 +292,8 @@ } ] >>>>>>> osgeo-main +======= + } + ] +>>>>>>> osgeo-main } diff --git a/doc/notebooks/hydrology.ipynb b/doc/notebooks/hydrology.ipynb index 3a846ed8734..d2a3355b7b0 100644 --- a/doc/notebooks/hydrology.ipynb +++ b/doc/notebooks/hydrology.ipynb @@ -70,6 +70,7 @@ "# Add a raster, vector and legend to the map\n", "elev_map.d_rast(map=\"elevation\")\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "elev_map.d_legend(raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\")\n", ======= @@ -77,6 +78,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "elev_map.d_legend(\n", " raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\"\n", ")\n", @@ -87,6 +90,9 @@ "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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -111,6 +117,7 @@ "outputs": [], "source": [ <<<<<<< 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", @@ -120,6 +127,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.fill.dir\",\n", " input=\"elevation\",\n", @@ -152,6 +161,9 @@ "gs.run_command(\"r.fill.dir\", input=\"elev_fill2\", output=\"elev_fill3\", direction=\"dir3\", areas=\"area3\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -193,11 +205,14 @@ "source": [ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.watershed\",\n", " elevation=\"elevation@PERMANENT\",\n", @@ -211,6 +226,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -223,6 +241,7 @@ " threshold=80000)\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -233,6 +252,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", @@ -259,6 +283,7 @@ "# We can modify with color table for rasters with `r.colors`.\n", "# Note that if the raster is located in a different mapset (for example,\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", ======= @@ -266,6 +291,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "# elevation is in PERMANENT, not user1), the `r.colors` will not change\n", ======= "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", @@ -274,6 +301,9 @@ "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -311,11 +341,14 @@ "# Count cells in each watershed\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.stats.zonal\",\n", " base=\"watersheds\",\n", @@ -333,6 +366,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -345,6 +381,7 @@ "cell_area = float(proj[\"nsres\"])*float(proj[\"ewres\"])\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -355,6 +392,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", @@ -378,11 +420,14 @@ "gs.run_command(\"r.colors\", map=\"watershed_area\", color=\"plasma\")\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "\n", "watershed_map = gj.Map()\n", "watershed_map.d_rast(map=\"watershed_area\")\n", @@ -401,6 +446,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -418,6 +466,7 @@ " units=\" km2\")\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -428,6 +477,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()" ] @@ -463,6 +517,7 @@ "slope_map = gj.Map()\n", "slope_map.d_rast(map=\"slope\")\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "slope_map.d_legend(raster=\"slope\", at=(65, 90, 85, 90), fontsize=15, flags=\"b\", title=\"Slope\", units=\"°\")\n", ======= @@ -470,6 +525,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "slope_map.d_legend(\n", " raster=\"slope\",\n", " at=(65, 90, 85, 90),\n", @@ -485,6 +542,9 @@ "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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -508,11 +568,14 @@ "\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "columns = defaultdict(list) # each value in each column is appended to a list\n", "\n", "text = gs.read_command(\n", @@ -527,6 +590,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -540,6 +606,7 @@ " # based on column name k\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -550,6 +617,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", @@ -593,6 +665,7 @@ "source": [ "# Convert to vector\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\")" ======= @@ -600,6 +673,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\"\n", ")" @@ -610,6 +685,9 @@ "gs.run_command(\"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -626,11 +704,14 @@ "watershed_vect_map.d_rast(map=\"elevation\")\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "watershed_vect_map.d_vect(\n", " map=\"watersheds_vector\",\n", " fill_color=\"none\",\n", @@ -645,6 +726,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -658,6 +742,7 @@ " label_size=10)\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -668,6 +753,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 ebf8ad28473..75974d56299 100644 --- a/doc/notebooks/jupyter_example.ipynb +++ b/doc/notebooks/jupyter_example.ipynb @@ -9,6 +9,7 @@ "[\"GRASS](https://grass.osgeo.org/)\n", "\n", <<<<<<< 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", ======= @@ -16,6 +17,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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", ======= "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", @@ -24,6 +27,9 @@ "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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -83,6 +89,7 @@ "source": [ "gs.parse_command(\"g.region\", raster=\"lakes\", flags=\"pg\")\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", ======= @@ -90,6 +97,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500]\n", ")\n", @@ -100,6 +109,9 @@ "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -140,6 +152,7 @@ "\n", "# Add vector layers and legend\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "v_buffer_map.d_vect(map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", ======= @@ -147,6 +160,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "v_buffer_map.d_vect(\n", " map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\"\n", ")\n", @@ -157,6 +172,9 @@ "v_buffer_map.d_vect(map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/notebooks/jupyter_integration.ipynb b/doc/notebooks/jupyter_integration.ipynb index 52a4436c3a9..263192264fb 100644 --- a/doc/notebooks/jupyter_integration.ipynb +++ b/doc/notebooks/jupyter_integration.ipynb @@ -80,6 +80,7 @@ "source": [ "# Demonstration of GrassRenderer for non-interactive map display\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "r = gj.GrassRenderer(height=540)\n", "\n", @@ -96,6 +97,8 @@ ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "\n", "r = gj.GrassRenderer(height=540, filename = \"streams_maps.png\")\n", @@ -107,6 +110,9 @@ "r.run(\"d.vect\", map=\"streams\")\n", "\n", <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -118,6 +124,7 @@ "metadata": {}, "source": [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "#### Multiple instances of GrassRenderer\n", "\n", @@ -125,6 +132,9 @@ ======= "#### We can have two instances of GrassRenderer" >>>>>>> osgeo-main +======= + "#### We can have two instances of GrassRenderer" +>>>>>>> osgeo-main ======= "#### We can have two instances of GrassRenderer" >>>>>>> osgeo-main @@ -154,11 +164,14 @@ "source": [ "# Then, we return to the first instance and continue to modify and display it\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "# Notice that layers a drawn in the order they are added\n", ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "\n", "r.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", diff --git a/doc/notebooks/jupyter_tutorial.ipynb b/doc/notebooks/jupyter_tutorial.ipynb index e23f72feab7..5c4fb2545f4 100644 --- a/doc/notebooks/jupyter_tutorial.ipynb +++ b/doc/notebooks/jupyter_tutorial.ipynb @@ -8,11 +8,14 @@ "\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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", "The _grass.jupyter_ package was initially written as part of [Google Summer of Code in 2021](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS) by Caitlin Haedrich and was experimentally included in version 8.0.0. Caitlin further improved it thanks to the [GRASS Mini Grant 2022](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS/MiniGrant2022). The package was officially released for the first time as part of version 8.2.0. Credits for mentoring and additional development go to Vaclav Petras, Helena Mitasova, Stefan Blumentrath, and Anna Petrasova as well as to many members of the GRASS community who provided important feedback.\n", @@ -22,6 +25,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32,6 +38,7 @@ "In addition to simplifying the launch of *GRASS GIS* with a dedicated _init_ function, _grass.jupyter_ has two main display classes, _Map_ and _InteractiveMap_. Using the GRASS rendering engine in the background, _Map_ creates maps as PNG images. _InteractiveMap_ displays GRASS rasters and vectors with [*folium*](http://python-visualization.github.io/folium/), a [*leaflet*](https://leafletjs.com/) library for Python. The package includes also _Map3D_ and [_TimeSeriesMap_](temporal.ipynb).\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42,6 +49,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`." @@ -175,6 +187,7 @@ "# Then, we return to the first instance and continue to modify and display it\n", "# Notice that layers a drawn in the order they are added\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", ======= @@ -182,6 +195,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "example_map.run(\"d.vect\", map=\"zipcodes\", color=\"red\", fill_color=\"none\")\n", ======= "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", @@ -190,6 +205,9 @@ "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -261,6 +279,7 @@ "## Interactive Map Display\n", "\n", <<<<<<< 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*." ======= @@ -268,6 +287,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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/)." ======= "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*." @@ -276,6 +297,9 @@ "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 +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -289,6 +313,7 @@ "source": [ "# Create Interactive Map\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "raleigh_map = gj.InteractiveMap(width = 600)" ======= @@ -296,6 +321,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "raleigh_map = gj.InteractiveMap(width=600)" ======= "raleigh_map = gj.InteractiveMap(width = 600)" @@ -304,6 +331,9 @@ "raleigh_map = gj.InteractiveMap(width = 600)" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -319,6 +349,7 @@ "raleigh_map.add_raster(\"elevation\")\n", "raleigh_map.add_vector(\"roadsmajor\")\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "raleigh_map.add_layer_control(position = \"bottomright\")" ======= @@ -326,6 +357,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "raleigh_map.add_layer_control(position=\"bottomright\")" ======= "raleigh_map.add_layer_control(position = \"bottomright\")" @@ -334,6 +367,9 @@ "raleigh_map.add_layer_control(position = \"bottomright\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -383,11 +419,14 @@ "source": [ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "import folium\n", "\n", "\n", @@ -397,6 +436,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -409,6 +451,7 @@ "m = folium.Map(tiles=\"Stamen Terrain\", location=[35.761168,-78.668271], zoom_start=13)\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -419,6 +462,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", @@ -431,11 +479,14 @@ "folium.Marker(\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main " [35.781608, -78.675800], popup=\"Point of Interest\", tooltip=tooltip\n", ").add_to(m)\n", "\n", @@ -482,6 +533,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -495,6 +549,7 @@ "fig" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -505,6 +560,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 ] }, @@ -606,11 +666,14 @@ "source": [ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "## Animating Series of Maps\n", "\n", "The `SeriesMap` class animates a series of maps. The `ipywidgets` slider allows users to slide between maps and play a continuous loop. This class is similar to the `TimeSeriesMap` class for space-time datasets and shown in the [temporal notebook](./temporal.ipynb)." @@ -664,6 +727,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -703,6 +769,7 @@ "metadata": { "kernelspec": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "display_name": "Python 3", ======= @@ -710,6 +777,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "display_name": "Python 3 (ipykernel)", ======= "display_name": "Python 3", @@ -718,6 +787,9 @@ "display_name": "Python 3", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/notebooks/scripting_example.ipynb b/doc/notebooks/scripting_example.ipynb index 4b27c86dc7f..8228ddecc7f 100644 --- a/doc/notebooks/scripting_example.ipynb +++ b/doc/notebooks/scripting_example.ipynb @@ -75,6 +75,7 @@ "source": [ "gs.parse_command(\"g.region\", raster=\"lakes\", flags=\"pg\")\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", ======= @@ -82,6 +83,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500]\n", ")\n", @@ -92,6 +95,9 @@ "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123,6 +129,7 @@ "gs.run_command(\"d.erase\") # erase the display before drawing again\n", "!rm -f $GRASS_LEGEND_FILE # and remove the legend file\n", <<<<<<< 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", @@ -131,6 +138,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"d.vect\", map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\"\n", ")\n", @@ -146,6 +155,9 @@ "gs.run_command(\"d.vect\", map=\"buffer\", fill_color=\"#F8766D\", legend_label=\"Inner portion\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/notebooks/solar_potential.ipynb b/doc/notebooks/solar_potential.ipynb index 74c1d7380be..a7749a0019a 100644 --- a/doc/notebooks/solar_potential.ipynb +++ b/doc/notebooks/solar_potential.ipynb @@ -94,6 +94,7 @@ "outputs": [], "source": [ <<<<<<< 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\")" ======= @@ -101,6 +102,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.sunmask\",\n", " elevation=\"elevation\",\n", @@ -120,6 +123,9 @@ "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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -141,6 +147,7 @@ "outputs": [], "source": [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", incidout=\"incident\", day=\"356\", time=\"16.25\")\n", ======= @@ -148,6 +155,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.sun\",\n", " elevation=\"elevation\",\n", @@ -164,6 +173,9 @@ "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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -238,11 +250,14 @@ "source": [ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.run_command(\n", " \"r.sun\",\n", " elevation=\"elevation\",\n", @@ -267,6 +282,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -276,6 +294,7 @@ "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", day=\"172\", glob_rad=\"summer\", insol_time=\"its172\")\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -286,6 +305,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 e50c1916947..df1b7057821 100644 --- a/doc/notebooks/temporal.ipynb +++ b/doc/notebooks/temporal.ipynb @@ -33,6 +33,7 @@ "\n", "# Unpack zip to grassdata\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "shutil.unpack_archive(\"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\")" ======= @@ -40,6 +41,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "shutil.unpack_archive(\n", " \"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\"\n", ")" @@ -50,6 +53,9 @@ "shutil.unpack_archive(\"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -240,6 +246,7 @@ "precip_map = gj.TimeSeriesMap(use_region=True)\n", "precip_map.add_raster_series(\"precip_sum_2010\")\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", ======= @@ -247,6 +254,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "precip_map.d_legend(color=\"black\", at=(10, 40, 2, 6)) # Add legend\n", ======= "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", @@ -255,6 +264,9 @@ "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -279,6 +291,7 @@ "from IPython.display import Image\n", "\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Image(precip_map.save(\"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"))" ======= @@ -286,6 +299,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Image(\n", " precip_map.save(\n", " \"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"\n", @@ -298,6 +313,9 @@ "Image(precip_map.save(\"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"))" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/notebooks/viewshed_analysis.ipynb b/doc/notebooks/viewshed_analysis.ipynb index 1bd1928371f..dcdafbe61aa 100644 --- a/doc/notebooks/viewshed_analysis.ipynb +++ b/doc/notebooks/viewshed_analysis.ipynb @@ -66,6 +66,7 @@ "source": [ "gs.parse_command(\"g.region\", raster=\"elevation\", flags=\"apg\")\n", <<<<<<< 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\")" @@ -74,6 +75,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "gs.write_command(\n", " \"v.in.ascii\", input=\"-\", stdin=\"%s|%s\" % (642212, 224767), output=\"viewpoints\"\n", ")\n", @@ -94,6 +97,9 @@ "gs.run_command(\"r.viewshed\", input=\"elevation\", output=\"tower_los\", coordinates=\"642212,224767\", observer_elevation=\"165\", max_distance=\"10000\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/projectionintro.html b/doc/projectionintro.html index 96edf6e0762..fc3f1e4b138 100644 --- a/doc/projectionintro.html +++ b/doc/projectionintro.html @@ -29,6 +29,7 @@

Raster map transformation

The unreferenced map is geocoded within the XY location by defining <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -40,6 +41,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 @@ -66,6 +72,7 @@

Vector map transformation

a forward transformation is performed. The unreferenced map is imported <<<<<<< 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 @@ -74,6 +81,8 @@

Vector map transformation

======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -88,6 +97,9 @@

Vector map transformation

These points are stored into an ASCII file and then transformed within >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/doc/vector/v.example/main.c b/doc/vector/v.example/main.c index e78bfb2b904..f40fd3427df 100644 --- a/doc/vector/v.example/main.c +++ b/doc/vector/v.example/main.c @@ -110,6 +110,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Database connection not defined for layer %d"), 1); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* Output information useful for debuging @@ -118,6 +119,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Output information useful for debugging ======= /* Output information useful for debuging @@ -126,6 +129,9 @@ int main(int argc, char *argv[]) /* Output information useful for debuging >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/docker/README.md b/docker/README.md index 6b259fd9171..8edf92abc29 100644 --- a/docker/README.md +++ b/docker/README.md @@ -3,6 +3,7 @@ ## GRASS GIS docker matrix <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -10,6 +11,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD [![Docker Pulls](https://img.shields.io/docker/pulls/osgeo/grass-gis.svg)](https://grass.osgeo.org/download/docker/) @@ -39,6 +42,9 @@ docker pull osgeo/grass-gis: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -69,12 +75,15 @@ and ) To install a docker image, run (replace `` with the desired Docker tag from the table above): +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ## GRASS GIS docker matrix @@ -106,6 +115,9 @@ the table above): >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -113,6 +125,7 @@ the table above): docker pull mundialis/grass-py3-pdal: ``` +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -126,4 +139,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 c01bf23d626..3a57b353557 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,11 +1,14 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM alpine:3.15 as common ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main FROM alpine:3.19@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b as common ======= FROM alpine:3.15 as common @@ -14,6 +17,9 @@ FROM alpine:3.15 as common FROM alpine:3.15 as common >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26,6 +32,7 @@ LABEL maintainer="neteler@osgeo.org" # PACKAGES VERSIONS ARG PYTHON_VERSION=3 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # List of packages to be installed @@ -36,6 +43,8 @@ ENV PACKAGES="\ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # List of packages to be installed (proj-data omitted: 570.04 MB) ENV GRASS_RUN_PACKAGES="\ attr \ @@ -51,6 +60,9 @@ ENV PACKAGES="\ attr \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -64,11 +76,14 @@ ENV PACKAGES="\ freetype \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main g++ \ gcc \ gdal \ @@ -92,6 +107,9 @@ ENV PACKAGES="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -101,6 +119,7 @@ ENV PACKAGES="\ geos \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -111,6 +130,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 \ @@ -118,11 +142,14 @@ ENV PACKAGES="\ libbz2 \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main libgeotiff \ libjpeg-turbo \ libpng \ @@ -133,6 +160,9 @@ ENV PACKAGES="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -143,6 +173,7 @@ ENV PACKAGES="\ libunwind \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -153,6 +184,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 \ @@ -163,11 +199,14 @@ ENV PACKAGES="\ py3-pillow \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main python3 \ pdal \ pdal-dev \ @@ -176,6 +215,9 @@ ENV PACKAGES="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -185,6 +227,7 @@ ENV PACKAGES="\ postgresql \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -195,6 +238,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 \ sqlite \ @@ -210,6 +258,7 @@ ENV PACKAGES="\ WORKDIR /src +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -217,6 +266,8 @@ WORKDIR /src ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Add the packages RUN echo "Install main packages";\ apk update; \ @@ -225,6 +276,9 @@ RUN echo "Install main packages";\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -245,6 +299,7 @@ RUN echo "Install main packages";\ apk add --no-cache $PACKAGES <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -256,6 +311,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 @@ -304,6 +364,7 @@ ENV GRASS_BUILD_PACKAGES="\ fftw-dev \ freetype-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD g++ \ gcc \ @@ -313,6 +374,8 @@ ENV GRASS_BUILD_PACKAGES="\ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= g++ \ gcc \ @@ -324,6 +387,9 @@ ENV GRASS_BUILD_PACKAGES="\ gdal-dev \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -334,6 +400,7 @@ ENV GRASS_BUILD_PACKAGES="\ libjpeg-turbo-dev \ libpng-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD make \ ======= @@ -341,6 +408,8 @@ ENV GRASS_BUILD_PACKAGES="\ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main libpq-dev \ ======= make \ @@ -349,6 +418,9 @@ ENV GRASS_BUILD_PACKAGES="\ make \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -357,6 +429,7 @@ ENV GRASS_BUILD_PACKAGES="\ pdal \ pdal-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD postgresql-dev \ ======= @@ -364,6 +437,8 @@ ENV GRASS_BUILD_PACKAGES="\ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= postgresql-dev \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -371,6 +446,9 @@ ENV GRASS_BUILD_PACKAGES="\ postgresql-dev \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -404,6 +482,7 @@ RUN echo " => Configure and compile grass" && \ make install && \ ldconfig /etc/ld.so.conf.d +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -411,6 +490,8 @@ RUN echo " => Configure and compile grass" && \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/alpine/Dockerfile <<<<<<< HEAD:docker/alpine/Dockerfile # Get rid of version number here, restore in next stage via symbolic link @@ -452,6 +533,9 @@ RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -465,6 +549,7 @@ RUN cp /usr/local/grass83/gui/wxpython/xml/module_items.xml module_items.xml; \ mv module_items.xml /usr/local/grass83/gui/wxpython/xml/module_items.xml; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -476,10 +561,16 @@ 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 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -487,6 +578,8 @@ FROM common as grass ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/alpine/Dockerfile ======= ======= @@ -494,6 +587,9 @@ FROM common as grass ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -504,11 +600,14 @@ COPY --from=build /usr/local/bin/grass /usr/local/bin/grass COPY --from=build /usr/local/grass* /usr/local/grass/ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -529,6 +628,9 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -540,6 +642,7 @@ RUN ln -sf /usr/local/grass `grass --config path` RUN grass --tmp-location XY --exec g.version -rge && \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -550,6 +653,11 @@ RUN grass --tmp-location XY --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 @@ -565,11 +673,14 @@ COPY docker/testdata/test_grass_session.py /scripts/test_grass_session.py ENV GRASSBIN=grass <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal # Not yet ready for GRASS GIS 8: @@ -582,6 +693,9 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.learn.ml ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -597,6 +711,7 @@ RUN apk add py3-scikit-learn RUN grass --tmp-location XY --exec g.extension extension=r.learn.ml2 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -608,10 +723,16 @@ RUN grass --tmp-location XY --exec g.extension extension=r.learn.ml2 ======= >>>>>>> 8422103f4c (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 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -619,12 +740,17 @@ FROM grass as final ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main >>>>>>> e526e86235 (Dockerfile_alpine: fix broken pip six installation (#1568)):docker/alpine/Dockerfile_alpine ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -633,6 +759,7 @@ FROM grass as final ENV GRASSBIN="/usr/local/bin/grass" \ GRASS_SKIP_MAPSET_OWNER_CHECK=1 \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD SHELL="/bin/bash" ENV PROJ_NETWORK="ON" @@ -642,6 +769,8 @@ ENV PROJ_NETWORK="ON" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main SHELL="/bin/bash" \ # https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK PROJ_NETWORK=ON \ @@ -683,6 +812,9 @@ ENV PROJ_NETWORK="ON" >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -692,6 +824,7 @@ RUN grass --tmp-location XY --exec g.version -rge && \ python3 --version <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -703,6 +836,11 @@ RUN grass --tmp-location XY --exec g.version -rge && \ ======= >>>>>>> 8422103f4c (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 r.in.pdal in final image because test stage is not executed in github action COPY docker/testdata/simple.laz /tmp/simple.laz @@ -713,9 +851,12 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 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 @@ -723,6 +864,9 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -730,6 +874,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out WORKDIR /grassdb VOLUME /grassdb +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD CMD $GRASSBIN --version @@ -738,6 +883,8 @@ CMD $GRASSBIN --version ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main CMD ["$GRASSBIN", "--version"] ======= CMD $GRASSBIN --version @@ -746,6 +893,9 @@ CMD $GRASSBIN --version CMD $GRASSBIN --version >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index b247db670fc..6f7b70dabeb 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -1,11 +1,14 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100eaeb24d42e @@ -16,6 +19,9 @@ FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100 >>>>>>> e77ca8abf8 (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 5d3bd35e0a (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main <<<<<<< HEAD FROM debian:stable@sha256:84725fb1debbf461f54a23030be0bcde8449f2fa4eba8adf857b1a4c707fec8d @@ -35,6 +41,9 @@ FROM debian:10.1 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45,15 +54,21 @@ FROM debian:stable # apt-get update && apt-get install lsb-release -y && lsb_release -a <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -63,6 +78,7 @@ LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis. ENV DEBIAN_FRONTEND noninteractive +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # define versions to be used (PDAL is not available on Debian, so we compile it here) @@ -74,6 +90,9 @@ ARG PDAL_VERSION=2.4.3 >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # define versions to be used (PDAL is not available on Debian, so we compile it here) # https://github.com/PDAL/PDAL/releases @@ -105,6 +124,9 @@ ARG PDAL_VERSION=2.4.3 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132,6 +154,7 @@ RUN apt-get update && apt-get upgrade -y && \ libfftw3-bin \ libfftw3-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libfreetype6-dev \ ======= @@ -139,6 +162,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main libfreetype-dev \ ======= libfreetype6-dev \ @@ -147,6 +172,9 @@ RUN apt-get update && apt-get upgrade -y && \ libfreetype6-dev \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -157,6 +185,7 @@ RUN apt-get update && apt-get upgrade -y && \ libjsoncpp-dev \ libnetcdf-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libncurses5-dev \ libopenblas-base \ @@ -165,6 +194,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main libncurses-dev \ ======= libncurses5-dev \ @@ -175,6 +206,9 @@ RUN apt-get update && apt-get upgrade -y && \ libopenblas-base \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -184,6 +218,7 @@ RUN apt-get update && apt-get upgrade -y && \ libpnglite-dev \ libpq-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libproj-dev \ ======= @@ -200,6 +235,12 @@ RUN apt-get update && apt-get upgrade -y && \ libproj-dev \ ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + libproj-dev \ +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -212,6 +253,9 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -226,6 +270,7 @@ RUN apt-get update && apt-get upgrade -y && \ ncurses-bin \ netcdf-bin \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD proj-bin \ proj-data \ @@ -245,6 +290,13 @@ RUN apt-get update && apt-get upgrade -y && \ proj-data \ ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + proj-bin \ + proj-data \ +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -259,6 +311,9 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -280,6 +335,7 @@ RUN apt-get update && apt-get upgrade -y && \ wget \ zip \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD zlib1g-dev ======= @@ -287,6 +343,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main zlib1g-dev \ && apt-get clean all && rm -rf /var/lib/apt/lists/* ======= @@ -296,6 +354,9 @@ RUN apt-get update && apt-get upgrade -y && \ zlib1g-dev >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -303,6 +364,7 @@ RUN apt-get update && apt-get upgrade -y && \ RUN echo LANG="en_US.UTF-8" > /etc/default/locale RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -310,6 +372,8 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -354,6 +418,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -373,6 +440,7 @@ RUN mkdir vdatum && \ cd .. && \ rm -rf vdatum +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled @@ -390,6 +458,12 @@ RUN mkdir vdatum && \ ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled +======= +>>>>>>> osgeo-main ## install pdal >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -405,6 +479,9 @@ RUN mkdir vdatum && \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -432,6 +509,7 @@ RUN wget -q \ -DBUILD_PLUGIN_ICEBRIDGE=ON \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -442,6 +520,10 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -449,10 +531,13 @@ RUN wget -q \ -DWITH_LASZIP=OFF \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -479,6 +564,9 @@ RUN wget -q \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -493,6 +581,7 @@ COPY . /src/grass_build/ WORKDIR /src/grass_build <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Cleanup potentially leftover GISRC file with wrong path to "demolocation" RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* ======= @@ -511,6 +600,13 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +# 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)) @@ -525,6 +621,9 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -580,6 +679,7 @@ ENV SHELL /bin/bash ENV LC_ALL "en_US.UTF-8" ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Create generic GRASS GIS lib name regardless of version number @@ -589,6 +689,8 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/debian/Dockerfile <<<<<<< HEAD:docker/debian/Dockerfile # https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK @@ -625,6 +727,9 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -644,6 +749,7 @@ WORKDIR /scripts # install external GRASS GIS session Python API <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD RUN pip3 install grass-session ======= @@ -663,6 +769,14 @@ RUN pip3 install grass-session --break-system-packages >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) RUN pip3 install grass-session +>>>>>>> osgeo-main +======= +RUN pip3 install grass-session --break-system-packages +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +RUN pip3 install grass-session + >>>>>>> osgeo-main <<<<<<< HEAD # install GRASS GIS extensions @@ -679,6 +793,9 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -697,6 +814,7 @@ COPY docker/testdata/test_grass_session.py . #RUN /usr/bin/python3 /scripts/test_grass_session.py <<<<<<< 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 ======= @@ -725,6 +843,18 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD:docker/debian/Dockerfile +<<<<<<< HEAD:docker/debian/Dockerfile +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +# 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 +======= +>>>>>>> osgeo-main RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)):docker/ubuntu/Dockerfile_ubuntu_pdal ======= @@ -747,6 +877,9 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/docker/testdata/test_grass_session.py b/docker/testdata/test_grass_session.py index ac45c4370f5..0378a1359a2 100644 --- a/docker/testdata/test_grass_session.py +++ b/docker/testdata/test_grass_session.py @@ -2,17 +2,23 @@ # https://github.com/zarch/grass-session <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # pip install grass-session ======= >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)) ======= >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 81fed0a3ecb..28a0a29049f 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -8,6 +9,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # syntax=docker/dockerfile:1.7@sha256:a57df69d0ea827fb7266491f2813635de6f17269be881f696fbfdf2d83dda33e # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile. @@ -29,6 +32,9 @@ FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -36,6 +42,7 @@ LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis. ENV DEBIAN_FRONTEND noninteractive +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # define versions to be used (PDAL is not available on Ubuntu/Debian, so we compile it here) @@ -47,6 +54,8 @@ ARG PDAL_VERSION=2.4.3 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -76,6 +85,9 @@ ARG PDAL_VERSION=2.4.3 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -83,6 +95,7 @@ SHELL ["/bin/bash", "-c"] WORKDIR /tmp +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -90,6 +103,8 @@ WORKDIR /tmp ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ARG GUI # Todo: re-consider required dev packages for addons (~400MB in dev packages) @@ -100,6 +115,9 @@ ARG GRASS_RUN_PACKAGES="build-essential \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -111,6 +129,7 @@ RUN apt-get update && apt-get upgrade -y && \ cmake \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -121,6 +140,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 curl \ flex \ @@ -129,11 +153,14 @@ RUN apt-get update && apt-get upgrade -y && \ gdal-bin \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main geos-bin \ proj-bin \ netcdf-bin \ @@ -187,6 +214,9 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -240,6 +270,7 @@ RUN apt-get update && apt-get upgrade -y && \ subversion \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -250,6 +281,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 \ @@ -257,11 +293,14 @@ RUN apt-get update && apt-get upgrade -y && \ zip \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main zlib1g \ " @@ -446,6 +485,9 @@ WORKDIR /src/grass_build ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -458,10 +500,13 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## install laz-perf (missing from https://packages.ubuntu.com/) RUN apt-get install cmake WORKDIR /src @@ -478,6 +523,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -502,17 +550,23 @@ RUN mkdir vdatum && \ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## install pdal ======= ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -540,10 +594,13 @@ RUN wget -q \ -DBUILD_PLUGIN_ICEBRIDGE=ON \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -551,10 +608,13 @@ RUN wget -q \ -DWITH_LASZIP=OFF \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -568,6 +628,9 @@ RUN wget -q \ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -584,6 +647,7 @@ WORKDIR /src/grass_build # Cleanup potentially leftover GISRC file with wrong path to "demolocation" RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -597,6 +661,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" @@ -604,12 +673,15 @@ ENV MYLDFLAGS "-s" # CXX stuff: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ENV LD_LIBRARY_PATH "/usr/local/lib" ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #ENV LD_LIBRARY_PATH "/usr/local/lib" ======= ENV LD_LIBRARY_PATH "/usr/local/lib" @@ -618,6 +690,9 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" ENV LD_LIBRARY_PATH "/usr/local/lib" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -631,11 +706,14 @@ ENV NUMTHREADS=4 RUN make distclean || echo "nothing to clean" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RUN ./configure $GRASS_CONFIG \ && make -j $NUMTHREADS \ && make install && ldconfig \ @@ -697,6 +775,9 @@ CMD ["bash", "-c", "$GRASSBIN", "--version"] ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -759,10 +840,13 @@ RUN pip3 install grass-session ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # install GRASS GIS extensions RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal @@ -770,6 +854,9 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -790,6 +877,7 @@ COPY docker/testdata/test_grass_session.py . # 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 <<<<<<< HEAD +<<<<<<< HEAD WORKDIR /grassdb VOLUME /grassdb @@ -800,6 +888,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s ======= @@ -815,6 +905,9 @@ VOLUME /grassdb ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/docker/ubuntu_wxgui/Dockerfile b/docker/ubuntu_wxgui/Dockerfile index 83028a3d9e2..363950b163e 100644 --- a/docker/ubuntu_wxgui/Dockerfile +++ b/docker/ubuntu_wxgui/Dockerfile @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM ubuntu:22.04 ======= <<<<<<< HEAD @@ -13,12 +14,17 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main FROM ubuntu:22.04@sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" ======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -37,6 +43,9 @@ FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44,12 +53,16 @@ LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis. ENV DEBIAN_FRONTEND noninteractive +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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 @@ -58,12 +71,15 @@ ARG PDAL_VERSION=2.4.3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # 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 ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # define versions to be used # https://github.com/PDAL/PDAL/releases ARG PDAL_VERSION=2.4.3 @@ -81,6 +97,9 @@ ARG PDAL_VERSION=2.4.3 ARG PDAL_VERSION=2.4.3 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -134,6 +153,7 @@ RUN apt-get update && apt-get upgrade -y && \ libnetcdf-dev \ libncurses5-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libnotify4 \ ======= @@ -150,6 +170,12 @@ RUN apt-get update && apt-get upgrade -y && \ libnotify4 \ ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile +<<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile + 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 @@ -160,6 +186,9 @@ RUN apt-get update && apt-get upgrade -y && \ libnotify4 \ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -204,6 +233,7 @@ RUN apt-get update && apt-get upgrade -y && \ wget \ zip \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD zlib1g-dev ======= @@ -211,6 +241,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main zlib1g-dev \ && apt-get clean all && rm -rf /var/lib/apt/lists/* ======= @@ -220,6 +252,9 @@ RUN apt-get update && apt-get upgrade -y && \ zlib1g-dev >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -237,6 +272,7 @@ ENV NO_AT_BRIDGE=1 RUN echo LANG="en_US.UTF-8" > /etc/default/locale RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -244,6 +280,8 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile @@ -295,6 +333,9 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -314,6 +355,7 @@ RUN mkdir vdatum && \ cd .. && \ rm -rf vdatum +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled @@ -329,6 +371,11 @@ RUN mkdir vdatum && \ ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled +======= +>>>>>>> osgeo-main ## install pdal >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -338,6 +385,9 @@ RUN mkdir vdatum && \ ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -365,6 +415,7 @@ RUN wget -q \ -DBUILD_PLUGIN_ICEBRIDGE=ON \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -376,6 +427,11 @@ RUN wget -q \ <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -385,8 +441,11 @@ RUN wget -q \ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -402,6 +461,9 @@ RUN wget -q \ ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -474,6 +536,7 @@ ENV SHELL /bin/bash ENV LC_ALL "en_US.UTF-8" ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Create generic GRASS GIS lib name regardless of version number @@ -483,6 +546,8 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile # https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK @@ -519,6 +584,9 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -553,6 +621,7 @@ COPY docker/testdata/test_grass_session.py . #RUN /usr/bin/python3 /scripts/test_grass_session.py <<<<<<< 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 ======= @@ -577,6 +646,16 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile +<<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +# 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 +======= +>>>>>>> osgeo-main RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal ======= @@ -590,6 +669,9 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.filename/main.c b/general/g.filename/main.c index 94cdf551625..535f0a8b343 100644 --- a/general/g.filename/main.c +++ b/general/g.filename/main.c @@ -83,7 +83,10 @@ int main(int argc, char *argv[]) mapset = G_mapset(); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main /* Create element directory if requested and in current mapset. */ if (flag_create) { @@ -112,6 +115,9 @@ int main(int argc, char *argv[]) >>>>>>> 392c6e8e0b (pygrass: Add update parameters method to Module (#1712)) ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* Create element directory if requested and in current mapset. */ @@ -124,6 +130,7 @@ int main(int argc, char *argv[]) G_make_mapset_object_group(element); } +<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD @@ -170,6 +177,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 9143ea0a44d..edc88bec512 100644 --- a/general/g.findfile/g.findfile.html +++ b/general/g.findfile/g.findfile.html @@ -75,6 +75,7 @@

SHELL

PYTHON

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD See Python @@ -92,6 +93,12 @@

PYTHON

See Python ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +See Python +======= +>>>>>>> osgeo-main See Python >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -104,6 +111,9 @@

PYTHON

See Python >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.findfile/local_proto.h b/general/g.findfile/local_proto.h index 5cfe543cd47..38548e2901e 100644 --- a/general/g.findfile/local_proto.h +++ b/general/g.findfile/local_proto.h @@ -1,6 +1,7 @@ /* element.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void list_elements(void); int check_element(const char *); ======= @@ -8,6 +9,8 @@ int check_element(const char *); ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD void list_elements(void); /* int check_element(const char *); */ @@ -28,6 +31,9 @@ int check_element(const char *); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.gisenv/g.gisenv.html b/general/g.gisenv/g.gisenv.html index 023294acadd..0c554b64cde 100644 --- a/general/g.gisenv/g.gisenv.html +++ b/general/g.gisenv/g.gisenv.html @@ -148,6 +148,7 @@

NOTES

variable GISRC). If store=mapset is given then the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD variables are stored in <gisdbase>/<location>/<mapset>/VAR after the current GRASS session is closed. @@ -156,6 +157,8 @@

NOTES

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

NOTES

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.gui/g.gui.html b/general/g.gui/g.gui.html index 4bbe546cab9..ff20a31117b 100644 --- a/general/g.gui/g.gui.html +++ b/general/g.gui/g.gui.html @@ -7,6 +7,7 @@

DESCRIPTION

<<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD GRASS GIS comes with both a wxPython-based GUI ======= <<<<<<< HEAD @@ -22,6 +23,12 @@

DESCRIPTION

GRASS GIS comes with both a wxPython-based GUI ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -34,6 +41,9 @@

DESCRIPTION

GRASS GIS comes with both a wxPython-based GUI >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.mapset/main.c b/general/g.mapset/main.c index 4dabd24a17a..5b56673f3b9 100644 --- a/general/g.mapset/main.c +++ b/general/g.mapset/main.c @@ -51,6 +51,7 @@ int main(int argc, char *argv[]) module->label = _("Changes/reports current mapset."); module->description = _("Optionally create new mapset or list available " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "mapsets in given location."); ======= @@ -58,6 +59,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "mapsets in given project (location)."); ======= "mapsets in given location."); @@ -66,6 +69,9 @@ int main(int argc, char *argv[]) "mapsets in given location."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.mapsets/list.c b/general/g.mapsets/list.c index 5dca9cab4e1..972b9350ccd 100644 --- a/general/g.mapsets/list.c +++ b/general/g.mapsets/list.c @@ -5,6 +5,7 @@ #include "local_proto.h" #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void list_available_mapsets(const char **mapset_name, int nmapsets, @@ -15,6 +16,8 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main // Function to initialize a JSON object with a mapsets array static JSON_Object *initialize_json_object(void) { @@ -26,6 +29,9 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, const char *fs) { <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -62,12 +68,15 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, return root_object; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main // Function to serialize and print JSON object static void serialize_and_print_json_object(JSON_Value *root_value) { @@ -104,6 +113,9 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, if (n < nmapsets - 1) { ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -119,6 +131,10 @@ void list_accessible_mapsets(const char *fs) if (G_get_mapset_name(n + 1)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main diff --git a/general/g.mapsets/main.c b/general/g.mapsets/main.c index a1eef3b1772..26801415493 100644 --- a/general/g.mapsets/main.c +++ b/general/g.mapsets/main.c @@ -72,12 +72,15 @@ int main(int argc, char *argv[]) int operation, nchoices; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main enum OutputFormat format; ======= @@ -86,6 +89,9 @@ int main(int argc, char *argv[]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123,12 +129,19 @@ int main(int argc, char *argv[]) opt.op->description = _("Operation to be performed"); opt.op->answer = "add"; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= + opt.format = G_define_standard_option(G_OPT_F_FORMAT); +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD opt.format = G_define_option(); opt.format->key = "format"; @@ -139,6 +152,7 @@ int main(int argc, char *argv[]) opt.format->descriptions = "plain;Configurable plain text output;" "json;JSON (JavaScript Object Notation);"; opt.format->answer = "plain"; +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) opt.format->guisection = _("Print"); opt.fsep = G_define_standard_option(G_OPT_F_SEP); @@ -148,6 +162,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -157,6 +174,7 @@ int main(int argc, char *argv[]) opt.fs->guisection = _("Print"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -167,6 +185,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(); @@ -212,6 +235,7 @@ int main(int argc, char *argv[]) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -219,6 +243,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (strcmp(opt.format->answer, "json") == 0) format = JSON; else @@ -244,6 +270,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.message/g.message.html b/general/g.message/g.message.html index 39750c7ef3f..f987fc9e117 100644 --- a/general/g.message/g.message.html +++ b/general/g.message/g.message.html @@ -46,6 +46,7 @@

NOTES

Usage in Python scripts

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD GRASS @@ -63,6 +64,12 @@

Usage in Python scripts

GRASS ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +GRASS +======= +>>>>>>> osgeo-main GRASS >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -75,6 +82,9 @@

Usage in Python scripts

GRASS >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.mkfontcap/g.mkfontcap.html b/general/g.mkfontcap/g.mkfontcap.html index 3862390c0d2..ae737af3083 100644 --- a/general/g.mkfontcap/g.mkfontcap.html +++ b/general/g.mkfontcap/g.mkfontcap.html @@ -45,6 +45,7 @@

DESCRIPTION

SEE ALSO

+<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -60,6 +61,12 @@

SEE ALSO

<<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -76,6 +83,9 @@

SEE ALSO

>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.mkfontcap/main.c b/general/g.mkfontcap/main.c index 49258854abe..c4008bd6ddf 100644 --- a/general/g.mkfontcap/main.c +++ b/general/g.mkfontcap/main.c @@ -7,16 +7,22 @@ * <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * COPYRIGHT: (C) 2007-2024 by the GRASS Development Team ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -84,6 +90,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -93,6 +100,10 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main overwrite = G_define_flag(); @@ -101,6 +112,7 @@ int main(int argc, char *argv[]) _("Overwrite font configuration file if already existing"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -111,6 +123,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(); @@ -144,11 +161,14 @@ int main(int argc, char *argv[]) if (!access(fontcapfile, F_OK)) { /* File exists? */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (!G_get_overwrite()) G_fatal_error(_("Fontcap file %s already exists; use " "--overwrite flag if you " @@ -158,6 +178,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -168,6 +191,7 @@ int main(int argc, char *argv[]) fontcapfile, overwrite->key); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -178,6 +202,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 e29e6a75760..8ec2ae21349 100644 --- a/general/g.pnmcomp/main.c +++ b/general/g.pnmcomp/main.c @@ -76,6 +76,7 @@ static void read_header(FILE *fp, unsigned char *magic, int *maxval) if (sscanf(buf, "%d %d", &ncols, &nrows) != 2) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86,6 +87,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 abc9a6a2e59..d5f452f07e5 100644 --- a/general/g.proj/create.c +++ b/general/g.proj/create.c @@ -14,6 +14,7 @@ void create_location(const char *location) projwkt); if (ret == 0) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Location <%s> created"), location); else if (ret == -1) @@ -23,6 +24,8 @@ void create_location(const char *location) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Project <%s> created"), location); else if (ret == -1) G_fatal_error(_("Unable to create project <%s>: %s"), location, @@ -37,6 +40,9 @@ void create_location(const char *location) G_fatal_error(_("Unable to create location <%s>: %s"), location, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -48,11 +54,14 @@ void create_location(const char *location) /* Shouldn't happen */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create project <%s>"), location); G_message(_("You can switch to the new project by\n`%s=%s`"), @@ -61,6 +70,9 @@ void create_location(const char *location) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -70,6 +82,7 @@ void create_location(const char *location) "g.mapset mapset=PERMANENT location", location); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81,6 +94,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) @@ -92,6 +110,7 @@ void modify_projinfo(void) G_fatal_error( _("You must select the PERMANENT mapset before updating the " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "current location's projection (current mapset is <%s>)"), ======= @@ -99,6 +118,8 @@ void modify_projinfo(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "current project's coordinate reference system" " (current mapset is <%s>)"), ======= @@ -108,6 +129,9 @@ void modify_projinfo(void) "current location's projection (current mapset is <%s>)"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.proj/g.proj.html b/general/g.proj/g.proj.html index 1d9b21327f1..4f5fbe7e186 100644 --- a/general/g.proj/g.proj.html +++ b/general/g.proj/g.proj.html @@ -13,6 +13,7 @@

DESCRIPTION

    <<<<<<< 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 @@ -21,6 +22,8 @@

    DESCRIPTION

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

    DESCRIPTION

  • Changing the datum, or reporting and modifying the datum transformation >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -74,12 +80,15 @@

    DESCRIPTION

    proj4=description or -
    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
    description should be a projection description in ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main
    description should be a CRS description in =======
    description should be a projection description in @@ -88,6 +97,9 @@

    DESCRIPTION

    description should be a projection description in >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -125,11 +137,14 @@

    DESCRIPTION

    In addition however, if the -c flag is specified, g.proj will <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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. @@ -138,6 +153,9 @@

    DESCRIPTION

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -165,12 +183,15 @@

    NOTES

    0 (default): Continue without specifying parameters - if <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD used when creating a location, other GRASS modules will use the "default" ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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" @@ -179,6 +200,9 @@

    NOTES

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

    NOTES

    input co-ordinate system. This can be useful to change the datum information for an existing project. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

    Output is simply based on the input projection information. g.proj does @@ -200,6 +225,8 @@

    NOTES

    ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -208,6 +235,9 @@

    NOTES

    Output is simply based on the input projection information. g.proj does >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -341,6 +371,7 @@

    REFERENCES

    SEE ALSO

    +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -356,6 +387,12 @@

    SEE ALSO

    <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -372,6 +409,9 @@

    SEE ALSO

    >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.proj/input.c b/general/g.proj/input.c index 5dff35f2ae3..18c3383b4ac 100644 --- a/general/g.proj/input.c +++ b/general/g.proj/input.c @@ -117,17 +117,23 @@ int input_wkt(char *wktfile) if (infd) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -146,7 +152,10 @@ int input_wkt(char *wktfile) G_squeeze(buff); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -196,6 +205,9 @@ int input_wkt(char *wktfile) >>>>>>> 7c10386e82 (g.proj: fix reading input WKT (#1582)) >>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.proj/main.c b/general/g.proj/main.c index 6d690b91c77..171e28fff4a 100644 --- a/general/g.proj/main.c +++ b/general/g.proj/main.c @@ -64,6 +64,7 @@ int main(int argc, char *argv[]) * (to create a new location) when none exists. */ G_set_program_name(argv[0]); <<<<<<< 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 @@ -73,6 +74,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_no_gisinit(); ======= G_no_gisinit(); /* We don't call G_gisinit() here because it validates the @@ -85,6 +88,9 @@ int main(int argc, char *argv[]) * (to create a new location) when none exists */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -97,6 +103,7 @@ int main(int argc, char *argv[]) module->label = _("Prints or modifies GRASS projection information files " "(in various co-ordinate system descriptions)."); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD module->description = _("Can also be used to create new GRASS locations."); ======= @@ -104,6 +111,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main module->description = _("Can also be used to create new GRASS projects."); ======= module->description = _("Can also be used to create new GRASS locations."); @@ -112,6 +121,9 @@ int main(int argc, char *argv[]) module->description = _("Can also be used to create new GRASS locations."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -148,6 +160,7 @@ int main(int argc, char *argv[]) dontprettify->key = 'f'; dontprettify->guisection = _("Print"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dontprettify->description = _("Print 'flat' output with no linebreaks (applies to " @@ -160,6 +173,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #ifdef HAVE_OGR dontprettify->description = _("Print 'flat' output with no linebreaks " "(applies to WKT and PROJ.4 output)"); @@ -184,6 +199,9 @@ int main(int argc, char *argv[]) "PROJ.4 output)"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -389,11 +407,14 @@ int main(int argc, char *argv[]) (create->answer ? 1 : 0)); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (formats > 1) { #ifdef HAVE_OGR G_fatal_error(_("Only one of -%c, -%c, -%c, -%c, -%c" @@ -411,6 +432,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.proj/output.c b/general/g.proj/output.c index 82a1cc05aed..0ef50443005 100644 --- a/general/g.proj/output.c +++ b/general/g.proj/output.c @@ -279,6 +279,7 @@ void print_wkt(int esristyle, int dontprettify) if (outwkt != NULL) { fprintf(stdout, "%s\n", outwkt); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_free(outwkt); ======= @@ -286,6 +287,8 @@ void print_wkt(int esristyle, int dontprettify) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main CPLFree(outwkt); ======= G_free(outwkt); @@ -294,6 +297,9 @@ void print_wkt(int esristyle, int dontprettify) G_free(outwkt); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.region/g.region.html b/general/g.region/g.region.html index 1073d9742d3..19b4eb7f5cc 100644 --- a/general/g.region/g.region.html +++ b/general/g.region/g.region.html @@ -125,6 +125,7 @@

    NOTES

    This can be used for example to print modified region values for further use <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD without actually modifying the current region. ======= <<<<<<< HEAD @@ -140,6 +141,12 @@

    NOTES

    without actually modifying the current region. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +without actually modifying the current region. +======= +>>>>>>> osgeo-main without actually modifing the current region. >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) ======= @@ -152,6 +159,9 @@

    NOTES

    without actually modifying the current region. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -493,6 +503,7 @@

    Using g.region in a shell in combination with GDAL

    projection since it is reprojected on the fly. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -504,6 +515,11 @@

    Using g.region in a shell in combination with GDAL

    ======= >>>>>>> 8422103f4c (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/general/g.region/main.c b/general/g.region/main.c index ef877c729b6..31f922cd43c 100644 --- a/general/g.region/main.c +++ b/general/g.region/main.c @@ -31,6 +31,7 @@ int main(int argc, char *argv[]) int i; int print_flag = 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int flat_flag; ======= @@ -44,6 +45,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD int flat_flag; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + int flat_flag; +======= >>>>>>> osgeo-main int flat_flag; <<<<<<< HEAD @@ -57,6 +63,9 @@ int main(int argc, char *argv[]) int flat_flag; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -74,17 +83,23 @@ int main(int argc, char *argv[]) struct GModule *module; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96,10 +111,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main struct { struct Flag @@ -112,6 +130,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -436,8 +457,11 @@ int main(int argc, char *argv[]) parm.zoom, parm.align, parm.save, parm.grow, NULL); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_option_exclusive(flag.noupdate, flag.force, NULL); G_option_requires(flag.noupdate, flag.savedefault, flag.print, flag.lprint, flag.eprint, flag.center, flag.gmt_style, flag.wms_style, @@ -461,6 +485,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_option_exclusive(flag.noupdate, flag.force, NULL); G_option_requires(flag.noupdate, flag.savedefault, flag.print, flag.lprint, @@ -468,6 +495,7 @@ int main(int argc, char *argv[]) flag.dist_res, flag.nangle, flag.z, flag.bbox, flag.gprint, parm.save, NULL); <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -501,6 +529,8 @@ int main(int argc, char *argv[]) flag.gprint, parm.save, NULL); ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= G_option_exclusive(flag.noupdate, flag.force, NULL); @@ -510,6 +540,9 @@ int main(int argc, char *argv[]) flag.gprint, parm.save, NULL); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -571,11 +604,14 @@ int main(int argc, char *argv[]) if ((name = parm.region->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -583,6 +619,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -595,11 +634,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; mapset = G_find_file2("windows", name, ""); @@ -612,6 +654,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -621,6 +666,7 @@ int main(int argc, char *argv[]) if (parm.raster->answer) { int first = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -628,6 +674,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -635,6 +683,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -646,11 +697,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; rast_ptr = parm.raster->answers; @@ -662,6 +716,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -697,12 +754,17 @@ int main(int argc, char *argv[]) if ((name = parm.raster3d->answer)) { RASTER3D_Region win; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -712,6 +774,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -720,6 +783,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -736,6 +801,9 @@ int main(int argc, char *argv[]) G_fatal_error(_("3D raster map <%s> not found"), name); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -751,12 +819,17 @@ int main(int argc, char *argv[]) if (parm.vect->answer) { int first = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main update_file = true; vect_ptr = parm.vect->answers; @@ -766,6 +839,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD update_file = true; vect_ptr = parm.vect->answers; @@ -774,6 +848,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; vect_ptr = parm.vect->answers; @@ -790,6 +866,9 @@ int main(int argc, char *argv[]) for (; *vect_ptr != NULL; vect_ptr++) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -877,11 +956,14 @@ int main(int argc, char *argv[]) if ((value = parm.north->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -889,6 +971,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -919,11 +1004,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((i = nsew(value, "n+", "n-", "s+"))) { @@ -951,6 +1039,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -960,11 +1051,14 @@ int main(int argc, char *argv[]) if ((value = parm.south->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -972,6 +1066,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1002,11 +1099,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((i = nsew(value, "s+", "s-", "n-"))) { @@ -1034,6 +1134,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1043,11 +1146,14 @@ int main(int argc, char *argv[]) if ((value = parm.east->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1055,6 +1161,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1085,11 +1194,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((i = nsew(value, "e+", "e-", "w+"))) { @@ -1117,6 +1229,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1126,11 +1241,14 @@ int main(int argc, char *argv[]) if ((value = parm.west->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1138,6 +1256,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1168,11 +1289,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((i = nsew(value, "w+", "w-", "e-"))) { @@ -1200,6 +1324,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1209,11 +1336,14 @@ int main(int argc, char *argv[]) if ((value = parm.top->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1221,6 +1351,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1248,11 +1381,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((i = nsew(value, "t+", "t-", "b+"))) { @@ -1280,6 +1416,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1289,11 +1428,14 @@ int main(int argc, char *argv[]) if ((value = parm.bottom->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1301,6 +1443,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1328,11 +1473,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if ((i = nsew(value, "b+", "b-", "t-"))) { @@ -1360,6 +1508,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1369,11 +1520,14 @@ int main(int argc, char *argv[]) if ((value = parm.res->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1381,6 +1535,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1393,11 +1550,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -1410,6 +1570,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1426,11 +1589,14 @@ int main(int argc, char *argv[]) if ((value = parm.res3->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1438,6 +1604,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1451,11 +1620,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -1469,6 +1641,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1478,11 +1653,14 @@ int main(int argc, char *argv[]) if ((value = parm.nsres->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1490,6 +1668,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1501,11 +1682,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -1517,6 +1701,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1531,11 +1718,14 @@ int main(int argc, char *argv[]) if ((value = parm.ewres->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1543,6 +1733,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1554,11 +1747,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -1570,6 +1766,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1584,11 +1783,14 @@ int main(int argc, char *argv[]) if ((value = parm.tbres->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1596,6 +1798,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1607,11 +1812,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (sscanf(value, "%lf", &x) != 1) @@ -1623,6 +1831,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1637,11 +1848,14 @@ int main(int argc, char *argv[]) if ((value = parm.rows->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1649,6 +1863,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1661,11 +1878,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (sscanf(value, "%i", &ival) != 1) @@ -1678,6 +1898,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1687,11 +1910,14 @@ int main(int argc, char *argv[]) if ((value = parm.cols->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1699,6 +1925,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1711,11 +1940,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; if (sscanf(value, "%i", &ival) != 1) @@ -1728,6 +1960,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1737,11 +1972,14 @@ int main(int argc, char *argv[]) if ((name = parm.zoom->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1749,6 +1987,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1761,11 +2002,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; mapset = G_find_raster2(name, ""); @@ -1778,6 +2022,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1787,6 +2034,7 @@ int main(int argc, char *argv[]) if ((name = parm.align->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1797,6 +2045,10 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main update_file = true; mapset = G_find_raster2(name, ""); @@ -1805,6 +2057,7 @@ int main(int argc, char *argv[]) Rast_get_cellhd(name, mapset, &temp_window); Rast_align_window(&window, &temp_window); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } @@ -1816,6 +2069,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = true; @@ -1858,6 +2113,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1907,11 +2165,14 @@ int main(int argc, char *argv[]) if ((name = parm.save->answer)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1919,6 +2180,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1931,11 +2195,14 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) update_file = false; temp_window = window; @@ -1948,6 +2215,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1956,6 +2226,7 @@ int main(int argc, char *argv[]) G_adjust_Cell_head3(&window, row_flag, col_flag, 0); if (flag.force->answer || (update_file && !flag.noupdate->answer)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (G_put_window(&window) < 0) G_fatal_error(_("Unable to update current region")); @@ -1976,6 +2247,13 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD + 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) G_fatal_error(_("Unable to update current region")); @@ -1989,6 +2267,9 @@ int main(int argc, char *argv[]) G_fatal_error(_("Unable to update current region")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.region/printwindow.c b/general/g.region/printwindow.c index 2d62db0b423..38eb1303092 100644 --- a/general/g.region/printwindow.c +++ b/general/g.region/printwindow.c @@ -45,6 +45,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) x = G_projection() == PROJECTION_LL ? -1 : 0; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -55,6 +56,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; @@ -119,17 +125,23 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_SH) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "projection=%d%s", window->proj, sep); fprintf(stdout, "zone=%d%s", window->zone, sep); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -161,11 +173,14 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (datum[0] != '*') <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "datum=%s%s", datum, sep); else fprintf(stdout, "datum=wgs84%s", sep); @@ -177,6 +192,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -189,6 +207,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "ellipsoid=wgs84\n"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -199,6 +218,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 @@ -216,6 +240,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_SH) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (flat_flag) sep = " "; @@ -224,6 +249,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= if (flat_flag) sep = " "; @@ -233,6 +260,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) sep = " "; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -278,6 +308,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) sep); #endif <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (flat_flag) fprintf(stdout, "\n"); @@ -286,6 +317,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= if (flat_flag) fprintf(stdout, "\n"); @@ -295,6 +328,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "\n"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -359,10 +395,13 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if ((in_proj_info = G_get_projinfo()) == NULL) G_fatal_error( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection info of current location")); ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Can't get projection info of current project")); >>>>>>> osgeo-main @@ -415,6 +454,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0) G_fatal_error( +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection key values of current location")); @@ -538,8 +580,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_SH) { <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "nw_long=%.8f%snw_lat=%.8f%s", lo1, sep, la1, sep); fprintf(stdout, "ne_long=%.8f%sne_lat=%.8f%s", lo2, sep, la2, @@ -551,6 +596,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "center_long=%.8f%s", loc, sep); fprintf(stdout, "center_lat=%.8f%s", lac, sep); ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(stdout, "nw_long=%.8f\nnw_lat=%.8f\n", lo1, la1); fprintf(stdout, "ne_long=%.8f\nne_lat=%.8f\n", lo2, la2); @@ -559,6 +607,10 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "center_long=%.8f\n", loc); fprintf(stdout, "center_lat=%.8f\n", lac); <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -597,17 +649,23 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (!(print_flag & PRINT_REG)) { if (print_flag & PRINT_SH) { +<<<<<<< HEAD <<<<<<< HEAD fprintf(stdout, "rows=%d\n", window->rows); fprintf(stdout, "cols=%d\n", window->cols); ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "rows=%d%s", window->rows, sep); fprintf(stdout, "cols=%d%s", window->cols, sep); ======= fprintf(stdout, "rows=%d\n", window->rows); fprintf(stdout, "cols=%d\n", window->cols); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else { @@ -621,6 +679,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 project")); @@ -864,6 +923,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main loc = longitude; lac = latitude; @@ -923,6 +984,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -932,6 +996,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) else G_message( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("You are in a simple XY location, projection to Lat/Lon " ======= @@ -939,6 +1004,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("You are in a simple XY project, projection to Lat/Lon " ======= _("You are in a simple XY location, projection to Lat/Lon " @@ -947,6 +1014,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -958,6 +1028,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_EXTENT) { if (print_flag & PRINT_SH) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fprintf(stdout, "ns_extent=%f\n", window->north - window->south); fprintf(stdout, "ew_extent=%f\n", window->east - window->west); @@ -966,6 +1037,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "ns_extent=%f%s", window->north - window->south, sep); fprintf(stdout, "ew_extent=%f%s", window->east - window->west, sep); @@ -978,6 +1051,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "ew_extent=%f\n", window->east - window->west); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1005,11 +1081,14 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_SH) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "center_easting=%f%s", (window->west + window->east) / 2., sep); fprintf(stdout, "center_northing=%f%s", @@ -1018,6 +1097,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1027,6 +1109,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) (window->north + window->south) / 2.); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1037,6 +1120,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 { @@ -1068,6 +1156,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) G_format_easting(window->east, east, -1); G_format_easting(window->west, west, -1); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fprintf(stdout, "bbox=%s,%s,%s,%s\n", west, south, east, north); ======= @@ -1075,6 +1164,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "bbox=%s,%s,%s,%s%s", west, south, east, north, sep); ======= fprintf(stdout, "bbox=%s,%s,%s,%s\n", west, south, east, north); @@ -1083,6 +1174,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "bbox=%s,%s,%s,%s\n", west, south, east, north); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1094,6 +1188,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (G_projection() == PROJECTION_XY) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD convergence = NAN; ======= @@ -1109,6 +1204,12 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) <<<<<<< HEAD convergence = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + convergence = NAN; +======= >>>>>>> osgeo-main convergence = 0. / 0.; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1125,6 +1226,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1149,11 +1253,14 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) G_fatal_error( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Can't get projection info of current project")); if ((in_unit_info = G_get_projunits()) == NULL) @@ -1167,6 +1274,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1181,6 +1291,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) _("Can't get projection key values of current location")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1191,6 +1302,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); @@ -1232,6 +1348,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_SH) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fprintf(stdout, "converge_angle=%f\n", convergence); ======= @@ -1239,6 +1356,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "converge_angle=%f%s", convergence, sep); ======= fprintf(stdout, "converge_angle=%f\n", convergence); @@ -1247,6 +1366,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "converge_angle=%f\n", convergence); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1276,6 +1398,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if ((in_proj_info = G_get_projinfo()) == NULL) G_fatal_error( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection info of current location")); ======= @@ -1283,6 +1406,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Can't get projection info of current project")); ======= _("Can't get projection info of current location")); @@ -1291,6 +1416,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1303,6 +1431,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if ((in_unit_info = G_get_projunits()) == NULL) G_fatal_error( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection units of current location")); @@ -1311,6 +1440,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) _("Can't get projection key values of current location")); ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Can't get projection units of current project")); if (pj_get_kv(&iproj, in_proj_info, in_unit_info) < 0) @@ -1323,6 +1454,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) G_fatal_error( _("Can't get projection key values of current location")); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* output projection to lat/long and wgs84 ellipsoid */ @@ -1332,6 +1466,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection units of current project")); @@ -1352,6 +1487,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection units of current location")); @@ -1365,6 +1502,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1377,6 +1517,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (G_get_datumparams_from_projinfo(in_proj_info, buff, dum) < 0) G_fatal_error(_( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "WGS84 output not possible as this location does not " ======= @@ -1384,6 +1525,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "WGS84 output not possible as this project does not " ======= "WGS84 output not possible as this location does not " @@ -1392,6 +1535,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1525,11 +1671,14 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) if (print_flag & PRINT_SH) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "ll_n=%.8f%s", sh_ll_n, sep); fprintf(stdout, "ll_s=%.8f%s", sh_ll_s, sep); fprintf(stdout, "ll_w=%.8f%s", sh_ll_w, sep); @@ -1542,6 +1691,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1554,6 +1706,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag) fprintf(stdout, "ll_clat=%.8f\n", (sh_ll_n + sh_ll_s) / 2.); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1564,6 +1717,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 0a2addc885e..51649d5c9b3 100644 --- a/general/g.region/testsuite/test_g_region.py +++ b/general/g.region/testsuite/test_g_region.py @@ -4,12 +4,15 @@ """ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD from grass.gunittest.case import TestCase ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main from grass.gunittest.case import TestCase from grass.gunittest.gmodules import call_module @@ -20,6 +23,9 @@ from grass.gunittest.case import TestCase >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -60,6 +66,7 @@ def test_d_flag(self): self.assertEqual(n_default, region["n"]) self.assertEqual(res_default, region["nsres"]) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -67,6 +74,8 @@ def test_d_flag(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def test_f_flag(self): line = call_module("g.region", flags="fglecn3", capture_stdout=True) self.assertEqual(1, len(line.splitlines())) @@ -76,6 +85,9 @@ def test_f_flag(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< 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 8a40bc58f4d..6413bbc1873 100644 --- a/general/g.setproj/g.setproj.html +++ b/general/g.setproj/g.setproj.html @@ -27,6 +27,7 @@

    DESCRIPTION

    Allows a user to create a PROJ_INFO file in the PERMANENT mapset of the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD current location. PROJ_INFO file is used to record the projection information associated with the specified mapset. ======= @@ -34,6 +35,8 @@

    DESCRIPTION

    ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main current project. PROJ_INFO file is used to record the CRS information associated with the specified project. ======= @@ -45,6 +48,9 @@

    DESCRIPTION

    associated with the specified mapset. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -81,10 +87,14 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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. @@ -93,12 +103,15 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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. ======= ======= >>>>>>> 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. @@ -121,6 +134,9 @@

    NOTES

    >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.setproj/main.c b/general/g.setproj/main.c index e4a7a94e110..c2a5d1ed2ae 100644 --- a/general/g.setproj/main.c +++ b/general/g.setproj/main.c @@ -274,6 +274,7 @@ int main(int argc, char *argv[]) /* Hard coded to use "Equidistant Cylincrical" * until g.setproj has been changed to run <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * recurively, to allow input of options for ======= @@ -281,6 +282,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * recursively, to allow input of options for ======= * recurively, to allow input of options for @@ -289,6 +292,9 @@ int main(int argc, char *argv[]) * recurively, to allow input of options for >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -303,6 +309,7 @@ int main(int argc, char *argv[]) G_strip(spheroid); if (G_get_spheroid_by_name(spheroid, &aa, &e2, &f)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* if legal ellips. exist, ask wether or not to change ======= @@ -310,6 +317,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* if legal ellips. exist, ask whether or not to change ======= /* if legal ellips. exist, ask wether or not to change @@ -318,6 +327,9 @@ int main(int argc, char *argv[]) /* if legal ellips. exist, ask wether or not to change >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.version/g.version.html b/general/g.version/g.version.html index ff9814c6cc9..1e42d0f7c97 100644 --- a/general/g.version/g.version.html +++ b/general/g.version/g.version.html @@ -38,6 +38,7 @@

    Basic info

     g.version
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 GRASS 8.2.0dev (2022)
@@ -47,6 +48,9 @@ 
    Basic info
    
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 GRASS 8.4.0 (2024)
 =======
@@ -62,6 +66,9 @@ 
    Basic info
    
 GRASS 8.2.0dev (2022)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -72,6 +79,7 @@ 
    GIS Library info
    
 
     g.version -r
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 GRASS 8.2.0dev (2022)
@@ -83,6 +91,9 @@ 
    GIS Library info
    
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 GRASS 8.4.0 (2024)
 libgis revision: c9e8576cf
@@ -108,6 +119,9 @@ 
    GIS Library info
    
 libgis date: 2022-04-27T09:38:49+00:00
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -117,6 +131,7 @@ 
    Full info in shell script style
    
 
     g.version -rge
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 version=8.2.0dev
@@ -132,6 +147,9 @@ 
    Full info in shell script style
    
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 version=8.4.0
 date=2024
@@ -185,6 +203,9 @@ 
    Full info in shell script style
    
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 libgis_revision=c9e8576cf
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -195,6 +216,7 @@ 
    Full info in shell script style
    
 sqlite=3.36.0
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -206,6 +228,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 87c0646d870..3a156ddeb59 100644
--- a/grasslib.dox
+++ b/grasslib.dox
@@ -2,6 +2,7 @@
 
@@ -147,6 +169,9 @@ href="https://grass.osgeo.org">https://grass.osgeo.org    
 \image html "grass_arch.png" "GRASS GIS Architecture"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -161,6 +186,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
  - raster: \ref rasterlib
  - vector: \ref vectorlib
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  - Temporal GIS API: See https://grass.osgeo.org/grass-devel/manuals/libpython/temporal_framework.html
 =======
@@ -176,6 +202,12 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
 <<<<<<< HEAD
  - Temporal GIS API: See https://grass.osgeo.org/grass-devel/manuals/libpython/temporal_framework.html
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+ - Temporal GIS API: See https://grass.osgeo.org/grass-devel/manuals/libpython/temporal_framework.html
+=======
 >>>>>>> osgeo-main
  - Temporal GIS API: See https://grass.osgeo.org/grass80/manuals/libpython/temporal_framework.html
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -189,6 +221,9 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
  - Temporal GIS API: See https://grass.osgeo.org/grass-devel/manuals/libpython/temporal_framework.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -252,6 +287,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
 
 \subsection pythonlibs Python API
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
  - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass-devel/manuals/libpython/)
@@ -268,6 +304,12 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
 <<<<<<< HEAD
  - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass-devel/manuals/libpython/)
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+ - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass-devel/manuals/libpython/)
+=======
 >>>>>>> osgeo-main
  - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass80/manuals/libpython/)
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -281,6 +323,9 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
  - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass-devel/manuals/libpython/)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -294,16 +339,22 @@ href="https://grass.osgeo.org">https://grass.osgeo.org
  - datetime:	\ref datetime (DateTime library)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
  - external:	\ref external (External libraries from other projects such as shapelib, parson and \ref ccmathlib)
 =======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/.pylintrc b/gui/wxpython/.pylintrc
index fe95f9b28bb..4cb50fd1a86 100644
--- a/gui/wxpython/.pylintrc
+++ b/gui/wxpython/.pylintrc
@@ -321,12 +321,15 @@ ignore-on-opaque-inference=yes
 # qualified names.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 ignored-classes=optparse.Values,thread._local,_thread._local
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 ignored-classes=optparse.Values,thread._local,_thread._local,main_window.page.MainPageBase
 =======
 ignored-classes=optparse.Values,thread._local,_thread._local
@@ -335,6 +338,9 @@ ignored-classes=optparse.Values,thread._local,_thread._local
 ignored-classes=optparse.Values,thread._local,_thread._local
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -399,12 +405,15 @@ init-import=no
 # builtins.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 redefining-builtins-modules=past.builtins,future.builtins,builtins,io
 =======
 redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
@@ -413,6 +422,9 @@ 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))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/core/gconsole.py b/gui/wxpython/core/gconsole.py
index 885c0157c02..7430b263342 100644
--- a/gui/wxpython/core/gconsole.py
+++ b/gui/wxpython/core/gconsole.py
@@ -761,11 +761,14 @@ def OnCmdDone(self, event):
             msg = _("Command aborted")
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             status = Status.ABORTED
 =======
 =======
@@ -781,6 +784,9 @@ def OnCmdDone(self, event):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> c9839e72f7 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -790,11 +796,14 @@ def OnCmdDone(self, event):
             )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             status = Status.FAILED
 =======
 =======
@@ -810,6 +819,9 @@ def OnCmdDone(self, event):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> c9839e72f7 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/core/settings.py b/gui/wxpython/core/settings.py
index dc7dbb1b7bc..047ab8828fc 100644
--- a/gui/wxpython/core/settings.py
+++ b/gui/wxpython/core/settings.py
@@ -153,6 +153,7 @@ def _defaultSettings(self):
                     "resAlign": {"enabled": False},
                 },
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 "singleWindow": {"enabled": False},
 =======
@@ -160,6 +161,8 @@ def _defaultSettings(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 "singleWinPanesLayoutPos": {
                     "enabled": False,
                     "pos": "",
@@ -171,6 +174,9 @@ def _defaultSettings(self):
                 "singleWindow": {"enabled": False},
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -214,17 +220,23 @@ def _defaultSettings(self):
                 "commandNotebook": {"selection": 0},
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 "singleWindow": {"enabled": True},
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/core/utils.py b/gui/wxpython/core/utils.py
index d718c7aaa60..29378cbe2b8 100644
--- a/gui/wxpython/core/utils.py
+++ b/gui/wxpython/core/utils.py
@@ -24,6 +24,7 @@
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
@@ -34,6 +35,10 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 import six
 >>>>>>> 584e61d06d (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 
diff --git a/gui/wxpython/datacatalog/tree.py b/gui/wxpython/datacatalog/tree.py
index c07e23694b9..c447916301d 100644
--- a/gui/wxpython/datacatalog/tree.py
+++ b/gui/wxpython/datacatalog/tree.py
@@ -161,6 +161,7 @@ def getLocationTree(gisdbase, location, queue, mapsets=None, lazy=False):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
@@ -171,6 +172,10 @@ def getLocationTree(gisdbase, location, queue, mapsets=None, lazy=False):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 class CurrentMapsetWatch(FileSystemEventHandler):
     """Monitors rc file to check if mapset has been changed.
     In that case wx event is dispatched to event handler.
@@ -437,6 +442,7 @@ def __init__(
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
@@ -446,6 +452,10 @@ def __init__(
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         self.observer = None
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1067,11 +1077,14 @@ def OnDoubleClick(self, node):
                         message=_(
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                             "Map <{map_name}@{map_mapset}> is not in the current "
                             "project. To be able to display it you need to switch to "
                             "<{map_location}> project. Note that if you switch there "
@@ -1080,6 +1093,9 @@ def OnDoubleClick(self, node):
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1089,6 +1105,7 @@ def OnDoubleClick(self, node):
                             "Map Displays will be closed.\n\n"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -1099,6 +1116,11 @@ def OnDoubleClick(self, node):
 >>>>>>> 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
                             "Do you want to switch anyway?"
                         ).format(
@@ -1107,6 +1129,7 @@ def OnDoubleClick(self, node):
                             map_location=selected_loc.data["name"],
                         ),
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                         caption=_("Map in a different location"),
 =======
@@ -1114,6 +1137,8 @@ def OnDoubleClick(self, node):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                         caption=_("Map in a different project"),
 =======
                         caption=_("Map in a different location"),
@@ -1122,6 +1147,9 @@ def OnDoubleClick(self, node):
                         caption=_("Map in a different location"),
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1581,9 +1609,13 @@ def OnPasteMap(self, event):
                 if pasted == 0:
                     Debug.msg(1, "COPIED TO: " + new_name)
                     if self.copy_mode:
-                        self.showNotification.emit(message=_("g.copy completed"))
+                        self.showNotification.emit(message=_("Copying completed"))
                     else:
-                        self.showNotification.emit(message=_("g.copy completed"))
+                        # remove old
+                        self._removeMapAfterCopy(
+                            self.copy_layer[i], self.copy_mapset[i], env2
+                        )
+                        self.showNotification.emit(message=_("Moving completed"))
                     self._giface.grassdbChanged.emit(
                         grassdb=self.selected_grassdb[0].data["name"],
                         location=self.selected_location[0].data["name"],
@@ -1592,11 +1624,6 @@ def OnPasteMap(self, event):
                         element=node,
                         action="new",
                     )
-                    # remove old
-                    if not self.copy_mode:
-                        self._removeMapAfterCopy(
-                            self.copy_layer[i], self.copy_mapset[i], env2
-                        )
 
                 gscript.try_remove(gisrc)
                 gscript.try_remove(gisrc2)
diff --git a/gui/wxpython/docs/wxGUI.nviz.html b/gui/wxpython/docs/wxGUI.nviz.html
index 086a2075842..07e2b0151b7 100644
--- a/gui/wxpython/docs/wxGUI.nviz.html
+++ b/gui/wxpython/docs/wxGUI.nviz.html
@@ -440,11 +440,14 @@ 
    AUTHORS
    
 with contributions by Terrance McGhee.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 
@@ -460,6 +463,9 @@ 
    AUTHORS
    
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gcp/manager.py b/gui/wxpython/gcp/manager.py
index cce58e1942f..db4f4e7af23 100644
--- a/gui/wxpython/gcp/manager.py
+++ b/gui/wxpython/gcp/manager.py
@@ -1695,6 +1695,7 @@ def ReloadGCPs(self, event):
 
     def OnFocus(self, event):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 =======
@@ -1702,6 +1703,8 @@ def OnFocus(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # TODO: it is here just to remove old or obsolete beavior of base class
         #       gcp/MapPanel?
 =======
@@ -1711,6 +1714,9 @@ def OnFocus(self, event):
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gcp/mapdisplay.py b/gui/wxpython/gcp/mapdisplay.py
index 2c43111a8aa..ac4220f4fa0 100644
--- a/gui/wxpython/gcp/mapdisplay.py
+++ b/gui/wxpython/gcp/mapdisplay.py
@@ -108,11 +108,14 @@ def __init__(
         self.statusbar = self.CreateStatusbar(statusbarItems)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
         self.statusbarManager.SetMode(8)  # goto GCP
@@ -122,6 +125,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -256,17 +262,23 @@ def AddToolbar(self, name):
         if name == "map":
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -278,10 +290,13 @@ def AddToolbar(self, name):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
             self.toolbars["map"] = MapToolbar(self, self._toolSwitcher, self._giface)
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -289,6 +304,9 @@ def AddToolbar(self, name):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gmodeler/g.gui.gmodeler.html b/gui/wxpython/gmodeler/g.gui.gmodeler.html
index 0571c11c04a..fb2fdf1ecec 100644
--- a/gui/wxpython/gmodeler/g.gui.gmodeler.html
+++ b/gui/wxpython/gmodeler/g.gui.gmodeler.html
@@ -390,6 +390,9 @@ 
    Using the Script editor
    
 Figure: Script editor in the wxGUI Graphical Modeler - set to actinia.
 
 
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -404,6 +407,9 @@ 
    Using the Script editor
    
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gmodeler/model.py b/gui/wxpython/gmodeler/model.py
index 5a6ce1fbd1d..f64a33dd21d 100644
--- a/gui/wxpython/gmodeler/model.py
+++ b/gui/wxpython/gmodeler/model.py
@@ -2640,6 +2640,7 @@ class WriteScriptFile(ABC):
 
     @abstractmethod
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     def __init__(self, fd, model):
         """Constructor to be overriden."""
@@ -4189,6 +4190,10 @@ class WritePythonFile(WriteScriptFile):
 <<<<<<< HEAD
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
+=======
 >>>>>>> osgeo-main
     def __init__(self, fd, model):
         """Constructor to be overriden."""
@@ -5910,6 +5915,12 @@ def __init__(self, fd, model, grassAPI="script"):
         self._writePython()
 
     def _getStandardizedOption(self, string):
+        """Return GRASS standardized option based on specified string.
+
+        :param string: input string to be converted
+
+        :return: GRASS standardized option as a string or None if not converted
+        """
         if string == "raster":
             return "G_OPT_R_MAP"
         elif string == "vector":
@@ -5923,7 +5934,7 @@ def _getStandardizedOption(self, string):
         elif string == "region":
             return "G_OPT_M_REGION"
 
-        return ""
+        return None
 
     def _writePython(self):
         """Write model to file"""
@@ -5967,7 +5978,8 @@ def _writePython(self):
 
         modelItems = self.model.GetItems(ModelAction)
         for item in modelItems:
-            for flag in item.GetParameterizedParams()["flags"]:
+            parametrizedParams = item.GetParameterizedParams()
+            for flag in parametrizedParams["flags"]:
                 if flag["label"]:
                     desc = flag["label"]
                 else:
@@ -5991,7 +6003,7 @@ def _writePython(self):
                     self.fd.write("# % answer: False\n")
                 self.fd.write("# %end\n")
 
-            for param in item.GetParameterizedParams()["params"]:
+            for param in parametrizedParams["params"]:
                 if param["label"]:
                     desc = param["label"]
                 else:
@@ -6018,6 +6030,29 @@ def _writePython(self):
                     self.fd.write("# % answer: {}\n".format(param["value"]))
                 self.fd.write("# %end\n")
 
+        # variables
+        for vname, vdesc in self.model.GetVariables().items():
+            self.fd.write("# %option")
+            optionType = self._getStandardizedOption(vdesc["type"])
+            if optionType:
+                self.fd.write(" {}".format(optionType))
+            self.fd.write("\n")
+            self.fd.write(
+                r"""# % key: {param_name}
+# % description: {description}
+# % required: yes
+""".format(
+                    param_name=vname,
+                    description=vdesc.get("description", ""),
+                )
+            )
+            if optionType is None and vdesc["type"]:
+                self.fd.write("# % type: {}\n".format(vdesc["type"]))
+
+            if vdesc["value"]:
+                self.fd.write("# % answer: {}\n".format(vdesc["value"]))
+            self.fd.write("# %end\n")
+
         # import modules
         self.fd.write(
             r"""
@@ -6044,6 +6079,7 @@ def cleanup():
         if rast:
             self.fd.write(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 r"""    run_command("g.remove", flags="f", type="raster",
                 name=%s)
@@ -6068,6 +6104,8 @@ def cleanup():
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 r"""    %s("g.remove", flags="f", type="raster",
                 name=%s)
 """
@@ -6127,6 +6165,9 @@ def cleanup():
                 % ",".join(map(lambda x: '"' + x + '"', rast3d))
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -6135,6 +6176,7 @@ def cleanup():
             self.fd.write("    pass\n")
 
         self.fd.write("\ndef main(options, flags):\n")
+<<<<<<< HEAD
 <<<<<<< HEAD
         for item in self.model.GetItems(ModelAction):
 =======
@@ -6151,8 +6193,25 @@ def cleanup():
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+        modelVars = self.model.GetVariables()
+        for item in self.model.GetItems(ModelAction):
+            modelParams = item.GetParameterizedParams()
+            modelParams["vars"] = modelVars
+            self._writeItem(item, variables=modelParams)
+=======
+<<<<<<< HEAD
+        for item in self.model.GetItems(ModelAction):
+=======
+        for item in self.model.GetItems():
+<<<<<<< HEAD
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             self._writeItem(item, variables=item.GetParameterizedParams())
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 
         self.fd.write("    return 0\n")
 
@@ -6195,6 +6254,45 @@ def _writePythonAction(self, item, variables={}, intermediates=None):
             strcmd + self._getPythonActionCmd(item, task, len(strcmd), variables) + "\n"
         )
 
+    def _substitutePythonParamValue(
+        self, value, name, parameterizedParams, variables, item
+    ):
+        """Substitute parameterized options or variables.
+
+        :param value: parameter value to be substituted
+        :param name: parameter name
+        :param parameterizedParams: list of parameterized options
+        :param variables: list of user-defined variables
+        :param item: item object
+
+        :return: substituted value
+        """
+        foundVar = False
+        parameterizedValue = value
+
+        if name in parameterizedParams:
+            foundVar = True
+            parameterizedValue = 'options["{}"]'.format(self._getParamName(name, item))
+        else:
+            # check for variables
+            formattedVar = False
+            for var in variables["vars"]:
+                pattern = re.compile("%" + var)
+                found = pattern.search(value)
+                if found:
+                    foundVar = True
+                    if found.end() != len(value):
+                        formattedVar = True
+                        parameterizedValue = pattern.sub(
+                            "{options['" + var + "']}", value
+                        )
+                    else:
+                        parameterizedValue = f'options["{var}"]'
+            if formattedVar:
+                parameterizedValue = 'f"' + parameterizedValue + '"'
+
+        return foundVar, parameterizedValue
+
     def _getPythonActionCmd(self, item, task, cmdIndent, variables={}):
         opts = task.get_options()
 
@@ -6222,11 +6320,18 @@ def _getPythonActionCmd(self, item, task, cmdIndent, variables={}):
                     value = list(map(float, value))
 
             if (name and value) or (name in parameterizedParams):
-                foundVar = False
-
-                if name in parameterizedParams:
-                    foundVar = True
-                    value = 'options["{}"]'.format(self._getParamName(name, item))
+                if isinstance(value, list):
+                    foundVar = False
+                    for idx in range(len(value)):
+                        foundVar_, value[idx] = self._substitutePythonParamValue(
+                            value[idx], name, parameterizedParams, variables, item
+                        )
+                        if foundVar_ is True:
+                            foundVar = True
+                else:
+                    foundVar, value = self._substitutePythonParamValue(
+                        value, name, parameterizedParams, variables, item
+                    )
 
                 if (
                     foundVar
@@ -6239,7 +6344,7 @@ def _getPythonActionCmd(self, item, task, cmdIndent, variables={}):
 
         ret += '"%s"' % task.get_name()
         if flags:
-            ret += ",\n{indent}flags='{fl}'".format(indent=" " * cmdIndent, fl=flags)
+            ret += ',\n{indent}flags="{fl}"'.format(indent=" " * cmdIndent, fl=flags)
             if itemParameterizedFlags:
                 ret += " + getParameterizedFlags(options, [{}])".format(
                     itemParameterizedFlags
@@ -6259,40 +6364,6 @@ def _getPythonActionCmd(self, item, task, cmdIndent, variables={}):
 
         return ret
 
-    def _substituteVariable(self, string, variable, data):
-        """Substitute variable in the string
-
-        :param string: string to be modified
-        :param variable: variable to be substituted
-        :param data: data related to the variable
-
-        :return: modified string
-        """
-        result = ""
-        ss = re.split(r"\w*(%" + variable + ")w*", string)
-
-        if not ss[0] and not ss[-1]:
-            if data:
-                return "options['%s']" % variable
-            else:
-                return variable
-
-        for s in ss:
-            if not s or s == '"':
-                continue
-
-            if s == "%" + variable:
-                if data:
-                    result += "+options['%s']+" % variable
-                else:
-                    result += "+%s+" % variable
-            else:
-                result += '"' + s
-                if not s.endswith("]"):  # options
-                    result += '"'
-
-        return result.strip("+")
-
 
 class ModelParamDialog(wx.Dialog):
     def __init__(
diff --git a/gui/wxpython/gmodeler/toolbars.py b/gui/wxpython/gmodeler/toolbars.py
index c1f3fbf8c49..b2bbd0a3a56 100644
--- a/gui/wxpython/gmodeler/toolbars.py
+++ b/gui/wxpython/gmodeler/toolbars.py
@@ -60,6 +60,7 @@ def _toolbarData(self):
             ),
             "actionAdd": MetaIcon(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 img="module-add", label=_("Add GRASS tool (module) to model")
 =======
@@ -67,6 +68,8 @@ def _toolbarData(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 img="module-add",
                 label=_("Add GRASS tool (module) to model") + " (Ctrl+Alt+A)",
             ),
@@ -79,6 +82,9 @@ def _toolbarData(self):
                 img="module-add", label=_("Add GRASS tool (module) to model")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -97,17 +103,23 @@ def _toolbarData(self):
             "validate": MetaIcon(img="check", label=_("Validate model")),
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             "settings": MetaIcon(img="modeler-settings", label=_("Modeler settings")),
             "properties": MetaIcon(img="options", label=_("Set model properties")),
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -126,11 +138,14 @@ def _toolbarData(self):
             (
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 ("new", icons["new"].label.rsplit(" ", 1)[0]),
                 icons["new"],
                 self.parent.OnModelNew,
@@ -224,6 +239,9 @@ def _toolbarData(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gui_core/goutput.py b/gui/wxpython/gui_core/goutput.py
index 0dd0021d5f2..64775662f34 100644
--- a/gui/wxpython/gui_core/goutput.py
+++ b/gui/wxpython/gui_core/goutput.py
@@ -45,12 +45,15 @@
 from gui_core.prompt import GPromptSTC
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 from gui_core.wrap import Button, ClearButton, StaticText
 =======
 from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
@@ -59,6 +62,9 @@
 from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -163,11 +169,14 @@ def __init__(
         self.btnCmdAbort.SetToolTip(_("Abort running command"))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
         self.btnClear.Bind(wx.EVT_BUTTON, self.OnClear)
         self.btnOutputSave.Bind(wx.EVT_BUTTON, self.OnOutputSave)
@@ -176,6 +185,9 @@ def __init__(
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -196,6 +208,7 @@ def __init__(
         self.btnCmdExportHistory.Bind(wx.EVT_BUTTON, self.OnCmdExportHistory)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
@@ -206,6 +219,11 @@ def __init__(
 >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
 
         self._layout()
@@ -499,6 +517,7 @@ def OnCmdProgress(self, event):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
@@ -508,6 +527,10 @@ def OnCmdProgress(self, event):
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
     def OnCmdExportHistory(self, event):
         """Export the history of executed commands stored
diff --git a/gui/wxpython/gui_core/gselect.py b/gui/wxpython/gui_core/gselect.py
index 118caabab3e..39a1bf56fb7 100644
--- a/gui/wxpython/gui_core/gselect.py
+++ b/gui/wxpython/gui_core/gselect.py
@@ -50,6 +50,7 @@
 import six
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778))
@@ -61,6 +62,11 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 import ctypes
 
 import wx
@@ -2014,6 +2020,7 @@ def SetSourceType(self, sourceType):
             self.dbWidgets["format"].SetItems(list(self.dbFormats.values()))
             if self.dbFormats:
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 db_formats = self.dbFormats.values()
                 if "PostgreSQL" in db_formats:
@@ -2030,6 +2037,12 @@ def SetSourceType(self, sourceType):
                 db_formats = self.dbFormats.values()
                 if "PostgreSQL" in db_formats:
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+                db_formats = self.dbFormats.values()
+                if "PostgreSQL" in db_formats:
+=======
 >>>>>>> osgeo-main
                 if "PostgreSQL" in self.dbFormats.values():
 >>>>>>> 584e61d06d (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
@@ -2042,6 +2055,9 @@ def SetSourceType(self, sourceType):
                 if "PostgreSQL" in db_formats:
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2331,6 +2347,7 @@ def hasRastSameProjAsLocation(dsn, table=None):
                     "r.external", quiet=True, read=True, flags="t", input=dsn
                 )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
                 # v.external returns info for individual bands, however projection is shared by all bands ->
@@ -2340,6 +2357,8 @@ def hasRastSameProjAsLocation(dsn, table=None):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 # v.external returns info for individual bands, however projection is
                 # shared by all bands -> (it is possible to take first line)
 =======
@@ -2351,6 +2370,9 @@ def hasRastSameProjAsLocation(dsn, table=None):
                 # (it is possible to take first line)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3084,6 +3106,7 @@ def _isMapSelected(self):
 
     def _chckMap(self):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         """Check if selected map in 'input' widget is the same as selected map in lmgr"""
 =======
@@ -3091,6 +3114,8 @@ def _chckMap(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         """Check if selected map in 'input' widget is the same as selected map in
         lmgr"""
 =======
@@ -3100,6 +3125,9 @@ def _chckMap(self):
         """Check if selected map in 'input' widget is the same as selected map in lmgr"""
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3208,6 +3236,7 @@ def __init__(
         **kwargs,
     ):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(SignatureSelect, self).__init__(parent, id, size=size, **kwargs)
 
@@ -3219,6 +3248,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().__init__(parent, id, size=size, **kwargs)
         self.SetName("SignatureSelect")
         self.mapsets = mapsets
@@ -3240,6 +3271,9 @@ def UpdateItems(self, element):
             for mapset in mapsets:
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3252,9 +3286,12 @@ def UpdateItems(self, element):
     def _append_mapset_signatures(self, mapset, element, items):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         # A workaround to list signature files before a separate
         # signature management module is developed
@@ -3264,6 +3301,9 @@ def _append_mapset_signatures(self, mapset, element, items):
         super(SignatureSelect, self).__init__(parent, id, size=size, **kwargs)
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3294,11 +3334,14 @@ def _append_mapset_signatures(self, mapset, element, items):
         I_free_signatures_list(count, ctypes.byref(sig_list))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
diff --git a/gui/wxpython/gui_core/mapdisp.py b/gui/wxpython/gui_core/mapdisp.py
index 5578e72a7e3..7db13e0187f 100644
--- a/gui/wxpython/gui_core/mapdisp.py
+++ b/gui/wxpython/gui_core/mapdisp.py
@@ -9,17 +9,23 @@
  - mapdisp::DoubleMapPanel
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
  - mapdisp::FrameMixin
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -45,6 +51,7 @@
 from mapdisp import statusbar as sb
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 from mapwin.base import MapWindowProperties
 =======
 <<<<<<< HEAD
@@ -58,6 +65,11 @@
 from mapwin.base import MapWindowProperties
 =======
 >>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+from mapwin.base import MapWindowProperties
+=======
+>>>>>>> osgeo-main
 >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689))
 =======
 from mapwin.base import MapWindowProperties
@@ -66,6 +78,9 @@
 from mapwin.base import MapWindowProperties
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -76,16 +91,22 @@
 class MapPanelBase(wx.Panel):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
     r"""Base class for map display window
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -217,6 +238,7 @@ def OnSize(self, event):
         # update statusbar
         self.StatusbarUpdate()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -224,6 +246,8 @@ def OnSize(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
     def OnFullScreen(self, event):
@@ -240,6 +264,9 @@ def OnFullScreen(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -419,6 +446,7 @@ def CreateStatusbar(self, statusbarItems):
         statusbar = wx.StatusBar(self, id=wx.ID_ANY)
         statusbar.SetMinHeight(24)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         statusbar.SetFieldsCount(3)
         statusbar.SetStatusWidths([-6, -2, -1])
@@ -435,6 +463,12 @@ def CreateStatusbar(self, statusbarItems):
         statusbar.SetFieldsCount(3)
         statusbar.SetStatusWidths([-6, -2, -1])
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+        statusbar.SetFieldsCount(3)
+        statusbar.SetStatusWidths([-6, -2, -1])
+=======
 >>>>>>> osgeo-main
         statusbar.SetFieldsCount(4)
         statusbar.SetStatusWidths([-5, -2, -1, -1])
@@ -448,6 +482,9 @@ def CreateStatusbar(self, statusbarItems):
         statusbar.SetStatusWidths([-6, -2, -1])
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -459,6 +496,7 @@ def CreateStatusbar(self, statusbarItems):
         )
         self.statusbarManager.AddStatusbarItem(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             sb.SbRender(self, statusbar=statusbar, position=2)
         )
@@ -475,6 +513,12 @@ def CreateStatusbar(self, statusbarItems):
             sb.SbRender(self, statusbar=statusbar, position=2)
         )
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+            sb.SbRender(self, statusbar=statusbar, position=2)
+        )
+=======
 >>>>>>> osgeo-main
             sb.SbMask(self, statusbar=statusbar, position=2)
         )
@@ -492,6 +536,9 @@ def CreateStatusbar(self, statusbarItems):
         )
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -516,6 +563,7 @@ def AddStatusbarPane(self):
 
     def SetStatusText(self, *args):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         """Overide wx.StatusBar method"""
 =======
@@ -523,6 +571,8 @@ def SetStatusText(self, *args):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         """Override wx.StatusBar method"""
 =======
         """Overide wx.StatusBar method"""
@@ -531,6 +581,9 @@ def SetStatusText(self, *args):
         """Overide wx.StatusBar method"""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -558,6 +611,10 @@ def StatusbarEnableLongHelp(self, enable=True):
         for toolbar in six.itervalues(self.toolbars):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
@@ -616,6 +673,7 @@ def IsPaneShown(self, name):
             return self._mgr.GetPane(name).IsShown()
         return False
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
 
     def AreAllToolbarsShown(self):
         return self.GetMapToolbar().IsShown()
@@ -709,6 +767,8 @@ def IsPaneShown(self, name):
             return self._mgr.GetPane(name).IsShown()
         return False
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
 
     def AreAllToolbarsShown(self):
         return self.GetMapToolbar().IsShown()
@@ -745,8 +805,11 @@ def IsPaneShown(self, name):
 
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+=======
+>>>>>>> osgeo-main
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689))
@@ -827,6 +890,7 @@ def OnMapDisplayProperties(self, event):
 
 class SingleMapPanel(MapPanelBase):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     """Panel with one map window.
 =======
@@ -834,6 +898,8 @@ class SingleMapPanel(MapPanelBase):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
     r"""Panel with one map window.
 =======
     """Panel with one map window.
@@ -842,6 +908,9 @@ class SingleMapPanel(MapPanelBase):
     """Panel with one map window.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1208,11 +1277,14 @@ def SetSize(self, *args):
         self.GetParent().SetSize(*args)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
     def Close(self):
         self.GetParent().Close()
@@ -1221,6 +1293,9 @@ def Close(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gui_core/preferences.py b/gui/wxpython/gui_core/preferences.py
index c819f1adf43..281547930f1 100644
--- a/gui/wxpython/gui_core/preferences.py
+++ b/gui/wxpython/gui_core/preferences.py
@@ -2017,11 +2017,14 @@ def _updateSettings(self):
                 # window size must be larger than zero, not minimized
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 # do not save dim when mapdisp is docked within single window
                 if (not mapdisp.IsDockable() or not mapdisp.IsDocked()) and (
                     size[0] > 0 and size[1] > 0
@@ -2031,6 +2034,9 @@ def _updateSettings(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gui_core/prompt.py b/gui/wxpython/gui_core/prompt.py
index 32d3bccc305..57a92c833a6 100644
--- a/gui/wxpython/gui_core/prompt.py
+++ b/gui/wxpython/gui_core/prompt.py
@@ -76,6 +76,7 @@ def __init__(self, parent, giface, menuModel):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
@@ -85,6 +86,10 @@ def __init__(self, parent, giface, menuModel):
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 7c10386e82 (g.proj: fix reading input WKT (#1582))
 >>>>>>> osgeo-main
 
     def _readHistory(self):
@@ -232,6 +237,7 @@ def __init__(self, parent, giface, menuModel, margin=False):
         # show hint
         self._showHint()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -239,6 +245,8 @@ def __init__(self, parent, giface, menuModel, margin=False):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # read history file
         self._loadHistory()
         if giface:
@@ -254,6 +262,9 @@ def __init__(self, parent, giface, menuModel, margin=False):
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -385,6 +396,7 @@ def OnKillFocus(self, event):
         # show hint
         if self.IsEmpty():
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             self._showHint()
 =======
@@ -392,6 +404,8 @@ def OnKillFocus(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             wx.CallAfter(self._showHint)
 =======
             self._showHint()
@@ -400,6 +414,9 @@ def OnKillFocus(self, event):
             self._showHint()
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gui_core/pyedit.py b/gui/wxpython/gui_core/pyedit.py
index d6aee3cb427..98a895c6e11 100644
--- a/gui/wxpython/gui_core/pyedit.py
+++ b/gui/wxpython/gui_core/pyedit.py
@@ -665,6 +665,7 @@ def __init__(self, parent):
             "overwriteFalse": MetaIcon(img="unlocked", label=_("Deactive overwrite")),
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -675,6 +676,11 @@ def __init__(self, parent):
 >>>>>>> 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
             "help": BaseIcons["help"],
             "quit": BaseIcons["quit"],
diff --git a/gui/wxpython/gui_core/toolbars.py b/gui/wxpython/gui_core/toolbars.py
index 2bfd34b12b5..cb8001e4dd9 100644
--- a/gui/wxpython/gui_core/toolbars.py
+++ b/gui/wxpython/gui_core/toolbars.py
@@ -85,17 +85,23 @@
     ),
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
     "docking": MetaIcon(img="monitor-dock", label=_("(Un)dock")),
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gui_core/widgets.py b/gui/wxpython/gui_core/widgets.py
index 4b815070424..4d0ab7deb1e 100644
--- a/gui/wxpython/gui_core/widgets.py
+++ b/gui/wxpython/gui_core/widgets.py
@@ -135,11 +135,14 @@ def BindPageChanged(self):
     def AddPage(self, *args, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         """Add a new page
 
         :param str name: use this param if notebooks has ability to
@@ -155,6 +158,9 @@ def AddPage(self, *args, **kwargs):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -169,11 +175,14 @@ def AddPage(self, *args, **kwargs):
     def InsertPage(self, *args, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         """Insert a new page
 
         :param str name: use this param if notebooks has ability to
@@ -189,6 +198,9 @@ def InsertPage(self, *args, **kwargs):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -202,11 +214,14 @@ def InsertPage(self, *args, **kwargs):
             self.classObject.InsertPage(self.widget, *args, **kwargs)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         except (
             TypeError
         ) as e:  # documentation says 'index', but certain versions of wx require 'n'
@@ -214,6 +229,9 @@ def InsertPage(self, *args, **kwargs):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1300,6 +1318,7 @@ def __init__(self, parent, model, showChoice=True, showTip=False, **kwargs):
         if self._showTip:
             self._searchTip = StaticWrapText(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 parent=self, id=wx.ID_ANY, label="Choose a tool", size=(-1, 35)
 =======
@@ -1307,6 +1326,8 @@ def __init__(self, parent, model, showChoice=True, showTip=False, **kwargs):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 parent=self, id=wx.ID_ANY, label="Choose a tool", size=(-1, 40)
 =======
                 parent=self, id=wx.ID_ANY, label="Choose a tool", size=(-1, 35)
@@ -1315,6 +1336,9 @@ def __init__(self, parent, model, showChoice=True, showTip=False, **kwargs):
                 parent=self, id=wx.ID_ANY, label="Choose a tool", size=(-1, 35)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1382,6 +1406,7 @@ def OnSearchModule(self, event):
                 self._searchChoice.SetSelection(0)
                 self.OnSelectModule()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
         label = _("%d tools match") % len(commands)
@@ -1390,6 +1415,8 @@ def OnSearchModule(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         label = _("{} tools matched").format(len(commands))
 =======
         label = _("%d tools match") % len(commands)
@@ -1398,6 +1425,9 @@ def OnSearchModule(self, event):
         label = _("%d tools match") % len(commands)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/gui_core/wrap.py b/gui/wxpython/gui_core/wrap.py
index 72a4a088638..18694fb7218 100644
--- a/gui/wxpython/gui_core/wrap.py
+++ b/gui/wxpython/gui_core/wrap.py
@@ -646,6 +646,7 @@ def DrawLinePoint(self, *args, **kwargs):
         kwargs = convertToInt(argsOrKwargs=kwargs, roundVal=True)
         if wxPythonPhoenix:
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             super(PseudoDC, self).DrawLine(*args, **kwargs)
         else:
@@ -655,6 +656,8 @@ def DrawLinePoint(self, *args, **kwargs):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             super().DrawLine(*args, **kwargs)
         else:
             super().DrawLinePoint(*args, **kwargs)
@@ -669,6 +672,9 @@ def DrawLinePoint(self, *args, **kwargs):
             super(PseudoDC, self).DrawLinePoint(*args, **kwargs)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -732,6 +738,7 @@ def DrawCircle(self, *args, **kwargs):
         kwargs = convertToInt(argsOrKwargs=kwargs, roundVal=True)
         super(PseudoDC, self).DrawCircle(*args, **kwargs)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     def DrawRectangle(self, *args, **kwargs):
         args = convertToInt(argsOrKwargs=args, roundVal=True)
@@ -750,6 +757,8 @@ def DrawCircle(self, *args, **kwargs):
 
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 class ClientDC(wx.ClientDC):
     """Wrapper around wx.ClientDC to have more control
diff --git a/gui/wxpython/history/tree.py b/gui/wxpython/history/tree.py
index e99432cdde5..6df28af94dd 100644
--- a/gui/wxpython/history/tree.py
+++ b/gui/wxpython/history/tree.py
@@ -76,16 +76,21 @@ def dayToLabel(self, day):
         if day == OLD_DATE:
             return _("No time info")
 
+        month_name = day.strftime("%B")
+        base_date = _("{month_name} {day_number}").format(
+            month_name=month_name, day_number=day.day
+        )
+
         if day == current_date:
-            return "{:%B %-d} (today)".format(day)
+            return _("{base_date} (today)").format(base_date=base_date)
         elif day == current_date - datetime.timedelta(days=1):
-            return "{:%B %-d} (yesterday)".format(day)
+            return _("{base_date} (yesterday)").format(base_date=base_date)
         elif day >= (current_date - datetime.timedelta(days=current_date.weekday())):
-            return "{:%B %-d} (this week)".format(day)
+            return _("{base_date} (this week)").format(base_date=base_date)
         elif day.year == current_date.year:
-            return "{:%B %-d}".format(day)
+            return _("{base_date}").format(base_date=base_date)
         else:
-            return "{:%B %-d, %Y}".format(day)
+            return _("{base_date}, {year}").format(base_date=base_date, year=day.year)
 
 
 class HistoryBrowserTree(CTreeView):
diff --git a/gui/wxpython/iclass/frame.py b/gui/wxpython/iclass/frame.py
index 5722e11bef4..96c3458b881 100644
--- a/gui/wxpython/iclass/frame.py
+++ b/gui/wxpython/iclass/frame.py
@@ -95,6 +95,7 @@ def __init__(
         :param parent: (no parent is expected)
         :param title: window title
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         :param toolbars: dictionary of active toolbars (default value represents all toolbars)
 =======
@@ -102,6 +103,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         :param toolbars: dictionary of active toolbars (default value represents all
                          toolbars)
 =======
@@ -111,6 +114,9 @@ def __init__(
         :param toolbars: dictionary of active toolbars (default value represents all toolbars)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -131,6 +137,7 @@ def __init__(
             self.giface = StandaloneMapDisplayGrassInterface(self)
         self.tree = None
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -138,11 +145,16 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # show computation region by default
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -229,9 +241,13 @@ def __init__(
             sb.SbCompRegionExtent,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
 >>>>>>> osgeo-main
             sb.SbDisplayGeometry,
             sb.SbMapScale,
@@ -240,12 +256,15 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             sb.SbDisplayGeometry,
             sb.SbMapScale,
             sb.SbGoTo,
 =======
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             sb.SbShowRegion,
             sb.SbAlignExtent,
@@ -266,6 +285,9 @@ def __init__(
             sb.SbGoTo,
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -437,17 +459,23 @@ def AddToolbar(self, name):
         if name == "vdigit":
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -476,10 +504,13 @@ def AddToolbar(self, name):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
             self.toolbars[name] = VDigitToolbar(
                 parent=self,
                 toolSwitcher=self._toolSwitcher,
@@ -505,6 +536,9 @@ def AddToolbar(self, name):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1481,6 +1515,7 @@ def GetCurrentCategoryIdx(self):
     def OnZoomIn(self, event):
         """Enable zooming for plots"""
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(IClassMapPanel, self).OnZoomIn(event)
 =======
@@ -1488,6 +1523,8 @@ def OnZoomIn(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().OnZoomIn(event)
 =======
         super(IClassMapPanel, self).OnZoomIn(event)
@@ -1496,6 +1533,9 @@ def OnZoomIn(self, event):
         super(IClassMapPanel, self).OnZoomIn(event)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1504,6 +1544,7 @@ def OnZoomIn(self, event):
     def OnZoomOut(self, event):
         """Enable zooming for plots"""
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(IClassMapPanel, self).OnZoomOut(event)
 =======
@@ -1511,6 +1552,8 @@ def OnZoomOut(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().OnZoomOut(event)
 =======
         super(IClassMapPanel, self).OnZoomOut(event)
@@ -1519,6 +1562,9 @@ def OnZoomOut(self, event):
         super(IClassMapPanel, self).OnZoomOut(event)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1527,6 +1573,7 @@ def OnZoomOut(self, event):
     def OnPan(self, event):
         """Enable panning for plots"""
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(IClassMapPanel, self).OnPan(event)
 =======
@@ -1534,6 +1581,8 @@ def OnPan(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().OnPan(event)
 =======
         super(IClassMapPanel, self).OnPan(event)
@@ -1542,6 +1591,9 @@ def OnPan(self, event):
         super(IClassMapPanel, self).OnPan(event)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/iclass/g.gui.iclass.py b/gui/wxpython/iclass/g.gui.iclass.py
index 127c1da1347..61509664ce4 100755
--- a/gui/wxpython/iclass/g.gui.iclass.py
+++ b/gui/wxpython/iclass/g.gui.iclass.py
@@ -65,6 +65,7 @@ def main():
 
     from core.settings import UserSettings
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     from core import globalvar
     from iclass.frame import IClassMapDisplay
@@ -81,6 +82,12 @@ def main():
     from core import globalvar
     from iclass.frame import IClassMapDisplay
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+    from core import globalvar
+    from iclass.frame import IClassMapDisplay
+=======
 >>>>>>> osgeo-main
     from iclass.frame import IClassMapFrame
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
@@ -93,6 +100,9 @@ def main():
     from iclass.frame import IClassMapDisplay
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -137,9 +147,13 @@ def main():
     # show main frame
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
 >>>>>>> osgeo-main
     frame = wx.Frame(
         parent=None,
@@ -148,12 +162,15 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     frame = wx.Frame(
         parent=None,
         size=globalvar.MAP_WINDOW_SIZE,
 =======
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     frame = IClassMapFrame(
         parent=None,
@@ -170,6 +187,9 @@ def main():
         size=globalvar.MAP_WINDOW_SIZE,
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/image2target/g.gui.image2target.html b/gui/wxpython/image2target/g.gui.image2target.html
index 139bc880e35..8534a93d01b 100644
--- a/gui/wxpython/image2target/g.gui.image2target.html
+++ b/gui/wxpython/image2target/g.gui.image2target.html
@@ -313,11 +313,14 @@ 
    AUTHORS
    
 Martin Landa, Czech Technical University in Prague, Czech Republic
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 
@@ -333,6 +336,9 @@ 
    AUTHORS
    
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/image2target/ii2t_manager.py b/gui/wxpython/image2target/ii2t_manager.py
index 62cfce972b9..dbfb52a2fe0 100644
--- a/gui/wxpython/image2target/ii2t_manager.py
+++ b/gui/wxpython/image2target/ii2t_manager.py
@@ -1721,6 +1721,7 @@ def ReloadGCPs(self, event):
 
     def OnFocus(self, event):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 =======
@@ -1728,6 +1729,8 @@ def OnFocus(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # TODO: it is here just to remove old or obsolete beavior of base class
         #       gcp/MapPanel?
 =======
@@ -1737,6 +1740,9 @@ def OnFocus(self, event):
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/image2target/ii2t_mapdisplay.py b/gui/wxpython/image2target/ii2t_mapdisplay.py
index ee3f92c6d5d..6f30392b448 100644
--- a/gui/wxpython/image2target/ii2t_mapdisplay.py
+++ b/gui/wxpython/image2target/ii2t_mapdisplay.py
@@ -63,6 +63,7 @@ def __init__(
         :param map: instance of render.Map
         :param auimgs: AUI manager
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         :param kwargs: wx.Panel attribures
 =======
@@ -70,6 +71,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         :param kwargs: wx.Panel attributes
 =======
         :param kwargs: wx.Panel attribures
@@ -78,6 +81,9 @@ def __init__(
         :param kwargs: wx.Panel attribures
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -132,10 +138,13 @@ def __init__(
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
         self.statusbarManager.SetMode(8)  # goto GCP
@@ -143,6 +152,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -279,17 +291,23 @@ def AddToolbar(self, name):
         if name == "map":
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -301,10 +319,13 @@ def AddToolbar(self, name):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
             self.toolbars["map"] = MapToolbar(self, self._toolSwitcher, self._giface)
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -312,6 +333,9 @@ def AddToolbar(self, name):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/iscatt/toolbars.py b/gui/wxpython/iscatt/toolbars.py
index af3274230f4..a16810ef119 100644
--- a/gui/wxpython/iscatt/toolbars.py
+++ b/gui/wxpython/iscatt/toolbars.py
@@ -151,16 +151,22 @@ def SetPloltsMode(self, event, tool_name):
             for i_tool_data in self.controller.data:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 i_tool_name = get_tool_name(i_tool_data[0])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -192,16 +198,22 @@ def UnsetMode(self):
         for i_tool_data in self.controller.data:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             i_tool_name = get_tool_name(i_tool_data[0])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -330,16 +342,22 @@ def SetMode(self, event, tool_name):
             for i_tool_data in self.controller.data:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 i_tool_name = get_tool_name(i_tool_data[0])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -364,16 +382,22 @@ def UnsetMode(self):
         for i_tool_data in self.controller.data:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             i_tool_name = get_tool_name(i_tool_data[0])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/lmgr/frame.py b/gui/wxpython/lmgr/frame.py
index 2106de833a5..cfad5dc075a 100644
--- a/gui/wxpython/lmgr/frame.py
+++ b/gui/wxpython/lmgr/frame.py
@@ -72,16 +72,22 @@
 from lmgr.pyshell import PyShellWindow
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 from lmgr.giface import LayerManagerGrassInterface
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -91,6 +97,7 @@
 )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -102,6 +109,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 mapdisp.frame import MapDisplay
 from datacatalog.catalog import DataCatalog
 from history.browser import HistoryBrowser
@@ -190,17 +202,23 @@ def show_menu_errors(messages):
         self._createMenuBar()
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -212,10 +230,13 @@ def show_menu_errors(messages):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
         self.statusbar = self.CreateStatusBar(number=1)
 <<<<<<< HEAD
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -226,6 +247,9 @@ def show_menu_errors(messages):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -236,17 +260,23 @@ def show_menu_errors(messages):
         self._createConsole(self.notebook)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         self._createHistoryBrowser(self.notebook)
 =======
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -446,6 +476,7 @@ def _createTabMenu(self):
 
         return menu
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -453,6 +484,8 @@ def _createTabMenu(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -488,6 +521,9 @@ def _createDisplayPanel(self, parent):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -503,6 +539,7 @@ def IsPaneShown(self, name):
             return self._auimgr.GetPane(name).IsShown()
         return False
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     def SetStatusText(self, *args):
@@ -513,6 +550,9 @@ def SetStatusText(self, *args):
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
     def SetStatusText(self, *args):
         """Override SbMain statusbar method"""
@@ -525,6 +565,9 @@ def SetStatusText(self, *args):
         """Overide SbMain statusbar method"""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -539,7 +582,10 @@ def _createNotebook(self):
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
 =======
@@ -561,6 +607,9 @@ def _createNotebook(self):
 
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -575,11 +624,14 @@ def _createDisplay(self, parent):
         """Initialize Display widget"""
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -587,6 +639,9 @@ def _createDisplay(self, parent):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -598,10 +653,13 @@ def _createDisplay(self, parent):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
         self.displayPanel, self.notebookLayers = self._createDisplayPanel(parent)
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -612,6 +670,9 @@ def _createDisplay(self, parent):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -661,6 +722,7 @@ def _createConsole(self, parent):
 
         self._setCopyingOfSelectedText()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -668,6 +730,8 @@ def _createConsole(self, parent):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
     def _createHistoryBrowser(self, parent):
         """Initialize history browser widget"""
         if not UserSettings.Get(group="manager", key="hideTabs", subkey="history"):
@@ -686,6 +750,9 @@ def _createHistoryBrowser(self, parent):
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -700,6 +767,7 @@ def _createPythonShell(self, parent):
         else:
             self.pyshell = None
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -707,6 +775,8 @@ def _createPythonShell(self, parent):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -714,6 +784,9 @@ def _createPythonShell(self, parent):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -742,6 +815,7 @@ def NewDisplay(self, name=None, show=True):
         self.notebookLayers.AddPage(page=self.pg_panel, text=name, select=True)
         self.currentPage = self.notebookLayers.GetCurrentPage()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -749,6 +823,8 @@ def NewDisplay(self, name=None, show=True):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         def CreateNewMapDisplay(giface, layertree):
             """Callback function which creates a new Map Display window
             :param giface: giface for map display
@@ -757,6 +833,9 @@ def CreateNewMapDisplay(giface, layertree):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -766,6 +845,7 @@ def CreateNewMapDisplay(layertree):
             :param name: name of new map display window
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -776,6 +856,11 @@ def CreateNewMapDisplay(layertree):
 >>>>>>> 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: reference to mapdisplay instance
             """
@@ -792,6 +877,7 @@ def CreateNewMapDisplay(layertree):
                 title=name,
             )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -799,6 +885,8 @@ def CreateNewMapDisplay(layertree):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             # create Map Display
             mapdisplay = MapDisplay(
                 parent=mapframe,
@@ -807,6 +895,9 @@ def CreateNewMapDisplay(layertree):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -820,6 +911,7 @@ def CreateNewMapDisplay(layertree):
                 giface=self._gifaceForDisplay,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -830,6 +922,11 @@ def CreateNewMapDisplay(layertree):
 >>>>>>> 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
                 id=wx.ID_ANY,
                 size=globalvar.MAP_WINDOW_SIZE,
@@ -901,6 +998,7 @@ def CanCloseDisplay(askIfSaveWorkspace):
                 return pgnum_dict
             return None
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
         mapdisplay.canCloseDisplayCallback = CanCloseDisplay
@@ -909,6 +1007,8 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         mapdisplay.canCloseCallback = CanCloseDisplay
 =======
         mapdisplay.canCloseDisplayCallback = CanCloseDisplay
@@ -917,6 +1017,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
         mapdisplay.canCloseDisplayCallback = CanCloseDisplay
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -929,6 +1032,7 @@ def CanCloseDisplay(askIfSaveWorkspace):
 
         mapdisplay.starting3dMode.connect(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             lambda firstTime, mapDisplayPage=self.currentPage: self._onMapDisplayStarting3dMode(
                 mapDisplayPage
@@ -937,6 +1041,8 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             lambda firstTime, mapDisplayPage=self.currentPage: (
                 self._onMapDisplayStarting3dMode(mapDisplayPage)
 =======
@@ -948,6 +1054,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
                 mapDisplayPage
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -956,6 +1065,7 @@ def CanCloseDisplay(askIfSaveWorkspace):
         mapdisplay.starting3dMode.connect(self.AddNvizTools)
         mapdisplay.ending3dMode.connect(self.RemoveNvizTools)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         mapdisplay.closingDisplay.connect(self._closePageNoEvent)
 =======
@@ -963,6 +1073,8 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         mapdisplay.closingPage.connect(self._closePageNoEvent)
 =======
         mapdisplay.closingDisplay.connect(self._closePageNoEvent)
@@ -971,6 +1083,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
         mapdisplay.closingDisplay.connect(self._closePageNoEvent)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -998,10 +1113,13 @@ def CanCloseDisplay(askIfSaveWorkspace):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -1010,6 +1128,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1021,16 +1142,22 @@ def _addPagesToNotebook(self):
         # add 'display' widget to main notebook page
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1043,10 +1170,13 @@ def _addPagesToNotebook(self):
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
         self.notebook.AddPage(page=self.displayPanel, text=_("Display"), name="layers")
 =======
@@ -1067,6 +1197,9 @@ def _addPagesToNotebook(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1077,6 +1210,7 @@ def _addPagesToNotebook(self):
             lambda notification: self._switchPage(notification)
         )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1084,6 +1218,8 @@ def _addPagesToNotebook(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # add 'history module' widget to main notebook page
         if self.history:
             self.notebook.AddPage(page=self.history, text=_("History"), name="history")
@@ -1093,6 +1229,9 @@ def _addPagesToNotebook(self):
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2146,6 +2285,7 @@ def OnIClass(self, event=None, cmd=None):
             )
             return
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -2153,12 +2293,17 @@ def OnIClass(self, event=None, cmd=None):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2172,10 +2317,13 @@ def OnIClass(self, event=None, cmd=None):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
         win = IClassMapFrame(parent=self)
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -2183,6 +2331,9 @@ def OnIClass(self, event=None, cmd=None):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2377,6 +2528,7 @@ def OnShowAttributeTable(self, event, selection=None):
         # show ATM window
         dbmanager.Show()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -2384,6 +2536,8 @@ def OnShowAttributeTable(self, event, selection=None):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
     def OnNewDisplay(self, event=None):
@@ -2508,6 +2662,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/lmgr/giface.py b/gui/wxpython/lmgr/giface.py
index 29a0f0bce66..310ea24597c 100644
--- a/gui/wxpython/lmgr/giface.py
+++ b/gui/wxpython/lmgr/giface.py
@@ -275,6 +275,7 @@ def GetProgress(self):
         return self.lmgr.goutput.GetProgressBar()
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -282,6 +283,8 @@ def GetProgress(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 class LayerManagerGrassInterfaceForMapDisplay:
 =======
@@ -307,6 +310,9 @@ def AreAllToolbarsShown(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/lmgr/layertree.py b/gui/wxpython/lmgr/layertree.py
index 3fb116e462e..8a7076bf6c3 100644
--- a/gui/wxpython/lmgr/layertree.py
+++ b/gui/wxpython/lmgr/layertree.py
@@ -94,6 +94,7 @@ def __init__(
         parent,
         giface,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         createNewMapDisplay,
 =======
@@ -110,6 +111,12 @@ def __init__(
         createNewMapDisplay,
 =======
 >>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+        createNewMapDisplay,
+=======
+>>>>>>> osgeo-main
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -120,6 +127,9 @@ def __init__(
         createNewMapDisplay,
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -136,11 +146,14 @@ def __init__(
     ):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         if "style" in kwargs:
             ctstyle |= kwargs["style"]
             del kwargs["style"]
@@ -148,6 +161,9 @@ def __init__(
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -157,11 +173,14 @@ def __init__(
             del kwargs["style"]
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         self.displayIndex = kwargs["idx"]
         del kwargs["idx"]
 <<<<<<< HEAD
@@ -173,6 +192,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -183,11 +205,14 @@ def __init__(
         del kwargs["notebook"]
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -203,6 +228,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -232,6 +260,7 @@ def __init__(
 
         if globalvar.hasAgw:
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             super(LayerTree, self).__init__(parent, id, agwStyle=ctstyle, **kwargs)
         else:
@@ -241,6 +270,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             super().__init__(parent, id, agwStyle=ctstyle, **kwargs)
         else:
             super().__init__(parent, id, style=ctstyle, **kwargs)
@@ -255,6 +286,9 @@ def __init__(
             super(LayerTree, self).__init__(parent, id, style=ctstyle, **kwargs)
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -271,6 +305,7 @@ def __init__(
 
         # init associated map display
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self.mapdisplay = createNewMapDisplay(layertree=self)
 =======
@@ -279,6 +314,9 @@ def __init__(
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
         # create instance of Map Display interface
         self._gifaceForDisplay = LayerManagerGrassInterfaceForMapDisplay(giface, self)
@@ -316,6 +354,9 @@ def __init__(
         self.mapdisplay = createNewMapDisplay(layertree=self)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -599,6 +640,7 @@ def OnLayerContextMenu(self, event):
                 "export-attr",
                 "pack",
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 "check",
                 "uncheck",
@@ -618,6 +660,13 @@ def OnLayerContextMenu(self, event):
                 "uncheck",
 =======
 >>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+                "check",
+                "uncheck",
+=======
+>>>>>>> osgeo-main
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -630,6 +679,9 @@ def OnLayerContextMenu(self, event):
                 "uncheck",
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -653,12 +705,15 @@ def OnLayerContextMenu(self, event):
             self.Bind(wx.EVT_MENU, self.OnRenameLayer, id=self.popupID["rename"])
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if numSelected > 1:
@@ -686,7 +741,10 @@ def OnLayerContextMenu(self, event):
             )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
 =======
@@ -694,7 +752,10 @@ def OnLayerContextMenu(self, event):
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
 
         if numSelected > 1:
             item = wx.MenuItem(
@@ -719,6 +780,9 @@ def OnLayerContextMenu(self, event):
                 self.OnCheckUncheckSelectedLayer,
                 id=self.popupID["uncheck"],
             )
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if numSelected > 1:
@@ -784,6 +848,7 @@ def OnLayerContextMenu(self, event):
             if numSelected == 1:
                 self.popupMenu.AppendSeparator()
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 if not (ltype == "raster_3d" or self.mapdisplay.IsPaneShown("3d")):
 =======
@@ -799,6 +864,12 @@ def OnLayerContextMenu(self, event):
 <<<<<<< HEAD
                 if not (ltype == "raster_3d" or self.mapdisplay.IsPaneShown("3d")):
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+                if not (ltype == "raster_3d" or self.mapdisplay.IsPaneShown("3d")):
+=======
 >>>>>>> osgeo-main
                 if ltype != "raster_3d":
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -812,6 +883,9 @@ def OnLayerContextMenu(self, event):
                 if not (ltype == "raster_3d" or self.mapdisplay.IsPaneShown("3d")):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -838,6 +912,7 @@ def OnLayerContextMenu(self, event):
                     wx.EVT_MENU, self.OnPopupProperties, id=self.popupID["properties"]
                 )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -845,6 +920,8 @@ def OnLayerContextMenu(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -852,6 +929,9 @@ def OnLayerContextMenu(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -864,11 +944,14 @@ def OnLayerContextMenu(self, event):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
                 if (
                     ltype
@@ -888,6 +971,9 @@ def OnLayerContextMenu(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -948,11 +1034,14 @@ def OnLayerContextMenu(self, event):
                     )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         elif ltype == "group":
             # Dynamically add Change opacity level menu item according
             # if any layer inside group layer is map layer
@@ -985,6 +1074,9 @@ def OnLayerContextMenu(self, event):
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1548,11 +1640,14 @@ def OnReportStats(self, event):
             self._giface.RunCmd(
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1560,6 +1655,9 @@ def OnReportStats(self, event):
 =======
 >>>>>>> 1dffc5dfd4 (r.report: add default units, change to full unit names (#1666))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1572,10 +1670,13 @@ def OnReportStats(self, event):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
                 ["r.report", "map=%s" % ",".join(rasters), "units=h,c,p"]
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
@@ -1586,6 +1687,9 @@ def OnReportStats(self, event):
 =======
 >>>>>>> 1dffc5dfd4 (r.report: add default units, change to full unit names (#1666))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1754,6 +1858,7 @@ def OnNvizProperties(self, event):
             vector/volume
         """
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if not UserSettings.Get(
             group="general",
@@ -1763,6 +1868,9 @@ def OnNvizProperties(self, event):
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
         if not UserSettings.Get(
             group="appearance",
@@ -1775,6 +1883,9 @@ def OnNvizProperties(self, event):
             group="general",
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1786,10 +1897,13 @@ def OnNvizProperties(self, event):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
         self.lmgr.notebook.SetSelectionByName("nviz")
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
@@ -1800,6 +1914,9 @@ def OnNvizProperties(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1884,6 +2001,7 @@ def OnGrassDBChanged(
                     )
                     self.SetItemText(item, newlabel)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1891,6 +2009,8 @@ def OnGrassDBChanged(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1898,6 +2018,9 @@ def OnGrassDBChanged(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1914,10 +2037,13 @@ def OnCheckUncheckSelectedLayer(self, event):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -1926,6 +2052,9 @@ def OnCheckUncheckSelectedLayer(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/lmgr/pyshell.py b/gui/wxpython/lmgr/pyshell.py
index 3e90fb9cae5..f38ab30eabd 100644
--- a/gui/wxpython/lmgr/pyshell.py
+++ b/gui/wxpython/lmgr/pyshell.py
@@ -22,6 +22,7 @@
 =======
 from __future__ import print_function
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -35,6 +36,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 io
 from contextlib import redirect_stdout
 import sys
diff --git a/gui/wxpython/lmgr/statusbar.py b/gui/wxpython/lmgr/statusbar.py
index 88a1465ebb2..1f483047583 100644
--- a/gui/wxpython/lmgr/statusbar.py
+++ b/gui/wxpython/lmgr/statusbar.py
@@ -24,17 +24,23 @@
 from core.gcmd import RunCommand
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 from core.watchdog import watchdog_used
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -79,6 +85,7 @@ def OnSize(self, event):
 
     def SetStatusText(self, *args):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         """Overide wx.StatusBar method"""
 =======
@@ -86,6 +93,8 @@ def SetStatusText(self, *args):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         """Override wx.StatusBar method"""
 =======
         """Overide wx.StatusBar method"""
@@ -94,6 +103,9 @@ def SetStatusText(self, *args):
         """Overide wx.StatusBar method"""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -119,11 +131,14 @@ def __init__(self, parent, giface):
         self.giface.currentMapsetChanged.connect(self.Refresh)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         if not watchdog_used:
             self.giface.grassdbChanged.connect(self.dbChanged)
         self.Refresh()
@@ -138,6 +153,9 @@ def dbChanged(self, map=None, newname=None):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -147,6 +165,7 @@ def dbChanged(self, map=None, newname=None):
     def _dbChanged(self, map=None, newname=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -157,6 +176,11 @@ def _dbChanged(self, map=None, newname=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
         if map == self.mask_layer or newname == self.mask_layer:
             self.Refresh()
diff --git a/gui/wxpython/lmgr/toolbars.py b/gui/wxpython/lmgr/toolbars.py
index 9ed638e9d5d..807ed46343b 100644
--- a/gui/wxpython/lmgr/toolbars.py
+++ b/gui/wxpython/lmgr/toolbars.py
@@ -126,17 +126,23 @@ def _toolbarData(self):
             (
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -180,6 +186,7 @@ def _toolbarData(self):
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
@@ -187,6 +194,9 @@ def _toolbarData(self):
 <<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 (None,),
                 (
@@ -200,6 +210,7 @@ def _toolbarData(self):
                     self.parent.OnDeleteLayer,
                 ),
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 (None,),
                 (
@@ -207,6 +218,8 @@ def _toolbarData(self):
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 ("addMulti", icons["addMulti"], self.parent.OnAddMaps),
                 ("addrast", icons["addRast"], self.parent.OnAddRaster),
@@ -238,6 +251,9 @@ def _toolbarData(self):
                 (
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -289,17 +305,23 @@ def _toolbarData(self):
             (
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -312,10 +334,13 @@ def _toolbarData(self):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
                 ("newdisplay", icons["newdisplay"], self.parent.OnNewDisplay),
                 (None,),
                 ("mapCalc", icons["mapcalc"], self.parent.OnMapCalculator),
@@ -326,6 +351,9 @@ def _toolbarData(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -356,7 +384,10 @@ def _toolbarData(self):
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
                 (None,),
@@ -386,6 +417,9 @@ def _toolbarData(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/location_wizard/wizard.py b/gui/wxpython/location_wizard/wizard.py
index c290dc23edb..67a2125be22 100644
--- a/gui/wxpython/location_wizard/wizard.py
+++ b/gui/wxpython/location_wizard/wizard.py
@@ -200,6 +200,7 @@ def __init__(self, wizard, parent, grassdatabase):
         # text controls
         self.tgisdbase = self.MakeLabel(grassdatabase)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self.tlocation = self.MakeTextCtrl("newLocation")
 =======
@@ -207,6 +208,8 @@ def __init__(self, wizard, parent, grassdatabase):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         self.tlocation = self.MakeTextCtrl("newProject")
 =======
         self.tlocation = self.MakeTextCtrl("newLocation")
@@ -215,6 +218,9 @@ def __init__(self, wizard, parent, grassdatabase):
         self.tlocation = self.MakeTextCtrl("newLocation")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/main_window/frame.py b/gui/wxpython/main_window/frame.py
index ffcfc139d27..949a80e7493 100644
--- a/gui/wxpython/main_window/frame.py
+++ b/gui/wxpython/main_window/frame.py
@@ -72,6 +72,9 @@
 =======
 >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -101,16 +104,22 @@
 from lmgr.pyshell import PyShellWindow
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 from lmgr.giface import LayerManagerGrassInterface
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -120,12 +129,15 @@
 )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 from mapdisp.frame import MapPanel
 from datacatalog.catalog import DataCatalog
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171,6 +183,7 @@ def __init__(
         title=None,
         workspace=None,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         size=wx.Display().GetGeometry().GetSize(),
 =======
@@ -178,6 +191,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         size=wx.GetClientDisplayRect().GetSize(),
 =======
         size=wx.Display().GetGeometry().GetSize(),
@@ -186,6 +201,9 @@ def __init__(
         size=wx.Display().GetGeometry().GetSize(),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -239,6 +257,7 @@ def show_menu_errors(messages):
         # the search tree and command console
         self._moduleTreeBuilder = LayerManagerModuleTree(message_handler=add_menu_error)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self._auimgr = aui.AuiManager(self)
 =======
@@ -246,6 +265,8 @@ def show_menu_errors(messages):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         self._auimgr = SingleWindowAuiManager(self)
 =======
         self._auimgr = aui.AuiManager(self)
@@ -254,6 +275,9 @@ def show_menu_errors(messages):
         self._auimgr = aui.AuiManager(self)
 >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -267,6 +291,7 @@ def show_menu_errors(messages):
         # set pane sizes according to the full screen size of the primary monitor
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -277,6 +302,10 @@ def show_menu_errors(messages):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
         self.PANE_BEST_SIZE = tuple(t // 5 for t in self.size)
         self.PANE_MIN_SIZE = tuple(t // 8 for t in self.size)
@@ -288,9 +317,12 @@ def show_menu_errors(messages):
         )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         size = wx.Display().GetGeometry().GetSize()
         self.PANE_BEST_SIZE = tuple(t / 3 for t in size)
@@ -330,6 +362,9 @@ def show_menu_errors(messages):
         )
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -344,9 +379,12 @@ def show_menu_errors(messages):
         if UserSettings.Get(group="general", key="defWindowPos", subkey="enabled"):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             single_window_dim = {
                 "group": "general",
@@ -376,6 +414,9 @@ def show_menu_errors(messages):
             self.Maximize(True)
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -403,6 +444,7 @@ def show_menu_errors(messages):
             # does center (of screen) make sense for lmgr?
             self.Centre()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -415,6 +457,11 @@ def show_menu_errors(messages):
 >>>>>>> 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.Show()
 
@@ -525,6 +572,7 @@ def IsPaneShown(self, name):
             return self._auimgr.GetPane(name).IsShown()
         return False
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -533,6 +581,9 @@ def IsPaneShown(self, name):
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
     def SetStatusText(self, *args):
@@ -553,6 +604,9 @@ def _createMainNotebook(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -560,6 +614,7 @@ def SetStatusText(self, *args):
         """Overide SbMain statusbar method"""
         self.statusbar.SetStatusText(*args)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -572,6 +627,11 @@ def SetStatusText(self, *args):
 >>>>>>> 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 _createMapNotebook(self):
         """Create Map Display notebook"""
@@ -598,6 +658,7 @@ def _createMapNotebook(self):
             self.OnMapNotebookClose,
         )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -610,6 +671,11 @@ def _createMapNotebook(self):
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     def _createDataCatalog(self, parent):
         """Initialize Data Catalog widget"""
@@ -711,6 +777,7 @@ def _createPythonShell(self, parent):
         else:
             self.pyshell = None
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -718,6 +785,8 @@ def _createPythonShell(self, parent):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -725,6 +794,9 @@ def _createPythonShell(self, parent):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -749,6 +821,7 @@ def NewDisplay(self, name=None, show=True):
         )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -760,6 +833,11 @@ def NewDisplay(self, name=None, show=True):
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         # create display toolbar
         dmgrToolbar = DisplayPanelToolbar(guiparent=self.pg_panel, parent=self)
@@ -769,11 +847,14 @@ def NewDisplay(self, name=None, show=True):
         self.currentPageNum = self.notebookLayers.GetSelection()
         self.notebookLayers.EnsureVisible(self.currentPageNum)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         def CreateNewMapDisplay(giface, layertree):
             """Callback function which creates a new Map Display window
@@ -800,6 +881,9 @@ def CreateNewMapDisplay(giface, layertree):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -819,6 +903,7 @@ def CreateNewMapDisplay(layertree):
                 giface=self._gifaceForDisplay,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
@@ -829,6 +914,11 @@ def CreateNewMapDisplay(layertree):
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 id=wx.ID_ANY,
                 tree=layertree,
@@ -836,17 +926,23 @@ def CreateNewMapDisplay(layertree):
                 Map=layertree.Map,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 dockable=True,
 =======
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -855,6 +951,7 @@ def CreateNewMapDisplay(layertree):
             )
             # add map display panel to notebook and make it current
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             self.mapnotebook.AddPage(mapdisplay, name)
             self.mapnotebook.SetSelection(self.currentPageNum)
@@ -863,6 +960,8 @@ def CreateNewMapDisplay(layertree):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             self.mainnotebook.AddPage(mapdisplay, name)
 =======
             self.mapnotebook.AddPage(mapdisplay, name)
@@ -873,6 +972,9 @@ def CreateNewMapDisplay(layertree):
             self.mapnotebook.SetSelection(self.currentPageNum)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -905,6 +1007,7 @@ def CreateNewMapDisplay(layertree):
         # layout for controls
         cb_boxsizer = wx.BoxSizer(wx.VERTICAL)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         cb_boxsizer.Add(dmgrToolbar, proportion=0, flag=wx.EXPAND)
 =======
@@ -919,6 +1022,11 @@ def CreateNewMapDisplay(layertree):
         cb_boxsizer.Add(dmgrToolbar, proportion=0, flag=wx.EXPAND)
 =======
 >>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+        cb_boxsizer.Add(dmgrToolbar, proportion=0, flag=wx.EXPAND)
+=======
+>>>>>>> osgeo-main
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 =======
         cb_boxsizer.Add(dmgrToolbar, proportion=0, flag=wx.EXPAND)
@@ -927,6 +1035,9 @@ def CreateNewMapDisplay(layertree):
         cb_boxsizer.Add(dmgrToolbar, proportion=0, flag=wx.EXPAND)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -937,11 +1048,14 @@ def CreateNewMapDisplay(layertree):
         self.GetLayerTree().Layout()
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # Repaint Layers pane map display toolbar widget on the wxMac
         self._repaintLayersPaneMapDisplayToolbar()
 =======
@@ -949,6 +1063,9 @@ def CreateNewMapDisplay(layertree):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -964,17 +1081,23 @@ def _setUpMapDisplay(self, mapdisplay):
         def CanCloseDisplay(askIfSaveWorkspace):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -985,6 +1108,7 @@ def CanCloseDisplay(askIfSaveWorkspace):
                                                map display notebook layers
                                                tree page index and
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                                                "mapnotebook" key represent
 =======
@@ -992,6 +1116,8 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                                                "mainnotebook" key represent
 =======
                                                "mapnotebook" key represent
@@ -1000,6 +1126,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
                                                "mapnotebook" key represent
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1009,6 +1138,7 @@ def CanCloseDisplay(askIfSaveWorkspace):
             pgnum_dict = {}
             pgnum_dict["layers"] = self.notebookLayers.GetPageIndex(page)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             pgnum_dict["mapnotebook"] = self.mapnotebook.GetPageIndex(mapdisplay)
             name = self.notebookLayers.GetPageText(pgnum_dict["layers"])
@@ -1017,6 +1147,8 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             pgnum_dict["mainnotebook"] = self.mainnotebook.GetPageIndex(mapdisplay)
             name = self.notebookLayers.GetPageText(pgnum_dict["layers"])
 =======
@@ -1033,6 +1165,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
             name = self.notebookLayers.GetPageText(pgnum_dict["layers"])
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1042,11 +1177,14 @@ def CanCloseDisplay(askIfSaveWorkspace):
             ):
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
                 return pgnum_dict
             return None
@@ -1077,6 +1215,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
 >>>>>>> 7896e1a53f (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1090,6 +1231,10 @@ def CanCloseDisplay(askIfSaveWorkspace):
             lambda page=self.currentPage: self._onMapDisplayFocus(page),
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
@@ -1106,6 +1251,7 @@ def CanCloseDisplay(askIfSaveWorkspace):
         mapdisplay.starting3dMode.connect(self.AddNvizTools)
         mapdisplay.ending3dMode.connect(self.RemoveNvizTools)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         mapdisplay.closingDisplay.connect(self._closePageNoEvent)
 =======
@@ -1113,6 +1259,8 @@ def CanCloseDisplay(askIfSaveWorkspace):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 =======
         mapdisplay.closingDisplay.connect(self._closePageNoEvent)
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
@@ -1120,6 +1268,9 @@ def CanCloseDisplay(askIfSaveWorkspace):
         mapdisplay.closingDisplay.connect(self._closePageNoEvent)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1144,11 +1295,14 @@ def CanCloseDisplay(askIfSaveWorkspace):
         )
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
     def BuildPanes(self):
         """Build panes - toolbars as well as panels"""
@@ -1250,6 +1404,9 @@ def _createMapDisplay(self, parent):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1345,9 +1502,12 @@ def BuildPanes(self):
             aui.AuiPaneInfo()
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             .Name("display")
             .Caption("Display")
@@ -1536,6 +1696,9 @@ def BuildPanes(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1551,6 +1714,7 @@ def BuildPanes(self):
             .MaximizeButton(True),
         )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1558,6 +1722,9 @@ def BuildPanes(self):
 >>>>>>> osgeo-main
 =======
 >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621))
 >>>>>>> osgeo-main
         self._auimgr.AddPane(
             self.search,
@@ -1618,6 +1785,7 @@ def BuildPanes(self):
 
         wx.CallAfter(self.datacatalog.LoadItems)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1625,6 +1793,8 @@ def BuildPanes(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         single_win_panes_layout_pos_enabled = UserSettings.Get(
             group="general",
             key="singleWinPanesLayoutPos",
@@ -1644,6 +1814,9 @@ def BuildPanes(self):
 =======
 >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1654,11 +1827,14 @@ def BindEvents(self):
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindowOrExit)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1672,6 +1848,9 @@ def BindEvents(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1746,10 +1925,13 @@ def AddNvizTools(self, firstTime):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
 =======
 
         self._auimgr.GetPane("nviz").Show()
@@ -1760,6 +1942,9 @@ def AddNvizTools(self, firstTime):
         self._auimgr.Update()
 >>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1956,15 +2141,21 @@ def OnCBPageChanged(self, event):
         self.currentPageNum = self.notebookLayers.GetSelection()
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if hasattr(self.currentPage, "maptree") and self.mainnotebook.GetCurrentPage():
             self.mainnotebook.SetSelectionToMainPage(self.GetMapDisplay())
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1973,6 +2164,7 @@ def OnCBPageChanged(self, event):
         except Exception:
             pass
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
         event.Skip()
@@ -1991,6 +2183,12 @@ def OnCBPageClosing(self, event):
 
         event.Skip()
 
+>>>>>>> osgeo-main
+=======
+>>>>>>> 523219d6d4 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
+
+        event.Skip()
+
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -2020,6 +2218,7 @@ def OnCBPageClosing(self, event):
         maptree = self.notebookLayers.GetPage(event.GetSelection()).maptree
         maptree.GetMapDisplay().CleanUp()
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self.mapnotebook.DeletePage(self.GetMapDisplayIndex())
 =======
@@ -2027,6 +2226,8 @@ def OnCBPageClosing(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         self.mainnotebook.DeleteMainPage(self.GetMapDisplay())
 =======
         self.mapnotebook.DeletePage(self.GetMapDisplayIndex())
@@ -2035,6 +2236,9 @@ def OnCBPageClosing(self, event):
         self.mapnotebook.DeletePage(self.GetMapDisplayIndex())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2044,6 +2248,7 @@ def OnCBPageClosing(self, event):
 
         event.Skip()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -2051,6 +2256,8 @@ def OnCBPageClosing(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
     def _renamePageNoEvent(self, pgnum_dict, is_docked, text):
         if is_docked:
@@ -2072,6 +2279,9 @@ def _closePageNoEvent(self, pgnum_dict):
         page closing event.
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2109,6 +2319,7 @@ def FocusPage(self, page_text):
                 if notebook.GetPageText(i) == page_text:
                     notebook.SetSelection(i)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     def RunSpecialCmd(self, command):
@@ -2118,6 +2329,8 @@ def RunSpecialCmd(self, command):
 =======
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
         :param dict pgnum_dict: dict "layers" key represent map display
@@ -2901,6 +3114,7 @@ def OnRenameDisplay(self, event):
             name = dlg.GetValue()
             self.notebookLayers.SetPageText(page=self.currentPageNum, text=name)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             self.mapnotebook.SetPageText(page_idx=self.GetMapDisplayIndex(), text=name)
 =======
@@ -2908,6 +3122,8 @@ def OnRenameDisplay(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             self.mainnotebook.SetMainPageText(page=self.GetMapDisplay(), text=name)
 =======
             self.mapnotebook.SetPageText(page_idx=self.GetMapDisplayIndex(), text=name)
@@ -2916,6 +3132,9 @@ def OnRenameDisplay(self, event):
             self.mapnotebook.SetPageText(page_idx=self.GetMapDisplayIndex(), text=name)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3544,6 +3763,7 @@ def OnDeleteLayer(self, event):
             except ValueError:
                 pass
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     def OnCloseWindow(self, event):
@@ -3557,6 +3777,8 @@ def OnCloseWindowOrExit(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
     def OnKeyDown(self, event):
@@ -3660,6 +3882,7 @@ def MsgDisplayResolution(self, limitText=None):
         )
         return dlg
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -3667,6 +3890,8 @@ def MsgDisplayResolution(self, limitText=None):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
     def _onMapsetWatchdog(self, map_path, map_dest):
         """Current mapset watchdog event handler
 
@@ -3684,6 +3909,9 @@ def _onMapsetChanged(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3694,6 +3922,7 @@ def OnMapNotebookClose(self, event):
         event.Veto()
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3705,3 +3934,8 @@ def OnMapNotebookClose(self, event):
 =======
 >>>>>>> 8422103f4c (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/gui/wxpython/mapdisp/frame.py b/gui/wxpython/mapdisp/frame.py
index 4f53d8bee81..324bccad42d 100644
--- a/gui/wxpython/mapdisp/frame.py
+++ b/gui/wxpython/mapdisp/frame.py
@@ -63,6 +63,7 @@
 from grass.pydispatch.signal import Signal
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 class MapPanel(SingleMapPanel):
@@ -71,6 +72,8 @@ class MapPanel(SingleMapPanel):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 class MapPanel(SingleMapPanel, MainPageBase):
 =======
 class MapPanel(SingleMapPanel):
@@ -79,6 +82,9 @@ class MapPanel(SingleMapPanel):
 class MapPanel(SingleMapPanel):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -132,6 +138,7 @@ def __init__(
         # used for VDigit toolbar and window and GLWindow
         self.tree = tree
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # checks for saving workspace
         self.canCloseDisplayCallback = None
@@ -140,6 +147,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
         # Saved Map Display output img size
         self._saved_output_img_size = None
@@ -155,6 +164,9 @@ def __init__(
         # Emitted when switching map notebook tabs (Single-Window)
         self.onFocus = Signal("MapPanel.onFocus")
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -169,6 +181,7 @@ def __init__(
         # Parameter firstTime specifies if 3D was already actived.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -179,6 +192,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.starting3dMode = Signal("MapPanel.starting3dMode")
 
@@ -187,6 +205,7 @@ def __init__(
 
         # Emitted when closing display by closing its window.
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self.closingDisplay = Signal("MapPanel.closingDisplay")
 
@@ -196,6 +215,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 =======
         self.closingDisplay = Signal("MapPanel.closingDisplay")
 
@@ -207,6 +228,9 @@ def __init__(
         # Emitted when closing display by closing its window.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -226,11 +250,14 @@ def __init__(
         if statusbar:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -238,6 +265,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -248,6 +278,7 @@ def __init__(
                 sb.SbCompRegionExtent,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -259,6 +290,11 @@ def __init__(
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 sb.SbDisplayGeometry,
                 sb.SbMapScale,
@@ -270,8 +306,11 @@ def __init__(
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 sb.SbShowRegion,
                 sb.SbAlignExtent,
@@ -293,6 +332,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -314,10 +356,13 @@ def __init__(
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
             self.statusbar = self.CreateStatusbar()
 >>>>>>> 015cec3442 (wxGUI/map display: manage wx.StatusBar widget by AUI (#1646))
 =======
@@ -328,6 +373,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -362,6 +410,7 @@ def __init__(
 
         # register context menu actions
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if self.statusbar:
             self._registerContextMenuActions()
@@ -378,6 +427,12 @@ def __init__(
         if self.statusbar:
             self._registerContextMenuActions()
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+        if self.statusbar:
+            self._registerContextMenuActions()
+=======
 >>>>>>> osgeo-main
         self._registerContextMenuActions()
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -390,6 +445,9 @@ def __init__(
             self._registerContextMenuActions()
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -426,6 +484,7 @@ def __init__(
             .Layer(0),
         )
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -433,11 +492,16 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -449,10 +513,13 @@ def __init__(
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 270077e68a (wxGUI/map display: manage wx.StatusBar widget by AUI (#1646))
         self._mgr.AddPane(
             self.statusbar,
@@ -481,6 +548,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -514,6 +584,7 @@ def __init__(
     def _registerContextMenuActions(self):
         """Register show/hide toolbars and statusbar context menu actions"""
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
         def show_hide_toolbar_label():
@@ -524,6 +595,8 @@ def show_hide_toolbar_label():
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 =======
 
         def show_hide_toolbar_label():
@@ -621,6 +694,9 @@ def show_hide_toolbar_label():
                 _("Hide toolbars") if self.AreAllToolbarsShown() else _("Show toolbars")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -634,6 +710,7 @@ def on_show_hide_toolbar(event):
             label=show_hide_toolbar_label,
             action=on_show_hide_toolbar,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         )
 
@@ -652,6 +729,8 @@ def on_show_hide_statusbar(event):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         )
 
@@ -1064,6 +1143,7 @@ def RemoveToolbar(self, name, destroy=False):
 
         self._mgr.Update()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1071,6 +1151,8 @@ def RemoveToolbar(self, name, destroy=False):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
     def ShowAllToolbars(self, show=True):
@@ -1096,6 +1178,9 @@ def IsPaneShown(self, name):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1413,6 +1498,7 @@ def OnCloseWindow(self, event, askIfSaveWorkspace=True):
         Also close associated layer tree page
         """
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         Debug.msg(2, "MapPanel.OnCloseWindow()")
         if self.canCloseDisplayCallback:
@@ -1428,6 +1514,8 @@ def OnCloseWindow(self, event, askIfSaveWorkspace=True):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
         Debug.msg(2, "MapPanel.OnCloseWindow()")
         if self.canCloseCallback:
@@ -1476,6 +1564,9 @@ def OnCloseWindow(self, event, askIfSaveWorkspace=True):
                     self.closingDisplay.emit(pgnum_dict=pgnum_dict)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1971,6 +2062,7 @@ def OnZoomToMap(self, event):
         NULLs) or vector map.
         """
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         Debug.msg(3, "MapPanel.OnZoomToMap()")
 =======
@@ -1984,6 +2076,11 @@ def OnZoomToMap(self, event):
 <<<<<<< HEAD
         Debug.msg(3, "MapPanel.OnZoomToMap()")
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+        Debug.msg(3, "MapPanel.OnZoomToMap()")
+=======
 >>>>>>> osgeo-main
         Debug.msg(3, "MapFrame.OnZoomToMap()")
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
@@ -1994,6 +2091,9 @@ def OnZoomToMap(self, event):
         Debug.msg(3, "MapPanel.OnZoomToMap()")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2084,6 +2184,7 @@ def SetProperties(
         self.mapWindowProperties.alignExtent = alignExtent
         self.mapWindowProperties.resolution = constrainRes
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -2091,6 +2192,8 @@ def SetProperties(
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
     def IsStandalone(self):
@@ -2134,6 +2237,9 @@ def GetLayerManager(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2261,17 +2367,23 @@ def QuitVDigit(self):
         self.RemoveToolbar("vdigit", destroy=True)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2337,16 +2449,22 @@ def __init__(self, parent, giface, id, tree, lmgr, idx, Map, title, **kwargs):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/mapdisp/main.py b/gui/wxpython/mapdisp/main.py
index f495055c2c9..b60aa77be3f 100644
--- a/gui/wxpython/mapdisp/main.py
+++ b/gui/wxpython/mapdisp/main.py
@@ -27,16 +27,22 @@
 @author Anna Kratochvilova  (MapPanelBase)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 """  # noqa: E501
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -473,11 +479,14 @@ def GetMapDisplay(self):
     def GetProgress(self):
         return self._mapframe.GetProgressBar()
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -485,6 +494,7 @@ def GetProgress(self):
 class DMonGrassInterface(StandaloneMapDisplayGrassInterface):
     """@implements GrassInterface"""
 =======
+<<<<<<< HEAD
 class DMonGrassInterface(StandaloneMapDisplayGrassInterface):
     """@implements GrassInterface"""
 
@@ -500,6 +510,8 @@ def __init__(self, mapframe):
 class DMonGrassInterface(StandaloneMapDisplayGrassInterface):
     """@implements GrassInterface"""
 =======
+=======
+>>>>>>> osgeo-main
 class DMonGrassInterface(StandaloneMapDisplayGrassInterface):
     """@implements GrassInterface"""
 
@@ -547,6 +559,9 @@ def AreAllToolbarsShown(self):
 >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635))
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -554,6 +569,7 @@ def AreAllToolbarsShown(self):
 class DMonGrassInterface(StandaloneMapDisplayGrassInterface):
     """@implements GrassInterface"""
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 class DMonDisplay(FrameMixin, MapPanel):
@@ -578,6 +594,18 @@ def __init__(self, mapframe):
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
+class DMonDisplay(FrameMixin, MapPanel):
+    """Map display for wrapping map panel with d.mon mathods and frame methods"""
+
+>>>>>>> osgeo-main
+=======
+    def __init__(self, mapframe):
+        StandaloneMapDisplayGrassInterface.__init__(self, mapframe)
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+
 class DMonDisplay(FrameMixin, MapPanel):
     """Map display for wrapping map panel with d.mon mathods and frame methods"""
 
@@ -591,6 +619,9 @@ class DMonDisplay(FrameMixin, MapPanel):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/mapdisp/statusbar.py b/gui/wxpython/mapdisp/statusbar.py
index f2b8a6aef60..68613ad768f 100644
--- a/gui/wxpython/mapdisp/statusbar.py
+++ b/gui/wxpython/mapdisp/statusbar.py
@@ -55,11 +55,14 @@ class SbManager:
     Provides progress bar (SbProgress).
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
     Items with position 0 are shown according to selection in Map Display settings
     dialog. Only one item of the same class is supposed to be in statusbar. Manager
     user have to create statusbar on his own, add items to manager and call Update
@@ -68,6 +71,9 @@ class SbManager:
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -284,6 +290,7 @@ def _progressShown(self):
     def _progressHidden(self):
         self.statusbar.SetStatusText(self._oldStatus, 0)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     def SetMode(self, mode):
@@ -301,6 +308,12 @@ def SetMode(self, mode):
     def SetMode(self, mode):
         """Sets current mode and updates statusbar
 =======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+    def SetMode(self, mode):
+        """Sets current mode and updates statusbar
+=======
 >>>>>>> osgeo-main
     def OnToggleStatus(self, event):
         """Toggle status text"""
@@ -321,6 +334,9 @@ def SetMode(self, mode):
         """Sets current mode and updates statusbar
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -342,6 +358,7 @@ def SetProgress(self, range, value, text):
         if text:
             self.statusbar.SetStatusText(text)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     def OnContextMenu(self, event):
@@ -349,6 +366,9 @@ def OnContextMenu(self, event):
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 <<<<<<< HEAD
     def OnContextMenu(self, event):
         """Popup context menu enabling to choose a widget that will be shown in
@@ -361,6 +381,9 @@ def OnContextMenu(self, event):
     def OnContextMenu(self, event):
         """Popup context menu enabling to choose a widget that will be shown in statusbar."""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         def setSbItemProperty(idx):
@@ -405,6 +428,7 @@ def OnContextMenu(self, event):
         """Popup context menu enabling to choose a widget that will be shown in statusbar."""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
+<<<<<<< HEAD
 <<<<<<< HEAD
         def setSbItemProperty(idx):
             self.mapFrame.mapWindowProperties.sbItem = idx
@@ -436,6 +460,8 @@ def getSbItemProperty():
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 015cec3442 (wxGUI/map display: manage wx.StatusBar widget by AUI (#1646))
@@ -513,6 +539,7 @@ def _update(self, longHelp):
 
     def Update(self):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         """Called when statusbar action is activated (e.g. through Map Display settings)."""
 =======
@@ -520,6 +547,8 @@ def Update(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         """Called when statusbar action is activated (e.g. through Map Display
         settings)."""
 =======
@@ -529,6 +558,9 @@ def Update(self):
         """Called when statusbar action is activated (e.g. through Map Display settings)."""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -574,6 +606,7 @@ def Update(self):
         self.Show()
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -581,6 +614,8 @@ def Update(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 class SbShowRegion(SbItem):
@@ -755,6 +790,9 @@ def OnToggleUpdateMap(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/mapdisp/toolbars.py b/gui/wxpython/mapdisp/toolbars.py
index 1d03cd86c4b..dfd7a6cea76 100644
--- a/gui/wxpython/mapdisp/toolbars.py
+++ b/gui/wxpython/mapdisp/toolbars.py
@@ -121,6 +121,7 @@ def __init__(self, parent, toolSwitcher, giface):
             self._giface.WriteLog(
                 _(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     "Note that the wxGUI's vector digitizer is disabled in this installation. "
 =======
@@ -128,6 +129,8 @@ def __init__(self, parent, toolSwitcher, giface):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                     "Note that the wxGUI's vector digitizer is disabled in this "
                     "installation."
 =======
@@ -137,6 +140,9 @@ def __init__(self, parent, toolSwitcher, giface):
                     "Note that the wxGUI's vector digitizer is disabled in this installation. "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -190,11 +196,14 @@ def _toolbarData(self):
             (
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 ("renderMap", BaseIcons["render"].label),
                 BaseIcons["render"],
                 self.parent.OnRender,
@@ -279,6 +288,9 @@ def _toolbarData(self):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/mapswipe/frame.py b/gui/wxpython/mapswipe/frame.py
index ded6d49b009..8bcb36322a7 100644
--- a/gui/wxpython/mapswipe/frame.py
+++ b/gui/wxpython/mapswipe/frame.py
@@ -101,9 +101,13 @@ def __init__(
             sb.SbCompRegionExtent,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
 >>>>>>> osgeo-main
             sb.SbDisplayGeometry,
             sb.SbMapScale,
@@ -112,12 +116,15 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             sb.SbDisplayGeometry,
             sb.SbMapScale,
             sb.SbGoTo,
 =======
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             sb.SbShowRegion,
             sb.SbAlignExtent,
@@ -138,6 +145,9 @@ def __init__(
             sb.SbGoTo,
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -192,6 +202,7 @@ def TrackCursor(self, event):
     def ActivateFirstMap(self, event=None):
         """Switch tracking direction"""
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(SwipeMapPanel, self).ActivateFirstMap(event)
 =======
@@ -199,6 +210,8 @@ def ActivateFirstMap(self, event=None):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().ActivateFirstMap(event)
 =======
         super(SwipeMapPanel, self).ActivateFirstMap(event)
@@ -207,6 +220,9 @@ def ActivateFirstMap(self, event=None):
         super(SwipeMapPanel, self).ActivateFirstMap(event)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -217,6 +233,7 @@ def ActivateFirstMap(self, event=None):
     def ActivateSecondMap(self, event=None):
         """Switch tracking direction"""
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(SwipeMapPanel, self).ActivateSecondMap(event)
 =======
@@ -224,6 +241,8 @@ def ActivateSecondMap(self, event=None):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().ActivateSecondMap(event)
 =======
         super(SwipeMapPanel, self).ActivateSecondMap(event)
@@ -232,6 +251,9 @@ def ActivateSecondMap(self, event=None):
         super(SwipeMapPanel, self).ActivateSecondMap(event)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -299,6 +321,7 @@ def OnSize(self, event):
         Debug.msg(4, "SwipeMapPanel.OnSize()")
         self.resize = grass.clock()
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(SwipeMapPanel, self).OnSize(event)
 =======
@@ -306,6 +329,8 @@ def OnSize(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         super().OnSize(event)
 =======
         super(SwipeMapPanel, self).OnSize(event)
@@ -314,6 +339,9 @@ def OnSize(self, event):
         super(SwipeMapPanel, self).OnSize(event)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -367,6 +395,7 @@ def AddToolbar(self, name):
                 .Row(1)
                 .Position(0)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 .BestSize((self.toolbars["swipeMain"].GetBestSize())),
 =======
@@ -374,6 +403,8 @@ def AddToolbar(self, name):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 .BestSize(self.toolbars["swipeMain"].GetBestSize()),
 =======
                 .BestSize((self.toolbars["swipeMain"].GetBestSize())),
@@ -382,6 +413,9 @@ def AddToolbar(self, name):
                 .BestSize((self.toolbars["swipeMain"].GetBestSize())),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -407,6 +441,7 @@ def AddToolbar(self, name):
                 .Row(1)
                 .Position(1)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 .BestSize((self.toolbars["swipeMap"].GetBestSize())),
 =======
@@ -414,6 +449,8 @@ def AddToolbar(self, name):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 .BestSize(self.toolbars["swipeMap"].GetBestSize()),
 =======
                 .BestSize((self.toolbars["swipeMap"].GetBestSize())),
@@ -422,6 +459,9 @@ def AddToolbar(self, name):
                 .BestSize((self.toolbars["swipeMap"].GetBestSize())),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -447,6 +487,7 @@ def AddToolbar(self, name):
                 .Row(1)
                 .Position(2)
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 .BestSize((self.toolbars["swipeMisc"].GetBestSize())),
 =======
@@ -454,6 +495,8 @@ def AddToolbar(self, name):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
                 .BestSize(self.toolbars["swipeMisc"].GetBestSize()),
 =======
                 .BestSize((self.toolbars["swipeMisc"].GetBestSize())),
@@ -462,6 +505,9 @@ def AddToolbar(self, name):
                 .BestSize((self.toolbars["swipeMisc"].GetBestSize())),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/mapswipe/g.gui.mapswipe.py b/gui/wxpython/mapswipe/g.gui.mapswipe.py
index d8eef5e2c4d..ff722dc5eab 100755
--- a/gui/wxpython/mapswipe/g.gui.mapswipe.py
+++ b/gui/wxpython/mapswipe/g.gui.mapswipe.py
@@ -91,11 +91,14 @@ def main():
         giface=StandaloneGrassInterface(),
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
         title=_("Map Swipe Tool - GRASS GIS"),
@@ -105,6 +108,9 @@ def main():
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/mapwin/base.py b/gui/wxpython/mapwin/base.py
index be853b51eb4..311a6af2cbe 100644
--- a/gui/wxpython/mapwin/base.py
+++ b/gui/wxpython/mapwin/base.py
@@ -103,6 +103,7 @@ def alignExtent(self, value):
     def useDefinedProjection(self):
         return self._useDefinedProjection
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     @useDefinedProjection.setter
@@ -135,6 +136,10 @@ def sbItem(self, mode):
 <<<<<<< HEAD
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
+=======
 >>>>>>> osgeo-main
 
     @useDefinedProjection.setter
@@ -471,6 +476,7 @@ def OnMotion(self, event):
     def GetLastEN(self):
         """Returns last coordinates of mouse cursor.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
         @deprecated This method is deprecated. Use Signal with coordinates as parameters.
@@ -479,6 +485,8 @@ def GetLastEN(self):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         @deprecated This method is deprecated. Use Signal with coordinates as
         parameters.
 =======
@@ -488,6 +496,9 @@ def GetLastEN(self):
         @deprecated This method is deprecated. Use Signal with coordinates as parameters.
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/photo2image/ip2i_manager.py b/gui/wxpython/photo2image/ip2i_manager.py
index 94911bc7b99..b4ee340ad3b 100644
--- a/gui/wxpython/photo2image/ip2i_manager.py
+++ b/gui/wxpython/photo2image/ip2i_manager.py
@@ -1042,6 +1042,7 @@ def ReloadGCPs(self, event):
 
     def OnFocus(self, event):
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 =======
@@ -1049,6 +1050,8 @@ def OnFocus(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
         # TODO: it is here just to remove old or obsolete beavior of base class
         #       gcp/MapPanel?
 =======
@@ -1058,6 +1061,9 @@ def OnFocus(self, event):
         # TODO: it is here just to remove old or obsolate beavior of base class gcp/MapPanel?
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/photo2image/ip2i_mapdisplay.py b/gui/wxpython/photo2image/ip2i_mapdisplay.py
index f8ea0dcdcf2..f2d977cc7de 100644
--- a/gui/wxpython/photo2image/ip2i_mapdisplay.py
+++ b/gui/wxpython/photo2image/ip2i_mapdisplay.py
@@ -106,11 +106,14 @@ def __init__(
         self.statusbar = self.CreateStatusbar(statusbarItems)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
         self.statusbarManager.SetMode(8)  # goto GCP
@@ -120,6 +123,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -252,17 +258,23 @@ def AddToolbar(self, name):
         if name == "map":
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -274,10 +286,13 @@ def AddToolbar(self, name):
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> osgeo-main
             self.toolbars["map"] = MapToolbar(self, self._toolSwitcher, self._giface)
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -285,6 +300,9 @@ def AddToolbar(self, name):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/psmap/frame.py b/gui/wxpython/psmap/frame.py
index 5c0b0832acf..2a5019f4f66 100644
--- a/gui/wxpython/psmap/frame.py
+++ b/gui/wxpython/psmap/frame.py
@@ -500,6 +500,7 @@ def OnCmdDone(self, event):
                     im = PILImage.fromarray(np.rot90(im_array, 3))
                 im.save(self.imgName, format="PNG")
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             except (IOError, OSError):
 =======
@@ -507,6 +508,8 @@ def OnCmdDone(self, event):
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
             except OSError:
 =======
             except (IOError, OSError):
@@ -515,6 +518,9 @@ def OnCmdDone(self, event):
             except (IOError, OSError):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -531,9 +537,12 @@ def OnCmdDone(self, event):
                     hyperlinkLabel=_(
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                         "You can download {program} {arch} version here."
                     ).format(
@@ -547,6 +556,9 @@ def OnCmdDone(self, event):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -557,6 +569,7 @@ def OnCmdDone(self, event):
                     ),
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -567,6 +580,11 @@ def OnCmdDone(self, event):
 >>>>>>> 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
                 )
                 dlg.ShowModal()
diff --git a/gui/wxpython/psmap/g.gui.psmap.html b/gui/wxpython/psmap/g.gui.psmap.html
index d94940ace39..f5a57611b97 100644
--- a/gui/wxpython/psmap/g.gui.psmap.html
+++ b/gui/wxpython/psmap/g.gui.psmap.html
@@ -204,10 +204,13 @@ 
    CARTOGRAPHIC COMPOSER TOOLBAR
    
   
     Generates hardcopy map output in PDF using ps2pdf.
    
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -222,6 +225,9 @@ 
    CARTOGRAPHIC COMPOSER TOOLBAR
    
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/psmap/utils.py b/gui/wxpython/psmap/utils.py
index 09a7238934e..716612fb894 100644
--- a/gui/wxpython/psmap/utils.py
+++ b/gui/wxpython/psmap/utils.py
@@ -17,17 +17,23 @@
 """
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/rdigit/g.gui.rdigit.py b/gui/wxpython/rdigit/g.gui.rdigit.py
index efbf1706499..4cfcdea35c5 100755
--- a/gui/wxpython/rdigit/g.gui.rdigit.py
+++ b/gui/wxpython/rdigit/g.gui.rdigit.py
@@ -142,11 +142,14 @@ def __init__(
             self.rdigit.quitDigitizer.connect(lambda: self.Close())
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
             # add Map Display panel to Map Display frame
             sizer = wx.BoxSizer(wx.VERTICAL)
@@ -158,6 +161,9 @@ def __init__(
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
diff --git a/gui/wxpython/rlisetup/g.gui.rlisetup.html b/gui/wxpython/rlisetup/g.gui.rlisetup.html
index 84190df6f22..ab7f5f96709 100644
--- a/gui/wxpython/rlisetup/g.gui.rlisetup.html
+++ b/gui/wxpython/rlisetup/g.gui.rlisetup.html
@@ -57,6 +57,7 @@ 
    Usage details
    
  configuration is shown in a small text editor window.
  
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 Creating a new Location based on a geodata file's projection (-c)
@@ -735,6 +872,8 @@ 
    Batch jobs with the exec interface
    
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> 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)
@@ -743,6 +882,9 @@ 
    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))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -808,6 +950,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 import grass.script as gs
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 gs.message('Current GRASS GIS environment:')
 =======
@@ -823,6 +966,13 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 
+gs.message('Current GRASS GIS environment:')
+=======
+>>>>>>> osgeo-main
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+
 gs.message('Current GRASS GIS environment:')
 =======
 >>>>>>> osgeo-main
@@ -844,6 +994,9 @@ 
    Execution of shell and Python scripts instead of single commands
    
 gs.message('Current GRASS GIS environment:')
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -858,6 +1011,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
     print(vector)
 
    
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -865,6 +1019,8 @@ 
    Execution of shell and Python scripts instead of single commands
    
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 
    Using temporary project
    
 
 Creating a new temporary project based on a georeferenced file's
@@ -877,6 +1033,9 @@ 
    Using temporary project
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -890,6 +1049,7 @@ 
    Using temporary location
    
 grass --tmp-location elevation.tiff --exec test.sh
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -901,6 +1061,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: @@ -908,11 +1073,14 @@

    Using temporary location

     <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 grass --tmp-project EPSG:3358 --exec test.py
    @@ -927,6 +1095,9 @@

    Using temporary location

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -942,6 +1113,7 @@

    Using temporary location

    Temporary location is automatically deleted after computation, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -953,6 +1125,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. @@ -960,11 +1137,14 @@

    Using temporary location

    A single command can be also executed, e.g. to examine properties of the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main temporary project: 
    @@ -980,6 +1160,9 @@ 
    Using temporary location
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -996,6 +1179,7 @@ 
    Using temporary location
    
 grass --tmp-location XY --exec r.neighbors --help
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -1007,6 +1191,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
    @@ -1016,12 +1205,15 @@

    Using temporary mapset

    A single command can be executed, e.g., to examine properties of a <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD location (here using the NC SPM sample location): ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main project (here using the NC SPM sample dataset): ======= location (here using the NC SPM sample location): @@ -1030,6 +1222,9 @@

    Using temporary mapset

    location (here using the NC SPM sample location): >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1068,6 +1263,7 @@

    Using temporary mapset

    Troubleshooting

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1079,6 +1275,10 @@

    Troubleshooting

    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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) @@ -1086,10 +1286,13 @@

    Troubleshooting

    have its executable bit set. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) Importantly, to avoid an "[Errno 8] Exec format error" there must be a @@ -1116,6 +1319,9 @@

    Troubleshooting

    have its executable bit set. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1152,11 +1358,14 @@

    AUTHORS (of this page)

    Martin Landa, Czech Technical University in Prague, Czech Republic <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1176,6 +1385,9 @@

    AUTHORS (of this page)

    ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/init/grass.py b/lib/init/grass.py index f1350c3c988..cf2039bb97c 100755 --- a/lib/init/grass.py +++ b/lib/init/grass.py @@ -20,6 +20,7 @@ # user interface and cleans up after it is finished. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -27,6 +28,9 @@ >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= @@ -42,6 +46,9 @@ # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -407,6 +414,7 @@ def help_message(default_gui): config=_("print GRASS configuration parameters"), config_detail=_( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "options: arch,build,compiler,date,path,python_path,revision,svn_revision,version" ======= @@ -414,6 +422,8 @@ def help_message(default_gui): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "options: arch,build,compiler,date,path,python_path,revision," "svn_revision,version" ======= @@ -423,6 +433,9 @@ def help_message(default_gui): "options: arch,build,compiler,date,path,python_path,revision,svn_revision,version" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -478,6 +491,7 @@ def get_grass_config_dir(): (the one which caries mapset settings from session to session). """ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if WINDOWS: grass_config_dirname = f"GRASS{GRASS_VERSION_MAJOR}" @@ -494,6 +508,12 @@ def get_grass_config_dir(): if WINDOWS: grass_config_dirname = f"GRASS{GRASS_VERSION_MAJOR}" ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if WINDOWS: + grass_config_dirname = f"GRASS{GRASS_VERSION_MAJOR}" +======= >>>>>>> osgeo-main if sys.platform == "win32": grass_config_dirname = "GRASS8" @@ -510,6 +530,9 @@ def get_grass_config_dir(): grass_config_dirname = f"GRASS{GRASS_VERSION_MAJOR}" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -532,6 +555,7 @@ def get_grass_config_dir(): directory = os.path.join(win_conf_path, grass_config_dirname) else: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD grass_config_dirname = f".grass{GRASS_VERSION_MAJOR}" ======= @@ -547,6 +571,12 @@ def get_grass_config_dir(): <<<<<<< HEAD grass_config_dirname = f".grass{GRASS_VERSION_MAJOR}" ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + grass_config_dirname = f".grass{GRASS_VERSION_MAJOR}" +======= >>>>>>> osgeo-main grass_config_dirname = ".grass8" >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -560,6 +590,9 @@ def get_grass_config_dir(): grass_config_dirname = f".grass{GRASS_VERSION_MAJOR}" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -595,6 +628,7 @@ def create_tmp(user, gis_lock): tmpdir_name = f"grass{GRASS_VERSION_MAJOR}-{user}-{gis_lock}" if tmp: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD tmpdir = os.path.join(tmp, tmpdir_name) ======= @@ -608,6 +642,11 @@ def create_tmp(user, gis_lock): <<<<<<< HEAD tmpdir = os.path.join(tmp, tmpdir_name) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + tmpdir = os.path.join(tmp, tmpdir_name) +======= >>>>>>> osgeo-main tmpdir = os.path.join( tmp, "grass8-%(user)s-%(lock)s" % {"user": user, "lock": gis_lock} @@ -620,6 +659,9 @@ def create_tmp(user, gis_lock): tmpdir = os.path.join(tmp, tmpdir_name) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -632,6 +674,7 @@ def create_tmp(user, gis_lock): for ttmp in ("/tmp", "/var/tmp", "/usr/tmp"): tmp = ttmp <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD tmpdir = os.path.join(tmp, tmpdir_name) ======= @@ -645,6 +688,11 @@ def create_tmp(user, gis_lock): <<<<<<< HEAD tmpdir = os.path.join(tmp, tmpdir_name) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + tmpdir = os.path.join(tmp, tmpdir_name) +======= >>>>>>> osgeo-main tmpdir = os.path.join( tmp, "grass8-%(user)s-%(lock)s" % {"user": user, "lock": gis_lock} @@ -657,6 +705,9 @@ def create_tmp(user, gis_lock): tmpdir = os.path.join(tmp, tmpdir_name) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -670,6 +721,7 @@ def create_tmp(user, gis_lock): if not tmp: fatal( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Unable to create temporary directory <{tmpdir_name}>! Exiting.").format( tmpdir_name=tmpdir_name @@ -686,6 +738,12 @@ def create_tmp(user, gis_lock): _("Unable to create temporary directory <{tmpdir_name}>! Exiting.").format( tmpdir_name=tmpdir_name ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + _("Unable to create temporary directory <{tmpdir_name}>! Exiting.").format( + tmpdir_name=tmpdir_name +======= >>>>>>> osgeo-main _( "Unable to create temporary directory >>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1341,6 +1402,7 @@ def set_mapset( _("Creating new GRASS GIS location <{}>...").format( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1351,6 +1413,11 @@ def set_mapset( >>>>>>> 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 location_name ) @@ -1386,6 +1453,7 @@ def set_mapset( "No CRS is needed for creating mapset <{mapset}>, " "but <{geofile}> was provided as CRS." <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD " Did you mean to create a new location?" ).format(mapset=mapset, geofile=geofile) @@ -1394,6 +1462,8 @@ def set_mapset( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main " Did you mean to create a new project?" ).format(mapset=mapset, geofile=geofile) ) @@ -1411,6 +1481,9 @@ def set_mapset( ).format(mapset=mapset, geofile=geofile) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/init/grass.sh b/lib/init/grass.sh index 648a9ff2f57..9c87b28a551 100755 --- a/lib/init/grass.sh +++ b/lib/init/grass.sh @@ -15,6 +15,7 @@ # interface and cleans up after it is finished. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -22,6 +23,9 @@ >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= @@ -37,6 +41,9 @@ # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/init/helptext.html b/lib/init/helptext.html index d2ec93243dc..9b72da8681b 100644 --- a/lib/init/helptext.html +++ b/lib/init/helptext.html @@ -4,6 +4,7 @@ When launching GRASS GIS for the first time, you will open a <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD default Location "world_latlog_wgs84" where you can find a map layer called "country_boundaries" showing a world map in the WGS84 coordinate system.

    @@ -13,6 +14,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main default project "world_latlog_wgs84" where you can find a map layer called "country_boundaries" showing a world map in the WGS84 coordinate system.

    @@ -39,6 +42,9 @@ >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -50,11 +56,14 @@

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD The main component of the Data tab is the Data Catalog which shows the GRASS GIS hierarchical structure consisting of @@ -182,6 +191,9 @@

    3. Creating a GRASS Database with Sample Data

    ======= >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -209,6 +221,7 @@

    3. Creating a GRASS Database with Sample Data

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4fcbd3f967 (Add Binder badge/button to readme (#1628)) @@ -220,12 +233,18 @@

    3. Creating a GRASS Database with Sample Data

    ======= >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) >>>>>>> osgeo-main +======= +>>>>>>> 4fcbd3f967 (Add Binder badge/button to readme (#1628)) +======= +>>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) +>>>>>>> osgeo-main

    For more info about data hierarchy, see GRASS GIS Database page.

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

    GRASS started in the default Location, now what?

    @@ -235,6 +254,9 @@

    GRASS started in the default Location, now what?

    >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD

    GRASS started in the default project, now what?

    >>>>>>> osgeo-main @@ -276,6 +298,9 @@

    Creating a New Location with the Location Wizard

    GRASS started in the default Location, now what?

    +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main First, if you would like to get to know GRASS better before importing your own data, @@ -340,6 +365,9 @@

    Creating a New project with the Project Wizard

    ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -350,7 +378,10 @@

    Creating a New project with the Project Wizard

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main >>>>>>> 4fcbd3f967 (Add Binder badge/button to readme (#1628)) @@ -362,6 +393,9 @@

    Creating a New project with the Project Wizard

    >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -373,11 +407,14 @@

    Creating a New project with the Project Wizard

    Importing data

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main After creating a new project, you are ready to import your data. You can use simple raster or vector data import [Raster import], [Vector import] or a variety of more specialized tools. @@ -386,6 +423,9 @@

    Importing data

    ======= >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -395,6 +435,7 @@

    Importing data

    If the data's CRS does not match your Location's CRS, data will be automatically reprojected. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4fcbd3f967 (Add Binder badge/button to readme (#1628)) @@ -406,11 +447,17 @@

    Importing data

    ======= >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) >>>>>>> osgeo-main +======= +>>>>>>> 4fcbd3f967 (Add Binder badge/button to readme (#1628)) +======= +>>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) +>>>>>>> osgeo-main After import your raster or vector data are added as a layer to Map Display. To change layer properties, go to Display tab. To analyze your data, search for a tool in the Modules tab. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

    Text-based startup and Location creation

    @@ -423,6 +470,9 @@

    Text-based startup and Location creation

    >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD

    Text-based startup and project creation

    @@ -476,6 +526,9 @@

    Text-based startup and Location creation

    <<<<<<< HEAD >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -485,12 +538,15 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main ======= <<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main GRASS GIS Reference Manual
    @@ -499,7 +555,10 @@

    See also

    GRASS GIS tutorials and books <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -539,6 +598,9 @@

    See also

    GRASS GIS tutorials and books >>>>>>> 5871ca876b (wxGUI/Single-Window GUI: arrangement of basic widgets (#1621)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -548,11 +610,14 @@

    See also

    List of EPSG codes (Database of worldwide coordinate systems) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -569,6 +634,9 @@

    See also

    ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/init/variables.html b/lib/init/variables.html index 03deb1bd2fd..a4254e0086c 100644 --- a/lib/init/variables.html +++ b/lib/init/variables.html @@ -101,6 +101,7 @@

    List of selected (GRASS related) shell environment variables

    Windows %APPDATA%\Roaming\GRASS8\addons.
    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -114,6 +115,12 @@

    List of selected (GRASS related) shell environment variables

    <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -127,6 +134,9 @@

    List of selected (GRASS related) shell environment variables

    >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -136,9 +146,12 @@

    List of selected (GRASS related) shell environment variables

    standard distribution. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main
    GRASS_COMPATIBILITY_TEST
    @@ -151,6 +164,9 @@

    List of selected (GRASS related) shell environment variables

    ======= >>>>>>> 6dd43833fd (Improve G_open|find _misc function documentation (#1760)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -163,11 +179,14 @@

    List of selected (GRASS related) shell environment variables

    otherwise ZLIB, which can be changed with e.g. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GRASS_COMPRESSOR=ZSTD, granted that GRASS has been compiled with the requested compressor. Compressors that are always available are RLE, ZLIB, and LZ4. The compressors BZIP2 and ZSTD @@ -176,6 +195,9 @@

    List of selected (GRASS related) shell environment variables

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -605,6 +627,7 @@

    List of selected GRASS gisenv variables

    initial location name
    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -615,6 +638,11 @@

    List of selected GRASS gisenv variables

    >>>>>>> 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
    MAPSET
    @@ -636,9 +664,12 @@

    List of selected GRASS gisenv variables

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main
    NPROCS
    @@ -657,6 +688,9 @@

    List of selected GRASS gisenv variables

    g.gisenv set="NPROCS=12" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -689,6 +723,7 @@

    GRASS-related Files

    stores the shell environment variables (MS Windows only)
    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -700,6 +735,11 @@

    GRASS-related Files

    <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + ======= >>>>>>> osgeo-main @@ -714,6 +754,9 @@

    GRASS-related Files

    >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/iostream/ami_stream.cpp b/lib/iostream/ami_stream.cpp index 93cc229d040..e17740e6e26 100644 --- a/lib/iostream/ami_stream.cpp +++ b/lib/iostream/ami_stream.cpp @@ -82,6 +82,7 @@ int ami_single_temp_name(const std::string &base, char *tmp_path) exit(1); } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD snprintf(tmp_path, GPATH_MAX, "%s/%s_XXXXXX", base_dir, base.c_str()); ======= @@ -97,6 +98,12 @@ int ami_single_temp_name(const std::string &base, char *tmp_path) <<<<<<< HEAD snprintf(tmp_path, GPATH_MAX, "%s/%s_XXXXXX", base_dir, base.c_str()); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + snprintf(tmp_path, GPATH_MAX, "%s/%s_XXXXXX", base_dir, base.c_str()); +======= >>>>>>> osgeo-main sprintf(tmp_path, "%s/%s_XXXXXX", base_dir, base.c_str()); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -113,6 +120,9 @@ int ami_single_temp_name(const std::string &base, char *tmp_path) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/iostream/rtimer.cpp b/lib/iostream/rtimer.cpp index 7a87c2dcebb..be10e9baa0f 100644 --- a/lib/iostream/rtimer.cpp +++ b/lib/iostream/rtimer.cpp @@ -38,6 +38,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -45,12 +46,17 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= // #include >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -75,7 +81,10 @@ char *rt_sprint_safe(char *buf, Rtimer rt) rt_w_useconds(rt)); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -143,6 +152,9 @@ char *rt_sprint_safe(char *buf, Rtimer rt) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/lidar/zones.c b/lib/lidar/zones.c index cb0b0d211a9..880e309c509 100644 --- a/lib/lidar/zones.c +++ b/lib/lidar/zones.c @@ -564,12 +564,15 @@ void P_Aux_to_Raster(double **matrix, int fd) /*------------------------------------------------------------------------------------------------*/ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void P_Aux_to_Vector(struct Map_info *Map, struct Map_info *Out, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void P_Aux_to_Vector(struct Map_info *Map UNUSED, struct Map_info *Out, >>>>>>> osgeo-main dbDriver *driver, char *tab_name) @@ -578,10 +581,13 @@ void P_Aux_to_Vector(struct Map_info *Map UNUSED, struct Map_info *Out, int more, type; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= void P_Aux_to_Vector(struct Map_info *Map, struct Map_info *Out, dbDriver *driver, char *tab_name) { @@ -607,6 +613,9 @@ void P_Aux_to_Vector(struct Map_info *Map, struct Map_info *Out, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -637,11 +646,14 @@ void P_Aux_to_Vector(struct Map_info *Map, struct Map_info *Out, while (db_fetch(&cursor, DB_NEXT, &more) == DB_OK && more) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -658,6 +670,9 @@ void P_Aux_to_Vector(struct Map_info *Map, struct Map_info *Out, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/manage/do_copy.c b/lib/manage/do_copy.c index 3fd76cbc603..b00180e76b2 100644 --- a/lib/manage/do_copy.c +++ b/lib/manage/do_copy.c @@ -55,17 +55,23 @@ int M_do_copy(int n, const char *old, const char *mapset, const char *new) else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -79,10 +85,13 @@ int M_do_copy(int n, const char *old, const char *mapset, const char *new) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main for (i = 0; i < list[n].nelem; i++) { G_make_mapset_object_group(list[n].element[i]); G_file_name(path, list[n].element[i], old, mapset); @@ -95,6 +104,9 @@ int M_do_copy(int n, const char *old, const char *mapset, const char *new) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/manage/do_list.c b/lib/manage/do_list.c index bf24f52dbc8..61b459e8a73 100644 --- a/lib/manage/do_list.c +++ b/lib/manage/do_list.c @@ -34,6 +34,7 @@ void M_do_list(int n, const char *mapset) for (i = 0; i < nlist; i++) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -44,6 +45,10 @@ void M_do_list(int n, const char *mapset) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main G_list_element(list[i].element[0], list[i].desc[0], mapset, NULL); } @@ -52,10 +57,13 @@ void M_do_list(int n, const char *mapset) G_list_element(list[n].element[0], list[n].desc[0], mapset, NULL); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) G_list_element(list[i].element[0], list[i].desc[0], mapset, @@ -90,6 +98,9 @@ void M_do_list(int n, const char *mapset) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/manage/sighold.c b/lib/manage/sighold.c index a1b97ee5161..0a39169f590 100644 --- a/lib/manage/sighold.c +++ b/lib/manage/sighold.c @@ -24,6 +24,7 @@ int M__hold_signals(int hold) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void (*sig)(int) = hold ? SIG_IGN : SIG_DFL; ======= @@ -39,6 +40,12 @@ int M__hold_signals(int hold) <<<<<<< HEAD void (*sig)(int) = hold ? SIG_IGN : SIG_DFL; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + void (*sig)(int) = hold ? SIG_IGN : SIG_DFL; +======= >>>>>>> osgeo-main void (*sig)() = hold ? SIG_IGN : SIG_DFL; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -55,6 +62,9 @@ int M__hold_signals(int hold) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/nviz/change_view.c b/lib/nviz/change_view.c index fae4fa0bfd1..d709f2b3699 100644 --- a/lib/nviz/change_view.c +++ b/lib/nviz/change_view.c @@ -315,6 +315,7 @@ void Nviz_init_rotation(void) Changes viewpoint and viewdir. Based on visualization/nviz/src/togl_flythrough.c and simplified. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD \param data nviz data @@ -323,6 +324,8 @@ void Nviz_init_rotation(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param data nviz data [unused] ======= \param data nviz data @@ -331,6 +334,9 @@ void Nviz_init_rotation(void) \param data nviz data >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -341,17 +347,23 @@ void Nviz_init_rotation(void) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void Nviz_flythrough(nv_data *data UNUSED, float *fly_info, int *scale, int lateral) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/nviz/cplanes_obj.c b/lib/nviz/cplanes_obj.c index 5b9f486fa93..f032a083f36 100644 --- a/lib/nviz/cplanes_obj.c +++ b/lib/nviz/cplanes_obj.c @@ -92,12 +92,15 @@ int Nviz_draw_cplane(nv_data *data, int bound1, int bound2) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void cp_draw(nv_data *data, int current, int surf1, int surf2) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void cp_draw(nv_data *data, int current UNUSED, int surf1, int surf2) ======= void cp_draw(nv_data *data, int current, int surf1, int surf2) @@ -106,6 +109,9 @@ void cp_draw(nv_data *data, int current, int surf1, int surf2) void cp_draw(nv_data *data, int current, int surf1, int surf2) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -268,12 +274,15 @@ int Nviz_get_cplane_translation(nv_data *data, int id, float *dx, float *dy, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Nviz_set_fence_color(nv_data *data, int type) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Nviz_set_fence_color(nv_data *data UNUSED, int type) ======= int Nviz_set_fence_color(nv_data *data, int type) @@ -282,6 +291,9 @@ int Nviz_set_fence_color(nv_data *data, int type) int Nviz_set_fence_color(nv_data *data, int type) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/nviz/lights.c b/lib/nviz/lights.c index 30f7d60f2b5..3d074a51397 100644 --- a/lib/nviz/lights.c +++ b/lib/nviz/lights.c @@ -181,6 +181,7 @@ int Nviz_new_light(nv_data *data) /*! \brief Draw lighting model +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD \param data nviz data @@ -191,6 +192,8 @@ void Nviz_draw_model(nv_data *data) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param data nviz data [unused] */ void Nviz_draw_model(nv_data *data UNUSED) @@ -205,6 +208,9 @@ void Nviz_draw_model(nv_data *data) void Nviz_draw_model(nv_data *data) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/nviz/map_obj.c b/lib/nviz/map_obj.c index fd18ab08dfa..b63767e0d4f 100644 --- a/lib/nviz/map_obj.c +++ b/lib/nviz/map_obj.c @@ -264,17 +264,23 @@ int Nviz_set_attr(int id, int type, int desc, int src, const char *str_value, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main FALLTHROUGH; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/nviz/position.c b/lib/nviz/position.c index be4d8c847bf..a226c7a408e 100644 --- a/lib/nviz/position.c +++ b/lib/nviz/position.c @@ -119,12 +119,15 @@ int Nviz_set_focus_map(int type, int id) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Nviz_get_focus(nv_data *data, float *x, float *y, float *z) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Nviz_get_focus(nv_data *data UNUSED, float *x, float *y, float *z) ======= int Nviz_get_focus(nv_data *data, float *x, float *y, float *z) @@ -133,6 +136,9 @@ int Nviz_get_focus(nv_data *data, float *x, float *y, float *z) int Nviz_get_focus(nv_data *data, float *x, float *y, float *z) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -158,12 +164,15 @@ int Nviz_get_focus(nv_data *data, float *x, float *y, float *z) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Nviz_set_focus(nv_data *data, float x, float y, float z) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Nviz_set_focus(nv_data *data UNUSED, float x, float y, float z) ======= int Nviz_set_focus(nv_data *data, float x, float y, float z) @@ -172,6 +181,9 @@ int Nviz_set_focus(nv_data *data, float x, float y, float z) int Nviz_set_focus(nv_data *data, float x, float y, float z) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -195,12 +207,15 @@ int Nviz_set_focus(nv_data *data, float x, float y, float z) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Nviz_has_focus(nv_data *data) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Nviz_has_focus(nv_data *data UNUSED) ======= int Nviz_has_focus(nv_data *data) @@ -209,6 +224,9 @@ int Nviz_has_focus(nv_data *data) int Nviz_has_focus(nv_data *data) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -239,12 +257,15 @@ float Nviz_get_xyrange(nv_data *data) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Nviz_get_zrange(nv_data *data, float *min, float *max) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Nviz_get_zrange(nv_data *data UNUSED, float *min, float *max) ======= int Nviz_get_zrange(nv_data *data, float *min, float *max) @@ -253,6 +274,9 @@ int Nviz_get_zrange(nv_data *data, float *min, float *max) int Nviz_get_zrange(nv_data *data, float *min, float *max) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -268,12 +292,15 @@ int Nviz_get_zrange(nv_data *data, float *min, float *max) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD float Nviz_get_longdim(nv_data *data) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main float Nviz_get_longdim(nv_data *data UNUSED) ======= float Nviz_get_longdim(nv_data *data) @@ -282,6 +309,9 @@ float Nviz_get_longdim(nv_data *data) float Nviz_get_longdim(nv_data *data) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/nviz/render.c b/lib/nviz/render.c index 7d2d749e4d4..5bbeed63c9a 100644 --- a/lib/nviz/render.c +++ b/lib/nviz/render.c @@ -160,6 +160,7 @@ int Nviz_create_render_window(struct render_window *rwin, void *display UNUSED, int Nviz_create_render_window(struct render_window *rwin, void *display, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -170,6 +171,11 @@ int Nviz_create_render_window(struct render_window *rwin, void *display, >>>>>>> 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 width, int height) { diff --git a/lib/ogsf/TODO b/lib/ogsf/TODO index e7bf4b44d8a..992292f04af 100644 --- a/lib/ogsf/TODO +++ b/lib/ogsf/TODO @@ -29,12 +29,15 @@ You are right that there is a problem with normals for surfaces with values <0-1>- I have already reported it, it seems that it is also causing parts of <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD the surface to disapear for larger values of z for higher resolution/higher ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main the surface to disappear for larger values of z for higher resolution/higher ======= the surface to disapear for larger values of z for higher resolution/higher @@ -43,6 +46,9 @@ the surface to disapear for larger values of z for higher resolution/higher the surface to disapear for larger values of z for higher resolution/higher >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gk.c b/lib/ogsf/gk.c index 4b92464c0b8..45c89a253fe 100644 --- a/lib/ogsf/gk.c +++ b/lib/ogsf/gk.c @@ -570,6 +570,7 @@ double get_2key_neighbors(int nvk, float time, float range, int loop, Keylist *karray[], Keylist **km1, Keylist **kp1) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -581,6 +582,11 @@ double get_2key_neighbors(int nvk, float time, float range, int loop, ======= >>>>>>> 8422103f4c (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 i; double len; diff --git a/lib/ogsf/gpd.c b/lib/ogsf/gpd.c index 53ee2ce649d..96fbdc5d0c5 100644 --- a/lib/ogsf/gpd.c +++ b/lib/ogsf/gpd.c @@ -214,12 +214,15 @@ void gpd_obj(geosurf *gs, gvstyle *style, Point3 pt) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int gpd_2dsite(geosite *gp, geosurf *gs, int do_fast) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int gpd_2dsite(geosite *gp, geosurf *gs, int do_fast UNUSED) ======= int gpd_2dsite(geosite *gp, geosurf *gs, int do_fast) @@ -228,6 +231,9 @@ int gpd_2dsite(geosite *gp, geosurf *gs, int do_fast) int gpd_2dsite(geosite *gp, geosurf *gs, int do_fast) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -329,12 +335,15 @@ int gpd_2dsite(geosite *gp, geosurf *gs, int do_fast) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int gpd_3dsite(geosite *gp, float xo, float yo, int do_fast) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int gpd_3dsite(geosite *gp, float xo, float yo, int do_fast UNUSED) ======= int gpd_3dsite(geosite *gp, float xo, float yo, int do_fast) @@ -343,6 +352,9 @@ int gpd_3dsite(geosite *gp, float xo, float yo, int do_fast) int gpd_3dsite(geosite *gp, float xo, float yo, int do_fast) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gs2.c b/lib/ogsf/gs2.c index 3e9327aa860..7ea73f09339 100644 --- a/lib/ogsf/gs2.c +++ b/lib/ogsf/gs2.c @@ -3283,6 +3283,7 @@ int GS_get_distance_alongsurf(int hs, float x1, float y1, float x2, float y2, { geosurf *gs; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Point3 p1, p2; ======= @@ -3296,6 +3297,11 @@ int GS_get_distance_alongsurf(int hs, float x1, float y1, float x2, float y2, <<<<<<< HEAD Point3 p1, p2; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + Point3 p1, p2; +======= >>>>>>> osgeo-main float p1[2], p2[2]; <<<<<<< HEAD @@ -3312,6 +3318,9 @@ int GS_get_distance_alongsurf(int hs, float x1, float y1, float x2, float y2, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gs3.c b/lib/ogsf/gs3.c index 66b44564913..8f96731e430 100644 --- a/lib/ogsf/gs3.c +++ b/lib/ogsf/gs3.c @@ -845,12 +845,15 @@ int Gs_get_cat_label(const char *filename, int drow, int dcol, char *catstr) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd UNUSED, ======= int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, @@ -859,6 +862,9 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -913,6 +919,7 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, v.twist = gv->twist; v.fringe = 0; /* not implemented here */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD v.lightson = 1; /* always true, curently */ @@ -921,6 +928,8 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main v.lightson = 1; /* always true, currently */ ======= v.lightson = 1; /* always true, curently */ @@ -929,6 +938,9 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, v.lightson = 1; /* always true, curently */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -960,6 +972,7 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, v.surfonly = 0; /* N/A - now uses constant color */ strcpy((v.pgm_id), "Nvision-ALPHA!"); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD return (G_put_3dview(vname, mapset, &v, w)); @@ -968,6 +981,8 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main return (G_put_3dview(vname, &v, w)); ======= return (G_put_3dview(vname, mapset, &v, w)); @@ -976,6 +991,9 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, return (G_put_3dview(vname, mapset, &v, w)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -998,12 +1016,15 @@ int Gs_save_3dview(const char *vname, geoview *gv, geodisplay *gd, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Gs_load_3dview(const char *vname, geoview *gv, geodisplay *gd, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Gs_load_3dview(const char *vname, geoview *gv, geodisplay *gd UNUSED, ======= int Gs_load_3dview(const char *vname, geoview *gv, geodisplay *gd, @@ -1012,6 +1033,9 @@ int Gs_load_3dview(const char *vname, geoview *gv, geodisplay *gd, int Gs_load_3dview(const char *vname, geoview *gv, geodisplay *gd, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gsd_cplane.c b/lib/ogsf/gsd_cplane.c index 62948af57ba..c7a434d4f87 100644 --- a/lib/ogsf/gsd_cplane.c +++ b/lib/ogsf/gsd_cplane.c @@ -246,12 +246,15 @@ void gsd_cplane_settrans(int num, float tx, float ty, float tz) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2 UNUSED, int cpnum) ======= void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) @@ -260,6 +263,9 @@ void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -272,6 +278,7 @@ void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) gsd_set_clipplane(cpnum, 0); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* line on surface (asuming NO TILT) is (-A,B)->(A,-B), @@ -280,6 +287,8 @@ void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* line on surface (assuming NO TILT) is (-A,B)->(A,-B), ======= /* line on surface (asuming NO TILT) is (-A,B)->(A,-B), @@ -288,6 +297,9 @@ void gsd_draw_cplane_fence(geosurf *surf1, geosurf *surf2, int cpnum) /* line on surface (asuming NO TILT) is (-A,B)->(A,-B), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gsd_fringe.c b/lib/ogsf/gsd_fringe.c index 73536dce11f..25dd252e5f4 100644 --- a/lib/ogsf/gsd_fringe.c +++ b/lib/ogsf/gsd_fringe.c @@ -537,11 +537,14 @@ void gsd_fringe_horiz_line2(float bot, geosurf *surf, int row, int side) gsd_vert_func(pt); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -558,6 +561,9 @@ void gsd_fringe_horiz_line2(float bot, geosurf *surf, int row, int side) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gsd_objs.c b/lib/ogsf/gsd_objs.c index 623aad00168..78bf1d706d6 100644 --- a/lib/ogsf/gsd_objs.c +++ b/lib/ogsf/gsd_objs.c @@ -1227,6 +1227,7 @@ int gsd_scalebar_v2(float *pos, float len, GLuint fontbase, unsigned long bar_clr, unsigned long text_clr) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1238,6 +1239,11 @@ int gsd_scalebar_v2(float *pos, float len, GLuint fontbase, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { float base[6][3]; float Ntop[] = {0.0, 0.0, 1.0}; diff --git a/lib/ogsf/gsd_surf.c b/lib/ogsf/gsd_surf.c index c6c136d3f12..71f6ffa9290 100644 --- a/lib/ogsf/gsd_surf.c +++ b/lib/ogsf/gsd_surf.c @@ -1089,6 +1089,7 @@ int gsd_surf_const(geosurf *surf, float k) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int gsd_surf_func(geosurf *gs, int (*user_func)(void)) ======= <<<<<<< HEAD @@ -1096,6 +1097,9 @@ int gsd_surf_func(geosurf *gs, int (*user_func)(void)) >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD int gsd_surf_func(geosurf *gs UNUSED, int (*user_func)(void) UNUSED) ======= @@ -1114,6 +1118,9 @@ int gsd_surf_func(geosurf *gs, int (*user_func)(void)) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2291,6 +2298,7 @@ int gsd_surf_map(geosurf *surf) } */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2303,6 +2311,10 @@ int gsd_surf_map(geosurf *surf) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main /* Do not need BM_get because GET_MAPATT calls * same and returns zero if masked @@ -2394,7 +2406,10 @@ int gsd_surf_map(geosurf *surf) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -2490,6 +2505,9 @@ int gsd_surf_map(geosurf *surf) <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main gsd_litvert_func(n, ktrans | curcolor, pt); @@ -2497,6 +2515,7 @@ int gsd_surf_map(geosurf *surf) gsd_endtfan(); <<<<<<< HEAD ======= +<<<<<<< HEAD ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -2600,6 +2619,8 @@ int gsd_surf_map(geosurf *surf) >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main cnt2++; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2717,6 +2738,9 @@ int gsd_surf_map(geosurf *surf) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gsd_wire.c b/lib/ogsf/gsd_wire.c index 64d0c2d0943..afaefd25fd7 100644 --- a/lib/ogsf/gsd_wire.c +++ b/lib/ogsf/gsd_wire.c @@ -441,6 +441,7 @@ int gsd_wire_surf_const(geosurf *surf, float k) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int gsd_wire_surf_func(geosurf *gs, int (*user_func)(void)) ======= <<<<<<< HEAD @@ -448,6 +449,9 @@ int gsd_wire_surf_func(geosurf *gs, int (*user_func)(void)) >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD int gsd_wire_surf_func(geosurf *gs UNUSED, int (*user_func)(void) UNUSED) ======= @@ -466,6 +470,9 @@ int gsd_wire_surf_func(geosurf *gs, int (*user_func)(void)) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gsdrape.c b/lib/ogsf/gsdrape.c index b8c99f3079d..1a233f2af94 100644 --- a/lib/ogsf/gsdrape.c +++ b/lib/ogsf/gsdrape.c @@ -1065,12 +1065,15 @@ int get_horz_intersects(geosurf *gs, float *bgn, float *end, float *dir) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int get_diag_intersects(geosurf *gs, float *bgn, float *end, float *dir) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int get_diag_intersects(geosurf *gs, float *bgn, float *end, float *dir UNUSED) ======= int get_diag_intersects(geosurf *gs, float *bgn, float *end, float *dir) @@ -1079,6 +1082,9 @@ int get_diag_intersects(geosurf *gs, float *bgn, float *end, float *dir) int get_diag_intersects(geosurf *gs, float *bgn, float *end, float *dir) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gsx.c b/lib/ogsf/gsx.c index bd4b24a232d..03d90af4276 100644 --- a/lib/ogsf/gsx.c +++ b/lib/ogsf/gsx.c @@ -18,6 +18,7 @@ #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void (*Cxl_func)(void); @@ -35,6 +36,12 @@ void (*Cxl_func)(void); void (*Cxl_func)(void); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +void (*Cxl_func)(void); +======= +>>>>>>> osgeo-main void (*Cxl_func)(); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -50,6 +57,9 @@ void (*Cxl_func)(void); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gvl_calc.c b/lib/ogsf/gvl_calc.c index f555ece7178..fbab057f415 100644 --- a/lib/ogsf/gvl_calc.c +++ b/lib/ogsf/gvl_calc.c @@ -420,6 +420,7 @@ void iso_calc_cube(geovol_isosurf *isosurf, int x, int y, int z, } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* set egdes verts */ ======= @@ -427,6 +428,8 @@ void iso_calc_cube(geovol_isosurf *isosurf, int x, int y, int z, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* set edges verts */ ======= /* set egdes verts */ @@ -435,6 +438,9 @@ void iso_calc_cube(geovol_isosurf *isosurf, int x, int y, int z, /* set egdes verts */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -470,6 +476,7 @@ void iso_calc_cube(geovol_isosurf *isosurf, int x, int y, int z, } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* set egdes verts */ ======= @@ -477,6 +484,8 @@ void iso_calc_cube(geovol_isosurf *isosurf, int x, int y, int z, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* set edges verts */ ======= /* set egdes verts */ @@ -485,6 +494,9 @@ void iso_calc_cube(geovol_isosurf *isosurf, int x, int y, int z, /* set egdes verts */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gvl_calc2.c b/lib/ogsf/gvl_calc2.c index 83abae89d37..864f60e1bc5 100644 --- a/lib/ogsf/gvl_calc2.c +++ b/lib/ogsf/gvl_calc2.c @@ -376,17 +376,23 @@ int mc33_process_cube(int c_ndx, float *v) }; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main break; /* will not reach this as previous switch is exhaustive */ ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -576,17 +582,23 @@ int mc33_process_cube(int c_ndx, float *v) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main break; /* will not reach this as previous switch is exhaustive */ ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/ogsf/gvld.c b/lib/ogsf/gvld.c index 9b2191b1dfa..d4d18495972 100644 --- a/lib/ogsf/gvld.c +++ b/lib/ogsf/gvld.c @@ -409,12 +409,15 @@ int gvld_isosurf(geovol *gvl) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int gvld_wire_isosurf(geovol *gvl) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int gvld_wire_isosurf(geovol *gvl UNUSED) ======= int gvld_wire_isosurf(geovol *gvl) @@ -423,6 +426,9 @@ int gvld_wire_isosurf(geovol *gvl) int gvld_wire_isosurf(geovol *gvl) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/pngdriver/draw_bitmap.c b/lib/pngdriver/draw_bitmap.c index 3cd5ce94ec8..13df49a81c4 100644 --- a/lib/pngdriver/draw_bitmap.c +++ b/lib/pngdriver/draw_bitmap.c @@ -49,6 +49,7 @@ void PNG_draw_bitmap(int ncols, int nrows, int threshold, unsigned int k = buf[j * ncols + i]; unsigned int *p = &png.grid[y * png.width + x]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (k > (unsigned int)threshold) @@ -65,6 +66,12 @@ void PNG_draw_bitmap(int ncols, int nrows, int threshold, <<<<<<< HEAD if (k > (unsigned int)threshold) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (k > (unsigned int)threshold) +======= >>>>>>> osgeo-main if (k > threshold) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81,6 +88,9 @@ void PNG_draw_bitmap(int ncols, int nrows, int threshold, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/pngdriver/raster.c b/lib/pngdriver/raster.c index 31ae538e52f..b89e608af6f 100644 --- a/lib/pngdriver/raster.c +++ b/lib/pngdriver/raster.c @@ -110,12 +110,15 @@ void PNG_begin_raster(int mask, int s[2][2], double fd[2][2]) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int PNG_raster(int n, int row, const unsigned char *red, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int PNG_raster(UNUSED int n, int row, const unsigned char *red, ======= int PNG_raster(int n, int row, const unsigned char *red, @@ -124,6 +127,9 @@ int PNG_raster(int n, int row, const unsigned char *red, int PNG_raster(int n, int row, const unsigned char *red, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/pngdriver/read_bmp.c b/lib/pngdriver/read_bmp.c index 3d887beaf72..10211bba62d 100644 --- a/lib/pngdriver/read_bmp.c +++ b/lib/pngdriver/read_bmp.c @@ -43,6 +43,7 @@ static int read_bmp_header(const unsigned char *p) if (*p++ != 'M') return 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (get_4(&p) != (unsigned int)HEADER_SIZE + png.width * png.height * 4) @@ -57,6 +58,11 @@ static int read_bmp_header(const unsigned char *p) <<<<<<< HEAD if (get_4(&p) != (unsigned int)HEADER_SIZE + png.width * png.height * 4) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if (get_4(&p) != (unsigned int)HEADER_SIZE + png.width * png.height * 4) +======= >>>>>>> osgeo-main if (get_4(&p) != HEADER_SIZE + png.width * png.height * 4) <<<<<<< HEAD @@ -73,6 +79,9 @@ static int read_bmp_header(const unsigned char *p) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -86,11 +95,15 @@ static int read_bmp_header(const unsigned char *p) if (get_4(&p) != 40) return 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main if (get_4(&p) != (unsigned int)png.width) return 0; @@ -99,12 +112,15 @@ static int read_bmp_header(const unsigned char *p) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (get_4(&p) != (unsigned int)png.width) return 0; if (get_4(&p) != (unsigned int)-png.height) ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (get_4(&p) != png.width) return 0; @@ -128,6 +144,9 @@ static int read_bmp_header(const unsigned char *p) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -140,6 +159,7 @@ static int read_bmp_header(const unsigned char *p) if (get_4(&p) != 0) return 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (get_4(&p) != (unsigned int)png.width * png.height * 4) ======= @@ -155,6 +175,12 @@ static int read_bmp_header(const unsigned char *p) <<<<<<< HEAD if (get_4(&p) != (unsigned int)png.width * png.height * 4) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (get_4(&p) != (unsigned int)png.width * png.height * 4) +======= >>>>>>> osgeo-main if (get_4(&p) != png.width * png.height * 4) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -171,6 +197,9 @@ static int read_bmp_header(const unsigned char *p) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/proj/datum.c b/lib/proj/datum.c index dd5e480dfb6..4648d1557d8 100644 --- a/lib/proj/datum.c +++ b/lib/proj/datum.c @@ -382,11 +382,14 @@ struct datum_list *read_datum_table(void) current->next = NULL; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -406,6 +409,9 @@ struct datum_list *read_datum_table(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/proj/do_proj.c b/lib/proj/do_proj.c index 97d4bd95f06..258475bd44f 100644 --- a/lib/proj/do_proj.c +++ b/lib/proj/do_proj.c @@ -696,6 +696,7 @@ int GPJ_init_transform(const struct pj_info *info_in, if (op_list) proj_list_destroy(op_list); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* follwing code copied from proj_create_crs_to_crs_from_pj() @@ -706,6 +707,8 @@ int GPJ_init_transform(const struct pj_info *info_in, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* following code copied from proj_create_crs_to_crs_from_pj() * in proj src/4D_api.cpp * using PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION @@ -736,6 +739,9 @@ int GPJ_init_transform(const struct pj_info *info_in, * but using PROJ_SPATIAL_CRITERION_STRICT_CONTAINMENT */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -748,6 +754,7 @@ int GPJ_init_transform(const struct pj_info *info_in, proj_operation_factory_context_set_spatial_criterion( PJ_DEFAULT_CTX, operation_ctx, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD PROJ_SPATIAL_CRITERION_STRICT_CONTAINMENT); proj_operation_factory_context_set_grid_availability_use( @@ -868,6 +875,8 @@ int GPJ_init_transform(const struct pj_info *info_in, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION); /* from GDAL OGRProjCT::ListCoordinateOperations() */ proj_operation_factory_context_set_grid_availability_use( @@ -1222,6 +1231,9 @@ int GPJ_init_transform(const struct pj_info *info_in, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/proj/ellipse.c b/lib/proj/ellipse.c index 601224e0f63..6eb414c92c0 100644 --- a/lib/proj/ellipse.c +++ b/lib/proj/ellipse.c @@ -273,11 +273,14 @@ struct ellps_list *read_ellipsoid_table(int fatal) current->next = NULL; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -294,6 +297,9 @@ struct ellps_list *read_ellipsoid_table(int fatal) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/proj/get_proj.c b/lib/proj/get_proj.c index dc37017e3d4..e56518f2516 100644 --- a/lib/proj/get_proj.c +++ b/lib/proj/get_proj.c @@ -276,11 +276,14 @@ int pj_get_kv(struct pj_info *info, const struct Key_Value *in_proj_keys, G_fatal_error("PROJ 5 error %d", perr); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -289,6 +292,9 @@ int pj_get_kv(struct pj_info *info, const struct Key_Value *in_proj_keys, ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -306,10 +312,13 @@ int pj_get_kv(struct pj_info *info, const struct Key_Value *in_proj_keys, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -319,6 +328,9 @@ int pj_get_kv(struct pj_info *info, const struct Key_Value *in_proj_keys, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/psdriver/draw_bitmap.c b/lib/psdriver/draw_bitmap.c index afaa30420c5..0dff07c0a43 100644 --- a/lib/psdriver/draw_bitmap.c +++ b/lib/psdriver/draw_bitmap.c @@ -13,6 +13,7 @@ void PS_Bitmap(int ncols, int nrows, int threshold, const unsigned char *buf) for (i = 0; i < ncols; i++) { unsigned int k = buf[j * ncols + i]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (k > (unsigned int)threshold) @@ -29,6 +30,12 @@ void PS_Bitmap(int ncols, int nrows, int threshold, const unsigned char *buf) <<<<<<< HEAD if (k > (unsigned int)threshold) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (k > (unsigned int)threshold) +======= >>>>>>> osgeo-main if (k > threshold) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -45,6 +52,9 @@ void PS_Bitmap(int ncols, int nrows, int threshold, const unsigned char *buf) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/close.c b/lib/raster/close.c index f8f643b7b50..0db9410725f 100644 --- a/lib/raster/close.c +++ b/lib/raster/close.c @@ -172,6 +172,7 @@ static int close_old(int fd) /* if R__.auto_mask was only allocated for reading map rows to create <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD non-existant null rows, and not for actuall mask, free R__.mask_row ======= @@ -179,6 +180,8 @@ static int close_old(int fd) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main non-existent null rows, and not for actual mask, free R__.mask_row ======= non-existant null rows, and not for actuall mask, free R__.mask_row @@ -187,6 +190,9 @@ static int close_old(int fd) non-existant null rows, and not for actuall mask, free R__.mask_row >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -332,6 +338,7 @@ static int close_new_gdal(int fd, int ok) G_file_name_misc(path, "cell_misc", NULLC_FILE, fcb->name, G_mapset()); remove(path); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -339,12 +346,17 @@ static int close_new_gdal(int fd, int ok) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -357,10 +369,13 @@ static int close_new_gdal(int fd, int ok) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main /* write 0-length cell file */ G_make_mapset_object_group("cell"); G_file_name(path, "cell", fcb->name, fcb->mapset); @@ -372,6 +387,9 @@ static int close_new_gdal(int fd, int ok) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -379,6 +397,7 @@ static int close_new_gdal(int fd, int ok) if (fcb->map_type != CELL_TYPE) { /* floating point map */ write_fp_format(fd); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -386,12 +405,17 @@ static int close_new_gdal(int fd, int ok) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -414,10 +438,13 @@ static int close_new_gdal(int fd, int ok) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main /* write 0-length fcell file */ G_make_mapset_object_group("fcell"); G_file_name(path, "fcell", fcb->name, fcb->mapset); @@ -439,6 +466,9 @@ static int close_new_gdal(int fd, int ok) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -549,6 +579,7 @@ static int close_new(int fd, int ok) write_fp_format(fd); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -556,12 +587,17 @@ static int close_new(int fd, int ok) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -587,10 +623,13 @@ static int close_new(int fd, int ok) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main /* now write 0-length cell file */ G_make_mapset_object_group("cell"); cell_fd = @@ -616,6 +655,9 @@ static int close_new(int fd, int ok) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/format.c b/lib/raster/format.c index 1d96e623f29..014fb7d671c 100644 --- a/lib/raster/format.c +++ b/lib/raster/format.c @@ -108,6 +108,7 @@ static int read_row_ptrs(int nrows, int old, off_t *row_ptr, int fd) if (old) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD n = ((unsigned int)nrows + 1) * sizeof(off_t); ======= @@ -123,6 +124,12 @@ static int read_row_ptrs(int nrows, int old, off_t *row_ptr, int fd) <<<<<<< HEAD n = ((unsigned int)nrows + 1) * sizeof(off_t); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + n = ((unsigned int)nrows + 1) * sizeof(off_t); +======= >>>>>>> osgeo-main n = (nrows + 1) * sizeof(off_t); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -139,6 +146,9 @@ static int read_row_ptrs(int nrows, int old, off_t *row_ptr, int fd) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -164,11 +174,15 @@ static int read_row_ptrs(int nrows, int old, off_t *row_ptr, int fd) if (read(fd, buf, n) != n) goto badread; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main for (row = 0, b = buf; row <= (unsigned int)nrows; row++) { off_t v = 0; diff --git a/lib/raster/gdal.c b/lib/raster/gdal.c index 19411c8a425..7c639edc659 100644 --- a/lib/raster/gdal.c +++ b/lib/raster/gdal.c @@ -210,6 +210,7 @@ static void read_gdal_options(void) else { char path[GPATH_MAX]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -217,12 +218,17 @@ static void read_gdal_options(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -234,10 +240,13 @@ static void read_gdal_options(void) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main G_file_name(path, p, "", G_mapset()); st->opts.dir = G_store(path); if (access(path, 0) != 0) @@ -248,6 +257,9 @@ static void read_gdal_options(void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/get_row.c b/lib/raster/get_row.c index 3e2df41615c..0a346671070 100644 --- a/lib/raster/get_row.c +++ b/lib/raster/get_row.c @@ -163,6 +163,7 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf, /* pre 3.0 compression */ n = *nbytes = fcb->nbytes; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD bufsize = (size_t)n * fcb->cellhd.cols; @@ -187,6 +188,15 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf, bufsize = n * fcb->cellhd.cols; if (fcb->cellhd.compressed < 0 || readamount < bufsize) { >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + bufsize = (size_t)n * fcb->cellhd.cols; + if (fcb->cellhd.compressed < 0 || (size_t)readamount < bufsize) { +======= + bufsize = n * fcb->cellhd.cols; + if (fcb->cellhd.compressed < 0 || readamount < bufsize) { +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main if (fcb->cellhd.compressed == 1) rle_decompress(data_buf, cmp, n, readamount); @@ -201,10 +211,13 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf, } ======= <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main bufsize = n * fcb->cellhd.cols; if (fcb->cellhd.compressed < 0 || readamount < bufsize) { @@ -240,6 +253,9 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -335,6 +351,7 @@ static void cell_values_int(int fd, const unsigned char *data, int n) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -346,6 +363,11 @@ static void cell_values_int(int fd, const unsigned char *data, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { CELL *c = cell; COLUMN_MAPPING cmapold = 0; @@ -396,6 +418,7 @@ static void cell_values_float(int fd, const unsigned char *data, const COLUMN_MAPPING *cmap, int nbytes, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -406,6 +429,11 @@ static void cell_values_float(int fd, const unsigned char *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 void *cell, int n) { @@ -432,6 +460,7 @@ static void cell_values_double(int fd, const unsigned char *data, const COLUMN_MAPPING *cmap, int nbytes, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -442,6 +471,11 @@ static void cell_values_double(int fd, const unsigned char *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 void *cell, int n) { @@ -463,6 +497,7 @@ static void cell_values_double(int fd, const unsigned char *data, #ifdef HAVE_GDAL static void gdal_values_int(int fd, const unsigned char *data, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const COLUMN_MAPPING *cmap, int nbytes, void *cell, ======= @@ -478,6 +513,12 @@ static void gdal_values_int(int fd, const unsigned char *data, <<<<<<< HEAD const COLUMN_MAPPING *cmap, int nbytes, void *cell, ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + const COLUMN_MAPPING *cmap, int nbytes, void *cell, +======= >>>>>>> osgeo-main const COLUMN_MAPPING *cmap, int nbytes, CELL *cell, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -494,6 +535,9 @@ static void gdal_values_int(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -508,6 +552,7 @@ static void gdal_values_int(int fd, const unsigned char *data, for (i = 0; i < n; i++) { if (!cmap[i]) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD c[i] = 0; ======= @@ -523,6 +568,12 @@ static void gdal_values_int(int fd, const unsigned char *data, <<<<<<< HEAD c[i] = 0; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + c[i] = 0; +======= >>>>>>> osgeo-main cell[i] = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -539,6 +590,9 @@ static void gdal_values_int(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -547,6 +601,7 @@ static void gdal_values_int(int fd, const unsigned char *data, if (cmap[i] == cmapold) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD c[i] = c[i - 1]; ======= @@ -562,6 +617,12 @@ static void gdal_values_int(int fd, const unsigned char *data, <<<<<<< HEAD c[i] = c[i - 1]; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + c[i] = c[i - 1]; +======= >>>>>>> osgeo-main cell[i] = cell[i - 1]; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -578,6 +639,9 @@ static void gdal_values_int(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -590,11 +654,14 @@ static void gdal_values_int(int fd, const unsigned char *data, case GDT_Byte: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD c[i] = *(GByte *)d; @@ -652,6 +719,9 @@ static void gdal_values_int(int fd, const unsigned char *data, ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -674,6 +744,11 @@ static void gdal_values_int(int fd, const unsigned char *data, Rast_set_c_null_value(&c[i], 1); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) @@ -689,6 +764,7 @@ static void gdal_values_int(int fd, const unsigned char *data, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static void gdal_values_float(int fd, const unsigned char *data, @@ -699,6 +775,8 @@ static void gdal_values_float(int fd, const unsigned char *data, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD static void gdal_values_float(int fd UNUSED, const unsigned char *data, const COLUMN_MAPPING *cmap, int nbytes UNUSED, @@ -726,6 +804,9 @@ static void gdal_values_float(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -738,6 +819,7 @@ static void gdal_values_float(int fd, const unsigned char *data, for (i = 0; i < n; i++) { if (!cmap[i]) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD c[i] = 0; ======= @@ -753,6 +835,12 @@ static void gdal_values_float(int fd, const unsigned char *data, <<<<<<< HEAD c[i] = 0; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + c[i] = 0; +======= >>>>>>> osgeo-main cell[i] = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -769,6 +857,9 @@ static void gdal_values_float(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -778,6 +869,7 @@ static void gdal_values_float(int fd, const unsigned char *data, if (cmap[i] == cmapold) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -788,6 +880,10 @@ static void gdal_values_float(int fd, const unsigned char *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main c[i] = c[i - 1]; continue; @@ -796,6 +892,7 @@ static void gdal_values_float(int fd, const unsigned char *data, c[i] = d[cmap[i] - 1]; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= @@ -813,6 +910,15 @@ static void gdal_values_float(int fd, const unsigned char *data, continue; } +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) + cell[i] = cell[i - 1]; + continue; + } + >>>>>>> osgeo-main cell[i] = data[cmap[i] - 1]; <<<<<<< HEAD @@ -839,6 +945,9 @@ static void gdal_values_float(int fd, const unsigned char *data, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -846,6 +955,7 @@ static void gdal_values_float(int fd, const unsigned char *data, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static void gdal_values_double(int fd, const unsigned char *data, @@ -856,6 +966,8 @@ static void gdal_values_double(int fd, const unsigned char *data, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD static void gdal_values_double(int fd UNUSED, const unsigned char *data, const COLUMN_MAPPING *cmap, int nbytes UNUSED, @@ -883,6 +995,9 @@ static void gdal_values_double(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -895,6 +1010,7 @@ static void gdal_values_double(int fd, const unsigned char *data, for (i = 0; i < n; i++) { if (!cmap[i]) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD c[i] = 0; ======= @@ -910,6 +1026,12 @@ static void gdal_values_double(int fd, const unsigned char *data, <<<<<<< HEAD c[i] = 0; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + c[i] = 0; +======= >>>>>>> osgeo-main cell[i] = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -926,6 +1048,9 @@ static void gdal_values_double(int fd, const unsigned char *data, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -935,6 +1060,7 @@ static void gdal_values_double(int fd, const unsigned char *data, if (cmap[i] == cmapold) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -945,6 +1071,10 @@ static void gdal_values_double(int fd, const unsigned char *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main c[i] = c[i - 1]; continue; @@ -953,6 +1083,15 @@ static void gdal_values_double(int fd, const unsigned char *data, c[i] = d[cmap[i] - 1]; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD + +======= +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) + cell[i] = cell[i - 1]; + continue; + } ======= ======= @@ -962,6 +1101,7 @@ static void gdal_values_double(int fd, const unsigned char *data, continue; } +>>>>>>> osgeo-main ======= ======= ======= @@ -996,6 +1136,9 @@ static void gdal_values_double(int fd, const unsigned char *data, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1017,6 +1160,7 @@ static void transfer_to_cell_XX(int fd, void *cell) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1027,6 +1171,10 @@ static void transfer_to_cell_XX(int fd, void *cell) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main static void (*cell_values_type[3])( int, const unsigned char *, const COLUMN_MAPPING *, int, void *, @@ -1037,7 +1185,10 @@ static void transfer_to_cell_XX(int fd, void *cell) int) = {gdal_values_int, gdal_values_float, gdal_values_double}; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -1073,6 +1224,9 @@ static void transfer_to_cell_XX(int fd, void *cell) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1185,6 +1339,7 @@ static int get_map_row_nomask(int fd, void *rast, int row, RASTER_MAP_TYPE data_type) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD static void (*transfer_to_cell_FtypeOtype[3][3])(int, void *) = { ======= @@ -1200,6 +1355,12 @@ static int get_map_row_nomask(int fd, void *rast, int row, <<<<<<< HEAD static void (*transfer_to_cell_FtypeOtype[3][3])(int, void *) = { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + static void (*transfer_to_cell_FtypeOtype[3][3])(int, void *) = { +======= >>>>>>> osgeo-main static void (*transfer_to_cell_FtypeOtype[3][3])() = { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1216,6 +1377,9 @@ static int get_map_row_nomask(int fd, void *rast, int row, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1503,6 +1667,7 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row, if (readamount == size) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((res = read(null_fd, flags, size)) < 0 || (unsigned int)res != size) { @@ -1521,6 +1686,13 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row, if ((res = read(null_fd, flags, size)) < 0 || (unsigned int)res != size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((res = read(null_fd, flags, size)) < 0 || + (unsigned int)res != size) { +======= >>>>>>> osgeo-main if (read(null_fd, flags, size) != size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1539,6 +1711,9 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1551,6 +1726,7 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row, compressed_buf = G_malloc(readamount); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if ((res = read(null_fd, compressed_buf, readamount)) < 0 || @@ -1568,6 +1744,12 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row, if ((res = read(null_fd, compressed_buf, readamount)) < 0 || (unsigned int)res != readamount) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = read(null_fd, compressed_buf, readamount)) < 0 || + (unsigned int)res != readamount) { +======= >>>>>>> osgeo-main if (read(null_fd, compressed_buf, readamount) != readamount) { <<<<<<< HEAD @@ -1586,6 +1768,9 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/open.c b/lib/raster/open.c index 88df3f99d42..03cad73ef54 100644 --- a/lib/raster/open.c +++ b/lib/raster/open.c @@ -467,6 +467,7 @@ void Rast_set_cell_format(int n) if (R__.nbytes <= 0) R__.nbytes = 1; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (R__.nbytes > (int)sizeof(CELL)) ======= @@ -482,6 +483,12 @@ void Rast_set_cell_format(int n) <<<<<<< HEAD if (R__.nbytes > (int)sizeof(CELL)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (R__.nbytes > (int)sizeof(CELL)) +======= >>>>>>> osgeo-main if (R__.nbytes > sizeof(CELL)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -498,6 +505,9 @@ void Rast_set_cell_format(int n) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/put_row.c b/lib/raster/put_row.c index 767533dc814..edc97fb1b5a 100644 --- a/lib/raster/put_row.c +++ b/lib/raster/put_row.c @@ -150,6 +150,7 @@ static void convert_float(float *work_buf, int size, char *null_buf, const FCELL *rast, int row, int n) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -161,6 +162,11 @@ static void convert_float(float *work_buf, int size, char *null_buf, ======= >>>>>>> 8422103f4c (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 i; @@ -187,6 +193,7 @@ static void convert_double(double *work_buf, int size, char *null_buf, const DCELL *rast, int row, int n) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -198,6 +205,11 @@ static void convert_double(double *work_buf, int size, char *null_buf, ======= >>>>>>> 8422103f4c (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 i; @@ -238,6 +250,7 @@ static void put_fp_data(int fd, char *null_buf, const void *rast, int row, if (data_type == FCELL_TYPE) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD convert_float(work_buf, size, null_buf, rast, row, n); else @@ -247,6 +260,8 @@ static void put_fp_data(int fd, char *null_buf, const void *rast, int row, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main convert_float(work_buf, null_buf, rast, n); else convert_double(work_buf, null_buf, rast, n); @@ -261,6 +276,9 @@ static void put_fp_data(int fd, char *null_buf, const void *rast, int row, convert_double(work_buf, size, null_buf, rast, row, n); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -580,11 +598,15 @@ static void write_null_bits_compressed(const unsigned char *flags, int row, /* compress null bits file with LZ4, see lib/gis/compress.h */ nwrite = G_compress((unsigned char *)flags, size, compressed_buf, cmax, 3); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main if (nwrite > 0 && (size_t)nwrite < size) { if ((res = write(fcb->null_fd, compressed_buf, nwrite)) < 0 || @@ -593,12 +615,15 @@ static void write_null_bits_compressed(const unsigned char *flags, int row, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (nwrite > 0 && (size_t)nwrite < size) { if ((res = write(fcb->null_fd, compressed_buf, nwrite)) < 0 || (unsigned int)res != nwrite) ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (nwrite > 0 && nwrite < size) { if (write(fcb->null_fd, compressed_buf, nwrite) != nwrite) @@ -620,6 +645,9 @@ static void write_null_bits_compressed(const unsigned char *flags, int row, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -629,6 +657,7 @@ static void write_null_bits_compressed(const unsigned char *flags, int row, } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((res = write(fcb->null_fd, flags, size)) < 0 || (unsigned int)res != size) @@ -647,6 +676,13 @@ static void write_null_bits_compressed(const unsigned char *flags, int row, if ((res = write(fcb->null_fd, flags, size)) < 0 || (unsigned int)res != size) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((res = write(fcb->null_fd, flags, size)) < 0 || + (unsigned int)res != size) +======= >>>>>>> osgeo-main if (write(fcb->null_fd, flags, size) != size) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -665,6 +701,9 @@ static void write_null_bits_compressed(const unsigned char *flags, int row, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -706,6 +745,7 @@ void Rast__write_null_bits(int fd, const unsigned char *flags) if (lseek(fcb->null_fd, offset, SEEK_SET) < 0) G_fatal_error(_("Error writing null row %d of <%s>"), row, fcb->name); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if ((res = write(fcb->null_fd, flags, size)) < 0 || @@ -723,6 +763,12 @@ void Rast__write_null_bits(int fd, const unsigned char *flags) if ((res = write(fcb->null_fd, flags, size)) < 0 || (unsigned int)res != size) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = write(fcb->null_fd, flags, size)) < 0 || + (unsigned int)res != size) +======= >>>>>>> osgeo-main if (write(fcb->null_fd, flags, size) != size) <<<<<<< HEAD @@ -741,6 +787,9 @@ void Rast__write_null_bits(int fd, const unsigned char *flags) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/quant.c b/lib/raster/quant.c index 8c32ec3a289..86a43878423 100644 --- a/lib/raster/quant.c +++ b/lib/raster/quant.c @@ -124,6 +124,7 @@ int Rast__quant_organize_fp_lookup(struct Quant *q) qsort((char *)q->fp_lookup.vals, q->fp_lookup.nalloc, sizeof(DCELL), double_comp); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* now find the rule to apply inbetween each 2 values in a list */ @@ -132,6 +133,8 @@ int Rast__quant_organize_fp_lookup(struct Quant *q) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* now find the rule to apply in between each 2 values in a list */ ======= /* now find the rule to apply inbetween each 2 values in a list */ @@ -140,6 +143,9 @@ int Rast__quant_organize_fp_lookup(struct Quant *q) /* now find the rule to apply inbetween each 2 values in a list */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -614,6 +620,7 @@ CELL Rast_quant_get_cell_value(struct Quant *q, DCELL dcellVal) int try, min_ind, max_ind; struct Quant_table *p; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int (*lower)(double, double); ======= @@ -629,6 +636,12 @@ CELL Rast_quant_get_cell_value(struct Quant *q, DCELL dcellVal) <<<<<<< HEAD int (*lower)(double, double); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + int (*lower)(double, double); +======= >>>>>>> osgeo-main int (*lower)(); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -645,6 +658,9 @@ CELL Rast_quant_get_cell_value(struct Quant *q, DCELL dcellVal) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/quant_io.c b/lib/raster/quant_io.c index 790aeca4ace..f2b1db685fa 100644 --- a/lib/raster/quant_io.c +++ b/lib/raster/quant_io.c @@ -289,17 +289,23 @@ int Rast__quant_export(const char *name, const char *mapset, else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -312,10 +318,13 @@ int Rast__quant_export(const char *name, const char *mapset, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main sprintf(element, "quant2/%s", mapset); G_remove(element, name); G_make_mapset_object_group(element); @@ -327,6 +336,9 @@ int Rast__quant_export(const char *name, const char *mapset, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/range.c b/lib/raster/range.c index 4325952d65f..8a112bdf28a 100644 --- a/lib/raster/range.c +++ b/lib/raster/range.c @@ -329,6 +329,7 @@ int Rast_read_rstats(const char *name, const char *mapset, if (nbytes == 0) return 1; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (nbytes < 1 || (unsigned char)nbytes > sizeof(grass_int64)) { @@ -343,6 +344,11 @@ int Rast_read_rstats(const char *name, const char *mapset, <<<<<<< HEAD if (nbytes < 1 || (unsigned char)nbytes > sizeof(grass_int64)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if (nbytes < 1 || (unsigned char)nbytes > sizeof(grass_int64)) { +======= >>>>>>> osgeo-main if (nbytes < 1 || nbytes > sizeof(grass_int64)) { <<<<<<< HEAD @@ -359,6 +365,9 @@ int Rast_read_rstats(const char *name, const char *mapset, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/raster_metadata.c b/lib/raster/raster_metadata.c index 74aab46a322..10ad52bd706 100644 --- a/lib/raster/raster_metadata.c +++ b/lib/raster/raster_metadata.c @@ -3,6 +3,7 @@ \brief Raster library - Functions to read and write raster "units", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "semantic label" and "vertical datum" meta-data info ======= @@ -16,6 +17,11 @@ <<<<<<< HEAD "semantic label" and "vertical datum" meta-data info ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + "semantic label" and "vertical datum" meta-data info +======= >>>>>>> osgeo-main "band reference" and "vertical datum" meta-data info >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) @@ -26,6 +32,9 @@ "semantic label" and "vertical datum" meta-data info >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -110,9 +119,13 @@ void Rast_write_vdatum(const char *name, const char *str) /*! <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main * \brief Get a raster map semantic label metadata string * @@ -121,12 +134,15 @@ void Rast_write_vdatum(const char *name, const char *str) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \brief Get a raster map semantic label metadata string * * Read raster semantic label metadata file and put string in to str ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \brief Get a raster map's band reference metadata string * @@ -143,6 +159,9 @@ void Rast_write_vdatum(const char *name, const char *str) * Read raster semantic label metadata file and put string in to str >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -152,6 +171,7 @@ void Rast_write_vdatum(const char *name, const char *str) * <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -163,6 +183,11 @@ void Rast_write_vdatum(const char *name, const char *str) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * \return string representing semantic label on success * \return NULL on error @@ -201,8 +226,11 @@ char *Rast_get_semantic_label_or_name(const char *name, const char *mapset) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \return string representing band reference on success ======= @@ -249,6 +277,9 @@ char *Rast_get_semantic_label_or_name(const char *name, const char *mapset) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -258,6 +289,7 @@ char *Rast_get_semantic_label_or_name(const char *name, const char *mapset) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -270,6 +302,11 @@ char *Rast_get_semantic_label_or_name(const char *name, const char *mapset) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main void Rast_write_semantic_label(const char *name, const char *str) { misc_write_line("semantic_label", name, str); @@ -280,11 +317,14 @@ void Rast_write_semantic_label(const char *name, const char *str) * * Legal semantic label must be a legal GRASS file name. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * Semantic labels are capped in legth to GNAME_MAX. ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * Semantic labels are capped in length to GNAME_MAX. >>>>>>> osgeo-main @@ -327,10 +367,13 @@ bool Rast_legal_semantic_label(const char *semantic_label) return true; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= void Rast_write_bandref(const char *name, const char *str) ======= void Rast_write_semantic_label(const char *name, const char *str) @@ -393,6 +436,9 @@ bool Rast_legal_semantic_label(const char *semantic_label) return true; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -457,6 +503,7 @@ static void misc_write_line(const char *elem, const char *name, const char *str) if (!fp) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -468,6 +515,11 @@ static void misc_write_line(const char *elem, const char *name, const char *str) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_fatal_error( _("Unable to create <%s> metadata file for raster map <%s@%s>"), @@ -478,8 +530,11 @@ static void misc_write_line(const char *elem, const char *name, const char *str) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_fatal_error(_("Unable to create <%s> metadata file for raster map <%s@%s>"), elem, name, G_mapset()); @@ -495,6 +550,9 @@ static void misc_write_line(const char *elem, const char *name, const char *str) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -503,6 +561,7 @@ static void misc_write_line(const char *elem, const char *name, const char *str) if (fclose(fp) != 0) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error( _("Error closing <%s> metadata file for raster map <%s@%s>"), @@ -519,6 +578,12 @@ static void misc_write_line(const char *elem, const char *name, const char *str) G_fatal_error( _("Error closing <%s> metadata file for raster map <%s@%s>"), ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + G_fatal_error( + _("Error closing <%s> metadata file for raster map <%s@%s>"), +======= >>>>>>> osgeo-main G_fatal_error(_("Error closing <%s> metadata file for raster map <%s@%s>"), >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) @@ -531,6 +596,9 @@ static void misc_write_line(const char *elem, const char *name, const char *str) _("Error closing <%s> metadata file for raster map <%s@%s>"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster/testsuite/test_raster_metadata.py b/lib/raster/testsuite/test_raster_metadata.py index 8c054493b90..0d546a2290b 100644 --- a/lib/raster/testsuite/test_raster_metadata.py +++ b/lib/raster/testsuite/test_raster_metadata.py @@ -10,17 +10,23 @@ """ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37,17 +43,23 @@ from grass.lib.gis import G_remove_misc <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -61,10 +73,13 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main from grass.lib.raster import Rast_legal_bandref, Rast_read_bandref, Rast_write_bandref >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) ======= @@ -72,6 +87,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -81,17 +99,23 @@ class RastLegalBandIdTestCase(TestCase): def test_empty_name(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -104,6 +128,7 @@ def test_empty_name(self): ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -111,6 +136,9 @@ def test_empty_name(self): <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_illegal_name(self): @@ -153,8 +181,11 @@ class Rastsemantic_labelerenceTestCase(TestCase): ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = Rast_legal_bandref("") self.assertEqual(ret, -1) @@ -207,6 +238,9 @@ class Rastsemantic_labelerenceTestCase(TestCase): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -215,6 +249,7 @@ def setUpClass(cls): cls.map = tempname(10) cls.mapset = Mapset().name <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD cls.semantic_label = "The_Doors" ======= @@ -228,6 +263,11 @@ def setUpClass(cls): <<<<<<< HEAD cls.semantic_label = "The_Doors" ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + cls.semantic_label = "The_Doors" +======= >>>>>>> osgeo-main cls.bandref = "The_Doors" >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) @@ -238,6 +278,9 @@ def setUpClass(cls): cls.semantic_label = "The_Doors" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -250,6 +293,7 @@ def tearDownClass(cls): cls.del_temp_region() cls.runModule("g.remove", flags="f", type="raster", name=cls.map) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -257,12 +301,17 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -275,6 +324,7 @@ def test_read_semantic_label_present(self): ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -282,6 +332,9 @@ def test_read_semantic_label_present(self): <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_read_semantic_label_absent(self): @@ -306,8 +359,11 @@ def test_get_semantic_label_or_name(self): ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_read_bandref_present(self): Rast_write_bandref(self.map, self.bandref) @@ -346,6 +402,9 @@ def test_get_semantic_label_or_name(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/cache.c b/lib/raster3d/cache.c index 932c15eadf3..0ec49fa11ec 100644 --- a/lib/raster3d/cache.c +++ b/lib/raster3d/cache.c @@ -85,6 +85,7 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) return 0; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((res = read(map->cacheFD, tileBuf, nBytes)) < 0 || (size_t)res != nBytes) { @@ -101,6 +102,12 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) if ((res = read(map->cacheFD, tileBuf, nBytes)) < 0 || (size_t)res != nBytes) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = read(map->cacheFD, tileBuf, nBytes)) < 0 || + (size_t)res != nBytes) { +======= >>>>>>> osgeo-main if (read(map->cacheFD, tileBuf, nBytes) != nBytes) { <<<<<<< HEAD @@ -119,6 +126,9 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -148,6 +158,7 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) return 0; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((res = read(map->cacheFD, xdr, nBytes + sizeof(int))) < 0 || (size_t)res != nBytes + sizeof(int)) { @@ -164,6 +175,12 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) if ((res = read(map->cacheFD, xdr, nBytes + sizeof(int))) < 0 || (size_t)res != nBytes + sizeof(int)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = read(map->cacheFD, xdr, nBytes + sizeof(int))) < 0 || + (size_t)res != nBytes + sizeof(int)) { +======= >>>>>>> osgeo-main if (read(map->cacheFD, xdr, nBytes + sizeof(int)) != nBytes + sizeof(int)) { <<<<<<< HEAD @@ -182,6 +199,9 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -194,6 +214,7 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) return 0; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((res = write(map->cacheFD, xdr, nBytes + sizeof(int))) < 0 || (size_t)res != nBytes + sizeof(int)) { @@ -210,6 +231,12 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) if ((res = write(map->cacheFD, xdr, nBytes + sizeof(int))) < 0 || (size_t)res != nBytes + sizeof(int)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = write(map->cacheFD, xdr, nBytes + sizeof(int))) < 0 || + (size_t)res != nBytes + sizeof(int)) { +======= >>>>>>> osgeo-main if (write(map->cacheFD, xdr, nBytes + sizeof(int)) != nBytes + sizeof(int)) { @@ -230,6 +257,9 @@ static int cacheWrite_readFun(int tileIndex, void *tileBuf, void *closure) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -267,6 +297,7 @@ static int cacheWrite_writeFun(int tileIndex, const void *tileBuf, return 0; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((res = write(map->cacheFD, tileBuf, nBytes)) < 0 || (size_t)res != nBytes) { @@ -283,6 +314,12 @@ static int cacheWrite_writeFun(int tileIndex, const void *tileBuf, if ((res = write(map->cacheFD, tileBuf, nBytes)) < 0 || (size_t)res != nBytes) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = write(map->cacheFD, tileBuf, nBytes)) < 0 || + (size_t)res != nBytes) { +======= >>>>>>> osgeo-main if (write(map->cacheFD, tileBuf, nBytes) != nBytes) { <<<<<<< HEAD @@ -301,6 +338,9 @@ static int cacheWrite_writeFun(int tileIndex, const void *tileBuf, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/cache1.c b/lib/raster3d/cache1.c index 3f52835eda2..ee36a14928e 100644 --- a/lib/raster3d/cache1.c +++ b/lib/raster3d/cache1.c @@ -86,16 +86,22 @@ void Rast3d_cache_dispose(RASTER3D_cache *c) void *Rast3d_cache_new(int nofElts, int sizeOfElts, int nofNames, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -107,8 +113,11 @@ void *Rast3d_cache_new(int nofElts, int sizeOfElts, int nofNames, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int (*eltRemoveFun)(), void *eltRemoveFunData, int (*eltLoadFun)(), void *eltLoadFunData) @@ -130,6 +139,9 @@ void *Rast3d_cache_new(int nofElts, int sizeOfElts, int nofNames, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -183,6 +195,7 @@ void *Rast3d_cache_new(int nofElts, int sizeOfElts, int nofNames, /*---------------------------------------------------------------------------*/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void Rast3d_cache_set_remove_fun(RASTER3D_cache *c, @@ -203,6 +216,13 @@ void Rast3d_cache_set_remove_fun(RASTER3D_cache *c, int (*eltRemoveFun)(int, const void *, void *), ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +void Rast3d_cache_set_remove_fun(RASTER3D_cache *c, + int (*eltRemoveFun)(int, const void *, void *), +======= +>>>>>>> osgeo-main void Rast3d_cache_set_remove_fun(RASTER3D_cache *c, int (*eltRemoveFun)(), >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -220,6 +240,9 @@ void Rast3d_cache_set_remove_fun(RASTER3D_cache *c, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -231,6 +254,7 @@ void Rast3d_cache_set_remove_fun(RASTER3D_cache *c, /*---------------------------------------------------------------------------*/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void Rast3d_cache_set_load_fun(RASTER3D_cache *c, @@ -251,6 +275,13 @@ void Rast3d_cache_set_load_fun(RASTER3D_cache *c, int (*eltLoadFun)(int, void *, void *), ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +void Rast3d_cache_set_load_fun(RASTER3D_cache *c, + int (*eltLoadFun)(int, void *, void *), +======= +>>>>>>> osgeo-main void Rast3d_cache_set_load_fun(RASTER3D_cache *c, int (*eltLoadFun)(), >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -268,6 +299,9 @@ void Rast3d_cache_set_load_fun(RASTER3D_cache *c, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/cachehash.h b/lib/raster3d/cachehash.h index 6659fa84e00..4784a450b90 100644 --- a/lib/raster3d/cachehash.h +++ b/lib/raster3d/cachehash.h @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD extern void *Rast3d_cache_hash_new(int /* nofElts */); ======= <<<<<<< HEAD @@ -15,6 +16,12 @@ extern void *Rast3d_cache_hash_new(int /* nofElts */); extern void *Rast3d_cache_hash_new(int /* nofElts */); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +extern void *Rast3d_cache_hash_new(int /* nofElts */); +======= +>>>>>>> osgeo-main extern void *Rast3d_cache_hash_new(/* nofElts */); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -30,6 +37,9 @@ extern void *Rast3d_cache_hash_new(int /* nofElts */); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/doubleio.c b/lib/raster3d/doubleio.c index 858d3240a31..4c1daa6de7e 100644 --- a/lib/raster3d/doubleio.c +++ b/lib/raster3d/doubleio.c @@ -16,6 +16,7 @@ int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum) if (useXdr == RASTER3D_NO_XDR) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (write(fd, i, sizeof(double) * nofNum) != (int)sizeof(double) * nofNum) { @@ -34,6 +35,13 @@ int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum) if (write(fd, i, sizeof(double) * nofNum) != (int)sizeof(double) * nofNum) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (write(fd, i, sizeof(double) * nofNum) != + (int)sizeof(double) * nofNum) { +======= >>>>>>> osgeo-main if (write(fd, i, sizeof(double) * nofNum) != sizeof(double) * nofNum) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -52,6 +60,9 @@ int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -65,6 +76,7 @@ int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum) do { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD unsigned int j; ======= @@ -80,6 +92,12 @@ int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum) <<<<<<< HEAD unsigned int j; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + unsigned int j; +======= >>>>>>> osgeo-main int j; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -96,6 +114,9 @@ int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132,6 +153,7 @@ int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum) if (useXdr == RASTER3D_NO_XDR) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (read(fd, i, sizeof(double) * nofNum) != (int)sizeof(double) * nofNum) { @@ -150,6 +172,13 @@ int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum) if (read(fd, i, sizeof(double) * nofNum) != (int)sizeof(double) * nofNum) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (read(fd, i, sizeof(double) * nofNum) != + (int)sizeof(double) * nofNum) { +======= >>>>>>> osgeo-main if (read(fd, i, sizeof(double) * nofNum) != sizeof(double) * nofNum) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -168,6 +197,9 @@ int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -181,6 +213,7 @@ int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum) do { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD unsigned int j; ======= @@ -196,6 +229,12 @@ int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum) <<<<<<< HEAD unsigned int j; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + unsigned int j; +======= >>>>>>> osgeo-main int j; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -212,6 +251,9 @@ int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/fpcompress.c b/lib/raster3d/fpcompress.c index 777c8c77ea7..ec2877e2d42 100644 --- a/lib/raster3d/fpcompress.c +++ b/lib/raster3d/fpcompress.c @@ -163,6 +163,7 @@ static void G_fpcompress_rearrangeEncodeFloats(unsigned char *src, int size, /*printf ("%d\n", ((*src & mask) >> nBits) << nBits); */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { @@ -179,6 +180,12 @@ static void G_fpcompress_rearrangeEncodeFloats(unsigned char *src, int size, <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (8 - nBits < (unsigned int)precision) { +======= >>>>>>> osgeo-main if (8 - nBits < precision) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -195,6 +202,9 @@ static void G_fpcompress_rearrangeEncodeFloats(unsigned char *src, int size, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -372,6 +382,7 @@ static void G_fpcompress_rearrangeEncodeDoubles(unsigned char *src, int size, if (nBits && precision) { *cp1 |= (unsigned char)((unsigned char)(*src & mask) >> nBits); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { ======= @@ -387,6 +398,12 @@ static void G_fpcompress_rearrangeEncodeDoubles(unsigned char *src, int size, <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (8 - nBits < (unsigned int)precision) { +======= >>>>>>> osgeo-main if (8 - nBits < precision) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -403,6 +420,9 @@ static void G_fpcompress_rearrangeEncodeDoubles(unsigned char *src, int size, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -559,6 +579,7 @@ static void G_fpcompress_rearrangeDecodeFloats(unsigned char *src, int size, if (nBits && precision) { *dst = (unsigned char)((*cp1 << nBits) & mask); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { @@ -575,6 +596,12 @@ static void G_fpcompress_rearrangeDecodeFloats(unsigned char *src, int size, <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (8 - nBits < (unsigned int)precision) { +======= >>>>>>> osgeo-main if (8 - nBits < precision) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -591,6 +618,9 @@ static void G_fpcompress_rearrangeDecodeFloats(unsigned char *src, int size, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -760,6 +790,7 @@ static void G_fpcompress_rearrangeDecodeDoubles(unsigned char *src, int size, if (nBits && precision) { *dst = (unsigned char)((*cp1 << nBits) & mask); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { @@ -776,6 +807,12 @@ static void G_fpcompress_rearrangeDecodeDoubles(unsigned char *src, int size, <<<<<<< HEAD if (8 - nBits < (unsigned int)precision) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (8 - nBits < (unsigned int)precision) { +======= >>>>>>> osgeo-main if (8 - nBits < precision) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -792,6 +829,9 @@ static void G_fpcompress_rearrangeDecodeDoubles(unsigned char *src, int size, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/fpxdr.c b/lib/raster3d/fpxdr.c index ba10e71fc64..aaab83f945d 100644 --- a/lib/raster3d/fpxdr.c +++ b/lib/raster3d/fpxdr.c @@ -13,6 +13,7 @@ int Rast3d_is_xdr_null_num(const void *num, int isFloat) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD static const char null_bytes[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; @@ -21,6 +22,8 @@ int Rast3d_is_xdr_null_num(const void *num, int isFloat) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static const char null_bytes[8] = {(char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF}; @@ -33,6 +36,9 @@ int Rast3d_is_xdr_null_num(const void *num, int isFloat) 0xFF, 0xFF, 0xFF, 0xFF}; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -59,6 +65,7 @@ int Rast3d_is_xdr_null_double(const double *d) void Rast3d_set_xdr_null_num(void *num, int isFloat) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD static const char null_bytes[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; @@ -67,6 +74,8 @@ void Rast3d_set_xdr_null_num(void *num, int isFloat) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static const char null_bytes[8] = {(char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF, (char)0xFF}; @@ -79,6 +88,9 @@ void Rast3d_set_xdr_null_num(void *num, int isFloat) 0xFF, 0xFF, 0xFF, 0xFF}; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -165,6 +177,7 @@ static int xdr_put(const void *src) { if (isFloat) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > (size_t)xdrLength) ======= @@ -180,6 +193,12 @@ static int xdr_put(const void *src) <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > (size_t)xdrLength) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > (size_t)xdrLength) +======= >>>>>>> osgeo-main if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > xdrLength) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -196,6 +215,9 @@ static int xdr_put(const void *src) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -205,6 +227,7 @@ static int xdr_put(const void *src) } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > (size_t)xdrLength) ======= @@ -220,6 +243,12 @@ static int xdr_put(const void *src) <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > (size_t)xdrLength) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > (size_t)xdrLength) +======= >>>>>>> osgeo-main if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > xdrLength) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -236,6 +265,9 @@ static int xdr_put(const void *src) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -315,6 +347,7 @@ static int xdr_get(void *src) { if (isFloat) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > (size_t)xdrLength) ======= @@ -330,6 +363,12 @@ static int xdr_get(void *src) <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > (size_t)xdrLength) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > (size_t)xdrLength) +======= >>>>>>> osgeo-main if (xdr_off + RASTER3D_XDR_FLOAT_LENGTH > xdrLength) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -346,6 +385,9 @@ static int xdr_get(void *src) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -355,6 +397,7 @@ static int xdr_get(void *src) } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > (size_t)xdrLength) ======= @@ -370,6 +413,12 @@ static int xdr_get(void *src) <<<<<<< HEAD if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > (size_t)xdrLength) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > (size_t)xdrLength) +======= >>>>>>> osgeo-main if (xdr_off + RASTER3D_XDR_DOUBLE_LENGTH > xdrLength) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -386,6 +435,9 @@ static int xdr_get(void *src) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/header.c b/lib/raster3d/header.c index 3b90aabe95e..d8f31439c0c 100644 --- a/lib/raster3d/header.c +++ b/lib/raster3d/header.c @@ -32,6 +32,7 @@ int xdrLength; /*---------------------------------------------------------------------------*/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int Rast3d_readWriteHeader( @@ -49,6 +50,8 @@ static int Rast3d_readWriteHeader( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int Rast3d__readHeader( struct Key_Value *headerKeys, int *proj, int *zone, double *north, double *south, double *east, double *west, double *top, double *bottom, @@ -92,6 +95,9 @@ static int Rast3d_readWriteHeader( int returnVal; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -169,11 +175,14 @@ static int Rast3d_readWriteHeader( return 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Rast3d_error("Rast3d_readWriteHeader: error reading/writing header"); return 0; @@ -259,6 +268,9 @@ static int Rast3d__writeHeader( ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -290,6 +302,7 @@ int Rast3d_read_header(RASTER3D_Map *map, int *proj, int *zone, double *north, headerKeys = G_read_key_value_file(path); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -297,6 +310,8 @@ int Rast3d_read_header(RASTER3D_Map *map, int *proj, int *zone, double *north, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (!Rast3d__readHeader(headerKeys, proj, zone, north, south, east, west, top, bottom, rows, cols, depths, ew_res, ns_res, tb_res, tileX, tileY, tileZ, type, compression, @@ -306,6 +321,9 @@ int Rast3d_read_header(RASTER3D_Map *map, int *proj, int *zone, double *north, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -316,6 +334,7 @@ int Rast3d_read_header(RASTER3D_Map *map, int *proj, int *zone, double *north, hasIndex, unit, vertical_unit, version)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -326,6 +345,11 @@ int Rast3d_read_header(RASTER3D_Map *map, int *proj, int *zone, double *north, >>>>>>> 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 Rast3d_error( "Rast3d_read_header: error extracting header key(s) of file %s", @@ -353,6 +377,7 @@ int Rast3d_write_header(RASTER3D_Map *map, int proj, int zone, double north, headerKeys = G_create_key_value(); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (!Rast3d_readWriteHeader( @@ -362,6 +387,8 @@ int Rast3d_write_header(RASTER3D_Map *map, int proj, int zone, double north, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (!Rast3d__writeHeader( headerKeys, &proj, &zone, &north, &south, &east, &west, &top, ======= @@ -373,6 +400,9 @@ int Rast3d_write_header(RASTER3D_Map *map, int proj, int zone, double north, headerKeys, 0, &proj, &zone, &north, &south, &east, &west, &top, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/index.c b/lib/raster3d/index.c index e244a1d1196..0fe5129cc05 100644 --- a/lib/raster3d/index.c +++ b/lib/raster3d/index.c @@ -46,6 +46,7 @@ static int Rast3d_readIndex(RASTER3D_Map *map) if (indexLength < map->indexLongNbytes * map->nTiles) { /* RLE encoded? */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (indexLength > (int)sizeof(long) * map->nTiles) { @@ -62,6 +63,12 @@ static int Rast3d_readIndex(RASTER3D_Map *map) <<<<<<< HEAD if (indexLength > (int)sizeof(long) * map->nTiles) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (indexLength > (int)sizeof(long) * map->nTiles) { +======= >>>>>>> osgeo-main if (indexLength > sizeof(long) * map->nTiles) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -78,6 +85,9 @@ static int Rast3d_readIndex(RASTER3D_Map *map) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -101,6 +111,7 @@ static int Rast3d_readIndex(RASTER3D_Map *map) map->indexLongNbytes * map->nTiles, 1, &dummy1, &dummy2); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (indexLength > (int)sizeof(long) * map->nTiles) @@ -117,6 +128,12 @@ static int Rast3d_readIndex(RASTER3D_Map *map) <<<<<<< HEAD if (indexLength > (int)sizeof(long) * map->nTiles) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (indexLength > (int)sizeof(long) * map->nTiles) +======= >>>>>>> osgeo-main if (indexLength > sizeof(long) * map->nTiles) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -133,6 +150,9 @@ static int Rast3d_readIndex(RASTER3D_Map *map) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/intio.c b/lib/raster3d/intio.c index 2927d9f7f38..75da56cc7a2 100644 --- a/lib/raster3d/intio.c +++ b/lib/raster3d/intio.c @@ -16,6 +16,7 @@ int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum) if (useXdr == RASTER3D_NO_XDR) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (write(fd, i, sizeof(int) * nofNum) != (int)sizeof(int) * nofNum) { ======= @@ -31,6 +32,12 @@ int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum) <<<<<<< HEAD if (write(fd, i, sizeof(int) * nofNum) != (int)sizeof(int) * nofNum) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (write(fd, i, sizeof(int) * nofNum) != (int)sizeof(int) * nofNum) { +======= >>>>>>> osgeo-main if (write(fd, i, sizeof(int) * nofNum) != sizeof(int) * nofNum) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47,6 +54,9 @@ int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -60,6 +70,7 @@ int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum) do { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD unsigned int j; ======= @@ -75,6 +86,12 @@ int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum) <<<<<<< HEAD unsigned int j; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + unsigned int j; +======= >>>>>>> osgeo-main int j; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91,6 +108,9 @@ int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -127,6 +147,7 @@ int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum) if (useXdr == RASTER3D_NO_XDR) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (read(fd, i, sizeof(int) * nofNum) != (int)sizeof(int) * nofNum) { ======= @@ -142,6 +163,12 @@ int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum) <<<<<<< HEAD if (read(fd, i, sizeof(int) * nofNum) != (int)sizeof(int) * nofNum) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (read(fd, i, sizeof(int) * nofNum) != (int)sizeof(int) * nofNum) { +======= >>>>>>> osgeo-main if (read(fd, i, sizeof(int) * nofNum) != sizeof(int) * nofNum) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -158,6 +185,9 @@ int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -171,6 +201,7 @@ int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum) do { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD unsigned int j; ======= @@ -186,6 +217,12 @@ int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum) <<<<<<< HEAD unsigned int j; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + unsigned int j; +======= >>>>>>> osgeo-main int j; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -202,6 +239,9 @@ int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/long.c b/lib/raster3d/long.c index 2fa27a838f6..0ed2e446a59 100644 --- a/lib/raster3d/long.c +++ b/lib/raster3d/long.c @@ -50,6 +50,7 @@ void Rast3d_long_decode(unsigned char *source, long *dst, int nofNums, while (source != srcStop) { *dest = *source--; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((eltLength >= (int)RASTER3D_LONG_LENGTH) && (*dest != 0)) ======= @@ -65,6 +66,12 @@ void Rast3d_long_decode(unsigned char *source, long *dst, int nofNums, <<<<<<< HEAD if ((eltLength >= (int)RASTER3D_LONG_LENGTH) && (*dest != 0)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((eltLength >= (int)RASTER3D_LONG_LENGTH) && (*dest != 0)) +======= >>>>>>> osgeo-main if ((eltLength >= RASTER3D_LONG_LENGTH) && (*dest != 0)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81,6 +88,9 @@ void Rast3d_long_decode(unsigned char *source, long *dst, int nofNums, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96,6 +106,7 @@ void Rast3d_long_decode(unsigned char *source, long *dst, int nofNums, *dest *= 256; *dest += *source--; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((eltLength >= (int)RASTER3D_LONG_LENGTH) && (*dest != 0)) ======= @@ -111,6 +122,12 @@ void Rast3d_long_decode(unsigned char *source, long *dst, int nofNums, <<<<<<< HEAD if ((eltLength >= (int)RASTER3D_LONG_LENGTH) && (*dest != 0)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((eltLength >= (int)RASTER3D_LONG_LENGTH) && (*dest != 0)) +======= >>>>>>> osgeo-main if ((eltLength >= RASTER3D_LONG_LENGTH) && (*dest != 0)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -127,6 +144,9 @@ void Rast3d_long_decode(unsigned char *source, long *dst, int nofNums, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/mask.c b/lib/raster3d/mask.c index a22f4a8359c..5b8f2c6440f 100644 --- a/lib/raster3d/mask.c +++ b/lib/raster3d/mask.c @@ -305,6 +305,7 @@ void Rast3d_mask_tile(RASTER3D_Map *map, int tileIndex, void *tile, int type) for (dx = x; dx < cols; dx++) { RASTER3D_MASKNUM(map, dx, dy, dz, tile, type); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD tile += length; } @@ -317,6 +318,8 @@ void Rast3d_mask_tile(RASTER3D_Map *map, int tileIndex, void *tile, int type) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main tile = (char *)tile + length; } @@ -340,6 +343,9 @@ void Rast3d_mask_tile(RASTER3D_Map *map, int tileIndex, void *tile, int type) tile += yLength; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/open.c b/lib/raster3d/open.c index f8d4e75604e..8bf3cfbecdb 100644 --- a/lib/raster3d/open.c +++ b/lib/raster3d/open.c @@ -141,6 +141,7 @@ void *Rast3d_open_cell_old(const char *name, const char *mapset, /* if our long is to short to store offsets we can't read the file */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (map->indexNbytesUsed > (int)sizeof(long)) ======= @@ -156,6 +157,12 @@ void *Rast3d_open_cell_old(const char *name, const char *mapset, <<<<<<< HEAD if (map->indexNbytesUsed > (int)sizeof(long)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (map->indexNbytesUsed > (int)sizeof(long)) +======= >>>>>>> osgeo-main if (map->indexNbytesUsed > sizeof(long)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -172,6 +179,9 @@ void *Rast3d_open_cell_old(const char *name, const char *mapset, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/range.c b/lib/raster3d/range.c index 176d45f8e70..1d1fb8cfb72 100644 --- a/lib/raster3d/range.c +++ b/lib/raster3d/range.c @@ -15,6 +15,7 @@ void Rast3d_range_update_from_tile(RASTER3D_Map *map, const void *tile, int rows, int cols, int depths, int xRedundant, int yRedundant, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int zRedundant, int nofNum, int type) ======= @@ -22,6 +23,8 @@ void Rast3d_range_update_from_tile(RASTER3D_Map *map, const void *tile, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int zRedundant UNUSED, int nofNum, int type) ======= int zRedundant, int nofNum, int type) @@ -30,6 +33,9 @@ void Rast3d_range_update_from_tile(RASTER3D_Map *map, const void *tile, int zRedundant, int nofNum, int type) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/resample.c b/lib/raster3d/resample.c index d23a3518ecd..72502ece2bc 100644 --- a/lib/raster3d/resample.c +++ b/lib/raster3d/resample.c @@ -50,6 +50,7 @@ void Rast3d_nearest_neighbor(RASTER3D_Map *map, int x, int y, int z, * \return void */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -57,6 +58,10 @@ void Rast3d_nearest_neighbor(RASTER3D_Map *map, int x, int y, int z, <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main void Rast3d_set_resampling_fun(RASTER3D_Map *map, void (*resampleFun)(RASTER3D_Map *, int, int, int, void *, int)) @@ -66,12 +71,15 @@ void Rast3d_set_resampling_fun(RASTER3D_Map *map, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void Rast3d_set_resampling_fun(RASTER3D_Map *map, void (*resampleFun)(RASTER3D_Map *, int, int, int, void *, int)) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void Rast3d_set_resampling_fun(RASTER3D_Map *map, void (*resampleFun)()) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -90,6 +98,9 @@ void Rast3d_set_resampling_fun(RASTER3D_Map *map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -109,6 +120,7 @@ void Rast3d_set_resampling_fun(RASTER3D_Map *map, * \return void */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -116,6 +128,10 @@ void Rast3d_set_resampling_fun(RASTER3D_Map *map, <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main void Rast3d_get_resampling_fun(RASTER3D_Map *map, void (**resampleFun)(RASTER3D_Map *, int, int, int, void *, int)) @@ -125,12 +141,15 @@ void Rast3d_get_resampling_fun(RASTER3D_Map *map, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void Rast3d_get_resampling_fun(RASTER3D_Map *map, void (**resampleFun)(RASTER3D_Map *, int, int, int, void *, int)) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void Rast3d_get_resampling_fun(RASTER3D_Map *map, void (**resampleFun)()) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -149,6 +168,9 @@ void Rast3d_get_resampling_fun(RASTER3D_Map *map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -168,6 +190,7 @@ void Rast3d_get_resampling_fun(RASTER3D_Map *map, * \return void */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -175,6 +198,10 @@ void Rast3d_get_resampling_fun(RASTER3D_Map *map, <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main void Rast3d_get_nearest_neighbor_fun_ptr(void (**nnFunPtr)(RASTER3D_Map *, int, int, int, void *, int)) @@ -184,12 +211,15 @@ void Rast3d_get_nearest_neighbor_fun_ptr(void (**nnFunPtr)(RASTER3D_Map *, int, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void Rast3d_get_nearest_neighbor_fun_ptr(void (**nnFunPtr)(RASTER3D_Map *, int, int, int, void *, int)) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void Rast3d_get_nearest_neighbor_fun_ptr(void (**nnFunPtr)()) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -208,6 +238,9 @@ void Rast3d_get_nearest_neighbor_fun_ptr(void (**nnFunPtr)(RASTER3D_Map *, int, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/tilemath.c b/lib/raster3d/tilemath.c index 89e4a8101b1..299a8e1708c 100644 --- a/lib/raster3d/tilemath.c +++ b/lib/raster3d/tilemath.c @@ -344,6 +344,7 @@ void Rast3d_compute_optimal_tile_dimension(RASTER3D_Region *region, int type, "%li z %li\n", tileSize, x, y, z); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (maxSize < 0 || tileSize <= (unsigned int)maxSize * 1024) @@ -360,6 +361,12 @@ void Rast3d_compute_optimal_tile_dimension(RASTER3D_Region *region, int type, <<<<<<< HEAD if (maxSize < 0 || tileSize <= (unsigned int)maxSize * 1024) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (maxSize < 0 || tileSize <= (unsigned int)maxSize * 1024) +======= >>>>>>> osgeo-main if (tileSize <= maxSize * 1024) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -376,6 +383,9 @@ void Rast3d_compute_optimal_tile_dimension(RASTER3D_Region *region, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/tileread.c b/lib/raster3d/tileread.c index e5aea2230f6..4c709c08762 100644 --- a/lib/raster3d/tileread.c +++ b/lib/raster3d/tileread.c @@ -98,6 +98,7 @@ static int Rast3d_readTileUncompressed(RASTER3D_Map *map, int tileIndex, nofBytes = RASTER3D_MIN(nofBytes, (size_t)map->fileEndPtr - map->index[tileIndex]); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if ((res = read(map->data_fd, xdr, nofBytes)) < 0 || @@ -115,6 +116,12 @@ static int Rast3d_readTileUncompressed(RASTER3D_Map *map, int tileIndex, if ((res = read(map->data_fd, xdr, nofBytes)) < 0 || (size_t)res != nofBytes) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if ((res = read(map->data_fd, xdr, nofBytes)) < 0 || + (size_t)res != nofBytes) { +======= >>>>>>> osgeo-main if (read(map->data_fd, xdr, nofBytes) != nofBytes) { <<<<<<< HEAD @@ -133,6 +140,9 @@ static int Rast3d_readTileUncompressed(RASTER3D_Map *map, int tileIndex, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/tilewrite.c b/lib/raster3d/tilewrite.c index 3fcdc6eddc0..c2ded301526 100644 --- a/lib/raster3d/tilewrite.c +++ b/lib/raster3d/tilewrite.c @@ -12,6 +12,7 @@ static int Rast3d_tile2xdrTile(RASTER3D_Map *map, const void *tile, int rows, int cols, int depths, int xRedundant, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int yRedundant, int zRedundant, int nofNum, int type) @@ -20,6 +21,8 @@ static int Rast3d_tile2xdrTile(RASTER3D_Map *map, const void *tile, int rows, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int yRedundant, int zRedundant UNUSED, int nofNum, int type) ======= @@ -31,6 +34,9 @@ static int Rast3d_tile2xdrTile(RASTER3D_Map *map, const void *tile, int rows, int type) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -264,6 +270,7 @@ int Rast3d_write_tile_double(RASTER3D_Map *map, int tileIndex, const void *tile) * map-structure is written). If this tile has already been written before the * write request is ignored. If the tile was never referred to before the <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * invokation of Rast3d_flush_tile, a tile filled with NULL-values is written. ======= @@ -271,6 +278,8 @@ int Rast3d_write_tile_double(RASTER3D_Map *map, int tileIndex, const void *tile) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * invocation of Rast3d_flush_tile, a tile filled with NULL-values is written. ======= * invokation of Rast3d_flush_tile, a tile filled with NULL-values is written. @@ -279,6 +288,9 @@ int Rast3d_write_tile_double(RASTER3D_Map *map, int tileIndex, const void *tile) * invokation of Rast3d_flush_tile, a tile filled with NULL-values is written. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/raster3d/windowio.c b/lib/raster3d/windowio.c index cf9ba5b0537..a2add2658ed 100644 --- a/lib/raster3d/windowio.c +++ b/lib/raster3d/windowio.c @@ -9,6 +9,7 @@ /*---------------------------------------------------------------------------*/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int Rast3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, @@ -24,6 +25,8 @@ static int Rast3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int Rast3d__readWindow(struct Key_Value *windowKeys, int *proj, int *zone, double *north, double *south, double *east, double *west, double *top, @@ -51,6 +54,9 @@ static int Rast3d_readWriteWindow(struct Key_Value *windowKeys, int doRead, int returnVal; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -213,6 +219,7 @@ int Rast3d_read_window(RASTER3D_Region *window, const char *windowName) windowKeys = G_read_key_value_file(path); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -220,6 +227,8 @@ int Rast3d_read_window(RASTER3D_Region *window, const char *windowName) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (!Rast3d__readWindow( windowKeys, &(window->proj), &(window->zone), &(window->north), &(window->south), &(window->east), &(window->west), @@ -230,6 +239,9 @@ int Rast3d_read_window(RASTER3D_Region *window, const char *windowName) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -241,6 +253,7 @@ int Rast3d_read_window(RASTER3D_Region *window, const char *windowName) &(window->ew_res), &(window->ns_res), &(window->tb_res))) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -251,6 +264,11 @@ int Rast3d_read_window(RASTER3D_Region *window, const char *windowName) >>>>>>> 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 Rast3d_error( "Rast3d_read_window: error extracting window key(s) of file %s", diff --git a/lib/rowio/get.c b/lib/rowio/get.c index 761ae4a940e..f5bebef6a4b 100644 --- a/lib/rowio/get.c +++ b/lib/rowio/get.c @@ -83,6 +83,7 @@ void *Rowio_get(ROWIO *R, int row) /*! \brief Flush data +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD \param R pointer to ROWIO strcuture @@ -91,6 +92,8 @@ void *Rowio_get(ROWIO *R, int row) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param R pointer to ROWIO structure ======= \param R pointer to ROWIO strcuture @@ -99,6 +102,9 @@ void *Rowio_get(ROWIO *R, int row) \param R pointer to ROWIO strcuture >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/rst/interp_float/interp2d.c b/lib/rst/interp_float/interp2d.c index 80934bbd8b5..b0114af7fcc 100644 --- a/lib/rst/interp_float/interp2d.c +++ b/lib/rst/interp_float/interp2d.c @@ -67,6 +67,7 @@ int IL_grid_calc_2d( double *c1min, double *c1max, /*!< min and max interp. curv. val. */ double *c2min, double *c2max, /*!< min and max interp. curv. val. */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double *ertot, /*!< total interpolating func. error */ ======= @@ -74,6 +75,8 @@ int IL_grid_calc_2d( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double *ertot UNUSED, /*!< total interpolating func. error */ ======= double *ertot, /*!< total interpolating func. error */ @@ -82,6 +85,9 @@ int IL_grid_calc_2d( double *ertot, /*!< total interpolating func. error */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/rst/interp_float/output2d.c b/lib/rst/interp_float/output2d.c index 488449d2b75..aea4d94789a 100644 --- a/lib/rst/interp_float/output2d.c +++ b/lib/rst/interp_float/output2d.c @@ -60,6 +60,7 @@ int IL_output_2d(struct interp_params *params, double zminac, double zmaxac, double c1min, double c1max, /*!< min,max interpolated values */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double c2min, double c2max, double gmin, double gmax, ======= @@ -67,6 +68,8 @@ int IL_output_2d(struct interp_params *params, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double c2min, double c2max, double gmin UNUSED, double gmax UNUSED, ======= @@ -76,6 +79,9 @@ int IL_output_2d(struct interp_params *params, double c2min, double c2max, double gmin, double gmax, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -151,6 +157,7 @@ int IL_output_2d(struct interp_params *params, 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_z) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -166,6 +173,12 @@ int IL_output_2d(struct interp_params *params, <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -182,6 +195,9 @@ int IL_output_2d(struct interp_params *params, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -201,6 +217,7 @@ int IL_output_2d(struct interp_params *params, 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dx) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -216,6 +233,12 @@ int IL_output_2d(struct interp_params *params, <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -232,6 +255,9 @@ int IL_output_2d(struct interp_params *params, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -251,6 +277,7 @@ int IL_output_2d(struct interp_params *params, 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dy) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -266,6 +293,12 @@ int IL_output_2d(struct interp_params *params, <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -282,6 +315,9 @@ int IL_output_2d(struct interp_params *params, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -301,6 +337,7 @@ int IL_output_2d(struct interp_params *params, 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xx) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -316,6 +353,12 @@ int IL_output_2d(struct interp_params *params, <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -332,6 +375,9 @@ int IL_output_2d(struct interp_params *params, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -351,6 +397,7 @@ int IL_output_2d(struct interp_params *params, 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_yy) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -366,6 +413,12 @@ int IL_output_2d(struct interp_params *params, <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -382,6 +435,9 @@ int IL_output_2d(struct interp_params *params, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -401,6 +457,7 @@ int IL_output_2d(struct interp_params *params, 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xy) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -416,6 +473,12 @@ int IL_output_2d(struct interp_params *params, <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -432,6 +495,9 @@ int IL_output_2d(struct interp_params *params, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/rst/interp_float/resout2d.c b/lib/rst/interp_float/resout2d.c index af25c25b63c..1799ee9668e 100644 --- a/lib/rst/interp_float/resout2d.c +++ b/lib/rst/interp_float/resout2d.c @@ -47,6 +47,7 @@ int IL_resample_output_2d( double zmax, /* min,max input z-values */ double zminac, double zmaxac, /* min,max interpolated values */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double c1min, double c1max, double c2min, double c2max, double gmin, double gmax, double ertot, /* total interplating func. error */ @@ -55,6 +56,8 @@ int IL_resample_output_2d( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double c1min, double c1max, double c2min, double c2max, double gmin UNUSED, double gmax UNUSED, double ertot, /* total interplating func. error */ ======= @@ -66,6 +69,9 @@ int IL_resample_output_2d( double gmax, double ertot, /* total interplating func. error */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -147,6 +153,7 @@ int IL_resample_output_2d( 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_z) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -162,6 +169,12 @@ int IL_resample_output_2d( <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -178,6 +191,9 @@ int IL_resample_output_2d( >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -197,6 +213,7 @@ int IL_resample_output_2d( 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dx) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -212,6 +229,12 @@ int IL_resample_output_2d( <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -228,6 +251,9 @@ int IL_resample_output_2d( >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -247,6 +273,7 @@ int IL_resample_output_2d( 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dy) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -262,6 +289,12 @@ int IL_resample_output_2d( <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -278,6 +311,9 @@ int IL_resample_output_2d( >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -297,6 +333,7 @@ int IL_resample_output_2d( 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xx) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -312,6 +349,12 @@ int IL_resample_output_2d( <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -328,6 +371,9 @@ int IL_resample_output_2d( >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -347,6 +393,7 @@ int IL_resample_output_2d( 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_yy) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -362,6 +409,12 @@ int IL_resample_output_2d( <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -378,6 +431,9 @@ int IL_resample_output_2d( >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -397,6 +453,7 @@ int IL_resample_output_2d( 0); if (fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xy) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)params->nsizc) ======= @@ -412,6 +469,12 @@ int IL_resample_output_2d( <<<<<<< HEAD (size_t)params->nsizc) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)params->nsizc) +======= >>>>>>> osgeo-main params->nsizc) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -428,6 +491,9 @@ int IL_resample_output_2d( >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/rst/qtree/qtree.h b/lib/rst/qtree/qtree.h index 7a27f2d6718..ef0aca34706 100644 --- a/lib/rst/qtree/qtree.h +++ b/lib/rst/qtree/qtree.h @@ -36,16 +36,22 @@ struct multfunc { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -59,7 +65,10 @@ struct multfunc { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -90,6 +99,9 @@ struct multfunc { >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/segment/format.c b/lib/segment/format.c index b3284eef782..3e11abb4987 100644 --- a/lib/segment/format.c +++ b/lib/segment/format.c @@ -110,6 +110,7 @@ static int seg_format(int fd, off_t nrows, off_t ncols, int srows, int scols, if (nrows <= 0 || ncols <= 0 || len <= 0 || srows <= 0 || scols <= 0) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning("Segment_format(fd,%" PRI_OFF_T ",%" PRI_OFF_T ======= @@ -117,6 +118,8 @@ static int seg_format(int fd, off_t nrows, off_t ncols, int srows, int scols, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning("Segment_format(fd,%" PRId64 ",%" PRId64 ======= G_warning("Segment_format(fd,%" PRI_OFF_T ",%" PRI_OFF_T @@ -125,6 +128,9 @@ static int seg_format(int fd, off_t nrows, off_t ncols, int srows, int scols, G_warning("Segment_format(fd,%" PRI_OFF_T ",%" PRI_OFF_T >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -245,6 +251,7 @@ static int zero_fill(int fd, off_t nbytes) while (nbytes > 0) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD n = nbytes > (int)sizeof(buf) ? (int)sizeof(buf) : nbytes; ======= @@ -260,6 +267,12 @@ static int zero_fill(int fd, off_t nbytes) <<<<<<< HEAD n = nbytes > (int)sizeof(buf) ? (int)sizeof(buf) : nbytes; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + n = nbytes > (int)sizeof(buf) ? (int)sizeof(buf) : nbytes; +======= >>>>>>> osgeo-main n = nbytes > sizeof(buf) ? sizeof(buf) : nbytes; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -276,6 +289,9 @@ static int zero_fill(int fd, off_t nbytes) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/segment/segmentlib.dox b/lib/segment/segmentlib.dox index 1656a6a91d7..d310ab70a84 100644 --- a/lib/segment/segmentlib.dox +++ b/lib/segment/segmentlib.dox @@ -247,16 +247,22 @@ memory: Deletes the segment file and uses Segment_release() to release the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main allocated memory. No further cleaning up is required. ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_ave.c b/lib/stats/c_ave.c index 3f9ea81eb37..0d36eac5e29 100644 --- a/lib/stats/c_ave.c +++ b/lib/stats/c_ave.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_ave(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_ave(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_ave(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_ave(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_ave(DCELL *result, DCELL *values, int n, const void *closure) void c_ave(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42,6 +48,7 @@ void c_ave(DCELL *result, DCELL *values, int n, const void *closure) *result = sum / count; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_ave(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -50,6 +57,8 @@ void w_ave(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_ave(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= void w_ave(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -58,6 +67,9 @@ void w_ave(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_ave(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_count.c b/lib/stats/c_count.c index 2dc4ba18203..776b7a1ba05 100644 --- a/lib/stats/c_count.c +++ b/lib/stats/c_count.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_count(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_count(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_count(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_count(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_count(DCELL *result, DCELL *values, int n, const void *closure) void c_count(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33,6 +39,7 @@ void c_count(DCELL *result, DCELL *values, int n, const void *closure) *result = count; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_count(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -41,6 +48,8 @@ void w_count(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_count(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -50,6 +59,9 @@ void w_count(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_count(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_divr.c b/lib/stats/c_divr.c index 71986421fda..883ee942867 100644 --- a/lib/stats/c_divr.c +++ b/lib/stats/c_divr.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_divr(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_divr(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_divr(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_divr(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_divr(DCELL *result, DCELL *values, int n, const void *closure) void c_divr(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_intr.c b/lib/stats/c_intr.c index ebb85d15e38..995eb641fc4 100644 --- a/lib/stats/c_intr.c +++ b/lib/stats/c_intr.c @@ -2,6 +2,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_intr(DCELL *result, DCELL *values, int n, const void *closure) @@ -10,6 +11,8 @@ void c_intr(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_intr(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_intr(DCELL *result, DCELL *values, int n, const void *closure) @@ -18,6 +21,9 @@ void c_intr(DCELL *result, DCELL *values, int n, const void *closure) void c_intr(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_kurt.c b/lib/stats/c_kurt.c index d50791e6dd6..2c9aea971dc 100644 --- a/lib/stats/c_kurt.c +++ b/lib/stats/c_kurt.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_kurt(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_kurt(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_kurt(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_kurt(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_kurt(DCELL *result, DCELL *values, int n, const void *closure) void c_kurt(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -62,6 +68,7 @@ void c_kurt(DCELL *result, DCELL *values, int n, const void *closure) *result = sumqt / (count * var * var) - 3; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_kurt(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -70,6 +77,8 @@ void w_kurt(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_kurt(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -79,6 +88,9 @@ void w_kurt(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_kurt(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_max.c b/lib/stats/c_max.c index 25aef7de805..1d314be4e93 100644 --- a/lib/stats/c_max.c +++ b/lib/stats/c_max.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_max(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_max(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_max(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_max(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_max(DCELL *result, DCELL *values, int n, const void *closure) void c_max(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40,6 +46,7 @@ void c_max(DCELL *result, DCELL *values, int n, const void *closure) *result = max; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_max(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -48,6 +55,8 @@ void w_max(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_max(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= void w_max(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -56,6 +65,9 @@ void w_max(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_max(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_maxx.c b/lib/stats/c_maxx.c index 10082f16dc0..e88057a66b5 100644 --- a/lib/stats/c_maxx.c +++ b/lib/stats/c_maxx.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_maxx(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_maxx(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_maxx(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_maxx(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_maxx(DCELL *result, DCELL *values, int n, const void *closure) void c_maxx(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_median.c b/lib/stats/c_median.c index e840fe43e83..911ab4a744e 100644 --- a/lib/stats/c_median.c +++ b/lib/stats/c_median.c @@ -2,6 +2,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_median(DCELL *result, DCELL *values, int n, const void *closure) @@ -10,6 +11,8 @@ void c_median(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_median(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_median(DCELL *result, DCELL *values, int n, const void *closure) @@ -18,6 +21,9 @@ void c_median(DCELL *result, DCELL *values, int n, const void *closure) void c_median(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30,6 +36,7 @@ void c_median(DCELL *result, DCELL *values, int n, const void *closure) *result = (values[(n - 1) / 2] + values[n / 2]) / 2; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_median(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -38,6 +45,8 @@ void w_median(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_median(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -47,6 +56,9 @@ void w_median(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_median(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_min.c b/lib/stats/c_min.c index b4fd09a070c..6ee77c36d80 100644 --- a/lib/stats/c_min.c +++ b/lib/stats/c_min.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_min(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_min(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_min(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_min(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_min(DCELL *result, DCELL *values, int n, const void *closure) void c_min(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40,6 +46,7 @@ void c_min(DCELL *result, DCELL *values, int n, const void *closure) *result = min; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_min(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -48,6 +55,8 @@ void w_min(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_min(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= void w_min(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -56,6 +65,9 @@ void w_min(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_min(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_minx.c b/lib/stats/c_minx.c index 1462e2ec5ec..7ee7cacb9cf 100644 --- a/lib/stats/c_minx.c +++ b/lib/stats/c_minx.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_minx(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_minx(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_minx(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_minx(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_minx(DCELL *result, DCELL *values, int n, const void *closure) void c_minx(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_mode.c b/lib/stats/c_mode.c index 8a5dd5912d9..82e2cec548d 100644 --- a/lib/stats/c_mode.c +++ b/lib/stats/c_mode.c @@ -2,6 +2,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_mode(DCELL *result, DCELL *values, int n, const void *closure) @@ -10,6 +11,8 @@ void c_mode(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_mode(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_mode(DCELL *result, DCELL *values, int n, const void *closure) @@ -18,6 +21,9 @@ void c_mode(DCELL *result, DCELL *values, int n, const void *closure) void c_mode(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -53,6 +59,7 @@ void c_mode(DCELL *result, DCELL *values, int n, const void *closure) *result = mode; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_mode(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -61,6 +68,8 @@ void w_mode(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_mode(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -70,6 +79,9 @@ void w_mode(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_mode(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_percentile.c b/lib/stats/c_percentile.c index b473658012c..6d5c1b51b0a 100644 --- a/lib/stats/c_percentile.c +++ b/lib/stats/c_percentile.c @@ -26,6 +26,7 @@ void c_quant(DCELL *result, DCELL *values, int n, const void *closure) (i0 == i1) ? values[i0] : values[i0] * (i1 - k) + values[i1] * (k - i0); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_quart1(DCELL *result, DCELL *values, int n, const void *closure) @@ -34,6 +35,8 @@ void c_quart1(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_quart1(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_quart1(DCELL *result, DCELL *values, int n, const void *closure) @@ -42,6 +45,9 @@ void c_quart1(DCELL *result, DCELL *values, int n, const void *closure) void c_quart1(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -51,6 +57,7 @@ void c_quart1(DCELL *result, DCELL *values, int n, const void *closure) c_quant(result, values, n, &q); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_quart3(DCELL *result, DCELL *values, int n, const void *closure) @@ -59,6 +66,8 @@ void c_quart3(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_quart3(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_quart3(DCELL *result, DCELL *values, int n, const void *closure) @@ -67,6 +76,9 @@ void c_quart3(DCELL *result, DCELL *values, int n, const void *closure) void c_quart3(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -76,6 +88,7 @@ void c_quart3(DCELL *result, DCELL *values, int n, const void *closure) c_quant(result, values, n, &q); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_perc90(DCELL *result, DCELL *values, int n, const void *closure) @@ -84,6 +97,8 @@ void c_perc90(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_perc90(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_perc90(DCELL *result, DCELL *values, int n, const void *closure) @@ -92,6 +107,9 @@ void c_perc90(DCELL *result, DCELL *values, int n, const void *closure) void c_perc90(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -129,6 +147,7 @@ void w_quant(DCELL *result, DCELL (*values)[2], int n, const void *closure) *result = values[i][0]; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_quart1(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -137,6 +156,8 @@ void w_quart1(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_quart1(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -146,6 +167,9 @@ void w_quart1(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_quart1(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -155,6 +179,7 @@ void w_quart1(DCELL *result, DCELL (*values)[2], int n, const void *closure) w_quant(result, values, n, &q); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_quart3(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -163,6 +188,8 @@ void w_quart3(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_quart3(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -172,6 +199,9 @@ void w_quart3(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_quart3(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -181,6 +211,7 @@ void w_quart3(DCELL *result, DCELL (*values)[2], int n, const void *closure) w_quant(result, values, n, &q); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_perc90(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -189,6 +220,8 @@ void w_perc90(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_perc90(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -198,6 +231,9 @@ void w_perc90(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_perc90(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_range.c b/lib/stats/c_range.c index 92aa2b59e1c..111d8fb11d3 100644 --- a/lib/stats/c_range.c +++ b/lib/stats/c_range.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_range(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_range(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_range(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_range(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_range(DCELL *result, DCELL *values, int n, const void *closure) void c_range(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_reg.c b/lib/stats/c_reg.c index e4371441e01..6738d50d929 100644 --- a/lib/stats/c_reg.c +++ b/lib/stats/c_reg.c @@ -85,6 +85,7 @@ static void regression(DCELL *result, DCELL *values, int n, int which) Rast_set_d_null_value(result, 1); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure) @@ -93,6 +94,8 @@ void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure) @@ -101,6 +104,9 @@ void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure) void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -108,6 +114,7 @@ void c_reg_m(DCELL *result, DCELL *values, int n, const void *closure) regression(result, values, n, REGRESSION_SLOPE); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure) @@ -116,6 +123,8 @@ void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure) @@ -124,6 +133,9 @@ void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure) void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -131,6 +143,7 @@ void c_reg_c(DCELL *result, DCELL *values, int n, const void *closure) regression(result, values, n, REGRESSION_OFFSET); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure) @@ -139,6 +152,8 @@ void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure) @@ -147,6 +162,9 @@ void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure) void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -154,6 +172,7 @@ void c_reg_r2(DCELL *result, DCELL *values, int n, const void *closure) regression(result, values, n, REGRESSION_COEFF_DET); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_reg_t(DCELL *result, DCELL *values, int n, const void *closure) @@ -162,6 +181,8 @@ void c_reg_t(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_reg_t(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_reg_t(DCELL *result, DCELL *values, int n, const void *closure) @@ -170,6 +191,9 @@ void c_reg_t(DCELL *result, DCELL *values, int n, const void *closure) void c_reg_t(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -251,6 +275,7 @@ static void regression_w(DCELL *result, DCELL (*values)[2], int n, int which) Rast_set_d_null_value(result, 1); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_reg_m(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -259,6 +284,8 @@ void w_reg_m(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_reg_m(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -268,6 +295,9 @@ void w_reg_m(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_reg_m(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -275,6 +305,7 @@ void w_reg_m(DCELL *result, DCELL (*values)[2], int n, const void *closure) regression_w(result, values, n, REGRESSION_SLOPE); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_reg_c(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -283,6 +314,8 @@ void w_reg_c(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_reg_c(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -292,6 +325,9 @@ void w_reg_c(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_reg_c(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -299,6 +335,7 @@ void w_reg_c(DCELL *result, DCELL (*values)[2], int n, const void *closure) regression_w(result, values, n, REGRESSION_OFFSET); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_reg_r2(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -307,6 +344,8 @@ void w_reg_r2(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_reg_r2(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -316,6 +355,9 @@ void w_reg_r2(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_reg_r2(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -323,6 +365,7 @@ void w_reg_r2(DCELL *result, DCELL (*values)[2], int n, const void *closure) regression_w(result, values, n, REGRESSION_COEFF_DET); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_reg_t(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -331,6 +374,8 @@ void w_reg_t(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_reg_t(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -340,6 +385,9 @@ void w_reg_t(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_reg_t(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_skew.c b/lib/stats/c_skew.c index e7d49a8cf0c..2ea1a380fcd 100644 --- a/lib/stats/c_skew.c +++ b/lib/stats/c_skew.c @@ -3,6 +3,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_skew(DCELL *result, DCELL *values, int n, const void *closure) @@ -11,6 +12,8 @@ void c_skew(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_skew(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_skew(DCELL *result, DCELL *values, int n, const void *closure) @@ -19,6 +22,9 @@ void c_skew(DCELL *result, DCELL *values, int n, const void *closure) void c_skew(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -64,6 +70,7 @@ void c_skew(DCELL *result, DCELL *values, int n, const void *closure) *result = sumcb / (count * sdev * sdev * sdev); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_skew(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -72,6 +79,8 @@ void w_skew(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_skew(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= @@ -81,6 +90,9 @@ void w_skew(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_skew(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_sum.c b/lib/stats/c_sum.c index 1cd0756e7ab..196393a519c 100644 --- a/lib/stats/c_sum.c +++ b/lib/stats/c_sum.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_sum(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_sum(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_sum(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_sum(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_sum(DCELL *result, DCELL *values, int n, const void *closure) void c_sum(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42,6 +48,7 @@ void c_sum(DCELL *result, DCELL *values, int n, const void *closure) *result = sum; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_sum(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -50,6 +57,8 @@ void w_sum(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_sum(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= void w_sum(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -58,6 +67,9 @@ void w_sum(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_sum(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/stats/c_var.c b/lib/stats/c_var.c index 090ae801342..1eb203d4fbe 100644 --- a/lib/stats/c_var.c +++ b/lib/stats/c_var.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void c_var(DCELL *result, DCELL *values, int n, const void *closure) @@ -9,6 +10,8 @@ void c_var(DCELL *result, DCELL *values, int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void c_var(DCELL *result, DCELL *values, int n, const void *closure UNUSED) ======= void c_var(DCELL *result, DCELL *values, int n, const void *closure) @@ -17,6 +20,9 @@ void c_var(DCELL *result, DCELL *values, int n, const void *closure) void c_var(DCELL *result, DCELL *values, int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -58,6 +64,7 @@ void c_var(DCELL *result, DCELL *values, int n, const void *closure) *result = sumsq / count; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void w_var(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -66,6 +73,8 @@ void w_var(DCELL *result, DCELL (*values)[2], int n, const void *closure) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void w_var(DCELL *result, DCELL (*values)[2], int n, const void *closure UNUSED) ======= void w_var(DCELL *result, DCELL (*values)[2], int n, const void *closure) @@ -74,6 +83,9 @@ void w_var(DCELL *result, DCELL (*values)[2], int n, const void *closure) void w_var(DCELL *result, DCELL (*values)[2], int n, const void *closure) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/temporal/SQL/raster_views.sql b/lib/temporal/SQL/raster_views.sql index 664afc3db2a..84f80e2f828 100644 --- a/lib/temporal/SQL/raster_views.sql +++ b/lib/temporal/SQL/raster_views.sql @@ -18,6 +18,7 @@ CREATE VIEW raster_view_abs_time AS SELECT A4.nsres, A4.ewres, A4.min, A4.max, A4.number_of_cells, A4.semantic_label, A5.registered_stds <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD FROM raster_base A1, raster_absolute_time A2, ======= @@ -35,6 +36,12 @@ CREATE VIEW raster_view_abs_time AS SELECT ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD + FROM raster_base A1, raster_absolute_time A2, +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) FROM raster_base A1, raster_absolute_time A2, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -48,6 +55,9 @@ CREATE VIEW raster_view_abs_time AS SELECT >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -67,6 +77,7 @@ CREATE VIEW raster_view_rel_time AS SELECT A4.nsres, A4.ewres, A4.min, A4.max, A4.number_of_cells, A4.semantic_label, A5.registered_stds <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD FROM raster_base A1, raster_relative_time A2, ======= @@ -84,6 +95,12 @@ CREATE VIEW raster_view_rel_time AS SELECT ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD + FROM raster_base A1, raster_relative_time A2, +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) FROM raster_base A1, raster_relative_time A2, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -97,6 +114,9 @@ CREATE VIEW raster_view_rel_time AS SELECT >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/temporal/SQL/update_stds_spatial_temporal_extent_template.sql b/lib/temporal/SQL/update_stds_spatial_temporal_extent_template.sql index 57ef46a83d0..463044fa043 100644 --- a/lib/temporal/SQL/update_stds_spatial_temporal_extent_template.sql +++ b/lib/temporal/SQL/update_stds_spatial_temporal_extent_template.sql @@ -2,16 +2,22 @@ -- This SQL script is to update the spatial and temporal extent as well as <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main -- the modification time and revision of a space time dataset. This script ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41,10 +47,13 @@ UPDATE STDS_metadata SET number_of_maps = -- Update the temporal extent <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main UPDATE STDS_absolute_time SET start_time = new_stats.start_time_new, @@ -105,6 +114,9 @@ UPDATE STDS_spatial_extent ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -155,6 +167,7 @@ UPDATE STDS_spatial_extent SET proj = ) WHERE id = 'SPACETIME_ID'; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -166,3 +179,8 @@ UPDATE STDS_spatial_extent SET proj = ======= >>>>>>> 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/temporal/SQL/update_stds_spatial_temporal_extent_template_old.sql b/lib/temporal/SQL/update_stds_spatial_temporal_extent_template_old.sql new file mode 100644 index 00000000000..98359537f68 --- /dev/null +++ b/lib/temporal/SQL/update_stds_spatial_temporal_extent_template_old.sql @@ -0,0 +1,66 @@ +--############################################################################# +-- This SQL script is to update the spatial and temporal extent as well as +-- the modification time and revision of a space time dataset. This script +-- should be called when maps inserted or deleted in a space time dataset. +-- +-- +-- Author: Soeren Gebbert soerengebbert googlemail com +--############################################################################# + +-- SPACETIME_REGISTER_TABLE is a placeholder for specific stds map register table name (SQL compliant) +-- SPACETIME_ID is a placeholder for specific stds id: name@mapset +-- GRASS_MAP is a placeholder for specific map type: raster, raster3d or vector +-- STDS is a placeholder for specific space-time dataset type: strds, str3ds, stvds + +-- UPDATE STDS_base SET modification_time = datetime("NOW") WHERE id = 'SPACETIME_ID'; +-- UPDATE STDS_base SET revision = (revision + 1) WHERE id = 'SPACETIME_ID'; +-- Number of registered maps +UPDATE STDS_metadata SET number_of_maps = + (SELECT count(id) FROM SPACETIME_REGISTER_TABLE) + WHERE id = 'SPACETIME_ID'; +-- Update the temporal extent +UPDATE STDS_absolute_time SET start_time = + (SELECT min(start_time) FROM GRASS_MAP_absolute_time WHERE GRASS_MAP_absolute_time.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_absolute_time SET end_time = + (SELECT max(end_time) FROM GRASS_MAP_absolute_time WHERE GRASS_MAP_absolute_time.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_relative_time SET start_time = + (SELECT min(start_time) FROM GRASS_MAP_relative_time WHERE GRASS_MAP_relative_time.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_relative_time SET end_time = + (SELECT max(end_time) FROM GRASS_MAP_relative_time WHERE GRASS_MAP_relative_time.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +-- Update the spatial extent +UPDATE STDS_spatial_extent SET north = + (SELECT max(north) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_spatial_extent SET south = + (SELECT min(south) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_spatial_extent SET east = + (SELECT max(east) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_spatial_extent SET west = + (SELECT min(west) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_spatial_extent SET top = + (SELECT max(top) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_spatial_extent SET bottom = + (SELECT min(bottom) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE STDS_spatial_extent SET proj = + (SELECT min(proj) FROM GRASS_MAP_spatial_extent WHERE GRASS_MAP_spatial_extent.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; diff --git a/lib/temporal/SQL/update_str3ds_metadata_template.sql b/lib/temporal/SQL/update_str3ds_metadata_template.sql index bdafddc64b1..d4973bb0334 100644 --- a/lib/temporal/SQL/update_str3ds_metadata_template.sql +++ b/lib/temporal/SQL/update_str3ds_metadata_template.sql @@ -86,6 +86,7 @@ UPDATE str3ds_metadata SET tbres_max = ) WHERE id = 'SPACETIME_ID'; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -97,3 +98,8 @@ UPDATE str3ds_metadata SET tbres_max = ======= >>>>>>> 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/temporal/SQL/update_str3ds_metadata_template_old.sql b/lib/temporal/SQL/update_str3ds_metadata_template_old.sql new file mode 100644 index 00000000000..65aba6299cc --- /dev/null +++ b/lib/temporal/SQL/update_str3ds_metadata_template_old.sql @@ -0,0 +1,51 @@ +--############################################################################# +-- This SQL script is to update a space-time raster3d dataset metadata +-- +-- Author: Soeren Gebbert soerengebbert googlemail com +--############################################################################# + +-- SPACETIME_REGISTER_TABLE is a placeholder for specific stds map register table name (SQL compliant) +-- SPACETIME_ID is a placeholder for specific stds id: name@mapset + +-- Update the min and max values +UPDATE str3ds_metadata SET min_min = + (SELECT min(min) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET min_max = + (SELECT max(min) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET max_min = + (SELECT min(max) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET max_max = + (SELECT max(max) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +-- Update the resolution +UPDATE str3ds_metadata SET nsres_min = + (SELECT min(nsres) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET nsres_max = + (SELECT max(nsres) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET ewres_min = + (SELECT min(ewres) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET ewres_max = + (SELECT max(ewres) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET tbres_min = + (SELECT min(tbres) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE str3ds_metadata SET tbres_max = + (SELECT max(tbres) FROM raster3d_metadata WHERE raster3d_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; diff --git a/lib/temporal/SQL/update_strds_metadata_template.sql b/lib/temporal/SQL/update_strds_metadata_template.sql index c80e22e3888..dd65dfe25f0 100644 --- a/lib/temporal/SQL/update_strds_metadata_template.sql +++ b/lib/temporal/SQL/update_strds_metadata_template.sql @@ -75,6 +75,7 @@ UPDATE strds_metadata SET ewres_min = <<<<<<< HEAD UPDATE strds_metadata SET ewres_max = (SELECT max(ewres) FROM raster_metadata WHERE raster_metadata.id IN +<<<<<<< HEAD <<<<<<< HEAD (SELECT id FROM SPACETIME_REGISTER_TABLE) ) WHERE id = 'SPACETIME_ID'; @@ -85,6 +86,8 @@ UPDATE strds_metadata SET ewres_max = ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD UPDATE strds_metadata SET ewres_max = (SELECT max(ewres) FROM raster_metadata WHERE raster_metadata.id IN @@ -100,6 +103,9 @@ UPDATE strds_metadata SET ewres_max = ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/temporal/SQL/update_strds_metadata_template_old.sql b/lib/temporal/SQL/update_strds_metadata_template_old.sql new file mode 100644 index 00000000000..a234f204527 --- /dev/null +++ b/lib/temporal/SQL/update_strds_metadata_template_old.sql @@ -0,0 +1,43 @@ +--############################################################################# +-- This SQL is to update a space-time raster dataset metadata +-- +-- Author: Soeren Gebbert soerengebbert googlemail com +--############################################################################# + +-- SPACETIME_REGISTER_TABLE is a placeholder for specific stds map register table name (SQL compliant) +-- SPACETIME_ID is a placeholder for specific stds id: name@mapset + +-- Update the min and max values +UPDATE strds_metadata SET min_min = + (SELECT min(min) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE strds_metadata SET min_max = + (SELECT max(min) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE strds_metadata SET max_min = + (SELECT min(max) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE strds_metadata SET max_max = + (SELECT max(max) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +-- Update the resolution +UPDATE strds_metadata SET nsres_min = + (SELECT min(nsres) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE strds_metadata SET nsres_max = + (SELECT max(nsres) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE strds_metadata SET ewres_min = + (SELECT min(ewres) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE strds_metadata SET ewres_max = + (SELECT max(ewres) FROM raster_metadata WHERE raster_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; diff --git a/lib/temporal/SQL/update_stvds_metadata_template.sql b/lib/temporal/SQL/update_stvds_metadata_template.sql index 5fd574771f0..a57fa7314c8 100644 --- a/lib/temporal/SQL/update_stvds_metadata_template.sql +++ b/lib/temporal/SQL/update_stvds_metadata_template.sql @@ -12,11 +12,14 @@ -- Update the vector features and topology <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main UPDATE stvds_metadata SET points = new_stats.points_new, @@ -55,6 +58,9 @@ UPDATE stvds_metadata ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/temporal/SQL/update_stvds_metadata_template_old.sql b/lib/temporal/SQL/update_stvds_metadata_template_old.sql new file mode 100644 index 00000000000..d630318719a --- /dev/null +++ b/lib/temporal/SQL/update_stvds_metadata_template_old.sql @@ -0,0 +1,59 @@ +--############################################################################# +-- This SQL script is for now a placeholder, till the vector metadata +-- concept is clear +-- +-- Author: Soeren Gebbert soerengebbert googlemail com +--############################################################################# + +-- SPACETIME_REGISTER_TABLE is a placeholder for specific stds map register table name (SQL compliant) +-- SPACETIME_ID is a placeholder for specific stds id: name@mapset + +-- Update the vector features and topology +UPDATE stvds_metadata SET points = + (SELECT sum(points) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET lines = + (SELECT sum(lines) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET boundaries = + (SELECT sum(boundaries) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET centroids = + (SELECT sum(centroids) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET faces = + (SELECT sum(faces) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET kernels = + (SELECT sum(kernels) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET primitives = + (SELECT sum(primitives) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET nodes = + (SELECT sum(nodes) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET areas = + (SELECT sum(areas) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET islands = + (SELECT sum(islands) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET holes = + (SELECT sum(holes) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; +UPDATE stvds_metadata SET volumes = + (SELECT sum(volumes) FROM vector_metadata WHERE vector_metadata.id IN + (SELECT id FROM SPACETIME_REGISTER_TABLE) + ) WHERE id = 'SPACETIME_ID'; diff --git a/lib/temporal/lib/map_list.c b/lib/temporal/lib/map_list.c index cad077843b9..246827aa211 100644 --- a/lib/temporal/lib/map_list.c +++ b/lib/temporal/lib/map_list.c @@ -53,6 +53,7 @@ void tgis_free_map_list(tgisMapList *list) * */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD tgisMapList *tgis_new_map_list(void) ======= <<<<<<< HEAD @@ -68,6 +69,12 @@ tgisMapList *tgis_new_map_list(void) tgisMapList *tgis_new_map_list(void) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +tgisMapList *tgis_new_map_list(void) +======= +>>>>>>> osgeo-main tgisMapList *tgis_new_map_list() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -83,6 +90,9 @@ tgisMapList *tgis_new_map_list(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/area.c b/lib/vector/Vlib/area.c index eecb266907d..004718654e0 100644 --- a/lib/vector/Vlib/area.c +++ b/lib/vector/Vlib/area.c @@ -36,12 +36,15 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_area_points(const struct Map_info *Map, int area, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_area_points(struct Map_info *Map, int area, ======= int Vect_get_area_points(const struct Map_info *Map, int area, @@ -50,6 +53,9 @@ int Vect_get_area_points(const struct Map_info *Map, int area, int Vect_get_area_points(const struct Map_info *Map, int area, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -85,12 +91,15 @@ int Vect_get_area_points(const struct Map_info *Map, int area, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_isle_points(const struct Map_info *Map, int isle, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_isle_points(struct Map_info *Map, int isle, ======= int Vect_get_isle_points(const struct Map_info *Map, int isle, @@ -99,6 +108,9 @@ int Vect_get_isle_points(const struct Map_info *Map, int isle, int Vect_get_isle_points(const struct Map_info *Map, int isle, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -174,6 +186,7 @@ int Vect_get_area_centroid(struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_area_boundaries(const struct Map_info *Map, int area, struct ilist *List) ======= @@ -181,6 +194,8 @@ int Vect_get_area_boundaries(const struct Map_info *Map, int area, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_area_boundaries(struct Map_info *Map, int area, struct ilist *List) ======= int Vect_get_area_boundaries(const struct Map_info *Map, int area, @@ -191,6 +206,9 @@ int Vect_get_area_boundaries(const struct Map_info *Map, int area, struct ilist *List) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -231,6 +249,7 @@ int Vect_get_area_boundaries(const struct Map_info *Map, int area, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_isle_boundaries(const struct Map_info *Map, int isle, struct ilist *List) ======= @@ -238,6 +257,8 @@ int Vect_get_isle_boundaries(const struct Map_info *Map, int isle, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_isle_boundaries(struct Map_info *Map, int isle, struct ilist *List) ======= int Vect_get_isle_boundaries(const struct Map_info *Map, int isle, @@ -248,6 +269,9 @@ int Vect_get_isle_boundaries(const struct Map_info *Map, int isle, struct ilist *List) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -411,12 +435,15 @@ double Vect_get_area_perimeter(struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_point_in_area(double x, double y, const struct Map_info *Map, int area, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_point_in_area(double x, double y, struct Map_info *Map, int area, ======= int Vect_point_in_area(double x, double y, const struct Map_info *Map, int area, @@ -425,6 +452,9 @@ int Vect_point_in_area(double x, double y, const struct Map_info *Map, int area, int Vect_point_in_area(double x, double y, const struct Map_info *Map, int area, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -518,6 +548,7 @@ double Vect_get_area_area(struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_area_cats(const struct Map_info *Map, int area, struct line_cats *Cats) ======= @@ -525,6 +556,8 @@ int Vect_get_area_cats(const struct Map_info *Map, int area, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_area_cats(struct Map_info *Map, int area, struct line_cats *Cats) ======= int Vect_get_area_cats(const struct Map_info *Map, int area, @@ -535,6 +568,9 @@ int Vect_get_area_cats(const struct Map_info *Map, int area, struct line_cats *Cats) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -603,12 +639,15 @@ int Vect_get_area_cat(struct Map_info *Map, int area, int field) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__get_area_points(struct Map_info *Map, const plus_t *lines, ======= int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines, @@ -617,6 +656,9 @@ int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines, int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -650,12 +692,15 @@ int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect__get_area_points_nat(const struct Map_info *Map, const plus_t *lines, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__get_area_points_nat(struct Map_info *Map, const plus_t *lines, ======= int Vect__get_area_points_nat(const struct Map_info *Map, const plus_t *lines, @@ -664,6 +709,9 @@ int Vect__get_area_points_nat(const struct Map_info *Map, const plus_t *lines, int Vect__get_area_points_nat(const struct Map_info *Map, const plus_t *lines, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/area_pg.c b/lib/vector/Vlib/area_pg.c index d3cd3946a29..6875fde1a97 100644 --- a/lib/vector/Vlib/area_pg.c +++ b/lib/vector/Vlib/area_pg.c @@ -36,12 +36,15 @@ static PGresult *build_stmt(const struct Plus_head *, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect__get_area_points_pg(const struct Map_info *Map, const plus_t *lines, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__get_area_points_pg(struct Map_info *Map, const plus_t *lines, ======= int Vect__get_area_points_pg(const struct Map_info *Map, const plus_t *lines, @@ -50,6 +53,9 @@ int Vect__get_area_points_pg(const struct Map_info *Map, const plus_t *lines, int Vect__get_area_points_pg(const struct Map_info *Map, const plus_t *lines, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/array.c b/lib/vector/Vlib/array.c index 3691b39a134..3fd8c01960e 100644 --- a/lib/vector/Vlib/array.c +++ b/lib/vector/Vlib/array.c @@ -78,12 +78,15 @@ struct varray *Vect_new_varray(int size) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_set_varray_from_cat_string(struct Map_info *Map, int field, ======= int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field, @@ -92,6 +95,9 @@ int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field, int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -141,12 +147,15 @@ int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_set_varray_from_cat_list(const struct Map_info *Map, int field, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_set_varray_from_cat_list(struct Map_info *Map, int field, ======= int Vect_set_varray_from_cat_list(const struct Map_info *Map, int field, @@ -155,6 +164,9 @@ int Vect_set_varray_from_cat_list(const struct Map_info *Map, int field, int Vect_set_varray_from_cat_list(const struct Map_info *Map, int field, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -277,6 +289,7 @@ static int in_array(int *cats, size_t ncats, int cat) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_set_varray_from_db(const struct Map_info *Map, int field, const char *where, int type, int value, struct varray *varray) @@ -285,6 +298,8 @@ int Vect_set_varray_from_db(const struct Map_info *Map, int field, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_set_varray_from_db(struct Map_info *Map, int field, const char *where, int type, int value, struct varray *varray) ======= @@ -298,6 +313,9 @@ int Vect_set_varray_from_db(const struct Map_info *Map, int field, struct varray *varray) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/ascii.c b/lib/vector/Vlib/ascii.c index 9ffbeefa62e..b49b740805d 100644 --- a/lib/vector/Vlib/ascii.c +++ b/lib/vector/Vlib/ascii.c @@ -208,6 +208,7 @@ int Vect_read_ascii(FILE *ascii, struct Map_info *Map) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (sscanf(buff, "%u%u", &catn, &cat) != 2) { @@ -216,6 +217,8 @@ int Vect_read_ascii(FILE *ascii, struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (sscanf(buff, "%d%d", &catn, &cat) != 2) { ======= if (sscanf(buff, "%u%u", &catn, &cat) != 2) { @@ -224,6 +227,9 @@ int Vect_read_ascii(FILE *ascii, struct Map_info *Map) if (sscanf(buff, "%u%u", &catn, &cat) != 2) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -905,6 +911,7 @@ int Vect_write_ascii(FILE *ascii, FILE *att, struct Map_info *Map, int ver, } fprintf(ascii, "POLYGON("); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* write outter ring */ ======= @@ -912,6 +919,8 @@ int Vect_write_ascii(FILE *ascii, FILE *att, struct Map_info *Map, int ver, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* write outer ring */ ======= /* write outter ring */ @@ -920,6 +929,9 @@ int Vect_write_ascii(FILE *ascii, FILE *att, struct Map_info *Map, int ver, /* write outter ring */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/box.c b/lib/vector/Vlib/box.c index e48c2fb5528..b9d175fe213 100644 --- a/lib/vector/Vlib/box.c +++ b/lib/vector/Vlib/box.c @@ -234,6 +234,7 @@ int Vect_box_clip(double *x, double *y, double *c_x, double *c_y, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_line_box(const struct Map_info *Map, int line, struct bound_box *Box) ======= @@ -241,6 +242,8 @@ int Vect_get_line_box(const struct Map_info *Map, int line, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_line_box(struct Map_info *Map, int line, struct bound_box *Box) ======= int Vect_get_line_box(const struct Map_info *Map, int line, @@ -251,6 +254,9 @@ int Vect_get_line_box(const struct Map_info *Map, int line, struct bound_box *Box) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -269,6 +275,7 @@ int Vect_get_line_box(const struct Map_info *Map, int line, Line = Plus->Line[line]; if (Line == NULL) { /* dead */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; ======= @@ -284,6 +291,12 @@ int Vect_get_line_box(const struct Map_info *Map, int line, <<<<<<< HEAD Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; +======= >>>>>>> osgeo-main Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = 0. / 0.; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -300,6 +313,9 @@ int Vect_get_line_box(const struct Map_info *Map, int line, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -354,6 +370,7 @@ int Vect_get_line_box(const struct Map_info *Map, int line, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_area_box(const struct Map_info *Map, int area, struct bound_box *Box) ======= @@ -361,6 +378,8 @@ int Vect_get_area_box(const struct Map_info *Map, int area, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_area_box(struct Map_info *Map, int area, struct bound_box *Box) ======= int Vect_get_area_box(const struct Map_info *Map, int area, @@ -371,6 +390,9 @@ int Vect_get_area_box(const struct Map_info *Map, int area, struct bound_box *Box) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -388,6 +410,7 @@ int Vect_get_area_box(const struct Map_info *Map, int area, if (Area == NULL) { /* dead */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; ======= @@ -403,6 +426,12 @@ int Vect_get_area_box(const struct Map_info *Map, int area, <<<<<<< HEAD Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; +======= >>>>>>> osgeo-main Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = 0. / 0.; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -419,6 +448,9 @@ int Vect_get_area_box(const struct Map_info *Map, int area, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -454,6 +486,7 @@ int Vect_get_area_box(const struct Map_info *Map, int area, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_isle_box(const struct Map_info *Map, int isle, struct bound_box *Box) ======= @@ -461,6 +494,8 @@ int Vect_get_isle_box(const struct Map_info *Map, int isle, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_isle_box(struct Map_info *Map, int isle, struct bound_box *Box) ======= int Vect_get_isle_box(const struct Map_info *Map, int isle, @@ -471,6 +506,9 @@ int Vect_get_isle_box(const struct Map_info *Map, int isle, struct bound_box *Box) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -489,6 +527,7 @@ int Vect_get_isle_box(const struct Map_info *Map, int isle, if (Isle == NULL) { /* dead */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; ======= @@ -504,6 +543,12 @@ int Vect_get_isle_box(const struct Map_info *Map, int isle, <<<<<<< HEAD Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = NAN; +======= >>>>>>> osgeo-main Box->N = Box->S = Box->E = Box->W = Box->T = Box->B = 0. / 0.; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -520,6 +565,9 @@ int Vect_get_isle_box(const struct Map_info *Map, int isle, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/break_lines.c b/lib/vector/Vlib/break_lines.c index 5e98ab034be..823cddb82f4 100644 --- a/lib/vector/Vlib/break_lines.c +++ b/lib/vector/Vlib/break_lines.c @@ -214,6 +214,7 @@ int break_lines(struct Map_info *Map, struct ilist *List_break, * Fortunately usual lines/boundaries in GIS often forms a network where * lines are connected by end points, and touch by MBR. This function checks <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * and occasionaly skips such cases. This is currently done for 2D only ======= @@ -221,6 +222,8 @@ int break_lines(struct Map_info *Map, struct ilist *List_break, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * and occasionally skips such cases. This is currently done for 2D only ======= * and occasionaly skips such cases. This is currently done for 2D only @@ -229,6 +232,9 @@ int break_lines(struct Map_info *Map, struct ilist *List_break, * and occasionaly skips such cases. This is currently done for 2D only >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/break_polygons.c b/lib/vector/Vlib/break_polygons.c index d7a7b8d0274..ac920160d3d 100644 --- a/lib/vector/Vlib/break_polygons.c +++ b/lib/vector/Vlib/break_polygons.c @@ -149,6 +149,7 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, * points, if such point already exists check angles of segments and if * differ mark for break */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD npoints = 1; /* index starts from 1 ! */ @@ -163,6 +164,11 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, <<<<<<< HEAD npoints = 1; /* index starts from 1 ! */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + npoints = 1; /* index starts from 1 ! */ +======= >>>>>>> osgeo-main nmarks = 0; npoints = 1; /* index starts from 1 ! */ @@ -180,6 +186,9 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -216,11 +225,14 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, G_debug(3, "j = %d", j); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -237,6 +249,9 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -295,11 +310,14 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, XPnt.cross = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -316,6 +334,9 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -336,11 +357,14 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, XPnt.cross = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -357,6 +381,9 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -379,11 +406,14 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, XPnt.cross = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -400,6 +430,9 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -452,11 +485,14 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, G_debug(3, "j = %d", j); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -473,6 +509,9 @@ void Vect_break_polygons_file(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -634,11 +673,14 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, G_debug(3, "j = %d", j); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -655,6 +697,9 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -701,11 +746,14 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, XPnt_found->cross = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -722,6 +770,9 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -737,11 +788,14 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, XPnt_found->cross = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -758,6 +812,9 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -772,11 +829,14 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, XPnt_search.cross = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -793,6 +853,9 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -807,11 +870,14 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, rbtree_insert(RBTree, &XPnt_search); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -828,6 +894,9 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -872,11 +941,14 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, G_debug(3, "j = %d", j); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -893,6 +965,9 @@ void Vect_break_polygons_mem(struct Map_info *Map, int type, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/buffer2.c b/lib/vector/Vlib/buffer2.c index 6023e0cda9c..62ed0809bf5 100644 --- a/lib/vector/Vlib/buffer2.c +++ b/lib/vector/Vlib/buffer2.c @@ -135,16 +135,22 @@ static void line_coefficients(double x1, double y1, double x2, double y2, * parallel, 1 if they cross, 2 if they are the same line. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * !!!!!!!!!!!!!!!! FIX THIS TOLERANCE CONSTANTS BAD (and UGLY) CODE !!!!!!!!! ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1051,6 +1057,7 @@ void Vect_line_buffer2(const struct line_pnts *Points, double da, double db, round, tol, oPoints); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1061,6 +1068,11 @@ void Vect_line_buffer2(const struct line_pnts *Points, double da, double db, >>>>>>> 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 /* initializations */ @@ -1107,11 +1119,14 @@ void Vect_line_buffer2(const struct line_pnts *Points, double da, double db, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void Vect_area_buffer2(struct Map_info *Map, int area, double da, double db, double dalpha, int round, int caps, double tol, struct line_pnts **oPoints, struct line_pnts ***iPoints, @@ -1120,6 +1135,9 @@ void Vect_area_buffer2(struct Map_info *Map, int area, double da, double db, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1129,6 +1147,7 @@ void Vect_area_buffer2(const struct Map_info *Map, int area, double da, struct line_pnts ***iPoints, int *inner_count) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1140,6 +1159,11 @@ void Vect_area_buffer2(const struct Map_info *Map, int area, double da, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { struct line_pnts *tPoints, *outer; struct line_pnts **isles; diff --git a/lib/vector/Vlib/build.c b/lib/vector/Vlib/build.c index ff874df5456..3d45fe7f6f4 100644 --- a/lib/vector/Vlib/build.c +++ b/lib/vector/Vlib/build.c @@ -34,12 +34,15 @@ #if !defined HAVE_OGR || !defined HAVE_POSTGRES <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static int format(struct Map_info *Map, int build) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format(struct Map_info *Map UNUSED, int build UNUSED) ======= static int format(struct Map_info *Map, int build) @@ -48,6 +51,9 @@ static int format(struct Map_info *Map, int build) static int format(struct Map_info *Map, int build) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -57,6 +63,7 @@ static int format(struct Map_info *Map, int build) } #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -70,6 +77,10 @@ static int format(struct Map_info *Map, int build) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main static int (*Build_array[])(struct Map_info *, int) = {Vect_build_nat #ifdef HAVE_OGR , @@ -87,10 +98,13 @@ static int (*Build_array[])(struct Map_info *, int) = {Vect_build_nat format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= static int (*Build_array[])() = {Vect_build_nat ======= static int (*Build_array[])(struct Map_info *, int) = {Vect_build_nat @@ -154,6 +168,9 @@ static int (*Build_array[])(struct Map_info *, int) = {Vect_build_nat >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1034,6 +1051,7 @@ int Vect_build_partial(struct Map_info *Map, int build) if (plus->built >= GV_BUILD_AREAS) { int line, nlines, area, nareas, err_boundaries, err_centr_out, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD err_centr_dupl /*, err_nocentr */; ======= @@ -1049,6 +1067,12 @@ int Vect_build_partial(struct Map_info *Map, int build) <<<<<<< HEAD err_centr_dupl /*, err_nocentr */; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + err_centr_dupl /*, err_nocentr */; +======= >>>>>>> osgeo-main err_centr_dupl, err_nocentr; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1065,6 +1089,9 @@ int Vect_build_partial(struct Map_info *Map, int build) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1099,6 +1126,7 @@ int Vect_build_partial(struct Map_info *Map, int build) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* err_nocentr = 0; */ @@ -1115,6 +1143,12 @@ int Vect_build_partial(struct Map_info *Map, int build) <<<<<<< HEAD /* err_nocentr = 0; */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + /* err_nocentr = 0; */ +======= >>>>>>> osgeo-main err_nocentr = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1131,6 +1165,9 @@ int Vect_build_partial(struct Map_info *Map, int build) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1140,6 +1177,7 @@ int Vect_build_partial(struct Map_info *Map, int build) continue; line = Vect_get_area_centroid(Map, area); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* if (line == 0) err_nocentr++; */ @@ -1158,6 +1196,13 @@ int Vect_build_partial(struct Map_info *Map, int build) /* if (line == 0) err_nocentr++; */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + /* if (line == 0) + err_nocentr++; */ +======= >>>>>>> osgeo-main if (line == 0) err_nocentr++; @@ -1179,6 +1224,9 @@ int Vect_build_partial(struct Map_info *Map, int build) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1457,11 +1505,14 @@ int Vect_build_sidx_from_topo(struct Map_info *Map) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -1477,6 +1528,9 @@ int Vect_build_sidx_from_topo(struct Map_info *Map) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1551,12 +1605,15 @@ int Vect_save_sidx(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_sidx_dump(const struct Map_info *Map, FILE *out) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_sidx_dump(struct Map_info *Map, FILE *out) ======= int Vect_sidx_dump(const struct Map_info *Map, FILE *out) @@ -1565,6 +1622,9 @@ int Vect_sidx_dump(const struct Map_info *Map, FILE *out) int Vect_sidx_dump(const struct Map_info *Map, FILE *out) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/build_nat.c b/lib/vector/Vlib/build_nat.c index 3a906628d40..72375ca751c 100644 --- a/lib/vector/Vlib/build_nat.c +++ b/lib/vector/Vlib/build_nat.c @@ -235,16 +235,22 @@ int Vect_build_nat(struct Map_info *Map, int build) /* add message and G_percent() ? <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * it seems fast enough, no message / percent needed */ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/build_pg.c b/lib/vector/Vlib/build_pg.c index 3c23736e22c..df480fbf087 100644 --- a/lib/vector/Vlib/build_pg.c +++ b/lib/vector/Vlib/build_pg.c @@ -215,6 +215,7 @@ int build_topo(struct Map_info *Map, int build) /* update TopoGeometry based on GRASS-like topology */ Vect_build_nat(Map, build); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (n_nodes != Map->plus.n_nodes) @@ -231,6 +232,10 @@ int build_topo(struct Map_info *Map, int build) <<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= +======= +======= >>>>>>> osgeo-main if (n_nodes != Map->plus.n_nodes) diff --git a/lib/vector/Vlib/build_sfa.c b/lib/vector/Vlib/build_sfa.c index d05701c9c86..1314951ff58 100644 --- a/lib/vector/Vlib/build_sfa.c +++ b/lib/vector/Vlib/build_sfa.c @@ -28,6 +28,7 @@ /*! \brief This structure keeps info about geometry parts above current <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD geometry, path to curent geometry in the feature. First 'part' number ======= @@ -35,6 +36,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main geometry, path to current geometry in the feature. First 'part' number ======= geometry, path to curent geometry in the feature. First 'part' number @@ -43,6 +46,9 @@ geometry, path to curent geometry in the feature. First 'part' number >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/cindex.c b/lib/vector/Vlib/cindex.c index 1c8c3f0c5f4..eedc3578422 100644 --- a/lib/vector/Vlib/cindex.c +++ b/lib/vector/Vlib/cindex.c @@ -143,6 +143,7 @@ int Vect_cidx_get_field_index(struct Map_info *Map, int field) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_cidx_get_num_unique_cats_by_index(const struct Map_info *Map, int index) ======= @@ -150,6 +151,8 @@ int Vect_cidx_get_num_unique_cats_by_index(const struct Map_info *Map, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_cidx_get_num_unique_cats_by_index(struct Map_info *Map, int index) ======= int Vect_cidx_get_num_unique_cats_by_index(const struct Map_info *Map, @@ -160,6 +163,9 @@ int Vect_cidx_get_num_unique_cats_by_index(const struct Map_info *Map, int index) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -200,6 +206,7 @@ int Vect_cidx_get_num_cats_by_index(struct Map_info *Map, int index) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_cidx_get_num_types_by_index(const struct Map_info *Map, int field_index) ======= @@ -207,6 +214,8 @@ int Vect_cidx_get_num_types_by_index(const struct Map_info *Map, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_cidx_get_num_types_by_index(struct Map_info *Map, int field_index) ======= int Vect_cidx_get_num_types_by_index(const struct Map_info *Map, @@ -217,6 +226,9 @@ int Vect_cidx_get_num_types_by_index(const struct Map_info *Map, int field_index) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -241,6 +253,7 @@ int Vect_cidx_get_num_types_by_index(const struct Map_info *Map, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_cidx_get_type_count_by_index(const struct Map_info *Map, int field_index, int type_index, int *type, int *count) @@ -249,6 +262,8 @@ int Vect_cidx_get_type_count_by_index(const struct Map_info *Map, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_cidx_get_type_count_by_index(struct Map_info *Map, int field_index, int type_index, int *type, int *count) ======= @@ -262,6 +277,9 @@ int Vect_cidx_get_type_count_by_index(const struct Map_info *Map, int *type, int *count) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -327,12 +345,15 @@ int Vect_cidx_get_type_count(struct Map_info *Map, int field, int type) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_cidx_get_cat_by_index(const struct Map_info *Map, int field_index, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_cidx_get_cat_by_index(struct Map_info *Map, int field_index, ======= int Vect_cidx_get_cat_by_index(const struct Map_info *Map, int field_index, @@ -341,6 +362,9 @@ int Vect_cidx_get_cat_by_index(const struct Map_info *Map, int field_index, int Vect_cidx_get_cat_by_index(const struct Map_info *Map, int field_index, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -410,12 +434,15 @@ int Vect_cidx_get_unique_cats_by_index(struct Map_info *Map, int field_index, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_cidx_find_next(const struct Map_info *Map, int field_index, int cat, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_cidx_find_next(struct Map_info *Map, int field_index, int cat, ======= int Vect_cidx_find_next(const struct Map_info *Map, int field_index, int cat, @@ -424,6 +451,9 @@ int Vect_cidx_find_next(const struct Map_info *Map, int field_index, int cat, int Vect_cidx_find_next(const struct Map_info *Map, int field_index, int cat, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -474,6 +504,7 @@ int Vect_cidx_find_next(const struct Map_info *Map, int field_index, int cat, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void Vect_cidx_find_all(const struct Map_info *Map, int layer, int type_mask, int cat, struct ilist *lines) ======= @@ -481,6 +512,8 @@ void Vect_cidx_find_all(const struct Map_info *Map, int layer, int type_mask, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void Vect_cidx_find_all(struct Map_info *Map, int layer, int type_mask, int cat, struct ilist *lines) ======= @@ -492,6 +525,9 @@ void Vect_cidx_find_all(const struct Map_info *Map, int layer, int type_mask, int cat, struct ilist *lines) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -542,12 +578,15 @@ void Vect_cidx_find_all(const struct Map_info *Map, int layer, int type_mask, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_cidx_dump(const struct Map_info *Map, FILE *out) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_cidx_dump(struct Map_info *Map, FILE *out) ======= int Vect_cidx_dump(const struct Map_info *Map, FILE *out) @@ -556,6 +595,9 @@ int Vect_cidx_dump(const struct Map_info *Map, FILE *out) int Vect_cidx_dump(const struct Map_info *Map, FILE *out) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/close.c b/lib/vector/Vlib/close.c index 0c69b98e8e0..4658ba94df1 100644 --- a/lib/vector/Vlib/close.c +++ b/lib/vector/Vlib/close.c @@ -27,6 +27,7 @@ #include "local_proto.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int clo_dummy(struct Map_info *map) @@ -35,6 +36,8 @@ static int clo_dummy(struct Map_info *map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int clo_dummy(struct Map_info *map UNUSED) ======= static int clo_dummy(struct Map_info *map) @@ -43,6 +46,9 @@ static int clo_dummy(struct Map_info *map) static int clo_dummy(struct Map_info *map) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -53,12 +59,15 @@ static int clo_dummy(struct Map_info *map) #if !defined HAVE_OGR || !defined HAVE_POSTGRES <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static int format(struct Map_info *map) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format(struct Map_info *map UNUSED) ======= static int format(struct Map_info *map) @@ -67,6 +76,9 @@ static int format(struct Map_info *map) static int format(struct Map_info *map) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -76,6 +88,7 @@ static int format(struct Map_info *map) } #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -89,6 +102,10 @@ static int format(struct Map_info *map) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main static int (*Close_array[][2])(struct Map_info *) = {{clo_dummy, V1_close_nat} #ifdef HAVE_OGR , @@ -107,10 +124,13 @@ static int (*Close_array[][2])(struct Map_info *) = {{clo_dummy, V1_close_nat} {clo_dummy, format} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= static int (*Close_array[][2])() = {{clo_dummy, V1_close_nat} ======= static int (*Close_array[][2])(struct Map_info *) = {{clo_dummy, V1_close_nat} @@ -178,6 +198,9 @@ static int (*Close_array[][2])(struct Map_info *) = {{clo_dummy, V1_close_nat} >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/constraint.c b/lib/vector/Vlib/constraint.c index ff3f8831172..b42030c19c2 100644 --- a/lib/vector/Vlib/constraint.c +++ b/lib/vector/Vlib/constraint.c @@ -78,12 +78,15 @@ int Vect_set_constraint_region(struct Map_info *Map, double n, double s, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_constraint_box(const struct Map_info *Map, struct bound_box *Box) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_constraint_box(struct Map_info *Map, struct bound_box *Box) ======= int Vect_get_constraint_box(const struct Map_info *Map, struct bound_box *Box) @@ -92,6 +95,9 @@ int Vect_get_constraint_box(const struct Map_info *Map, struct bound_box *Box) int Vect_get_constraint_box(const struct Map_info *Map, struct bound_box *Box) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/copy.c b/lib/vector/Vlib/copy.c index bb9abcd90be..7976ee8e1df 100644 --- a/lib/vector/Vlib/copy.c +++ b/lib/vector/Vlib/copy.c @@ -48,11 +48,14 @@ static int copy_nodes(struct Map_info *, struct Map_info *); #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int copy_line_nodes(struct Map_info *, int, int, struct line_pnts *, struct Map_info *); static int is_isle(struct Map_info *, int); @@ -60,6 +63,9 @@ static int is_isle(struct Map_info *, int); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -412,16 +418,22 @@ int copy_lines_2(struct Map_info *In, int field, int topo, struct Map_info *Out) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int copy_nodes(struct Map_info *In, struct Map_info *Out) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -489,16 +501,22 @@ int copy_line_nodes(struct Map_info *In, int node, int with_z, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int is_isle(struct Map_info *Map, int area) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -545,16 +563,22 @@ int is_isle(const struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__copy_areas(struct Map_info *In, int field, struct Map_info *Out) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -679,12 +703,15 @@ int Vect__copy_areas(const struct Map_info *In, int field, struct Map_info *Out) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_copy_tables(const struct Map_info *In, struct Map_info *Out, int field) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_copy_tables(struct Map_info *In, struct Map_info *Out, int field) ======= int Vect_copy_tables(const struct Map_info *In, struct Map_info *Out, int field) @@ -693,6 +720,9 @@ int Vect_copy_tables(const struct Map_info *In, struct Map_info *Out, int field) int Vect_copy_tables(const struct Map_info *In, struct Map_info *Out, int field) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -747,6 +777,7 @@ int Vect_copy_tables(const struct Map_info *In, struct Map_info *Out, int field) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_copy_table(const struct Map_info *In, struct Map_info *Out, int field_in, int field_out, const char *field_name, int type) @@ -755,6 +786,8 @@ int Vect_copy_table(const struct Map_info *In, struct Map_info *Out, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_copy_table(struct Map_info *In, struct Map_info *Out, int field_in, int field_out, const char *field_name, int type) ======= @@ -768,6 +801,9 @@ int Vect_copy_table(const struct Map_info *In, struct Map_info *Out, int type) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -795,12 +831,15 @@ int Vect_copy_table(const struct Map_info *In, struct Map_info *Out, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_copy_table_by_cat_list(const struct Map_info *In, struct Map_info *Out, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_copy_table_by_cat_list(struct Map_info *In, struct Map_info *Out, ======= int Vect_copy_table_by_cat_list(const struct Map_info *In, struct Map_info *Out, @@ -809,6 +848,9 @@ int Vect_copy_table_by_cat_list(const struct Map_info *In, struct Map_info *Out, int Vect_copy_table_by_cat_list(const struct Map_info *In, struct Map_info *Out, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/dangles.c b/lib/vector/Vlib/dangles.c index e569794befd..1975d9d01bc 100644 --- a/lib/vector/Vlib/dangles.c +++ b/lib/vector/Vlib/dangles.c @@ -254,11 +254,14 @@ static void dangles(struct Map_info *Map, int type, int option, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dangles_removed++; } /* delete the chain */ } /* lcount == 1 */ @@ -267,6 +270,9 @@ static void dangles(struct Map_info *Map, int type, int option, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -277,6 +283,7 @@ static void dangles(struct Map_info *Map, int type, int option, } /* node <= nnodes */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -287,6 +294,11 @@ static void dangles(struct Map_info *Map, int type, int option, >>>>>>> 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_verbose_message(_("%s lines: %d"), lmsg, lines_removed); G_verbose_message(_("%s dangles: %d"), lmsg, dangles_removed); diff --git a/lib/vector/Vlib/field.c b/lib/vector/Vlib/field.c index ead2baa66a1..0f8d9b5e6c0 100644 --- a/lib/vector/Vlib/field.c +++ b/lib/vector/Vlib/field.c @@ -204,12 +204,15 @@ int Vect_map_del_dblink(struct Map_info *Map, int field) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void Vect_copy_map_dblinks(const struct Map_info *In, struct Map_info *Out, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void Vect_copy_map_dblinks(struct Map_info *In, struct Map_info *Out, ======= void Vect_copy_map_dblinks(const struct Map_info *In, struct Map_info *Out, @@ -218,6 +221,9 @@ void Vect_copy_map_dblinks(const struct Map_info *In, struct Map_info *Out, void Vect_copy_map_dblinks(const struct Map_info *In, struct Map_info *Out, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -254,6 +260,7 @@ void Vect_copy_map_dblinks(const struct Map_info *In, struct Map_info *Out, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_map_check_dblink(const struct Map_info *Map, int field, const char *name) ======= @@ -261,6 +268,8 @@ int Vect_map_check_dblink(const struct Map_info *Map, int field, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_map_check_dblink(struct Map_info *Map, int field, const char *name) ======= int Vect_map_check_dblink(const struct Map_info *Map, int field, @@ -271,6 +280,9 @@ int Vect_map_check_dblink(const struct Map_info *Map, int field, const char *name) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -553,16 +565,22 @@ struct field_info *Vect_get_dblink(struct Map_info *Map, int link) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct field_info *Vect_get_field(struct Map_info *Map, int field) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -595,12 +613,15 @@ struct field_info *Vect_get_field(const struct Map_info *Map, int field) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD struct field_info *Vect_get_field_by_name(const struct Map_info *Map, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct field_info *Vect_get_field_by_name(struct Map_info *Map, ======= struct field_info *Vect_get_field_by_name(const struct Map_info *Map, @@ -609,6 +630,9 @@ struct field_info *Vect_get_field_by_name(const struct Map_info *Map, struct field_info *Vect_get_field_by_name(const struct Map_info *Map, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -643,6 +667,7 @@ struct field_info *Vect_get_field_by_name(const struct Map_info *Map, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD struct field_info *Vect_get_field2(const struct Map_info *Map, const char *field) ======= @@ -650,6 +675,8 @@ struct field_info *Vect_get_field2(const struct Map_info *Map, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct field_info *Vect_get_field2(struct Map_info *Map, const char *field) ======= struct field_info *Vect_get_field2(const struct Map_info *Map, @@ -660,6 +687,9 @@ struct field_info *Vect_get_field2(const struct Map_info *Map, const char *field) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -701,16 +731,22 @@ struct field_info *Vect_get_field2(const struct Map_info *Map, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_field_number(struct Map_info *Map, const char *field) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -862,6 +898,7 @@ static int read_dblinks_ogr(struct Map_info *Map) #else <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM > 1320 && \ HAVE_OGR /* seems to be fixed after 1320 release */ ======= @@ -870,6 +907,8 @@ static int read_dblinks_ogr(struct Map_info *Map) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #if GDAL_VERSION_NUM > 1320 && \ HAVE_OGR /* seems to be fixed after 1320 release */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -878,6 +917,9 @@ static int read_dblinks_ogr(struct Map_info *Map) HAVE_OGR /* seems to be fixed after 1320 release */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -929,6 +971,7 @@ static int read_dblinks_ogr(struct Map_info *Map) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -939,6 +982,10 @@ static int read_dblinks_ogr(struct Map_info *Map) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #else dbDriver *driver; dbCursor cursor; @@ -1047,6 +1094,7 @@ static int read_dblinks_ogr(struct Map_info *Map) #endif /* GDAL_VERSION_NUM > 1320 && HAVE_OGR */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1057,6 +1105,11 @@ static int read_dblinks_ogr(struct Map_info *Map) >>>>>>> 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; #endif /* HAVE_GDAL */ @@ -1194,16 +1247,22 @@ int Vect_write_dblinks(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char *Vect_subst_var(const char *in, struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/geos_to_wktb.c b/lib/vector/Vlib/geos_to_wktb.c index 5a03a4d2764..184d27658f2 100644 --- a/lib/vector/Vlib/geos_to_wktb.c +++ b/lib/vector/Vlib/geos_to_wktb.c @@ -127,12 +127,15 @@ char *Vect_read_area_to_wkt(struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD unsigned char *Vect_read_line_to_wkb(const struct Map_info *Map, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main unsigned char *Vect_read_line_to_wkb(struct Map_info *Map, ======= unsigned char *Vect_read_line_to_wkb(const struct Map_info *Map, @@ -141,6 +144,9 @@ unsigned char *Vect_read_line_to_wkb(const struct Map_info *Map, unsigned char *Vect_read_line_to_wkb(const struct Map_info *Map, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/graph.c b/lib/vector/Vlib/graph.c index 385ace4fe83..eaba8a7e484 100644 --- a/lib/vector/Vlib/graph.c +++ b/lib/vector/Vlib/graph.c @@ -26,6 +26,7 @@ static int static int clipper(dglGraph_s *pgraph, dglSPClipInput_s *pargIn, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dglSPClipOutput_s *pargOut, void *pvarg) ======= @@ -33,6 +34,8 @@ static int clipper(dglGraph_s *pgraph, dglSPClipInput_s *pargIn, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dglSPClipOutput_s *pargOut, void *pvarg UNUSED) ======= dglSPClipOutput_s *pargOut, void *pvarg) @@ -41,6 +44,9 @@ static int clipper(dglGraph_s *pgraph, dglSPClipInput_s *pargIn, dglSPClipOutput_s *pargOut, void *pvarg) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -215,6 +221,7 @@ int Vect_graph_shortest_path(dglGraph_s *graph, int from, int to, /* Check if from and to are identical, otherwise dglib returns path to <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * neares node and back! */ ======= @@ -222,6 +229,8 @@ int Vect_graph_shortest_path(dglGraph_s *graph, int from, int to, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * nearest node and back! */ ======= * neares node and back! */ @@ -230,6 +239,9 @@ int Vect_graph_shortest_path(dglGraph_s *graph, int from, int to, * neares node and back! */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/header.c b/lib/vector/Vlib/header.c index 971029cbc0c..be0a7d58c9c 100644 --- a/lib/vector/Vlib/header.c +++ b/lib/vector/Vlib/header.c @@ -32,16 +32,22 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_print_header(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -79,16 +85,22 @@ int Vect_read_header(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_write_header(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -223,16 +235,22 @@ int Vect__read_head(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *Vect_get_name(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -251,16 +269,22 @@ const char *Vect_get_name(const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *Vect_get_mapset(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -433,16 +457,22 @@ int Vect_set_map_name(struct Map_info *Map, const char *str) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *Vect_get_map_name(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -598,16 +628,22 @@ int Vect_set_proj(struct Map_info *Map, int proj) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_proj(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/header_finfo.c b/lib/vector/Vlib/header_finfo.c index 457fdd5c897..379f9d8fba3 100644 --- a/lib/vector/Vlib/header_finfo.c +++ b/lib/vector/Vlib/header_finfo.c @@ -107,16 +107,22 @@ char *Vect_get_finfo_layer_name(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *Vect_get_finfo_format_info(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -158,16 +164,22 @@ const char *Vect_get_finfo_format_info(const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *Vect_get_finfo_geometry_type(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -255,12 +267,15 @@ const char *Vect_get_finfo_geometry_type(const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD const struct Format_info *Vect_get_finfo(const struct Map_info *Map) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const struct Format_info *Vect_get_finfo(struct Map_info *Map) ======= const struct Format_info *Vect_get_finfo(const struct Map_info *Map) @@ -269,6 +284,9 @@ const struct Format_info *Vect_get_finfo(const struct Map_info *Map) const struct Format_info *Vect_get_finfo(const struct Map_info *Map) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -296,12 +314,15 @@ const struct Format_info *Vect_get_finfo(const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_finfo_topology_info(const struct Map_info *Map, char **toposchema, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_finfo_topology_info(struct Map_info *Map, char **toposchema, ======= int Vect_get_finfo_topology_info(const struct Map_info *Map, char **toposchema, @@ -310,6 +331,9 @@ int Vect_get_finfo_topology_info(const struct Map_info *Map, char **toposchema, int Vect_get_finfo_topology_info(const struct Map_info *Map, char **toposchema, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/intersect.c b/lib/vector/Vlib/intersect.c index a6812d6d2c1..3883c6e21ad 100644 --- a/lib/vector/Vlib/intersect.c +++ b/lib/vector/Vlib/intersect.c @@ -47,6 +47,7 @@ return point1 breakes: point2 breaks: distance1 on: distance2 on: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -57,6 +58,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 0 - - - - 1 a,b - a b @@ -678,6 +684,7 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, struct line_pnts ***ALines, struct line_pnts ***BLines, int *nalines, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int *nblines, int with_z) ======= @@ -685,6 +692,8 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int *nblines, int with_z UNUSED) ======= int *nblines, int with_z) @@ -693,6 +702,9 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, int *nblines, int with_z) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -781,6 +793,7 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, * * Note: once we snap breaks to vertices, we have to do that for both lines <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * A and B in the same way and because we cannot be sure that A childrens ======= @@ -788,6 +801,8 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * A and B in the same way and because we cannot be sure that A children ======= * A and B in the same way and because we cannot be sure that A childrens @@ -796,6 +811,9 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, * A and B in the same way and because we cannot be sure that A childrens >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1054,6 +1072,7 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, * \___| * B <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * This should not inluence that break is always on first segment, see ======= @@ -1061,6 +1080,8 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * This should not influence that break is always on first segment, see ======= * This should not inluence that break is always on first segment, see @@ -1069,6 +1090,9 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, * This should not inluence that break is always on first segment, see >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1228,6 +1252,7 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, for (j = last_seg + 1; j <= seg; j++) { G_debug(2, " segment j = %d", j); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* skipp vertex identical to last break */ ======= @@ -1235,6 +1260,8 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* skip vertex identical to last break */ ======= /* skipp vertex identical to last break */ @@ -1243,6 +1270,9 @@ int Vect_line_intersection(struct line_pnts *APoints, struct line_pnts *BPoints, /* skipp vertex identical to last break */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/intersect2.c b/lib/vector/Vlib/intersect2.c index 84efc2f2d50..5bbc541a6e3 100644 --- a/lib/vector/Vlib/intersect2.c +++ b/lib/vector/Vlib/intersect2.c @@ -47,6 +47,7 @@ return point1 breakes: point2 breaks: distance1 on: distance2 on: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -57,6 +58,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 0 - - - - 1 a,b - a b @@ -785,6 +791,7 @@ int Vect_line_intersection2(struct line_pnts *APoints, * * Note: once we snap breaks to vertices, we have to do that for both lines <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * A and B in the same way and because we cannot be sure that A childrens ======= @@ -792,6 +799,8 @@ int Vect_line_intersection2(struct line_pnts *APoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * A and B in the same way and because we cannot be sure that A children ======= * A and B in the same way and because we cannot be sure that A childrens @@ -800,6 +809,9 @@ int Vect_line_intersection2(struct line_pnts *APoints, * A and B in the same way and because we cannot be sure that A childrens >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1001,6 +1013,7 @@ int Vect_line_intersection2(struct line_pnts *APoints, * \___| * B <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * This should not inluence that break is always on first segment, see ======= @@ -1008,6 +1021,8 @@ int Vect_line_intersection2(struct line_pnts *APoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * This should not influence that break is always on first segment, see ======= * This should not inluence that break is always on first segment, see @@ -1016,6 +1031,9 @@ int Vect_line_intersection2(struct line_pnts *APoints, * This should not inluence that break is always on first segment, see >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/level_two.c b/lib/vector/Vlib/level_two.c index e8b89a50e3b..90a020c306e 100644 --- a/lib/vector/Vlib/level_two.c +++ b/lib/vector/Vlib/level_two.c @@ -273,6 +273,7 @@ int Vect_get_line_type(struct Map_info *Map, int line) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_node_coor(const struct Map_info *Map, int num, double *x, double *y, double *z) ======= @@ -280,6 +281,8 @@ int Vect_get_node_coor(const struct Map_info *Map, int num, double *x, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_node_coor(struct Map_info *Map, int num, double *x, double *y, double *z) ======= @@ -291,6 +294,9 @@ int Vect_get_node_coor(const struct Map_info *Map, int num, double *x, double *y, double *z) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -366,6 +372,7 @@ int Vect_get_line_nodes(struct Map_info *Map, int line, int *n1, int *n2) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_line_areas(const struct Map_info *Map, int line, int *left, int *right) ======= @@ -373,6 +380,8 @@ int Vect_get_line_areas(const struct Map_info *Map, int line, int *left, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_line_areas(struct Map_info *Map, int line, int *left, int *right) ======= int Vect_get_line_areas(const struct Map_info *Map, int line, int *left, @@ -383,6 +392,9 @@ int Vect_get_line_areas(const struct Map_info *Map, int line, int *left, int *right) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -487,6 +499,7 @@ int Vect_get_centroid_area(struct Map_info *Map, int centroid) /*! <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \brief Enable/disable maintanance of list of updated lines/nodes ======= @@ -494,6 +507,8 @@ int Vect_get_centroid_area(struct Map_info *Map, int centroid) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \brief Enable/disable maintenance of list of updated lines/nodes ======= \brief Enable/disable maintanance of list of updated lines/nodes @@ -502,6 +517,9 @@ int Vect_get_centroid_area(struct Map_info *Map, int centroid) \brief Enable/disable maintanance of list of updated lines/nodes >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/line.c b/lib/vector/Vlib/line.c index ccfe61d6f24..254e3cbeca9 100644 --- a/lib/vector/Vlib/line.c +++ b/lib/vector/Vlib/line.c @@ -172,6 +172,7 @@ int Vect_append_point(struct line_pnts *Points, double x, double y, double z) \return number of points <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \return -1 on error (alocation) ======= @@ -179,6 +180,8 @@ int Vect_append_point(struct line_pnts *Points, double x, double y, double z) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \return -1 on error (allocation) ======= \return -1 on error (alocation) @@ -187,6 +190,9 @@ int Vect_append_point(struct line_pnts *Points, double x, double y, double z) \return -1 on error (alocation) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/local_proto.h b/lib/vector/Vlib/local_proto.h index 38d270dde39..9bd558cfb55 100644 --- a/lib/vector/Vlib/local_proto.h +++ b/lib/vector/Vlib/local_proto.h @@ -21,6 +21,7 @@ /* area.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect__get_area_points(const struct Map_info *, const plus_t *, int, struct line_pnts *); int Vect__get_area_points_nat(const struct Map_info *, const plus_t *, int, @@ -29,6 +30,8 @@ int Vect__get_area_points_nat(const struct Map_info *, const plus_t *, int, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__get_area_points(struct Map_info *, const plus_t *, int, struct line_pnts *); int Vect__get_area_points_nat(struct Map_info *, const plus_t *, int, @@ -43,6 +46,9 @@ int Vect__get_area_points(const struct Map_info *, const plus_t *, int, int Vect__get_area_points_nat(const struct Map_info *, const plus_t *, int, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -63,17 +69,23 @@ int Vect__open_old(struct Map_info *, const char *, const char *, const char *, int, int, int); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char *Vect__get_path(char *, struct Map_info *); char *Vect__get_element_path(char *, struct Map_info *, const char *); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -86,6 +98,7 @@ int V2__add_line_to_topo_nat(struct Map_info *, off_t, int, const struct line_pnts *, const struct line_cats *, int, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int (*external_routine)(const struct Map_info *, int)); @@ -94,6 +107,8 @@ int V2__add_line_to_topo_nat(struct Map_info *, off_t, int, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int (*external_routine)(struct Map_info *, int)); ======= int (*external_routine)(const struct Map_info *, @@ -104,6 +119,9 @@ int V2__add_line_to_topo_nat(struct Map_info *, off_t, int, int)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/merge_lines.c b/lib/vector/Vlib/merge_lines.c index 84b82d09e6d..94c67a4f09b 100644 --- a/lib/vector/Vlib/merge_lines.c +++ b/lib/vector/Vlib/merge_lines.c @@ -145,6 +145,7 @@ int Vect_merge_lines(struct Map_info *Map, int type, int *new_lines, if (abs(curr_line) != abs(first)) { Vect_read_line(Map, NULL, Cats, abs(curr_line)); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* catgories must be identical */ @@ -153,6 +154,8 @@ int Vect_merge_lines(struct Map_info *Map, int type, int *new_lines, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* categories must be identical */ ======= /* catgories must be identical */ @@ -161,6 +164,9 @@ int Vect_merge_lines(struct Map_info *Map, int type, int *new_lines, /* catgories must be identical */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/net_analyze.c b/lib/vector/Vlib/net_analyze.c index af3f5ee31e9..62304bc56ae 100644 --- a/lib/vector/Vlib/net_analyze.c +++ b/lib/vector/Vlib/net_analyze.c @@ -23,6 +23,7 @@ static int static int clipper(dglGraph_s *pgraph, dglSPClipInput_s *pargIn, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dglSPClipOutput_s *pargOut, void *pvarg) ======= @@ -30,6 +31,8 @@ static int clipper(dglGraph_s *pgraph, dglSPClipInput_s *pargIn, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dglSPClipOutput_s *pargOut, void *pvarg UNUSED) ======= dglSPClipOutput_s *pargOut, void *pvarg) @@ -38,6 +41,9 @@ static int clipper(dglGraph_s *pgraph, dglSPClipInput_s *pargIn, dglSPClipOutput_s *pargOut, void *pvarg) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -183,6 +189,7 @@ static int find_shortest_path(struct Map_info *Map, int from, int to, /* Check if from and to are identical, otherwise dglib returns path to <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * neares node and back! */ ======= @@ -190,6 +197,8 @@ static int find_shortest_path(struct Map_info *Map, int from, int to, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * nearest node and back! */ ======= * neares node and back! */ @@ -198,6 +207,9 @@ static int find_shortest_path(struct Map_info *Map, int from, int to, * neares node and back! */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -449,12 +461,15 @@ dglGraph_s *Vect_net_get_graph(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_net_get_line_cost(const struct Map_info *Map, int line, int direction, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_net_get_line_cost(struct Map_info *Map, int line, int direction, ======= int Vect_net_get_line_cost(const struct Map_info *Map, int line, int direction, @@ -463,6 +478,9 @@ int Vect_net_get_line_cost(const struct Map_info *Map, int line, int direction, int Vect_net_get_line_cost(const struct Map_info *Map, int line, int direction, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1009,6 +1027,7 @@ find_shortest_path_coor(struct Map_info *Map, double fx, double fy, double fz, Vect_get_line_nodes(Map, abs(line), &node1, &node2); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* add the second node, the first of first segmet was alread * added */ @@ -1017,6 +1036,8 @@ find_shortest_path_coor(struct Map_info *Map, double fx, double fy, double fz, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* add the second node, the first of first segmet was * already added */ ======= @@ -1028,6 +1049,9 @@ find_shortest_path_coor(struct Map_info *Map, double fx, double fy, double fz, * added */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/net_build.c b/lib/vector/Vlib/net_build.c index a50ecd54a18..43d960eb5f2 100644 --- a/lib/vector/Vlib/net_build.c +++ b/lib/vector/Vlib/net_build.c @@ -38,6 +38,7 @@ \param afcol column with forward costs for arc \param abcol column with backward costs for arc (if NULL, back costs = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD forward costs), \param ncol column with costs for nodes (if NULL, do not use node costs), \param geo use geodesic calculation for length (LL), \param @@ -47,6 +48,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main forward costs) \param ncol column with costs for nodes (if NULL, do not use node costs) @@ -63,6 +66,9 @@ algorithm not used (in future code for algorithm) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -74,6 +80,7 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, int nfield, int tfield, int tucfield, const char *afcol, const char *abcol, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const char *ncol, int geo, int algorithm) ======= @@ -81,6 +88,8 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *ncol, int geo, int algorithm UNUSED) ======= const char *ncol, int geo, int algorithm) @@ -89,6 +98,9 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, const char *ncol, int geo, int algorithm) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -474,6 +486,7 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, if (ret != DB_OK) { G_warning( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Database record for turn with cat = %d in not found. " ======= @@ -481,6 +494,8 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Database record for turn with cat = %d is not found. " ======= _("Database record for turn with cat = %d in not found. " @@ -489,6 +504,9 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield, _("Database record for turn with cat = %d in not found. " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/open.c b/lib/vector/Vlib/open.c index d88ccb0a213..0db2fcb885b 100644 --- a/lib/vector/Vlib/open.c +++ b/lib/vector/Vlib/open.c @@ -44,6 +44,7 @@ */ #define MAX_OPEN_LEVEL 2 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int open_old_dummy(struct Map_info *Map, int update) @@ -52,6 +53,8 @@ static int open_old_dummy(struct Map_info *Map, int update) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int open_old_dummy(struct Map_info *Map UNUSED, int update UNUSED) ======= static int open_old_dummy(struct Map_info *Map, int update) @@ -60,6 +63,9 @@ static int open_old_dummy(struct Map_info *Map, int update) static int open_old_dummy(struct Map_info *Map, int update) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -67,6 +73,7 @@ static int open_old_dummy(struct Map_info *Map, int update) return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int open_new_dummy(struct Map_info *Map, const char *name, int with_z) @@ -75,6 +82,8 @@ static int open_new_dummy(struct Map_info *Map, const char *name, int with_z) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int open_new_dummy(struct Map_info *Map UNUSED, const char *name UNUSED, int with_z UNUSED) ======= @@ -84,6 +93,9 @@ static int open_new_dummy(struct Map_info *Map, const char *name, int with_z) static int open_new_dummy(struct Map_info *Map, const char *name, int with_z) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -94,12 +106,15 @@ static int open_new_dummy(struct Map_info *Map, const char *name, int with_z) #if !defined HAVE_OGR || !defined HAVE_POSTGRES <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static int format_old(struct Map_info *Map, int update) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format_old(struct Map_info *Map UNUSED, int update UNUSED) ======= static int format_old(struct Map_info *Map, int update) @@ -108,6 +123,9 @@ static int format_old(struct Map_info *Map, int update) static int format_old(struct Map_info *Map, int update) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -116,6 +134,7 @@ static int format_old(struct Map_info *Map, int update) return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int format_new(struct Map_info *Map, const char *name, int with_z) @@ -124,6 +143,8 @@ static int format_new(struct Map_info *Map, const char *name, int with_z) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format_new(struct Map_info *Map UNUSED, const char *name UNUSED, int with_z UNUSED) ======= @@ -133,6 +154,9 @@ static int format_new(struct Map_info *Map, const char *name, int with_z) static int format_new(struct Map_info *Map, const char *name, int with_z) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -144,6 +168,7 @@ static int format_new(struct Map_info *Map, const char *name, int with_z) static int Open_level = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -157,6 +182,10 @@ static int Open_level = 0; <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main static int (*Open_old_array[][2])(struct Map_info *, int) = {{open_old_dummy, V1_open_old_nat} #ifdef HAVE_OGR @@ -197,10 +226,13 @@ static int (*Open_new_array[][2])(struct Map_info *Map, const char *name, {open_new_dummy, format_new} <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= static int (*Open_old_array[][2])() = {{open_old_dummy, V1_open_old_nat} ======= static int (*Open_old_array[][2])(struct Map_info *, @@ -331,6 +363,9 @@ static int (*Open_new_array[][2])(struct Map_info *Map, const char *name, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1232,16 +1267,22 @@ int Vect_open_tmp_new(struct Map_info *Map, const char *name, int with_z) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_coor_info(struct Map_info *Map, struct Coor_info *Info) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1306,16 +1347,22 @@ int Vect_coor_info(const struct Map_info *Map, struct Coor_info *Info) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main const char *Vect_maptype_info(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1356,6 +1403,7 @@ const char *Vect_maptype_info(const struct Map_info *Map) - PostGIS fomat (GV_FORMAT_POSTGIS) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1366,6 +1414,11 @@ const char *Vect_maptype_info(const struct Map_info *Map) >>>>>>> 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 \param Map pointer to Map_info structure @@ -1374,16 +1427,22 @@ const char *Vect_maptype_info(const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_maptype(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1779,16 +1838,22 @@ int map_format(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char *Vect__get_path(char *path, struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1820,12 +1885,15 @@ char *Vect__get_path(char *path, const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD char *Vect__get_element_path(char *file_path, const struct Map_info *Map, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char *Vect__get_element_path(char *file_path, struct Map_info *Map, ======= char *Vect__get_element_path(char *file_path, const struct Map_info *Map, @@ -1834,6 +1902,9 @@ char *Vect__get_element_path(char *file_path, const struct Map_info *Map, char *Vect__get_element_path(char *file_path, const struct Map_info *Map, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/open_nat.c b/lib/vector/Vlib/open_nat.c index d95e9e8e1f0..2ceb7f51440 100644 --- a/lib/vector/Vlib/open_nat.c +++ b/lib/vector/Vlib/open_nat.c @@ -153,6 +153,7 @@ int check_coor(struct Map_info *Map) G_warning( _("Coor file of vector map <%s@%s> is larger than it should be " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "(%" PRI_OFF_T " bytes excess)"), ======= @@ -160,6 +161,8 @@ int check_coor(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "(%" PRId64 " bytes excess)"), ======= "(%" PRI_OFF_T " bytes excess)"), @@ -168,6 +171,9 @@ int check_coor(struct Map_info *Map) "(%" PRI_OFF_T " bytes excess)"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -176,6 +182,7 @@ int check_coor(struct Map_info *Map) else if (dif < 0) { G_warning(_("Coor file of vector <%s@%s> is shorter than it should be " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "(%" PRI_OFF_T " bytes missing)."), ======= @@ -183,6 +190,8 @@ int check_coor(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "(%" PRId64 " bytes missing)."), ======= "(%" PRI_OFF_T " bytes missing)."), @@ -191,6 +200,9 @@ int check_coor(struct Map_info *Map) "(%" PRI_OFF_T " bytes missing)."), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/open_pg.c b/lib/vector/Vlib/open_pg.c index ce27f497a8b..5f4bf535cc5 100644 --- a/lib/vector/Vlib/open_pg.c +++ b/lib/vector/Vlib/open_pg.c @@ -56,11 +56,14 @@ static int remap_node(const struct Format_info_offset *, int); static int remap_line(const struct Plus_head *, off_t, int); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #define NOPG_UNUSED #else @@ -70,6 +73,9 @@ static int remap_line(const struct Plus_head *, off_t, int); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -340,17 +346,23 @@ int V1_open_new_pg(struct Map_info *Map NOPG_UNUSED, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__open_topo_pg(struct Map_info *Map NOPG_UNUSED, int head_only NOPG_UNUSED, int update NOPG_UNUSED) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1782,16 +1794,22 @@ int Vect__load_map_lines_pg(struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void notice_processor(void *arg UNUSED, const char *message) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/overlay.c b/lib/vector/Vlib/overlay.c index 35a5c4ff330..045daada8e8 100644 --- a/lib/vector/Vlib/overlay.c +++ b/lib/vector/Vlib/overlay.c @@ -100,6 +100,7 @@ int Vect_overlay(struct Map_info *AMap, int atype, struct ilist *AList, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_overlay_and(struct Map_info *AMap, int atype, struct ilist *AList, struct ilist *AAList, struct Map_info *BMap, int btype, struct ilist *BList, struct ilist *BAList, @@ -108,6 +109,8 @@ int Vect_overlay_and(struct Map_info *AMap, int atype, struct ilist *AList, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_overlay_and(struct Map_info *AMap, int atype, struct ilist *AList UNUSED, struct ilist *AAList UNUSED, struct Map_info *BMap, int btype, @@ -123,6 +126,9 @@ int Vect_overlay_and(struct Map_info *AMap, int atype, struct ilist *AList, struct ilist *BList, struct ilist *BAList, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/pg_local_proto.h b/lib/vector/Vlib/pg_local_proto.h index d0897d11884..6510d559aa7 100644 --- a/lib/vector/Vlib/pg_local_proto.h +++ b/lib/vector/Vlib/pg_local_proto.h @@ -59,12 +59,15 @@ struct feat_parts { /* area_pg.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect__get_area_points_pg(const struct Map_info *, const plus_t *, int, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect__get_area_points_pg(struct Map_info *, const plus_t *, int, ======= int Vect__get_area_points_pg(const struct Map_info *, const plus_t *, int, @@ -73,6 +76,9 @@ int Vect__get_area_points_pg(const struct Map_info *, const plus_t *, int, int Vect__get_area_points_pg(const struct Map_info *, const plus_t *, int, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/poly.c b/lib/vector/Vlib/poly.c index 9b992072921..aa908e93fae 100644 --- a/lib/vector/Vlib/poly.c +++ b/lib/vector/Vlib/poly.c @@ -54,6 +54,7 @@ static int Vect__divide_and_conquer(struct Slink *, const struct line_pnts *, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_get_point_in_area(const struct Map_info *Map, int area, double *X, double *Y) ======= @@ -61,6 +62,8 @@ int Vect_get_point_in_area(const struct Map_info *Map, int area, double *X, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_point_in_area(struct Map_info *Map, int area, double *X, double *Y) ======= int Vect_get_point_in_area(const struct Map_info *Map, int area, double *X, @@ -71,6 +74,9 @@ int Vect_get_point_in_area(const struct Map_info *Map, int area, double *X, double *Y) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -121,6 +127,7 @@ static int comp_double(const void *i, const void *j) if (*i < *j) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -131,6 +138,11 @@ static int comp_double(const void *i, const void *j) >>>>>>> 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; @@ -614,6 +626,7 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points, qsort(Intersects->x, (size_t)Intersects->n_points, sizeof(double), <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (void *)comp_double); ======= @@ -621,6 +634,8 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main comp_double); ======= (void *)comp_double); @@ -629,6 +644,9 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points, (void *)comp_double); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -684,6 +702,7 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points, qsort(Intersects->y, (size_t)Intersects->n_points, sizeof(double), <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (void *)comp_double); ======= @@ -691,6 +710,8 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main comp_double); ======= (void *)comp_double); @@ -699,6 +720,9 @@ int Vect_get_point_in_poly_isl(const struct line_pnts *Points, (void *)comp_double); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -926,6 +950,7 @@ int Vect_point_in_poly(double X, double Y, const struct line_pnts *Points) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_point_in_area_outer_ring(double X, double Y, const struct Map_info *Map, int area, struct bound_box *box) @@ -934,6 +959,8 @@ int Vect_point_in_area_outer_ring(double X, double Y, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_point_in_area_outer_ring(double X, double Y, struct Map_info *Map, int area, struct bound_box *box) ======= @@ -947,6 +974,9 @@ int Vect_point_in_area_outer_ring(double X, double Y, struct bound_box *box) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/read.c b/lib/vector/Vlib/read.c index cecdcb0b59e..a810ba21c33 100644 --- a/lib/vector/Vlib/read.c +++ b/lib/vector/Vlib/read.c @@ -43,6 +43,7 @@ static int format2(struct Map_info *Map UNUSED, struct line_pnts *line_p UNUSED, } #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int (*Read_next_line_array[][3])() = { @@ -51,6 +52,8 @@ static int (*Read_next_line_array[][3])() = { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int (*Read_next_line_array[][3])(struct Map_info *, struct line_pnts *, struct line_cats *) = { ======= @@ -60,6 +63,9 @@ static int (*Read_next_line_array[][3])() = { static int (*Read_next_line_array[][3])() = { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -82,6 +88,7 @@ static int (*Read_next_line_array[][3])() = { #endif }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int (*Read_line_array[])() = {V2_read_line_nat @@ -103,6 +110,8 @@ static int (*Read_line_array[])() = {V2_read_line_nat ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int (*Read_line_array[])(struct Map_info *, struct line_pnts *, struct line_cats *, int) = {V2_read_line_nat #ifdef HAVE_OGR @@ -152,6 +161,9 @@ static int (*Read_line_array[])() = {V2_read_line_nat format >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -171,16 +183,22 @@ static int (*Read_line_array[])() = {V2_read_line_nat */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_get_next_line_id(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -220,12 +238,15 @@ int Vect_get_next_line_id(const struct Map_info *Map) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_read_next_line(const struct Map_info *Map, struct line_pnts *line_p, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_read_next_line(struct Map_info *Map, struct line_pnts *line_p, ======= int Vect_read_next_line(const struct Map_info *Map, struct line_pnts *line_p, @@ -234,6 +255,9 @@ int Vect_read_next_line(const struct Map_info *Map, struct line_pnts *line_p, int Vect_read_next_line(const struct Map_info *Map, struct line_pnts *line_p, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -276,12 +300,15 @@ int Vect_read_next_line(const struct Map_info *Map, struct line_pnts *line_p, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_read_line(const struct Map_info *Map, struct line_pnts *line_p, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_read_line(struct Map_info *Map, struct line_pnts *line_p, ======= int Vect_read_line(const struct Map_info *Map, struct line_pnts *line_p, @@ -290,6 +317,9 @@ int Vect_read_line(const struct Map_info *Map, struct line_pnts *line_p, int Vect_read_line(const struct Map_info *Map, struct line_pnts *line_p, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -379,16 +409,22 @@ int Vect_node_alive(struct Map_info *Map, int node) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_area_alive(struct Map_info *Map, int area) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -419,16 +455,22 @@ int Vect_area_alive(const struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_isle_alive(struct Map_info *Map, int isle) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -461,16 +503,22 @@ int Vect_isle_alive(const struct Map_info *Map, int isle) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main off_t Vect_get_line_offset(struct Map_info *Map, int line) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/read_ogr.c b/lib/vector/Vlib/read_ogr.c index fe91dba0cd6..d0912f8aaea 100644 --- a/lib/vector/Vlib/read_ogr.c +++ b/lib/vector/Vlib/read_ogr.c @@ -452,6 +452,7 @@ int read_next_line_ogr(struct Map_info *Map, struct line_pnts *line_p, \param hGeom OGR geometry \param offset given offset <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param[out] Points container used to store line pointes within ======= @@ -459,6 +460,8 @@ int read_next_line_ogr(struct Map_info *Map, struct line_pnts *line_p, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param[out] Points container used to store line points within ======= \param[out] Points container used to store line pointes within @@ -467,6 +470,9 @@ int read_next_line_ogr(struct Map_info *Map, struct line_pnts *line_p, \param[out] Points container used to store line pointes within >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -476,12 +482,15 @@ int read_next_line_ogr(struct Map_info *Map, struct line_pnts *line_p, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int read_line(struct Map_info *Map, OGRGeometryH hGeom, long offset, ======= int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, @@ -490,6 +499,9 @@ int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -566,6 +578,7 @@ int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, \param hGeom OGR geometry \param offset given offset <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param[out] Points container used to store line pointes within ======= @@ -573,6 +586,8 @@ int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param[out] Points container used to store line points within ======= \param[out] Points container used to store line pointes within @@ -581,6 +596,9 @@ int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, \param[out] Points container used to store line pointes within >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -590,16 +608,22 @@ int read_line(const struct Map_info *Map, OGRGeometryH hGeom, long offset, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int get_line_type(struct Map_info *Map, long fid) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/read_pg.c b/lib/vector/Vlib/read_pg.c index b160a8bde98..67023e5b455 100644 --- a/lib/vector/Vlib/read_pg.c +++ b/lib/vector/Vlib/read_pg.c @@ -87,6 +87,7 @@ static void error_tuples(struct Format_info_pg *); */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int V1_read_next_line_pg(struct Map_info *Map, struct line_pnts *line_p, struct line_cats *line_c) ======= @@ -94,6 +95,8 @@ int V1_read_next_line_pg(struct Map_info *Map, struct line_pnts *line_p, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int V1_read_next_line_pg(struct Map_info *Map NOPG_UNUSED, struct line_pnts *line_p NOPG_UNUSED, struct line_cats *line_c NOPG_UNUSED) @@ -106,6 +109,9 @@ int V1_read_next_line_pg(struct Map_info *Map, struct line_pnts *line_p, struct line_cats *line_c) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -265,6 +271,7 @@ int V2_read_next_line_pg(struct Map_info *Map NOPG_UNUSED, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int V1_read_line_pg(struct Map_info *Map, struct line_pnts *line_p, struct line_cats *line_c, off_t offset) ======= @@ -272,6 +279,8 @@ int V1_read_line_pg(struct Map_info *Map, struct line_pnts *line_p, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int V1_read_line_pg(struct Map_info *Map NOPG_UNUSED, struct line_pnts *line_p NOPG_UNUSED, struct line_cats *line_c NOPG_UNUSED, @@ -285,6 +294,9 @@ int V1_read_line_pg(struct Map_info *Map, struct line_pnts *line_p, struct line_cats *line_c, off_t offset) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -390,6 +402,7 @@ int V2_read_line_pg(struct Map_info *Map NOPG_UNUSED, return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug(4, "V2_read_line_pg() line = %d type = %d offset = %" PRI_OFF_T, @@ -399,6 +412,8 @@ int V2_read_line_pg(struct Map_info *Map NOPG_UNUSED, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(4, "V2_read_line_pg() line = %d type = %d offset = %" PRId64, line, Line->type, Line->offset); ======= @@ -410,6 +425,9 @@ int V2_read_line_pg(struct Map_info *Map NOPG_UNUSED, line, Line->type, Line->offset); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -767,6 +785,7 @@ SF_FeatureType get_feature(struct Map_info *Map, int fid, int type) col_idx = fid < 0 ? 3 : 2; /* TODO: dermine col_idx for random access */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -777,6 +796,11 @@ SF_FeatureType get_feature(struct Map_info *Map, int fid, int 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 if (!PQgetisnull(pg_info->res, pg_info->next_line, col_idx)) @@ -1339,6 +1363,7 @@ int Vect__open_cursor_next_line_pg(struct Format_info_pg *pg_info, /* set cursor name */ G_asprintf(&(pg_info->cursor_name), "%s_%s_%p", pg_info->schema_name, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD pg_info->table_name, pg_info->conn); ======= @@ -1346,6 +1371,8 @@ int Vect__open_cursor_next_line_pg(struct Format_info_pg *pg_info, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main pg_info->table_name, (void *)pg_info->conn); ======= pg_info->table_name, pg_info->conn); @@ -1354,6 +1381,9 @@ int Vect__open_cursor_next_line_pg(struct Format_info_pg *pg_info, pg_info->table_name, pg_info->conn); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1485,6 +1515,7 @@ int Vect__open_cursor_line_pg(struct Format_info_pg *pg_info, int fid, int type) pg_info->cursor_fid = fid; G_asprintf(&(pg_info->cursor_name), "%s_%s_%d_%p", pg_info->schema_name, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD pg_info->table_name, fid, pg_info->conn); ======= @@ -1492,6 +1523,8 @@ int Vect__open_cursor_line_pg(struct Format_info_pg *pg_info, int fid, int type) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main pg_info->table_name, fid, (void *)pg_info->conn); ======= pg_info->table_name, fid, pg_info->conn); @@ -1500,6 +1533,9 @@ int Vect__open_cursor_line_pg(struct Format_info_pg *pg_info, int fid, int type) pg_info->table_name, fid, pg_info->conn); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/read_sfa.c b/lib/vector/Vlib/read_sfa.c index 691cd46b510..b14fd4081e0 100644 --- a/lib/vector/Vlib/read_sfa.c +++ b/lib/vector/Vlib/read_sfa.c @@ -7,6 +7,7 @@ See read_ogr.c (OGR interface) and read_pg.c (PostGIS interface) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for imlementation issues. ======= @@ -14,6 +15,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for implementation issues. ======= for imlementation issues. @@ -22,6 +25,9 @@ for imlementation issues. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/rewind.c b/lib/vector/Vlib/rewind.c index 6e29684f1df..4a8938d8281 100644 --- a/lib/vector/Vlib/rewind.c +++ b/lib/vector/Vlib/rewind.c @@ -18,6 +18,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int rew_dummy(struct Map_info *Map) @@ -26,6 +27,8 @@ static int rew_dummy(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int rew_dummy(struct Map_info *Map UNUSED) ======= static int rew_dummy(struct Map_info *Map) @@ -34,6 +37,9 @@ static int rew_dummy(struct Map_info *Map) static int rew_dummy(struct Map_info *Map) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44,12 +50,15 @@ static int rew_dummy(struct Map_info *Map) #if !defined HAVE_OGR || !defined HAVE_POSTGRES <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static int format(struct Map_info *Map) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format(struct Map_info *Map UNUSED) ======= static int format(struct Map_info *Map) @@ -58,6 +67,9 @@ static int format(struct Map_info *Map) static int format(struct Map_info *Map) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -67,6 +79,7 @@ static int format(struct Map_info *Map) } #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int (*Rewind_array[][4])(struct Map_info *) = { @@ -84,6 +97,12 @@ static int (*Rewind_array[][4])(struct Map_info *) = { static int (*Rewind_array[][4])(struct Map_info *) = { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +static int (*Rewind_array[][4])(struct Map_info *) = { +======= +>>>>>>> osgeo-main static int (*Rewind_array[][4])() = { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -99,6 +118,9 @@ static int (*Rewind_array[][4])(struct Map_info *) = { >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/simple_features.c b/lib/vector/Vlib/simple_features.c index 326ea116c6f..c1f9a95554f 100644 --- a/lib/vector/Vlib/simple_features.c +++ b/lib/vector/Vlib/simple_features.c @@ -215,6 +215,7 @@ int Vect_sfa_line_astext(const struct line_pnts *Points, int type, int with_z, } case SF_POLYGON: /* polygon */ { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* write only outter/inner ring */ ======= @@ -222,6 +223,8 @@ int Vect_sfa_line_astext(const struct line_pnts *Points, int type, int with_z, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* write only outer/inner ring */ ======= /* write only outter/inner ring */ @@ -230,6 +233,9 @@ int Vect_sfa_line_astext(const struct line_pnts *Points, int type, int with_z, /* write only outter/inner ring */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -265,6 +271,7 @@ int Vect_sfa_line_astext(const struct line_pnts *Points, int type, int with_z, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vect_sfa_is_line_simple(const struct line_pnts *Points, int type, int with_z) ======= @@ -272,6 +279,8 @@ int Vect_sfa_is_line_simple(const struct line_pnts *Points, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_sfa_is_line_simple(const struct line_pnts *Points UNUSED, int type UNUSED, int with_z UNUSED) ======= @@ -283,6 +292,9 @@ int Vect_sfa_is_line_simple(const struct line_pnts *Points, int type, int with_z) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -338,16 +350,22 @@ int Vect_sfa_is_line_closed(const struct line_pnts *Points, int type, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vect_sfa_get_num_features(struct Map_info *Map) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/snap.c b/lib/vector/Vlib/snap.c index e26e7ec39a9..057a39b6bca 100644 --- a/lib/vector/Vlib/snap.c +++ b/lib/vector/Vlib/snap.c @@ -83,16 +83,22 @@ static int find_item(int id, const struct RTree_Rect *rect UNUSED, void *list) * to the list */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int add_item(int id, const struct RTree_Rect *rect UNUSED, void *list) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -200,6 +206,7 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, int line, ltype, line_idx; double thresh2; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -212,6 +219,10 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main int point; /* index in points array */ int nsnapped, ncreated; /* number of snapped verices, number of new vertices @@ -222,10 +233,13 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, int anew = 0, nnew; /* allocated new points, number of new points */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -261,6 +275,9 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -291,11 +308,14 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, point = 1; /* index starts from 1 ! */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -311,6 +331,9 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -335,11 +358,14 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, G_debug(3, " vertex v = %d", v); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -356,6 +382,9 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -400,11 +429,14 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, XPnts[point].anchor = 0; /* make it anchor */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -421,6 +453,9 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -453,11 +488,14 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, XPnts[pointb].anchor = point; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -474,6 +512,9 @@ static void Vect_snap_lines_list_kdtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -707,6 +748,7 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, int line, ltype, line_idx; double thresh2; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -719,6 +761,10 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main int point; /* index in points array */ int nsnapped, ncreated; /* number of snapped verices, number of new vertices @@ -729,10 +775,13 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, int anew = 0, nnew; /* allocated new points , number of new points */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -768,6 +817,9 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -808,11 +860,14 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, point = 1; /* index starts from 1 ! */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -828,6 +883,9 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -851,11 +909,14 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, G_debug(3, " vertex v = %d", v); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -872,6 +933,9 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -926,11 +990,14 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, XPnts[point].anchor = 0; /* make it anchor */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -947,6 +1014,9 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -983,11 +1053,14 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, XPnts[pointb].anchor = point; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1004,6 +1077,9 @@ static void Vect_snap_lines_list_rtree(struct Map_info *Map, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1297,11 +1373,14 @@ int Vect_snap_line(struct Map_info *Map, struct ilist *reflist, int asegments; /* number of allocated segments */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1318,6 +1397,9 @@ int Vect_snap_line(struct Map_info *Map, struct ilist *reflist, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1368,11 +1450,14 @@ int Vect_snap_line(struct Map_info *Map, struct ilist *reflist, point = segment = 1; /* index starts from 1 ! */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1388,6 +1473,9 @@ int Vect_snap_line(struct Map_info *Map, struct ilist *reflist, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1411,11 +1499,14 @@ int Vect_snap_line(struct Map_info *Map, struct ilist *reflist, G_debug(3, " vertex v = %d", v); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1432,6 +1523,9 @@ int Vect_snap_line(struct Map_info *Map, struct ilist *reflist, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/tin.c b/lib/vector/Vlib/tin.c index 31227593c8f..5fac35f7ce3 100644 --- a/lib/vector/Vlib/tin.c +++ b/lib/vector/Vlib/tin.c @@ -30,6 +30,7 @@ */ int Vect_tin_get_z(struct Map_info *Map, double tx, double ty, double *tz, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double *angle, double *slope) ======= @@ -37,6 +38,8 @@ int Vect_tin_get_z(struct Map_info *Map, double tx, double ty, double *tz, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double *angle UNUSED, double *slope UNUSED) ======= double *angle, double *slope) @@ -45,6 +48,9 @@ int Vect_tin_get_z(struct Map_info *Map, double tx, double ty, double *tz, double *angle, double *slope) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/write.c b/lib/vector/Vlib/write.c index eb06471ddaf..10b20d0105c 100644 --- a/lib/vector/Vlib/write.c +++ b/lib/vector/Vlib/write.c @@ -26,6 +26,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static off_t write_dummy(struct Map_info *Map, int type, @@ -38,6 +39,8 @@ static off_t write_dummy(struct Map_info *Map, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static off_t write_dummy(struct Map_info *Map UNUSED, int type UNUSED, const struct line_pnts *points UNUSED, const struct line_cats *cats UNUSED) @@ -61,6 +64,9 @@ static off_t write_dummy(struct Map_info *Map, int type, <<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -81,6 +87,7 @@ static int delete_dummy(struct Map_info *Map, off_t line) G_warning("Vect_delete_line() %s", _("for this format/level not supported")); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return -1; } @@ -89,6 +96,8 @@ static int restore_dummy(struct Map_info *Map, off_t offset, off_t line) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) return -1; } @@ -151,6 +160,9 @@ static int restore_dummy(struct Map_info *Map, off_t offset, off_t line) static int restore_dummy(struct Map_info *Map, off_t offset, off_t line) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -163,12 +175,15 @@ static int restore_dummy(struct Map_info *Map, off_t offset, off_t line) #if !defined HAVE_OGR || !defined HAVE_POSTGRES <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static int format(struct Map_info *Map, off_t line) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format(struct Map_info *Map UNUSED, off_t line UNUSED) ======= static int format(struct Map_info *Map, off_t line) @@ -177,6 +192,9 @@ static int format(struct Map_info *Map, off_t line) static int format(struct Map_info *Map, off_t line) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -185,6 +203,7 @@ static int format(struct Map_info *Map, off_t line) return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int format2(struct Map_info *Map, off_t offset, off_t line) @@ -193,6 +212,8 @@ static int format2(struct Map_info *Map, off_t offset, off_t line) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int format2(struct Map_info *Map UNUSED, off_t offset UNUSED, off_t line UNUSED) ======= @@ -202,6 +223,9 @@ static int format2(struct Map_info *Map, off_t offset, off_t line) static int format2(struct Map_info *Map, off_t offset, off_t line) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -210,6 +234,7 @@ static int format2(struct Map_info *Map, off_t offset, off_t line) return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static off_t format_l(struct Map_info *Map, int type, @@ -220,6 +245,8 @@ static off_t format_l(struct Map_info *Map, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static off_t format_l(struct Map_info *Map UNUSED, int type UNUSED, const struct line_pnts *points UNUSED, const struct line_cats *cats UNUSED) @@ -234,6 +261,9 @@ static off_t format_l(struct Map_info *Map, int type, const struct line_cats *cats) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -242,6 +272,7 @@ static off_t format_l(struct Map_info *Map, int type, return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static off_t format_l2(struct Map_info *Map, off_t line, int type, @@ -252,6 +283,8 @@ static off_t format_l2(struct Map_info *Map, off_t line, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static off_t format_l2(struct Map_info *Map UNUSED, off_t line UNUSED, int type UNUSED, const struct line_pnts *points UNUSED, const struct line_cats *cats UNUSED) @@ -266,6 +299,9 @@ static off_t format_l2(struct Map_info *Map, off_t line, int type, const struct line_cats *cats) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -275,6 +311,7 @@ static off_t format_l2(struct Map_info *Map, off_t line, int type, } #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -282,6 +319,10 @@ static off_t format_l2(struct Map_info *Map, off_t line, int type, <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main static off_t (*Vect_write_line_array[][3])(struct Map_info *, int, const struct line_pnts *, const struct line_cats *) = { @@ -291,12 +332,15 @@ static off_t (*Vect_write_line_array[][3])(struct Map_info *, int, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static off_t (*Vect_write_line_array[][3])(struct Map_info *, int, const struct line_pnts *, const struct line_cats *) = { ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main static off_t (*Vect_write_line_array[][3])() = { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -315,6 +359,9 @@ static off_t (*Vect_write_line_array[][3])(struct Map_info *, int, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -337,6 +384,7 @@ static off_t (*Vect_write_line_array[][3])(struct Map_info *, int, #endif }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -344,6 +392,10 @@ static off_t (*Vect_write_line_array[][3])(struct Map_info *, int, <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, const struct line_pnts *, const struct line_cats *) = { @@ -353,12 +405,15 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, const struct line_pnts *, const struct line_cats *) = { ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main static off_t (*Vect_rewrite_line_array[][3])() = { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -377,6 +432,9 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -388,6 +446,7 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, #else , <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD {rewrite_dummy, format_l2, format_l2}, {rewrite_dummy, format_l2, format_l2} @@ -406,6 +465,13 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, {rewrite_dummy, format_l2, format_l2}, {rewrite_dummy, format_l2, format_l2} ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + {rewrite_dummy, format_l2, format_l2}, + {rewrite_dummy, format_l2, format_l2} +======= >>>>>>> osgeo-main {rewrite_dummy, format_l, format_l}, {rewrite_dummy, format_l, format_l} @@ -427,6 +493,9 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -438,6 +507,7 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, , <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -448,6 +518,10 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main {rewrite_dummy, format_l2, format_l2} #endif @@ -456,8 +530,11 @@ static off_t (*Vect_rewrite_line_array[][3])(struct Map_info *, off_t, int, static int (*Vect_delete_line_array[][3])(struct Map_info *, off_t) = { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) {rewrite_dummy, format_l, format_l} @@ -500,6 +577,9 @@ static int (*Vect_delete_line_array[][3])(struct Map_info *, off_t) = { ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main {delete_dummy, V1_delete_line_nat, V2_delete_line_nat} #ifdef HAVE_OGR @@ -561,6 +641,7 @@ static int (*Vect_restore_line_array[][3])(struct Map_info *, off_t, off_t) = { ======= {restore_dummy, format2, format2} <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -667,6 +748,8 @@ static int (*Vect_restore_line_array[][3])(struct Map_info *, off_t, off_t) = { {restore_dummy, format2, format2} ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= ======= @@ -779,6 +862,7 @@ off_t Vect_rewrite_line(struct Map_info *Map, off_t line, int type, G_debug(3, "Vect_rewrite_line(): name = %s, format = %d, level = %d, " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "line/offset = %" PRI_OFF_T, ======= @@ -786,6 +870,8 @@ off_t Vect_rewrite_line(struct Map_info *Map, off_t line, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "line/offset = %" PRId64, ======= "line/offset = %" PRI_OFF_T, @@ -794,6 +880,9 @@ off_t Vect_rewrite_line(struct Map_info *Map, off_t line, int type, "line/offset = %" PRI_OFF_T, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -806,6 +895,7 @@ off_t Vect_rewrite_line(struct Map_info *Map, off_t line, int type, points, cats); if (ret == -1) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Unable to rewrite feature/offset %" PRI_OFF_T ======= @@ -813,6 +903,8 @@ off_t Vect_rewrite_line(struct Map_info *Map, off_t line, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Unable to rewrite feature/offset %" PRId64 ======= G_warning(_("Unable to rewrite feature/offset %" PRI_OFF_T @@ -821,6 +913,9 @@ off_t Vect_rewrite_line(struct Map_info *Map, off_t line, int type, G_warning(_("Unable to rewrite feature/offset %" PRI_OFF_T >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -857,6 +952,7 @@ int Vect_delete_line(struct Map_info *Map, off_t line) if (ret == -1) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Unable to delete feature/offset %" PRI_OFF_T ======= @@ -864,6 +960,8 @@ int Vect_delete_line(struct Map_info *Map, off_t line) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Unable to delete feature/offset %" PRId64 ======= G_warning(_("Unable to delete feature/offset %" PRI_OFF_T @@ -872,6 +970,9 @@ int Vect_delete_line(struct Map_info *Map, off_t line) G_warning(_("Unable to delete feature/offset %" PRI_OFF_T >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -901,6 +1002,7 @@ int Vect_restore_line(struct Map_info *Map, off_t offset, off_t line) G_debug(3, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Vect_restore_line(): name = %s, level = %d, offset = %" PRI_OFF_T ", line = %" PRI_OFF_T, @@ -909,6 +1011,8 @@ int Vect_restore_line(struct Map_info *Map, off_t offset, off_t line) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Vect_restore_line(): name = %s, level = %d, offset = %" PRId64 ", line = %" PRId64, ======= @@ -920,6 +1024,9 @@ int Vect_restore_line(struct Map_info *Map, off_t offset, off_t line) ", line = %" PRI_OFF_T, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -933,6 +1040,7 @@ int Vect_restore_line(struct Map_info *Map, off_t offset, off_t line) if (ret == -1) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Unable to restore feature/offset %" PRI_OFF_T ======= @@ -940,6 +1048,8 @@ int Vect_restore_line(struct Map_info *Map, off_t offset, off_t line) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Unable to restore feature/offset %" PRId64 ======= G_warning(_("Unable to restore feature/offset %" PRI_OFF_T @@ -948,6 +1058,9 @@ int Vect_restore_line(struct Map_info *Map, off_t offset, off_t line) G_warning(_("Unable to restore feature/offset %" PRI_OFF_T >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/write_nat.c b/lib/vector/Vlib/write_nat.c index cb569d1433b..c1d59c4e9a9 100644 --- a/lib/vector/Vlib/write_nat.c +++ b/lib/vector/Vlib/write_nat.c @@ -110,6 +110,7 @@ off_t V1_rewrite_line_nat(struct Map_info *Map, off_t offset, int type, static struct line_pnts *old_points = NULL; static struct line_cats *old_cats = NULL; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug(3, "V1_rewrite_line_nat(): offset = %" PRI_OFF_T, offset); @@ -118,6 +119,8 @@ off_t V1_rewrite_line_nat(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(3, "V1_rewrite_line_nat(): offset = %" PRId64, offset); ======= G_debug(3, "V1_rewrite_line_nat(): offset = %" PRI_OFF_T, offset); @@ -126,6 +129,9 @@ off_t V1_rewrite_line_nat(struct Map_info *Map, off_t offset, int type, G_debug(3, "V1_rewrite_line_nat(): offset = %" PRI_OFF_T, offset); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -372,6 +378,7 @@ int V1_restore_line_nat(struct Map_info *Map, off_t offset, off_t line) G_debug(3, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "V1_restore_line_nat(): offset = %" PRI_OFF_T ", line (not used) = %" PRI_OFF_T, @@ -380,6 +387,8 @@ int V1_restore_line_nat(struct Map_info *Map, off_t offset, off_t line) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "V1_restore_line_nat(): offset = %" PRId64 ", line (not used) = %" PRId64, ======= @@ -391,6 +400,9 @@ int V1_restore_line_nat(struct Map_info *Map, off_t offset, off_t line) ", line (not used) = %" PRI_OFF_T, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -444,6 +456,7 @@ int V2_restore_line_nat(struct Map_info *Map, off_t offset, off_t line) plus = &(Map->plus); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug( @@ -459,6 +472,8 @@ int V2_restore_line_nat(struct Map_info *Map, off_t offset, off_t line) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(3, "V2_restore_line_nat(): offset = %" PRId64 ", line = %" PRId64, offset, line); @@ -486,6 +501,9 @@ int V2_restore_line_nat(struct Map_info *Map, off_t offset, off_t line) line); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -562,6 +580,7 @@ off_t V1__write_line_nat(struct Map_info *Map, off_t offset, int type, offset = dig_ftell(&(Map->dig_fp)); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_debug(3, "V1__rewrite_line_nat(): offset = %" PRI_OFF_T, offset); ======= @@ -569,6 +588,8 @@ off_t V1__write_line_nat(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(3, "V1__rewrite_line_nat(): offset = %" PRId64, offset); ======= G_debug(3, "V1__rewrite_line_nat(): offset = %" PRI_OFF_T, offset); @@ -577,6 +598,9 @@ off_t V1__write_line_nat(struct Map_info *Map, off_t offset, int type, G_debug(3, "V1__rewrite_line_nat(): offset = %" PRI_OFF_T, offset); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1004,6 +1028,7 @@ int V2__add_line_to_topo_nat(struct Map_info *Map, off_t offset, int type, const struct line_pnts *points, const struct line_cats *cats, int restore_line, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int (*external_routine)(const struct Map_info *, int)) @@ -1012,6 +1037,8 @@ int V2__add_line_to_topo_nat(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int (*external_routine)(struct Map_info *, int)) ======= int (*external_routine)(const struct Map_info *, @@ -1022,6 +1049,9 @@ int V2__add_line_to_topo_nat(struct Map_info *Map, off_t offset, int type, int)) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1040,6 +1070,7 @@ int V2__add_line_to_topo_nat(struct Map_info *Map, off_t offset, int type, G_debug(3, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "V2__add_line_to_topo_nat(): offset = %" PRI_OFF_T ======= @@ -1047,6 +1078,8 @@ int V2__add_line_to_topo_nat(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "V2__add_line_to_topo_nat(): offset = %" PRId64 ======= "V2__add_line_to_topo_nat(): offset = %" PRI_OFF_T @@ -1055,6 +1088,9 @@ int V2__add_line_to_topo_nat(struct Map_info *Map, off_t offset, int type, "V2__add_line_to_topo_nat(): offset = %" PRI_OFF_T >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/write_ogr.c b/lib/vector/Vlib/write_ogr.c index c2bcb9f29b3..be8dc1c722f 100644 --- a/lib/vector/Vlib/write_ogr.c +++ b/lib/vector/Vlib/write_ogr.c @@ -91,6 +91,7 @@ off_t V1_rewrite_line_ogr(struct Map_info *Map, off_t offset, int type, const struct line_cats *cats) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_debug(3, "V1_rewrite_line_ogr(): type=%d offset=%" PRI_OFF_T, type, offset); @@ -99,6 +100,8 @@ off_t V1_rewrite_line_ogr(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(3, "V1_rewrite_line_ogr(): type=%d offset=%" PRId64, type, offset); ======= G_debug(3, "V1_rewrite_line_ogr(): type=%d offset=%" PRI_OFF_T, type, @@ -109,6 +112,9 @@ off_t V1_rewrite_line_ogr(struct Map_info *Map, off_t offset, int type, offset); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -153,6 +159,7 @@ int V1_delete_line_ogr(struct Map_info *Map, off_t offset) if (offset >= ogr_info->offset.array_num) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Invalid offset (%" PRI_OFF_T ")"), offset); ======= @@ -160,6 +167,8 @@ int V1_delete_line_ogr(struct Map_info *Map, off_t offset) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Invalid offset (%" PRId64 ")"), offset); ======= G_warning(_("Invalid offset (%" PRI_OFF_T ")"), offset); @@ -168,6 +177,9 @@ int V1_delete_line_ogr(struct Map_info *Map, off_t offset) G_warning(_("Invalid offset (%" PRI_OFF_T ")"), offset); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/Vlib/write_pg.c b/lib/vector/Vlib/write_pg.c index c51aa722759..230e00237fb 100644 --- a/lib/vector/Vlib/write_pg.c +++ b/lib/vector/Vlib/write_pg.c @@ -67,16 +67,22 @@ static int update_next_edge(struct Map_info *, int, int); #if 0 /* unused */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int delete_face(struct Map_info *, int); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96,6 +102,7 @@ static dbDriver *open_db(struct Format_info_pg *); static struct line_pnts *Points; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -103,6 +110,8 @@ static struct line_pnts *Points; ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #define NOPG_UNUSED #else #define NOPG_UNUSED UNUSED @@ -111,6 +120,9 @@ static struct line_pnts *Points; ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -220,6 +232,7 @@ off_t V2_write_line_pg(struct Map_info *Map NOPG_UNUSED, int type NOPG_UNUSED, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, const struct line_pnts *points, const struct line_cats *cats) @@ -231,6 +244,8 @@ off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main off_t V1_rewrite_line_pg(struct Map_info *Map NOPG_UNUSED, off_t offset, int type, const struct line_pnts *points NOPG_UNUSED, const struct line_cats *cats NOPG_UNUSED) @@ -253,6 +268,9 @@ off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, offset); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -286,6 +304,7 @@ off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, \param type feature type (GV_POINT, GV_LINE, ...) \param points feature geometry <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param cats feature categories ======= @@ -293,6 +312,8 @@ off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param cats feature categories (unused) ======= \param cats feature categories @@ -301,6 +322,9 @@ off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, \param cats feature categories >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -310,6 +334,7 @@ off_t V1_rewrite_line_pg(struct Map_info *Map, off_t offset, int type, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD off_t V2_rewrite_line_pg(struct Map_info *Map, off_t line, int type, const struct line_pnts *points, const struct line_cats *cats) @@ -318,6 +343,8 @@ off_t V2_rewrite_line_pg(struct Map_info *Map, off_t line, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main off_t V2_rewrite_line_pg(struct Map_info *Map NOPG_UNUSED, off_t line, int type, const struct line_pnts *points NOPG_UNUSED, const struct line_cats *cats UNUSED) @@ -332,6 +359,9 @@ off_t V2_rewrite_line_pg(struct Map_info *Map, off_t line, int type, const struct line_cats *cats) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -398,6 +428,7 @@ off_t V2_rewrite_line_pg(struct Map_info *Map, off_t line, int type, G_asprintf(&stmt, "UPDATE \"%s\".\"%s\" SET geom = '%s'::GEOMETRY WHERE %s_id = " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "%" PRI_OFF_T, ======= @@ -405,6 +436,8 @@ off_t V2_rewrite_line_pg(struct Map_info *Map, off_t line, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "%" PRId64, ======= "%" PRI_OFF_T, @@ -413,6 +446,9 @@ off_t V2_rewrite_line_pg(struct Map_info *Map, off_t line, int type, "%" PRI_OFF_T, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -510,16 +546,22 @@ int V1_delete_line_pg(struct Map_info *Map NOPG_UNUSED, */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int V2_delete_line_pg(struct Map_info *Map NOPG_UNUSED, off_t line NOPG_UNUSED) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2754,16 +2796,22 @@ int Vect__insert_face_pg(struct Map_info *Map, int area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int delete_face(struct Map_info *Map, int area) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2820,6 +2868,7 @@ int delete_face(const struct Map_info *Map, int area) - isolated edges <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD next left edge: -edge ======= @@ -2835,6 +2884,12 @@ int delete_face(const struct Map_info *Map, int area) <<<<<<< HEAD next left edge: -edge ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + next left edge: -edge +======= >>>>>>> osgeo-main next left edge: -edge >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2851,6 +2906,9 @@ int delete_face(const struct Map_info *Map, int area) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2862,6 +2920,7 @@ int delete_face(const struct Map_info *Map, int area) \param Map pointer to Map_info struct <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param line feature id ======= @@ -2877,6 +2936,12 @@ int delete_face(const struct Map_info *Map, int area) <<<<<<< HEAD \param line feature id ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + \param line feature id +======= >>>>>>> osgeo-main \param line feature id >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2893,6 +2958,9 @@ int delete_face(const struct Map_info *Map, int area) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3223,6 +3291,7 @@ int set_constraint_to_deferrable(struct Format_info_pg *pg_info, \param pg_info pointer to Format_info_pg struct +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD \return pointer to dbDriver on succes @@ -3231,6 +3300,8 @@ int set_constraint_to_deferrable(struct Format_info_pg *pg_info, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \return pointer to dbDriver on success ======= \return pointer to dbDriver on succes @@ -3239,6 +3310,9 @@ int set_constraint_to_deferrable(struct Format_info_pg *pg_info, \return pointer to dbDriver on succes >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/edgemgmt-template.c b/lib/vector/dglib/edgemgmt-template.c index a94d89d46a9..37bab97c6fb 100644 --- a/lib/vector/dglib/edgemgmt-template.c +++ b/lib/vector/dglib/edgemgmt-template.c @@ -20,6 +20,7 @@ * best view with tabstop=4 */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -27,6 +28,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include ======= @@ -34,6 +37,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -294,6 +300,7 @@ int DGL_ADD_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nHead, dglInt32_t nTail, return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) @@ -302,6 +309,8 @@ int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge UNUSED) ======= int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) @@ -310,6 +319,9 @@ int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -368,6 +380,7 @@ int DGL_DEL_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) #endif } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD dglInt32_t *DGL_GET_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) @@ -376,6 +389,8 @@ dglInt32_t *DGL_GET_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dglInt32_t *DGL_GET_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge UNUSED) ======= dglInt32_t *DGL_GET_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) @@ -384,6 +399,9 @@ dglInt32_t *DGL_GET_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) dglInt32_t *DGL_GET_EDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nEdge) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/graph.c b/lib/vector/dglib/graph.c index a1f5532823a..b3560a76882 100644 --- a/lib/vector/dglib/graph.c +++ b/lib/vector/dglib/graph.c @@ -40,6 +40,7 @@ #endif #include "helpers.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void dglResetStats(dglGraph_s *pgraph) @@ -48,6 +49,8 @@ void dglResetStats(dglGraph_s *pgraph) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void dglResetStats(dglGraph_s *pgraph UNUSED) ======= void dglResetStats(dglGraph_s *pgraph) @@ -56,6 +59,9 @@ void dglResetStats(dglGraph_s *pgraph) void dglResetStats(dglGraph_s *pgraph) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1064,6 +1070,7 @@ int dglMinimumSpanning(dglGraph_s *pgraphInput, dglGraph_s *pgraphOutput, return nRet; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void dglFreeSPReport(dglGraph_s *pgraph, dglSPReport_s *pSPReport) @@ -1072,6 +1079,8 @@ void dglFreeSPReport(dglGraph_s *pgraph, dglSPReport_s *pSPReport) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void dglFreeSPReport(dglGraph_s *pgraph UNUSED, dglSPReport_s *pSPReport) ======= void dglFreeSPReport(dglGraph_s *pgraph, dglSPReport_s *pSPReport) @@ -1080,6 +1089,9 @@ void dglFreeSPReport(dglGraph_s *pgraph, dglSPReport_s *pSPReport) void dglFreeSPReport(dglGraph_s *pgraph, dglSPReport_s *pSPReport) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1486,6 +1498,7 @@ int dglEdgeset_T_Initialize(dglEdgesetTraverser_s *pT, dglGraph_s *pGraph, return -pGraph->iErrno; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void dglEdgeset_T_Release(dglEdgesetTraverser_s *pT) @@ -1494,6 +1507,8 @@ void dglEdgeset_T_Release(dglEdgesetTraverser_s *pT) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void dglEdgeset_T_Release(dglEdgesetTraverser_s *pT UNUSED) ======= void dglEdgeset_T_Release(dglEdgesetTraverser_s *pT) @@ -1502,6 +1517,9 @@ void dglEdgeset_T_Release(dglEdgesetTraverser_s *pT) void dglEdgeset_T_Release(dglEdgesetTraverser_s *pT) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1561,6 +1579,7 @@ int dglIOContextInitialize(dglGraph_s *pG, dglIOContext_s *pIO) return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void dglIOContextRelease(dglIOContext_s *pIO) @@ -1569,6 +1588,8 @@ void dglIOContextRelease(dglIOContext_s *pIO) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void dglIOContextRelease(dglIOContext_s *pIO UNUSED) ======= void dglIOContextRelease(dglIOContext_s *pIO) @@ -1577,6 +1598,9 @@ void dglIOContextRelease(dglIOContext_s *pIO) void dglIOContextRelease(dglIOContext_s *pIO) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/misc-template.c b/lib/vector/dglib/misc-template.c index 9a5152fcab7..c6e3e97e4b3 100644 --- a/lib/vector/dglib/misc-template.c +++ b/lib/vector/dglib/misc-template.c @@ -27,6 +27,7 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int DGL_EDGE_T_INITIALIZE_FUNC(dglGraph_s *pGraph, dglEdgeTraverser_s *pT, dglEdgePrioritizer_s *pEP) ======= @@ -34,6 +35,8 @@ int DGL_EDGE_T_INITIALIZE_FUNC(dglGraph_s *pGraph, dglEdgeTraverser_s *pT, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int DGL_EDGE_T_INITIALIZE_FUNC(dglGraph_s *pGraph, dglEdgeTraverser_s *pT UNUSED, dglEdgePrioritizer_s *pEP UNUSED) @@ -46,6 +49,9 @@ int DGL_EDGE_T_INITIALIZE_FUNC(dglGraph_s *pGraph, dglEdgeTraverser_s *pT, dglEdgePrioritizer_s *pEP) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -298,6 +304,7 @@ int DGL_EDGESET_T_INITIALIZE_FUNC(dglGraph_s *pGraph, dglEdgesetTraverser_s *pT, return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void DGL_EDGESET_T_RELEASE_FUNC(dglEdgesetTraverser_s *pT) @@ -306,6 +313,8 @@ void DGL_EDGESET_T_RELEASE_FUNC(dglEdgesetTraverser_s *pT) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void DGL_EDGESET_T_RELEASE_FUNC(dglEdgesetTraverser_s *pT UNUSED) ======= void DGL_EDGESET_T_RELEASE_FUNC(dglEdgesetTraverser_s *pT) @@ -314,6 +323,9 @@ void DGL_EDGESET_T_RELEASE_FUNC(dglEdgesetTraverser_s *pT) void DGL_EDGESET_T_RELEASE_FUNC(dglEdgesetTraverser_s *pT) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/nodemgmt-template.c b/lib/vector/dglib/nodemgmt-template.c index 1846b69843c..fbf4c310420 100644 --- a/lib/vector/dglib/nodemgmt-template.c +++ b/lib/vector/dglib/nodemgmt-template.c @@ -20,6 +20,7 @@ * best view with tabstop=4 */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int DGL_ADD_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nId, void *pvNodeAttr, @@ -29,6 +30,8 @@ int DGL_ADD_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nId, void *pvNodeAttr, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include int DGL_ADD_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nId, @@ -42,6 +45,9 @@ int DGL_ADD_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nId, void *pvNodeAttr, dglInt32_t nFlags) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -212,6 +218,7 @@ int DGL_DEL_NODE_INEDGE_FUNC(dglGraph_s *pgraph, dglInt32_t nNode, } #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int DGL_DEL_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nNodeId) @@ -220,6 +227,8 @@ int DGL_DEL_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nNodeId) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int DGL_DEL_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nNodeId UNUSED) ======= int DGL_DEL_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nNodeId) @@ -228,6 +237,9 @@ int DGL_DEL_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nNodeId) int DGL_DEL_NODE_FUNC(dglGraph_s *pgraph, dglInt32_t nNodeId) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -434,6 +446,7 @@ dglInt32_t *DGL_GET_NODE_OUTEDGESET_FUNC(dglGraph_s *pgraph, dglInt32_t *pnode) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD dglInt32_t *DGL_GET_NODE_INEDGESET_FUNC(dglGraph_s *pgraph, dglInt32_t *pnode) @@ -442,6 +455,8 @@ dglInt32_t *DGL_GET_NODE_INEDGESET_FUNC(dglGraph_s *pgraph, dglInt32_t *pnode) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dglInt32_t *DGL_GET_NODE_INEDGESET_FUNC(dglGraph_s *pgraph, dglInt32_t *pnode UNUSED) ======= @@ -451,6 +466,9 @@ dglInt32_t *DGL_GET_NODE_INEDGESET_FUNC(dglGraph_s *pgraph, dglInt32_t *pnode) dglInt32_t *DGL_GET_NODE_INEDGESET_FUNC(dglGraph_s *pgraph, dglInt32_t *pnode) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/sp-template.c b/lib/vector/dglib/sp-template.c index 7b76aaa056b..5c63973ff60 100644 --- a/lib/vector/dglib/sp-template.c +++ b/lib/vector/dglib/sp-template.c @@ -40,6 +40,7 @@ #if !defined(DGL_DEFINE_TREE_PROCS) && !defined(DGL_DEFINE_FLAT_PROCS) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int DGL_SP_CACHE_INITIALIZE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache, @@ -49,6 +50,8 @@ int DGL_SP_CACHE_INITIALIZE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include int DGL_SP_CACHE_INITIALIZE_FUNC(dglGraph_s *pgraph UNUSED, @@ -62,6 +65,9 @@ int DGL_SP_CACHE_INITIALIZE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache, dglInt32_t nStart) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -79,6 +85,7 @@ int DGL_SP_CACHE_INITIALIZE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache, return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void DGL_SP_CACHE_RELEASE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache) @@ -87,6 +94,8 @@ void DGL_SP_CACHE_RELEASE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void DGL_SP_CACHE_RELEASE_FUNC(dglGraph_s *pgraph UNUSED, dglSPCache_s *pCache) ======= void DGL_SP_CACHE_RELEASE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache) @@ -95,6 +104,9 @@ void DGL_SP_CACHE_RELEASE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache) void DGL_SP_CACHE_RELEASE_FUNC(dglGraph_s *pgraph, dglSPCache_s *pCache) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/span-template.c b/lib/vector/dglib/span-template.c index 62f87ac0182..ec849ac500a 100644 --- a/lib/vector/dglib/span-template.c +++ b/lib/vector/dglib/span-template.c @@ -229,6 +229,7 @@ int DGL_SPAN_DEPTHFIRST_SPANNING_FUNC(dglGraph_s *pgraphIn, */ int DGL_SPAN_MINIMUM_SPANNING_FUNC(dglGraph_s *pgraphIn, dglGraph_s *pgraphOut, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dglInt32_t nVertex, dglSpanClip_fn fnClip, void *pvClipArg) @@ -237,6 +238,8 @@ int DGL_SPAN_MINIMUM_SPANNING_FUNC(dglGraph_s *pgraphIn, dglGraph_s *pgraphOut, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dglInt32_t nVertex, dglSpanClip_fn fnClip UNUSED, void *pvClipArg UNUSED) @@ -249,6 +252,9 @@ int DGL_SPAN_MINIMUM_SPANNING_FUNC(dglGraph_s *pgraphIn, dglGraph_s *pgraphOut, void *pvClipArg) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/dglib/tree.c b/lib/vector/dglib/tree.c index 6514c3ec525..6c2cab1c0bb 100644 --- a/lib/vector/dglib/tree.c +++ b/lib/vector/dglib/tree.c @@ -51,6 +51,7 @@ void dglTreeNodeCancel(void *pvNode, void *pvParam UNUSED) free(pvNode); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int dglTreeNodeCompare(const void *pvNodeA, const void *pvNodeB, void *pvParam) @@ -59,6 +60,8 @@ int dglTreeNodeCompare(const void *pvNodeA, const void *pvNodeB, void *pvParam) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int dglTreeNodeCompare(const void *pvNodeA, const void *pvNodeB, void *pvParam UNUSED) ======= @@ -68,6 +71,9 @@ int dglTreeNodeCompare(const void *pvNodeA, const void *pvNodeB, void *pvParam) int dglTreeNodeCompare(const void *pvNodeA, const void *pvNodeB, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -125,6 +131,7 @@ void dglTreeNode2Cancel(void *pvNode2, void *pvParam UNUSED) int dglTreeNode2Compare(const void *pvNode2A, const void *pvNode2B, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void *pvParam) ======= @@ -132,6 +139,8 @@ int dglTreeNode2Compare(const void *pvNode2A, const void *pvNode2B, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void *pvParam UNUSED) ======= void *pvParam) @@ -140,6 +149,9 @@ int dglTreeNode2Compare(const void *pvNode2A, const void *pvNode2B, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -192,6 +204,7 @@ void dglTreeEdgeCancel(void *pvEdge, void *pvParam UNUSED) free(pvEdge); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int dglTreeEdgeCompare(const void *pvEdgeA, const void *pvEdgeB, void *pvParam) @@ -200,6 +213,8 @@ int dglTreeEdgeCompare(const void *pvEdgeA, const void *pvEdgeB, void *pvParam) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int dglTreeEdgeCompare(const void *pvEdgeA, const void *pvEdgeB, void *pvParam UNUSED) ======= @@ -209,6 +224,9 @@ int dglTreeEdgeCompare(const void *pvEdgeA, const void *pvEdgeB, void *pvParam) int dglTreeEdgeCompare(const void *pvEdgeA, const void *pvEdgeB, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -260,6 +278,7 @@ void dglTreeTouchI32Cancel(void *pvTouchI32, void *pvParam UNUSED) int dglTreeTouchI32Compare(const void *pvTouchI32A, const void *pvTouchI32B, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void *pvParam) ======= @@ -267,6 +286,8 @@ int dglTreeTouchI32Compare(const void *pvTouchI32A, const void *pvTouchI32B, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void *pvParam UNUSED) ======= void *pvParam) @@ -275,6 +296,9 @@ int dglTreeTouchI32Compare(const void *pvTouchI32A, const void *pvTouchI32B, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -328,6 +352,7 @@ void dglTreePredistCancel(void *pvPredist, void *pvParam UNUSED) int dglTreePredistCompare(const void *pvPredistA, const void *pvPredistB, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void *pvParam) ======= @@ -335,6 +360,8 @@ int dglTreePredistCompare(const void *pvPredistA, const void *pvPredistB, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void *pvParam UNUSED) ======= void *pvParam) @@ -343,6 +370,9 @@ int dglTreePredistCompare(const void *pvPredistA, const void *pvPredistB, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -396,6 +426,7 @@ void dglTreeNodePri32Cancel(void *pvNodePri32, void *pvParam UNUSED) int dglTreeNodePri32Compare(const void *pvNodePri32A, const void *pvNodePri32B, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void *pvParam) ======= @@ -403,6 +434,8 @@ int dglTreeNodePri32Compare(const void *pvNodePri32A, const void *pvNodePri32B, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void *pvParam UNUSED) ======= void *pvParam) @@ -411,6 +444,9 @@ int dglTreeNodePri32Compare(const void *pvNodePri32A, const void *pvNodePri32B, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -467,6 +503,7 @@ void dglTreeEdgePri32Cancel(void *pvEdgePri32, void *pvParam UNUSED) int dglTreeEdgePri32Compare(const void *pvEdgePri32A, const void *pvEdgePri32B, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void *pvParam) ======= @@ -474,6 +511,8 @@ int dglTreeEdgePri32Compare(const void *pvEdgePri32A, const void *pvEdgePri32B, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void *pvParam UNUSED) ======= void *pvParam) @@ -482,6 +521,9 @@ int dglTreeEdgePri32Compare(const void *pvEdgePri32A, const void *pvEdgePri32B, void *pvParam) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -521,6 +563,7 @@ static void *_tree_malloc(struct libavl_allocator *allocator UNUSED, static void *_tree_malloc(struct libavl_allocator *allocator, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -531,6 +574,11 @@ static void *_tree_malloc(struct libavl_allocator *allocator, >>>>>>> 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 size_t libavl_size) { diff --git a/lib/vector/dglib/tree.h b/lib/vector/dglib/tree.h index ebf2dc3f222..926157d6a4a 100644 --- a/lib/vector/dglib/tree.h +++ b/lib/vector/dglib/tree.h @@ -52,6 +52,7 @@ #include "avl.h" #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD extern void *dglTreeGetAllocator(void); @@ -70,6 +71,12 @@ extern void *dglTreeGetAllocator(void); ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +extern void *dglTreeGetAllocator(void); +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) extern void *dglTreeGetAllocator(); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -83,6 +90,9 @@ extern void *dglTreeGetAllocator(void); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/cindex_rw.c b/lib/vector/diglib/cindex_rw.c index b989bde1432..098101c2fa2 100644 --- a/lib/vector/diglib/cindex_rw.c +++ b/lib/vector/diglib/cindex_rw.c @@ -14,6 +14,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -21,12 +22,17 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -82,6 +88,7 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) ci = &(plus->cidx[i]); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug(3, "cidx %d head offset: %" PRI_OFF_T, i, dig_ftell(fp)); @@ -90,6 +97,8 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(3, "cidx %d head offset: %" PRId64, i, dig_ftell(fp)); ======= G_debug(3, "cidx %d head offset: %" PRI_OFF_T, i, dig_ftell(fp)); @@ -98,6 +107,9 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) G_debug(3, "cidx %d head offset: %" PRI_OFF_T, i, dig_ftell(fp)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -136,6 +148,7 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) if (0 >= dig__fwrite_port_O(&(ci->offset), 1, fp, plus->off_t_size)) return (0); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_debug(3, "cidx %d offset: %" PRI_OFF_T, i, ci->offset); } @@ -146,6 +159,8 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(3, "cidx %d offset: %" PRId64, i, ci->offset); } @@ -163,6 +178,9 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) G_debug(3, "cidx body offset %" PRI_OFF_T, dig_ftell(fp)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -175,6 +193,7 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) \param fp pointer to gvfile structure <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param plus pointer to Plus_head strcuture ======= @@ -182,6 +201,8 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param plus pointer to Plus_head structure ======= \param plus pointer to Plus_head strcuture @@ -190,6 +211,9 @@ int dig_write_cidx_head(struct gvfile *fp, struct Plus_head *plus) \param plus pointer to Plus_head strcuture >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/file.c b/lib/vector/diglib/file.c index b2fdb43fce3..786d9bf70de 100644 --- a/lib/vector/diglib/file.c +++ b/lib/vector/diglib/file.c @@ -165,6 +165,7 @@ size_t dig_fwrite(const void *ptr, size_t size, size_t nmemb, /*! <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \brief Initialize gvfile strcuture ======= @@ -172,6 +173,8 @@ size_t dig_fwrite(const void *ptr, size_t size, size_t nmemb, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \brief Initialize gvfile structure ======= \brief Initialize gvfile strcuture @@ -180,6 +183,9 @@ size_t dig_fwrite(const void *ptr, size_t size, size_t nmemb, \brief Initialize gvfile strcuture >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/frmt.c b/lib/vector/diglib/frmt.c index 15d10850247..d30c9374ff8 100644 --- a/lib/vector/diglib/frmt.c +++ b/lib/vector/diglib/frmt.c @@ -154,12 +154,15 @@ int dig_read_frmt_ascii(FILE *dascii, struct Format_info *finfo) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int dig_write_frmt_ascii(FILE *dascii, struct Format_info *finfo, int format) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int dig_write_frmt_ascii(FILE *dascii UNUSED, struct Format_info *finfo UNUSED, int format UNUSED) ======= @@ -169,6 +172,9 @@ int dig_write_frmt_ascii(FILE *dascii, struct Format_info *finfo, int format) int dig_write_frmt_ascii(FILE *dascii, struct Format_info *finfo, int format) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/head.c b/lib/vector/diglib/head.c index 29576b4a0b9..679c9139dda 100644 --- a/lib/vector/diglib/head.c +++ b/lib/vector/diglib/head.c @@ -15,6 +15,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -22,12 +23,17 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -69,6 +75,7 @@ int dig__write_head(struct Map_info *Map) /* bytes 11 - 18 : size of coordinate file */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_debug(1, "write coor size (%" PRI_OFF_T ") to head", Map->head.size); ======= @@ -76,6 +83,8 @@ int dig__write_head(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(1, "write coor size (%" PRId64 ") to head", Map->head.size); ======= G_debug(1, "write coor size (%" PRI_OFF_T ") to head", Map->head.size); @@ -84,6 +93,9 @@ int dig__write_head(struct Map_info *Map) G_debug(1, "write coor size (%" PRI_OFF_T ") to head", Map->head.size); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -112,6 +124,7 @@ int dig__write_head(struct Map_info *Map) return (0); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug(2, "coor body offset %" PRI_OFF_T, dig_ftell(&(Map->dig_fp))); @@ -120,6 +133,8 @@ int dig__write_head(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(2, "coor body offset %" PRId64, dig_ftell(&(Map->dig_fp))); ======= G_debug(2, "coor body offset %" PRI_OFF_T, dig_ftell(&(Map->dig_fp))); @@ -128,6 +143,9 @@ int dig__write_head(struct Map_info *Map) G_debug(2, "coor body offset %" PRI_OFF_T, dig_ftell(&(Map->dig_fp))); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -212,6 +230,7 @@ int dig__read_head(struct Map_info *Map) return (0); } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_debug(2, " coor size %" PRI_OFF_T, Map->head.size); ======= @@ -219,6 +238,8 @@ int dig__read_head(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(2, " coor size %" PRId64, Map->head.size); ======= G_debug(2, " coor size %" PRI_OFF_T, Map->head.size); @@ -227,6 +248,9 @@ int dig__read_head(struct Map_info *Map) G_debug(2, " coor size %" PRI_OFF_T, Map->head.size); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/plus_area.c b/lib/vector/diglib/plus_area.c index 4d8ce888d42..ed9323f3ac8 100644 --- a/lib/vector/diglib/plus_area.c +++ b/lib/vector/diglib/plus_area.c @@ -218,6 +218,7 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines, return -1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -228,6 +229,11 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines, >>>>>>> 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 (i = 0; i < n_lines; i++) { @@ -241,17 +247,23 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines, topo->left); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dig_free_area(Area); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -267,17 +279,23 @@ int dig_add_area(struct Plus_head *plus, int n_lines, plus_t *lines, topo->right); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dig_free_area(Area); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -780,6 +798,7 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines, return -1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -790,6 +809,11 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines, >>>>>>> 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 Isle->area = 0; @@ -806,17 +830,23 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines, topo->left); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dig_free_isle(Isle); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -830,17 +860,23 @@ int dig_add_isle(struct Plus_head *plus, int n_lines, plus_t *lines, topo->right); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dig_free_isle(Isle); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/plus_node.c b/lib/vector/diglib/plus_node.c index 88a2bae46ef..33a21cc192f 100644 --- a/lib/vector/diglib/plus_node.c +++ b/lib/vector/diglib/plus_node.c @@ -26,6 +26,7 @@ static double dist_squared(double, double, double, double); * Line will be negative if END node * <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * 'node' must of course already exist space will be alloced to add 'line' to ======= @@ -33,6 +34,8 @@ static double dist_squared(double, double, double, double); ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * 'node' must of course already exist space will be allocated to add 'line' to ======= * 'node' must of course already exist space will be alloced to add 'line' to @@ -41,6 +44,9 @@ static double dist_squared(double, double, double, double); * 'node' must of course already exist space will be alloced to add 'line' to >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/plus_struct.c b/lib/vector/diglib/plus_struct.c index ea1842a3888..e76a5b9f856 100644 --- a/lib/vector/diglib/plus_struct.c +++ b/lib/vector/diglib/plus_struct.c @@ -15,6 +15,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -22,12 +23,17 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #include ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -83,6 +89,7 @@ int dig_Rd_P_node(struct Plus_head *Plus, int n, struct gvfile *fp) ptr = dig_alloc_node(); ptr->n_lines = cnt; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (dig_node_alloc_line(ptr, ptr->n_lines) == -1) @@ -94,6 +101,8 @@ int dig_Rd_P_node(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (dig_node_alloc_line(ptr, ptr->n_lines) == -1) { dig_free_node(ptr); return -1; @@ -144,6 +153,9 @@ int dig_Rd_P_node(struct Plus_head *Plus, int n, struct gvfile *fp) if (ptr->n_lines) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -169,6 +181,7 @@ int dig_Rd_P_node(struct Plus_head *Plus, int n, struct gvfile *fp) return (-1); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -179,6 +192,11 @@ int dig_Rd_P_node(struct Plus_head *Plus, int n, struct gvfile *fp) >>>>>>> 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 @@ -260,6 +278,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) /* offset */ if (0 >= dig__fread_port_O(&(ptr->offset), 1, fp, Plus->off_t_size)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return (-1); ======= @@ -267,6 +286,8 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; ======= return (-1); @@ -275,6 +296,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return (-1); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -292,6 +316,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) if (0 >= dig__fread_port_P(&(topo->area), 1, fp)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return -1; ======= @@ -299,6 +324,8 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; ======= return -1; @@ -307,6 +334,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -317,6 +347,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) if (0 >= dig__fread_port_P(&(topo->N1), 1, fp)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return -1; if (0 >= dig__fread_port_P(&(topo->N2), 1, fp)) @@ -326,6 +357,8 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; if (0 >= dig__fread_port_P(&(topo->N2), 1, fp)) goto free_exit_failure; @@ -340,6 +373,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -351,11 +387,14 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) if (0 >= dig__fread_port_P(&(topo->N1), 1, fp)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; if (0 >= dig__fread_port_P(&(topo->N2), 1, fp)) goto free_exit_failure; @@ -367,6 +406,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -379,6 +421,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -389,6 +432,11 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) >>>>>>> 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 } /* faces */ @@ -398,6 +446,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) if (0 >= dig__fread_port_I(&n_edges, 1, fp)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return -1; ======= @@ -405,6 +454,8 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; ======= return -1; @@ -413,6 +464,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -422,6 +476,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) /* left / right volume */ if (0 >= dig__fread_port_P(&(topo->left), 1, fp)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return -1; if (0 >= dig__fread_port_P(&(topo->left), 1, fp)) @@ -431,6 +486,8 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; if (0 >= dig__fread_port_P(&(topo->left), 1, fp)) goto free_exit_failure; @@ -445,6 +502,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -456,6 +516,7 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) if (0 >= dig__fread_port_P(&(topo->volume), 1, fp)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return -1; ======= @@ -463,6 +524,8 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main goto free_exit_failure; ======= return -1; @@ -471,6 +534,9 @@ int dig_Rd_P_line(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -639,6 +705,7 @@ int dig_Rd_P_area(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -649,6 +716,11 @@ int dig_Rd_P_area(struct Plus_head *Plus, int n, struct gvfile *fp) >>>>>>> 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 (ptr->n_isles) { @@ -668,6 +740,7 @@ int dig_Rd_P_area(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -678,6 +751,11 @@ int dig_Rd_P_area(struct Plus_head *Plus, int n, struct gvfile *fp) >>>>>>> 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 Plus->Area[n] = ptr; @@ -774,6 +852,7 @@ int dig_Rd_P_isle(struct Plus_head *Plus, int n, struct gvfile *fp) return -1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -784,6 +863,11 @@ int dig_Rd_P_isle(struct Plus_head *Plus, int n, struct gvfile *fp) >>>>>>> 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 Plus->Isle[n] = ptr; @@ -912,6 +996,7 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) else ptr->off_t_size = 4; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (sizeof(off_t) < (size_t)ptr->off_t_size) { @@ -926,6 +1011,11 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) <<<<<<< HEAD if (sizeof(off_t) < (size_t)ptr->off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if (sizeof(off_t) < (size_t)ptr->off_t_size) { +======= >>>>>>> osgeo-main if (sizeof(off_t) < ptr->off_t_size) { <<<<<<< HEAD @@ -942,6 +1032,9 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1021,6 +1114,7 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) if (0 >= dig__fread_port_O(&(ptr->coor_size), 1, fp, ptr->off_t_size)) return (-1); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug(2, " coor size %" PRI_OFF_T, ptr->coor_size); @@ -1029,6 +1123,8 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(2, " coor size %" PRId64, ptr->coor_size); ======= G_debug(2, " coor size %" PRI_OFF_T, ptr->coor_size); @@ -1037,6 +1133,9 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) G_debug(2, " coor size %" PRI_OFF_T, ptr->coor_size); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1046,6 +1145,7 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) return (0); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1053,6 +1153,8 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /*! \brief Write Plus_head to file @@ -1072,6 +1174,9 @@ int dig_Rd_Plus_head(struct gvfile *fp, struct Plus_head *ptr) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1097,6 +1202,7 @@ int dig_Wr_Plus_head(struct gvfile *fp, struct Plus_head *ptr) /* can only happen when sizeof(off_t) == 8 */ ptr->off_t_size = 8; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } else @@ -1106,6 +1212,8 @@ int dig_Wr_Plus_head(struct gvfile *fp, struct Plus_head *ptr) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main } else if (ptr->off_t_size == 0) { /* calculate the total size of topo file to get the correct off_t_size @@ -1181,6 +1289,9 @@ int dig_Wr_Plus_head(struct gvfile *fp, struct Plus_head *ptr) ptr->off_t_size = 4; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1266,6 +1377,7 @@ int dig_Wr_Plus_head(struct gvfile *fp, struct Plus_head *ptr) if (0 >= dig__fwrite_port_O(&(ptr->coor_size), 1, fp, ptr->off_t_size)) return (-1); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_debug(2, "topo body offset %" PRI_OFF_T, dig_ftell(fp)); @@ -1274,6 +1386,8 @@ int dig_Wr_Plus_head(struct gvfile *fp, struct Plus_head *ptr) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(2, "topo body offset %" PRId64, dig_ftell(fp)); ======= G_debug(2, "topo body offset %" PRI_OFF_T, dig_ftell(fp)); @@ -1282,6 +1396,9 @@ int dig_Wr_Plus_head(struct gvfile *fp, struct Plus_head *ptr) G_debug(2, "topo body offset %" PRI_OFF_T, dig_ftell(fp)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/portable.c b/lib/vector/diglib/portable.c index 976fd48a25e..588243b014a 100644 --- a/lib/vector/diglib/portable.c +++ b/lib/vector/diglib/portable.c @@ -173,6 +173,7 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, if (Cur_Head->off_t_quick) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((size_t)nat_off_t == port_off_t_size) { ======= @@ -188,6 +189,12 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD if ((size_t)nat_off_t == port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((size_t)nat_off_t == port_off_t_size) { +======= >>>>>>> osgeo-main if (nat_off_t == port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -204,6 +211,9 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -212,6 +222,7 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, return 0; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if ((size_t)nat_off_t > port_off_t_size) { ======= @@ -227,6 +238,12 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD else if ((size_t)nat_off_t > port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + else if ((size_t)nat_off_t > port_off_t_size) { +======= >>>>>>> osgeo-main else if (nat_off_t > port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -243,6 +260,9 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -274,6 +294,7 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, } } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= @@ -289,6 +310,12 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + else if ((size_t)nat_off_t < port_off_t_size) { +======= >>>>>>> osgeo-main else if (nat_off_t < port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -305,6 +332,9 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -314,6 +344,7 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((size_t)nat_off_t >= port_off_t_size) { ======= @@ -329,6 +360,12 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD if ((size_t)nat_off_t >= port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((size_t)nat_off_t >= port_off_t_size) { +======= >>>>>>> osgeo-main if (nat_off_t >= port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -345,6 +382,9 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -375,6 +415,7 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, } } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= @@ -390,6 +431,12 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + else if ((size_t)nat_off_t < port_off_t_size) { +======= >>>>>>> osgeo-main else if (nat_off_t < port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -406,6 +453,9 @@ int dig__fread_port_O(off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -812,6 +862,7 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, if (Cur_Head->off_t_quick) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -822,6 +873,10 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main if ((size_t)nat_off_t == port_off_t_size) { if (dig_fwrite(buf, port_off_t_size, cnt, fp) == cnt) @@ -830,7 +885,10 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, else if ((size_t)nat_off_t > port_off_t_size) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -862,6 +920,9 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -881,6 +942,7 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, return 1; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= @@ -896,6 +958,12 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + else if ((size_t)nat_off_t < port_off_t_size) { +======= >>>>>>> osgeo-main else if (nat_off_t < port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -912,6 +980,9 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -921,6 +992,7 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ((size_t)nat_off_t >= port_off_t_size) { ======= @@ -936,6 +1008,12 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD if ((size_t)nat_off_t >= port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((size_t)nat_off_t >= port_off_t_size) { +======= >>>>>>> osgeo-main if (nat_off_t >= port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -952,6 +1030,9 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -968,6 +1049,7 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, return 1; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= @@ -983,6 +1065,12 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, <<<<<<< HEAD else if ((size_t)nat_off_t < port_off_t_size) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + else if ((size_t)nat_off_t < port_off_t_size) { +======= >>>>>>> osgeo-main else if (nat_off_t < port_off_t_size) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -999,6 +1087,9 @@ int dig__fwrite_port_O(const off_t *buf, size_t cnt, struct gvfile *fp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1298,6 +1389,7 @@ void dig_init_portable(struct Port_info *port, int byte_order) else port->off_t_quick = FALSE; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for (i = 0; i < (size_t)nat_off_t; i++) { @@ -1312,6 +1404,11 @@ void dig_init_portable(struct Port_info *port, int byte_order) <<<<<<< HEAD for (i = 0; i < (size_t)nat_off_t; i++) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + for (i = 0; i < (size_t)nat_off_t; i++) { +======= >>>>>>> osgeo-main for (i = 0; i < nat_off_t; i++) { <<<<<<< HEAD @@ -1328,6 +1425,9 @@ void dig_init_portable(struct Port_info *port, int byte_order) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1361,6 +1461,7 @@ int dig_set_cur_port(struct Port_info *port) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int dig__byte_order_out(void) ======= <<<<<<< HEAD @@ -1377,6 +1478,12 @@ int dig__byte_order_out(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +int dig__byte_order_out(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) int dig__byte_order_out() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1390,6 +1497,9 @@ int dig__byte_order_out(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/prune.c b/lib/vector/diglib/prune.c index 8c848c69f88..fca78a477aa 100644 --- a/lib/vector/diglib/prune.c +++ b/lib/vector/diglib/prune.c @@ -79,6 +79,7 @@ int dig_prune(struct line_pnts *points, double thresh) int n_num; /* points left */ int at_num; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int ij = 0, /* position of farest point */ ja, jd, i, j, k, n, inu, it; /* indicateur de parcours du segment */ @@ -94,6 +95,8 @@ int dig_prune(struct line_pnts *points, double thresh) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int ij = 0, /* position of farthest point */ ja, jd, i, j, k, n, inu, it; /* indicateur de parcours du segment */ @@ -122,6 +125,9 @@ int dig_prune(struct line_pnts *points, double thresh) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -206,6 +212,7 @@ int dig_prune(struct line_pnts *points, double thresh) k = 1; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else { /* No point keeped : farest point */ ======= @@ -213,6 +220,8 @@ int dig_prune(struct line_pnts *points, double thresh) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else { /* No point keeped : farthest point */ ======= else { /* No point keeped : farest point */ @@ -221,6 +230,9 @@ int dig_prune(struct line_pnts *points, double thresh) else { /* No point keeped : farest point */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -231,6 +243,7 @@ int dig_prune(struct line_pnts *points, double thresh) k = 2; /* becomes the third one. */ } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* Loding remaining points */ ======= @@ -238,6 +251,8 @@ int dig_prune(struct line_pnts *points, double thresh) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Loading remaining points */ ======= /* Loding remaining points */ @@ -246,6 +261,9 @@ int dig_prune(struct line_pnts *points, double thresh) /* Loding remaining points */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -286,6 +304,7 @@ int dig_prune(struct line_pnts *points, double thresh) if (fpdist > t) { /* We found a point to be keeped */ /* Restart from <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD farest point */ ======= @@ -293,6 +312,8 @@ int dig_prune(struct line_pnts *points, double thresh) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main farthest point */ ======= farest point */ @@ -301,6 +322,9 @@ int dig_prune(struct line_pnts *points, double thresh) farest point */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/spindex.c b/lib/vector/diglib/spindex.c index 9bc6aae01d2..4d105a1843e 100644 --- a/lib/vector/diglib/spindex.c +++ b/lib/vector/diglib/spindex.c @@ -51,17 +51,23 @@ int dig_spidx_init(struct Plus_head *Plus) remove(filename); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -72,17 +78,23 @@ int dig_spidx_init(struct Plus_head *Plus) remove(filename); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -93,17 +105,23 @@ int dig_spidx_init(struct Plus_head *Plus) remove(filename); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -114,17 +132,23 @@ int dig_spidx_init(struct Plus_head *Plus) remove(filename); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -190,17 +214,23 @@ void dig_spidx_free_nodes(struct Plus_head *Plus) close(Plus->Node_spidx->fd); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -238,17 +268,23 @@ void dig_spidx_free_lines(struct Plus_head *Plus) close(Plus->Line_spidx->fd); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -286,17 +322,23 @@ void dig_spidx_free_areas(struct Plus_head *Plus) close(Plus->Area_spidx->fd); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -334,17 +376,23 @@ void dig_spidx_free_isles(struct Plus_head *Plus) close(Plus->Isle_spidx->fd); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_free(filename); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -728,12 +776,15 @@ int dig_spidx_del_isle(struct Plus_head *Plus, int isle) * to the list */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static int _add_item(int id, const struct RTree_Rect *rect, struct ilist *list) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int _add_item(int id, const struct RTree_Rect *rect UNUSED, struct ilist *list) ======= @@ -743,6 +794,9 @@ static int _add_item(int id, const struct RTree_Rect *rect, struct ilist *list) static int _add_item(int id, const struct RTree_Rect *rect, struct ilist *list) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -829,6 +883,7 @@ int dig_select_nodes(struct Plus_head *Plus, const struct bound_box *box, if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD RTreeSearch(Plus->Node_spidx, &rect, (void *)_add_item, list); else @@ -838,6 +893,8 @@ int dig_select_nodes(struct Plus_head *Plus, const struct bound_box *box, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RTreeSearch(Plus->Node_spidx, &rect, (SearchHitCallback *)_add_item, list); else @@ -854,6 +911,9 @@ int dig_select_nodes(struct Plus_head *Plus, const struct bound_box *box, rtree_search(Plus->Node_spidx, &rect, (void *)_add_item, list, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -901,6 +961,7 @@ int dig_find_node(struct Plus_head *Plus, double x, double y, double z) node = 0; if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD RTreeSearch(Plus->Node_spidx, &rect, (void *)_add_node, &node); else @@ -910,6 +971,8 @@ int dig_find_node(struct Plus_head *Plus, double x, double y, double z) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RTreeSearch(Plus->Node_spidx, &rect, (SearchHitCallback *)_add_node, &node); else @@ -926,6 +989,9 @@ int dig_find_node(struct Plus_head *Plus, double x, double y, double z) rtree_search(Plus->Node_spidx, &rect, (void *)_add_node, &node, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -968,6 +1034,7 @@ int dig_select_lines(struct Plus_head *Plus, const struct bound_box *box, if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD RTreeSearch(Plus->Line_spidx, &rect, (void *)_add_item_with_box, list); else @@ -978,6 +1045,8 @@ int dig_select_lines(struct Plus_head *Plus, const struct bound_box *box, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RTreeSearch(Plus->Line_spidx, &rect, (SearchHitCallback *)_add_item_with_box, list); else @@ -996,6 +1065,9 @@ int dig_select_lines(struct Plus_head *Plus, const struct bound_box *box, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1060,11 +1132,14 @@ int dig_find_line_box(struct Plus_head *Plus, int line, struct bound_box *box) if (Plus->Spidx_new) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ret = RTreeSearch(Plus->Line_spidx, &rect, (SearchHitCallback *)_set_item_box, &box_id); else @@ -1075,6 +1150,9 @@ int dig_find_line_box(struct Plus_head *Plus, int line, struct bound_box *box) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1085,6 +1163,7 @@ int dig_find_line_box(struct Plus_head *Plus, int line, struct bound_box *box) &box_id, Plus); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1095,6 +1174,11 @@ int dig_find_line_box(struct Plus_head *Plus, int line, struct bound_box *box) >>>>>>> 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 ret; @@ -1143,6 +1227,7 @@ int dig_select_areas(struct Plus_head *Plus, const struct bound_box *box, if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD RTreeSearch(Plus->Area_spidx, &rect, (void *)_add_item_with_box, list); else @@ -1153,6 +1238,8 @@ int dig_select_areas(struct Plus_head *Plus, const struct bound_box *box, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RTreeSearch(Plus->Area_spidx, &rect, (SearchHitCallback *)_add_item_with_box, list); else @@ -1171,6 +1258,9 @@ int dig_select_areas(struct Plus_head *Plus, const struct bound_box *box, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1224,6 +1314,7 @@ int dig_find_area_box(struct Plus_head *Plus, int area, struct bound_box *box) if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ret = RTreeSearch(Plus->Area_spidx, &rect, (void *)_set_item_box, &box_id); @@ -1235,6 +1326,8 @@ int dig_find_area_box(struct Plus_head *Plus, int area, struct bound_box *box) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ret = RTreeSearch(Plus->Area_spidx, &rect, (SearchHitCallback *)_set_item_box, &box_id); else @@ -1255,6 +1348,9 @@ int dig_find_area_box(struct Plus_head *Plus, int area, struct bound_box *box) &box_id, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1296,6 +1392,7 @@ int dig_select_isles(struct Plus_head *Plus, const struct bound_box *box, if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD RTreeSearch(Plus->Isle_spidx, &rect, (void *)_add_item_with_box, list); else @@ -1306,6 +1403,8 @@ int dig_select_isles(struct Plus_head *Plus, const struct bound_box *box, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main RTreeSearch(Plus->Isle_spidx, &rect, (SearchHitCallback *)_add_item_with_box, list); else @@ -1324,6 +1423,9 @@ int dig_select_isles(struct Plus_head *Plus, const struct bound_box *box, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1377,6 +1479,7 @@ int dig_find_isle_box(struct Plus_head *Plus, int isle, struct bound_box *box) if (Plus->Spidx_new) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ret = RTreeSearch(Plus->Isle_spidx, &rect, (void *)_set_item_box, &box_id); @@ -1388,6 +1491,8 @@ int dig_find_isle_box(struct Plus_head *Plus, int isle, struct bound_box *box) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ret = RTreeSearch(Plus->Isle_spidx, &rect, (SearchHitCallback *)_set_item_box, &box_id); else @@ -1408,6 +1513,9 @@ int dig_find_isle_box(struct Plus_head *Plus, int isle, struct bound_box *box) &box_id, Plus); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/spindex_rw.c b/lib/vector/diglib/spindex_rw.c index 6a66851868b..0d43d018f53 100644 --- a/lib/vector/diglib/spindex_rw.c +++ b/lib/vector/diglib/spindex_rw.c @@ -65,6 +65,7 @@ int dig_Wr_spidx_head(struct gvfile *fp, struct Plus_head *ptr) if (sizeof(off_t) > 4) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -75,6 +76,10 @@ int dig_Wr_spidx_head(struct gvfile *fp, struct Plus_head *ptr) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main off_t size; @@ -86,7 +91,10 @@ int dig_Wr_spidx_head(struct gvfile *fp, struct Plus_head *ptr) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -125,6 +133,9 @@ int dig_Wr_spidx_head(struct gvfile *fp, struct Plus_head *ptr) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -803,6 +814,7 @@ static off_t rtree_write_from_memory(struct gvfile *fp, off_t startpos, if (G_ftell(fp->file) != nextfreepos) G_fatal_error("Unable to write spatial index. " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Wrong node position (%" PRI_OFF_T ") in file (should be %" PRI_OFF_T ").", @@ -811,6 +823,8 @@ static off_t rtree_write_from_memory(struct gvfile *fp, off_t startpos, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Wrong node position (%" PRId64 ") in file (should be %" PRId64 ").", ======= @@ -822,6 +836,9 @@ static off_t rtree_write_from_memory(struct gvfile *fp, off_t startpos, ") in file (should be %" PRI_OFF_T ").", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -943,6 +960,7 @@ static off_t rtree_write_from_file(struct gvfile *fp, off_t startpos, if (G_ftell(fp->file) != nextfreepos) G_fatal_error("Unable to write spatial index. " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Wrong node position (%" PRI_OFF_T ") in file (should be %" PRI_OFF_T ").", @@ -951,6 +969,8 @@ static off_t rtree_write_from_file(struct gvfile *fp, off_t startpos, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Wrong node position (%" PRId64 ") in file (should be %" PRId64 ").", ======= @@ -962,6 +982,9 @@ static off_t rtree_write_from_file(struct gvfile *fp, off_t startpos, ") in file (should be %" PRI_OFF_T ").", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1262,10 +1285,15 @@ static void rtree_load_from_sidx(struct gvfile *fp, off_t rootpos, if (t->fd > -1) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main rtree_load_to_file(fp, rootpos, t, off_t_size); else @@ -1275,12 +1303,15 @@ static void rtree_load_from_sidx(struct gvfile *fp, off_t rootpos, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rtree_load_to_file(fp, rootpos, t, off_t_size); else rtree_load_to_memory(fp, rootpos, t, off_t_size); ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return rtree_load_to_file(fp, rootpos, t, off_t_size); else @@ -1306,6 +1337,9 @@ static void rtree_load_from_sidx(struct gvfile *fp, off_t rootpos, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/diglib/struct_alloc.c b/lib/vector/diglib/struct_alloc.c index e1fa47290b4..79703192d5a 100644 --- a/lib/vector/diglib/struct_alloc.c +++ b/lib/vector/diglib/struct_alloc.c @@ -29,6 +29,7 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD struct P_node *dig_alloc_node(void) ======= <<<<<<< HEAD @@ -45,6 +46,12 @@ struct P_node *dig_alloc_node(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +struct P_node *dig_alloc_node(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) struct P_node *dig_alloc_node() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -58,6 +65,9 @@ struct P_node *dig_alloc_node(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -159,6 +169,7 @@ int dig_alloc_nodes(struct Plus_head *Plus, int add) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD struct P_line *dig_alloc_line(void) ======= <<<<<<< HEAD @@ -175,6 +186,12 @@ struct P_line *dig_alloc_line(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +struct P_line *dig_alloc_line(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) struct P_line *dig_alloc_line() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -188,6 +205,9 @@ struct P_line *dig_alloc_line(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -331,6 +351,7 @@ int dig_alloc_isles(struct Plus_head *Plus, int add) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD struct P_area *dig_alloc_area(void) ======= <<<<<<< HEAD @@ -347,6 +368,12 @@ struct P_area *dig_alloc_area(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +struct P_area *dig_alloc_area(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) struct P_area *dig_alloc_area() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -360,6 +387,9 @@ struct P_area *dig_alloc_area(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -399,6 +429,7 @@ void dig_free_area(struct P_area *Area) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD struct P_isle *dig_alloc_isle(void) ======= <<<<<<< HEAD @@ -415,6 +446,12 @@ struct P_isle *dig_alloc_isle(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +struct P_isle *dig_alloc_isle(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) struct P_isle *dig_alloc_isle() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -428,6 +465,9 @@ struct P_isle *dig_alloc_isle(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -618,16 +658,22 @@ int dig_isle_alloc_line(struct P_isle *isle, int add) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int dig_out_of_memory(void) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/neta/flow.c b/lib/vector/neta/flow.c index d1055f4ae32..845948807d1 100644 --- a/lib/vector/neta/flow.c +++ b/lib/vector/neta/flow.c @@ -176,6 +176,7 @@ int NetA_flow(dglGraph_s *graph, struct ilist *source_list, */ int NetA_min_cut(dglGraph_s *graph, struct ilist *source_list, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct ilist *sink_list, int *flow, struct ilist *cut) ======= @@ -183,6 +184,8 @@ int NetA_min_cut(dglGraph_s *graph, struct ilist *source_list, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct ilist *sink_list UNUSED, int *flow, struct ilist *cut) ======= struct ilist *sink_list, int *flow, struct ilist *cut) @@ -191,6 +194,9 @@ int NetA_min_cut(dglGraph_s *graph, struct ilist *source_list, struct ilist *sink_list, int *flow, struct ilist *cut) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/neta/timetables.c b/lib/vector/neta/timetables.c index 242be7735a6..4fbb590844e 100644 --- a/lib/vector/neta/timetables.c +++ b/lib/vector/neta/timetables.c @@ -342,6 +342,7 @@ static neta_heap_data *new_heap_data(int conns, int v) */ void NetA_update_dijkstra(int old_conns, int new_conns, int to, int new_dst, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int v, int route, int rows, int update, ======= @@ -349,6 +350,8 @@ void NetA_update_dijkstra(int old_conns, int new_conns, int to, int new_dst, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int v, int route, int rows UNUSED, int update, ======= int v, int route, int rows, int update, @@ -357,6 +360,9 @@ void NetA_update_dijkstra(int old_conns, int new_conns, int to, int new_dst, int v, int route, int rows, int update, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/rtree/docs/README.grass b/lib/vector/rtree/docs/README.grass index ed42c7242a9..6928544ea84 100644 --- a/lib/vector/rtree/docs/README.grass +++ b/lib/vector/rtree/docs/README.grass @@ -15,16 +15,22 @@ Changes done in GRASS: index.c:277: warning: `tmp_nptr' might be used uninitialized in this function <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main were left because need deeper revision if may cause problems, instead of blindly init to 0/NULL ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/rtree/index.c b/lib/vector/rtree/index.c index 84bc5cfc42a..e3b35f78073 100644 --- a/lib/vector/rtree/index.c +++ b/lib/vector/rtree/index.c @@ -279,6 +279,7 @@ void RTreeDestroyTree(struct RTree *t) /*! \brief Search an R*-Tree +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Search in an RTree for all data retangles that overlap or touch the @@ -287,6 +288,8 @@ void RTreeDestroyTree(struct RTree *t) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Search in an RTree for all data rectangles that overlap or touch the ======= Search in an RTree for all data retangles that overlap or touch the @@ -295,6 +298,9 @@ void RTreeDestroyTree(struct RTree *t) Search in an RTree for all data retangles that overlap or touch the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/rtree/node.c b/lib/vector/rtree/node.c index 5565b981e4e..9798757e443 100644 --- a/lib/vector/rtree/node.c +++ b/lib/vector/rtree/node.c @@ -292,6 +292,7 @@ void RTreeDestroyNode(struct RTree_Node *n, int nodes) { int i; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (n->level > 0) { /* it is not leaf -> destroy childs */ @@ -300,6 +301,8 @@ void RTreeDestroyNode(struct RTree_Node *n, int nodes) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (n->level > 0) { /* it is not leaf -> destroy children */ ======= if (n->level > 0) { /* it is not leaf -> destroy childs */ @@ -308,6 +311,9 @@ void RTreeDestroyNode(struct RTree_Node *n, int nodes) if (n->level > 0) { /* it is not leaf -> destroy childs */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/rtree/rtree.h b/lib/vector/rtree/rtree.h index 10a0ef2010f..ebf6e24d502 100644 --- a/lib/vector/rtree/rtree.h +++ b/lib/vector/rtree/rtree.h @@ -150,6 +150,7 @@ struct RTree { struct _recycle { int avail; /* number of available positions */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int alloc; /* number of allcoated positions in *pos */ ======= @@ -157,6 +158,8 @@ struct RTree { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int alloc; /* number of allocated positions in *pos */ ======= int alloc; /* number of allcoated positions in *pos */ @@ -165,6 +168,9 @@ struct RTree { int alloc; /* number of allcoated positions in *pos */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/vedit/break.c b/lib/vector/vedit/break.c index 7f6f1b3a285..cbbe4c52f7d 100644 --- a/lib/vector/vedit/break.c +++ b/lib/vector/vedit/break.c @@ -226,6 +226,7 @@ int Vedit_connect_lines(struct Map_info *Map, struct ilist *List, double thresh) int connect_lines(struct Map_info *Map, int first, int line_from, int line_to, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double thresh, struct ilist *List) ======= @@ -233,6 +234,8 @@ int connect_lines(struct Map_info *Map, int first, int line_from, int line_to, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double thresh, struct ilist *List UNUSED) ======= double thresh, struct ilist *List) @@ -241,6 +244,9 @@ int connect_lines(struct Map_info *Map, int first, int line_from, int line_to, double thresh, struct ilist *List) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/vedit/extend.c b/lib/vector/vedit/extend.c index 54cd4d4b16b..6f709196918 100644 --- a/lib/vector/vedit/extend.c +++ b/lib/vector/vedit/extend.c @@ -151,6 +151,7 @@ int Vedit_extend_lines(struct Map_info *Map, struct ilist *List, int nodes, int extend_lines(struct Map_info *Map, int first, int line_from, int line_to, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int parallel, double thresh, struct ilist *List) ======= @@ -158,6 +159,8 @@ int extend_lines(struct Map_info *Map, int first, int line_from, int line_to, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int parallel, double thresh, struct ilist *List UNUSED) ======= int parallel, double thresh, struct ilist *List) @@ -166,6 +169,9 @@ int extend_lines(struct Map_info *Map, int first, int line_from, int line_to, int parallel, double thresh, struct ilist *List) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/vedit/merge.c b/lib/vector/vedit/merge.c index 0283ac83256..88b7cdb5855 100644 --- a/lib/vector/vedit/merge.c +++ b/lib/vector/vedit/merge.c @@ -222,6 +222,7 @@ static int merge_lines(struct line_pnts *Points1, struct line_cats *Cats1, /* find mininal distance and its index */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -232,6 +233,11 @@ static int merge_lines(struct line_pnts *Points1, struct line_cats *Cats1, >>>>>>> 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 mindist = Vedit_get_min_distance(Points1, Points2, 0, /* TODO 3D */ &mindistidx); diff --git a/lib/vector/vedit/render.c b/lib/vector/vedit/render.c index fc8ca248a30..05cee6429aa 100644 --- a/lib/vector/vedit/render.c +++ b/lib/vector/vedit/render.c @@ -35,6 +35,7 @@ static struct _state { static struct robject *draw_line(struct Map_info *, int, int); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD static struct robject *draw_line_vertices(void); ======= <<<<<<< HEAD @@ -48,6 +49,11 @@ static struct robject *draw_line_vertices(void); static struct robject *draw_line_vertices(void); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +static struct robject *draw_line_vertices(void); +======= +>>>>>>> osgeo-main static struct robject *draw_line_vertices(); <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63,6 +69,9 @@ static struct robject *draw_line_vertices(void); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/vedit/select.c b/lib/vector/vedit/select.c index 719b92f58cd..b7d8f73b43b 100644 --- a/lib/vector/vedit/select.c +++ b/lib/vector/vedit/select.c @@ -35,6 +35,7 @@ static int merge_lists(struct ilist *alist, struct ilist *blist); \param Map pointer to Map_info \param type feature type <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param layer layer number ======= @@ -42,6 +43,8 @@ static int merge_lists(struct ilist *alist, struct ilist *blist); ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main \param layer layer number (unused) ======= \param layer layer number @@ -50,6 +53,9 @@ static int merge_lists(struct ilist *alist, struct ilist *blist); \param layer layer number >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -61,12 +67,15 @@ static int merge_lists(struct ilist *alist, struct ilist *blist); */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int Vedit_select_by_query(struct Map_info *Map, int type, int layer, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int Vedit_select_by_query(struct Map_info *Map, int type, int layer UNUSED, ======= int Vedit_select_by_query(struct Map_info *Map, int type, int layer, @@ -75,6 +84,9 @@ int Vedit_select_by_query(struct Map_info *Map, int type, int layer, int Vedit_select_by_query(struct Map_info *Map, int type, int layer, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/lib/vector/vedit/vertex.c b/lib/vector/vedit/vertex.c index 6b9c0c7ba66..30ebf761823 100644 --- a/lib/vector/vedit/vertex.c +++ b/lib/vector/vedit/vertex.c @@ -161,11 +161,14 @@ int Vedit_move_vertex(struct Map_info *Map, struct Map_info **BgMap, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -185,6 +188,9 @@ int Vedit_move_vertex(struct Map_info *Map, struct Map_info **BgMap, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -281,11 +287,14 @@ int Vedit_add_vertex(struct Map_info *Map, struct ilist *List, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -305,6 +314,9 @@ int Vedit_add_vertex(struct Map_info *Map, struct ilist *List, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/Makefile b/locale/Makefile index beceed0ebe3..60b1c8f955f 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -57,7 +57,7 @@ pot: @echo "Generating $(WXPYDOMAIN)..." xgettext --from-code=utf-8 --keyword=_ --keyword=n_:1,2 -cGTC -o ./templates/$(WXPYDOMAIN).pot `$(WXPY_POTFILES)` -#merge already existing translations with new messages in POT template file and create new po files: +#merge already existing translations with new messages in POT template file, deduplicate it and create new po files: update-po: @for i in $(DOMAINS) ; do \ if [ "`ls ./po/$$i\_*.po 2>/dev/null`" = "" ] ; then \ @@ -72,7 +72,8 @@ update-po: lingua=`basename $$suffix .po`; \ prefix=`echo $$po | cut -d'_' -f1`; \ if msgmerge -o $$prefix\_$$suffix.new $$prefix\_$$suffix ../templates/$$prefix.pot; then\ - mv $$prefix\_$$suffix.new $$prefix\_$$suffix; \ + msguniq --use-first $$prefix\_$$suffix.new > $$prefix\_$$suffix; \ + rm -f $$prefix\_$$suffix.new; \ echo "Merged new messages into $$prefix\_$$suffix" ; \ else \ echo "Merging failed"; \ diff --git a/locale/po/grasslibs_ar.po b/locale/po/grasslibs_ar.po index 128fdee8513..314cf3dea01 100644 --- a/locale/po/grasslibs_ar.po +++ b/locale/po/grasslibs_ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:50+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Arabic since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4359,12 +4359,12 @@ msgstr "'%s' لم يمكن فتح ملف التاريخ للفيكتور" msgid "WARNING" msgstr "تحذير:" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 #, fuzzy msgid "Exiting..." msgstr " : توصيل اشباه المراكز" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 #, fuzzy msgid "Usage" msgstr "" @@ -4372,20 +4372,20 @@ msgstr "" "الإستخدام:\n" " " -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4420,145 +4420,154 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 +#: ../lib/init/grass.py:387 #, fuzzy msgid "initial GRASS database directory" msgstr "أسفا<%s> ليس إختيار صحيح\n" -#: ../lib/init/grass.py:387 -msgid "directory containing Locations" +#: ../lib/init/grass.py:388 +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:388 +#: ../lib/init/grass.py:389 #, fuzzy -msgid "initial GRASS Location" +msgid "initial GRASS project (location)" msgstr "أسفا<%s> ليس إختيار صحيح\n" -#: ../lib/init/grass.py:390 +#: ../lib/init/grass.py:391 msgid "" -"directory containing Mapsets with one common coordinate system (projection)" -msgstr "" - -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" -msgstr "" +#, fuzzy +msgid "initial GRASS mapset" +msgstr "أسفا<%s> ليس إختيار صحيح\n" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, fuzzy, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr " [%s] غير قادر على أنشاء ملف عنوان رئيسى ل" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, fuzzy, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "لم يمكن توفير ذاكرة كافية\n" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, fuzzy, python-format msgid "GUI <%s> not supported in this version" msgstr "الشكل المطلوب غير متاح فى هذا الأصدار" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4566,88 +4575,87 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." -msgstr "" +"Unable to create new project because the project <{location}> already exists." +msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/init/grass.py:994 -#, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." -msgstr "" +#: ../lib/init/grass.py:995 +#, fuzzy, python-brace-format +msgid "Unable to create new project <{location}> because <{path}> is a file." +msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." -msgstr "" +msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/init/grass.py:1004 -#, python-brace-format +#: ../lib/init/grass.py:1005 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." -msgstr "" +"Unable to create new project in the directory <{path}> for an unknown reason." +msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 #, fuzzy msgid "Mapset <{}> already exists." msgstr "'%s' لم يمكن فتح ملف التاريخ للفيكتور" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" -msgstr "" +#: ../lib/init/grass.py:1133 +#, fuzzy +msgid "Provide CRS to create a project" +msgstr "لم يتم انشاء عملية جديدة" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, fuzzy, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4658,22 +4666,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4683,217 +4691,221 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 #, fuzzy msgid "Building user fontcap..." msgstr "يتم الان بناء الطبولوجى ...\n" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 #, fuzzy msgid "The SHELL variable is not set" msgstr "GISRC - المتغير لم يحدد بشكل صحيح" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, fuzzy, python-format msgid "Executing <%s> ..." msgstr " : توصيل اشباه المراكز" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, fuzzy, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "فشل الإتصال\n" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, fuzzy, python-format msgid "Execution of <%s> finished." msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, fuzzy, python-brace-format msgid "Unable to close GUI. {0}" msgstr " %s لم يمكن فتح" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 #, fuzzy msgid "Done." msgstr "لاشىء" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, fuzzy, python-format msgid "Parameter <%s> not supported" msgstr "غير موجود'%s' الفيكتور" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, fuzzy, python-format msgid "Failed to start shell '%s'" msgstr "لم يمكن فتحه %s فى %s" @@ -5018,7 +5030,7 @@ msgid "Unable to position file" msgstr "لم يمكن فتحه %s فى %s" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, fuzzy, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr " [%s] غير قادر على أنشاء ملف عنوان رئيسى ل" @@ -5039,7 +5051,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -7366,8 +7377,8 @@ msgstr "%s: لم يمكن فتح ملف الطبوغرافية للكتابة\n #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -8098,7 +8109,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, fuzzy, c-format msgid "Unable to open OGR data source '%s'" msgstr " [%s] غير قادر على أنشاء ملف عنوان رئيسى ل" @@ -9123,37 +9134,37 @@ msgstr "لم تحدد قاعدة البيانات الأساس" msgid "Requested dblink %d, maximum link number %d" msgstr "رابط قاعدة البيانات المطلوب %d, القيمة العظمى للرابط %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, fuzzy, c-format msgid "Error in rule on row %d in <%s>" msgstr " %s فى %d خطا فى القاعدة على الصف" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, fuzzy, c-format msgid "Unable to open OGR layer <%s>" msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 #, fuzzy msgid "Unknown vector map format" msgstr "مسقط غير معروف" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, fuzzy, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "'%s' لم يمكن فتح ملف التاريخ للفيكتور" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 #, fuzzy msgid "Bug: attempt to update map which is not in current mapset" msgstr "خطأ: محاولة لتحديث خريطة ليست ضمن مجموعة الخرائط الحالية" @@ -9698,31 +9709,31 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, fuzzy, c-format msgid "Unable to delete node %d from spatial index" msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, fuzzy, c-format msgid "Unable to delete line %d from spatial index" msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 #, fuzzy msgid "Attempt to delete sidx for dead area" msgstr "%s: لم يمكن فتح ملف الطبوغرافية للكتابة\n" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, fuzzy, c-format msgid "Unable to delete area %d from spatial index" msgstr "لم يمكن فتحه %s فى %s" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, fuzzy, c-format msgid "Unable to delete isle %d from spatial index" msgstr "لم يمكن فتحه %s فى %s" @@ -9740,21 +9751,21 @@ msgstr "لم يمكن فتحه %s فى %s" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -9853,44 +9864,44 @@ msgstr "غير موجود'%s' الفيكتور" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, fuzzy, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "لم يمكن فتح ملف مؤقت" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, fuzzy, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "%s: لم يمكن فتح ملف الطبوغرافية للكتابة\n" @@ -9947,8 +9958,8 @@ msgstr "" #, fuzzy, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "[%s فى %s]لم يمكن انشاء ملف العنوان الرئيسى" #, fuzzy, c-format @@ -10313,8 +10324,8 @@ msgstr "" #, fuzzy, python-format #~ msgid "" -#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset <" -#~ "%(base)s>" +#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset " +#~ "<%(base)s>" #~ msgstr "خطأ: محاولة لتحديث خريطة ليست ضمن مجموعة الخرائط الحالية" #, fuzzy, python-format diff --git a/locale/po/grasslibs_bn.po b/locale/po/grasslibs_bn.po index 35dbd992da1..ca70bbff6c0 100644 --- a/locale/po/grasslibs_bn.po +++ b/locale/po/grasslibs_bn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_bn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:50+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bengali since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4597,28 +4597,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4652,143 +4652,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4796,87 +4804,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4887,22 +4893,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4912,214 +4918,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5236,7 +5246,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5257,7 +5267,6 @@ msgid "Error in cache" msgstr "ক্যাশে ত্রুটি" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8661,8 +8670,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9363,7 +9372,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -10320,36 +10329,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10871,30 +10880,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10911,21 +10920,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11015,44 +11024,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_cs.po b/locale/po/grasslibs_cs.po index 769534f0689..88ad64e5b8e 100644 --- a/locale/po/grasslibs_cs.po +++ b/locale/po/grasslibs_cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_cs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-05-05 10:08+0000\n" "Last-Translator: Markus \n" "Language-Team: Czech >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/mapset.c:38 msgid "MAPSET is not set" msgstr "MAPSET není nastaven" @@ -3964,6 +3967,9 @@ msgstr "<%s> v mapsetu <%s>" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4745,11 +4751,11 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" -"Nelze otevřít rastrovou mapu <%s@%s>, jelikož se jedná o reklasifikaci mapy<" -"%s@%s>, která neexistuje" +"Nelze otevřít rastrovou mapu <%s@%s>, jelikož se jedná o reklasifikaci " +"mapy<%s@%s>, která neexistuje" #: ../lib/raster/open.c:197 #, c-format @@ -5268,28 +5274,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5323,143 +5329,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5467,87 +5481,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5558,22 +5570,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5583,214 +5595,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5907,7 +5923,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5928,7 +5944,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -9338,8 +9353,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9377,6 +9392,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9388,6 +9404,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -10066,7 +10087,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Nelze otevřít zdroj dat OGR '%s'" @@ -11039,36 +11060,36 @@ msgstr "Výchozí databáze není nastavena" msgid "Requested dblink %d, maximum link number %d" msgstr "Požadovaný dblink %d, maximální počet spojení %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "Bug: pokus o aktualizaci mapy, která není v aktuálním mapsetu." @@ -11591,30 +11612,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Nelze smazat uzel %d z prostorového indexu" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Nelze smazat linii %d z prostorového indexu" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Pokus o odstranění sidx mrtvé plochy" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Nelze smazat plochu %d z prostorového indexu" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Nelze smazat ostrov %d z prostorového indexu" @@ -11631,21 +11652,21 @@ msgstr "nelze načíst soubor do paměti, sobor není otevřen" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Vemód vektorové paměti není podporován, použiji 'AUTO'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11737,44 +11758,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "Linie %d má již na levé straně plochu/ostrov %d" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "Linie %d má již na pravé straně plochu/ostrov %d" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Pokus o odstraněné ostrova z mrtvé plochy" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Pokus o odstranění neregistrovaného ostrova %d z plochy %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Pokus o odstranění mrtvé plochy" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "Mrtvý centroid %d registrován k ploše (chyba ve vektorové knihovně)." -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Pokus o odstranění informace o ploše %d z mrtvého ostrova %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Pokus o odstranění informace o ostrově %d z mrtvé plochy %d" @@ -11866,6 +11887,7 @@ msgstr "[%s]: Neznámá barva" #~ msgid "Unable to load GDAL library" #~ msgstr "Nelze načíst GDAL knihovnu" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -11923,6 +11945,8 @@ msgstr "Svrchní hodnota musí být větší, než spodní." <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, c-format #~ msgid "Datum <%s> not recognised by GRASS and no parameters found" #~ msgstr "" @@ -11947,13 +11971,13 @@ msgstr "Svrchní hodnota musí být větší, než spodní." #~ msgid "Fixing subtle input data rounding error of west boundary (%g>%g)" #~ msgstr "" -#~ "Ošetřuji příliš podrobná vstupní data zaokrouhlením západní hranice (%g>" -#~ "%g)" +#~ "Ošetřuji příliš podrobná vstupní data zaokrouhlením západní hranice " +#~ "(%g>%g)" #~ msgid "Fixing subtle input data rounding error of east boundary (%g>%g)" #~ msgstr "" -#~ "Ošetřuji příliš podrobná vstupní data zaokrouhlením východní hranice (%g>" -#~ "%g)" +#~ "Ošetřuji příliš podrobná vstupní data zaokrouhlením východní hranice " +#~ "(%g>%g)" #, fuzzy #~ msgid "No centroid defined for area %d. Area not exported." @@ -12175,6 +12199,9 @@ msgstr "Svrchní hodnota musí být větší, než spodní." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_de.po b/locale/po/grasslibs_de.po index aefdcc78f97..4ecfbcec3ed 100644 --- a/locale/po/grasslibs_de.po +++ b/locale/po/grasslibs_de.po @@ -13,13 +13,21 @@ msgstr "" "Project-Id-Version: grasslibs_de\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD +======= +"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" ======= "POT-Creation-Date: 2021-02-17 23:13-0500\n" "PO-Revision-Date: 2022-05-23 10:50+0000\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31,6 +39,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -41,11 +54,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "X-Generator: Weblate 5.0\n" #: ../lib/nviz/render.c:43 @@ -53,6 +69,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -651,6 +670,7 @@ msgstr "" "möglich." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -662,6 +682,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -693,17 +718,23 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to set current context (CGL error = %d)" msgstr "" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -715,6 +746,7 @@ msgstr "" "reduziert. Verwende dennoch die Wahrscheinlichkeiten für %i Klassen. " <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -726,6 +758,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -1657,8 +1694,8 @@ msgstr "Ignoriere %d Punkte (zu dicht)." #: ../lib/rst/interp_float/vinput2d.c:273 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" "%d Punkte, die (nach Ausdünnung) zur Verfügung stehen, sind weniger als die " "angegebenen NPMIN=%d." @@ -2041,7 +2078,7 @@ msgstr "" #: ../lib/vector/Vlib/read_ogr.c:157 ../lib/vector/Vlib/read_ogr.c:239 #: ../lib/vector/Vlib/write_ogr.c:70 ../lib/vector/Vlib/write_ogr.c:105 #: ../lib/vector/Vlib/write_ogr.c:146 ../lib/vector/Vlib/rewind_ogr.c:47 -#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:732 +#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:751 #: ../lib/vector/Vlib/build_sfa.c:720 msgid "GRASS is not compiled with OGR support" msgstr "" @@ -2604,6 +2641,7 @@ msgstr "" "quiet." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2615,6 +2653,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -2790,17 +2833,23 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "G__open(read): mapset <%s> doesn't match xmapset <%s>" msgstr "G__open(read): mapset <%s> passt nicht zu xmapset <%s>." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2813,6 +2862,7 @@ msgstr "" "entwirren." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2824,6 +2874,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -3707,7 +3762,7 @@ msgid "SYNOPSIS" msgstr "SYNOPSIS" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "Flags" @@ -3717,7 +3772,7 @@ msgid "Force launching GUI dialog" msgstr "" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "Parameter" @@ -3791,6 +3846,7 @@ msgstr "Datenbank Schema" #: ../lib/gis/parser_standard_options.c:198 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3802,6 +3858,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 "" @@ -3953,6 +4014,7 @@ msgstr "" #: ../lib/gis/parser_standard_options.c:454 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3964,6 +4026,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -3979,6 +4046,7 @@ msgstr "" #: ../lib/gis/parser_standard_options.c:474 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3990,6 +4058,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)" @@ -4126,11 +4199,12 @@ msgid "'.' for current mapset" msgstr "'.' für aktuellen Mapset" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +#, fuzzy +msgid "Project (location) name" msgstr "Name der Location" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +msgid "Project name (not path to project)" msgstr "" #: ../lib/gis/parser_standard_options.c:712 @@ -4239,6 +4313,7 @@ msgstr "" #: ../lib/gis/parser_standard_options.c:917 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4250,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 msgid "" "WHERE conditions of SQL statement without 'where' keyword used in the " "temporal GIS framework" @@ -4422,6 +4502,7 @@ msgid "" "range." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4433,6 +4514,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 @@ -4504,6 +4590,10 @@ msgid "" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -4708,6 +4798,7 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Neither %s (managed by d.mon command) nor %s (used for direct rendering) " "defined" @@ -5002,15 +5093,23 @@ msgstr "Kann %s nicht zum Schreiben öffnen." >>>>>>> osgeo-main ======= >>>>>>> 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" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) #: ../lib/gis/view.c:254 ../lib/gis/view.c:471 @@ -5050,6 +5149,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5293,6 +5395,7 @@ msgstr "" msgid "Invalid timestamp file for vector map <%s@%s>" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -5300,6 +5403,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/timestamp.c:525 #, c-format msgid "Unable to create timestamp file for vector map <%s@%s>" @@ -5360,6 +5465,9 @@ msgstr "Variable '%s' nicht gesetzt" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5417,6 +5525,7 @@ msgid "" "to rebuild topology or upgrade GRASS to at least version %d." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5428,12 +5537,18 @@ 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:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format <<<<<<< 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." @@ -5442,10 +5557,12 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to make mapset element %s (%s): %s" msgstr "Kann das Mapset Element %s (%s) nicht erzeugen: %s." -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "Kann auf das Mapset Element %s (%s) nicht zugreifen: %s." @@ -5464,6 +5581,9 @@ msgid "" "vector. Consider to rebuild topology or upgrade GRASS." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5473,6 +5593,7 @@ msgstr "" #, c-format <<<<<<< 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." @@ -5481,6 +5602,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "ZLIB decompression error %d: %s" ======= msgid "" @@ -5493,6 +5616,9 @@ msgid "" "rebuild topology using v.build or v.build.all module." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5516,17 +5642,23 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "gettimeofday failed: %s" msgstr "gettimeofday fehlgeschlagen: %s" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5538,6 +5670,7 @@ msgstr "" "lesen: Knoten %d, Linie %d" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5549,6 +5682,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -5833,11 +5971,14 @@ msgid "" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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." @@ -5847,6 +5988,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11252,6 +11396,7 @@ msgid "" "previous step failed and created an incomplete raster map." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11263,6 +11408,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 @@ -11757,8 +11907,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Kann die Rasterkarte <%s@%s> nicht öffnen, weil es eine Reklassifizierung " "der Rasterkarte <%s@%s> ist, welche nicht existiert." @@ -11892,6 +12042,7 @@ msgstr "" #: ../lib/raster/set_window.c:131 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11903,6 +12054,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -12283,28 +12439,28 @@ msgstr "" msgid "WARNING" msgstr "WARNUNG:" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "Beende..." -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "Benutzung" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -12338,143 +12494,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "Leere RC Datei ({file})" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -12482,87 +12646,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "Ein neues Mapset kann mit dem Flag '-c' erstellt werden." -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -12573,22 +12735,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -12603,7 +12765,7 @@ msgstr "" "dass Sie für diesen Vorgang eine Berechtigung benötigen). Werfen Sie " "sicherheitshalber noch einmal einen Blick in den Prozessor-Manager..." -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -12612,207 +12774,211 @@ msgstr "" "%(user)s führt derzeit GRASS im ausgewählten Mapset aus (Datei %(file)s " "gefunden). Erzwingt den Start von GRASS..." -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "Erstellen von Benutzer-Schriftarten..." -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "GRASS GIS Webseite" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "2D und 3D Raster MASKs vorhanden" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "3D-Raster MASK vorhanden" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Erledigt." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -12931,7 +13097,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -12952,7 +13118,6 @@ msgid "Error in cache" msgstr "Fehler im Cache" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Hinzufügung der Regel: %lf - %lf" @@ -13329,6 +13494,7 @@ msgstr "Kann Datei mit Kontrollpunkten der Gruppe [%s in %s] nicht erzeugen." #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -13341,6 +13507,11 @@ msgstr "Untergruppe <%s> der Gruppe <%s> ist leer\n" >>>>>>> osgeo-main ======= >>>>>>> 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." @@ -13634,6 +13805,7 @@ msgstr "" "Feature/Offset %lu in Vektorkarte <%s> kann nicht wiederhergestellt werden." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -13645,6 +13817,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -13709,6 +13886,7 @@ msgid "ERROR: <%s> is not a valid GRASS location" msgstr "FEHLER: <%s> ist keine gültige GRASS location" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -13720,6 +13898,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 @@ -13731,6 +13914,7 @@ msgstr "" msgid "Unable to write into category raster condition file <%s>." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -13738,6 +13922,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/imagery/iscatt_core.c:250 #, c-format msgid "Unable to open category raster conditions file <%s>." @@ -13751,6 +13937,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -13761,6 +13950,7 @@ msgid "Vector map <%s> is not opened on topology level" msgstr "Vektorkarte <%s> ist nicht im Topologielevel geöffnet." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -13772,12 +13962,18 @@ 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 msgid "Resolutions of patch <%s> and patched file <%s> are not same." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Removing empty 3D raster maps" @@ -13787,6 +13983,8 @@ msgstr "Entfernen der leeren 3D Rasterkarte" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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)" @@ -13800,6 +13998,9 @@ msgid "Removing empty 3D raster maps" msgstr "Entfernen der leeren 3D Rasterkarte" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14906,8 +15107,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -15624,7 +15825,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Kann die OGR-Datenquelle '%s' nicht öffnen." @@ -16184,6 +16385,7 @@ msgstr "Vect_new_cats_struct(): Nicht genügend Arbeitsspeicher." msgid "Too many categories (%d), unable to set cat %d (layer %d)" msgstr "Zuviele Kategorien (%d), kann cat %d (Layer %d) nicht setzen." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -16191,6 +16393,8 @@ msgstr "Zuviele Kategorien (%d), kann cat %d (Layer %d) nicht setzen." ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/vector/Vlib/cats.c:420 #, c-format msgid "Unable to convert category string '%s' (from '%s') to category range" @@ -16201,6 +16405,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16212,6 +16419,7 @@ msgstr "" "sollte für die GRASS 6 Vector Library aktualisiert werden)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -16223,6 +16431,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -16282,6 +16495,7 @@ msgstr "" "Ungültiger Name der Vektorkarte <%s>. SQL-Schlüsselwort darf nicht als " "Vektorkartenname benutzt werden." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -16342,6 +16556,8 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen." <<<<<<< HEAD ======= >>>>>>> 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)" @@ -16696,36 +16912,36 @@ msgstr "Standard-Datenbank ist nicht angegeben." msgid "Requested dblink %d, maximum link number %d" msgstr "Angeforderte Datenbankverknüpfung %d, maximale Verknüpfungsanzahl %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" "Bug: Versuch eine Karte zu aktualisieren, die nicht im aktuellen Mapset ist." @@ -17256,30 +17472,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Kann den Knoten %d nicht aus dem räumlichen Index löschen." -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Kann die Linie %d nicht aus dem räumlichen Index löschen." -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Versuche sidx einer toten Fläche zu löschen." -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Kann die Fläche %d nicht aus dem räumlichen Index löschen." -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Kann Insel %d nicht aus dem räumlichen Index löschen." @@ -17297,21 +17513,21 @@ msgstr "Kann Datei nicht in den Speicher laden. Datei ist nicht offen." msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Vector memory mode wird nicht unterstützt, verwende 'AUTO'." -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -17403,45 +17619,45 @@ msgstr "Vektorformat '%s' nicht unterstützt" msgid "Format definition is not correct: %s" msgstr "Format-Definition ist nicht korrekt: %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "Linie %d hat bereits Fläche/Insel %d zu ihrer Linken." -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "Linie %d hat bereits Fläche/Insel %d zu ihrer Rechten." -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Versuche Insel von einer toten Fläche zu löschen." -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Versuche nicht registrierte Insel %d der Fläche %d zu löschen." -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Versuche tote Fläche zu löschen." -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Toter Zentroid %d für Fläche registriert (Bug in der Vektorbibliothek)." -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Versuche Fläche %d von toter Insel %d zu löschen." -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Versuche Insel %d von toter Fläche %d zu löschen." @@ -17510,11 +17726,11 @@ msgstr "[%s]: Diese Farbe gibt es nicht." #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" -#~ "Kann die Signatur-Datei <%s> für die Untergruppe <%s> der Gruppe <%s> - <" -#~ "%s> nicht erstellen, da es nicht im aktuellen Mapset ist." +#~ "Kann die Signatur-Datei <%s> für die Untergruppe <%s> der Gruppe <%s> - " +#~ "<%s> nicht erstellen, da es nicht im aktuellen Mapset ist." #, c-format #~ msgid "Unable to create signature file <%s> for subgroup <%s> of group <%s>" @@ -17977,6 +18193,9 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_el.po b/locale/po/grasslibs_el.po index b43b7f3e676..f359eca4d50 100644 --- a/locale/po/grasslibs_el.po +++ b/locale/po/grasslibs_el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:50+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Greek >>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main #, c-format msgid "Illegal n-s resolution value for 3D: %g" msgstr "" @@ -2834,7 +2838,7 @@ msgid "SYNOPSIS" msgstr "ΣΥΝΟΨΗ" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "" @@ -2844,7 +2848,7 @@ msgid "Force launching GUI dialog" msgstr "" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "Παράμετροι" @@ -3201,11 +3205,11 @@ msgid "'.' for current mapset" msgstr "" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +msgid "Project (location) name" msgstr "" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +msgid "Project name (not path to project)" msgstr "" #: ../lib/gis/parser_standard_options.c:712 @@ -3739,12 +3743,12 @@ msgstr "" msgid "Unrecognised access mode: %o" msgstr "" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "" @@ -3759,6 +3763,7 @@ msgstr "" msgid "ZLIB decompression error %d: %s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -3766,6 +3771,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/mapset.c:38 msgid "MAPSET is not set" msgstr "MAPSET δεν έχει οριστεί" @@ -3983,6 +3990,9 @@ msgstr "<%s> στο mapset <%s>" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4363,6 +4373,9 @@ msgid "Invalid offset (%" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -4506,8 +4519,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Αδυναμία ανοίγματος ραστερ χάρτη <%s@%s> αφού είναι ένα reclass του ραστερ " "χάρτη <%s@%s> , ο οποίος δεν υπάρχει" @@ -5033,28 +5046,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5088,143 +5101,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5232,87 +5253,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5323,22 +5342,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5348,214 +5367,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5672,7 +5695,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5693,7 +5716,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8877,6 +8899,7 @@ msgstr "" msgid "Length of input WKB is too small" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -8884,6 +8907,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/vector/Vlib/read_pg.c:1097 #, c-format msgid "Invalid cache index %d (max: %d)" @@ -9118,8 +9143,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9152,6 +9177,9 @@ msgid "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -10729,7 +10757,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Αδυναμία ανοίγματος OGR πηγή δεδομένων '%s'" @@ -11704,36 +11732,36 @@ msgstr "Η προεπιλεγμένη βάση δεδομένων δεν έχε msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -12255,30 +12283,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Δεν γίνεται η διαγραφή του κόμβου %d από το χωρικό πίνακα" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Δεν γίνεται η διαγραφή της γραμμής %d από το χωρικό πίνακα" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Προσπάθεια διαγραφής sidx άκυρης γραμμής" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Δεν γίνεται η διαγραφή περιοχής %d από το χωρικό πίνακα" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Δεν γίνεται η διαγραφή της νησίδας %d από το χωρικό πίνακα" @@ -12295,21 +12323,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -12399,44 +12427,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Προσπάθεια διαγραφής επιφάνειας %d από κενή νησίδα (%d)" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Προσπάθεια διαγραφής νησίδας %d από κενή (dead) επιφάνεια %d" @@ -12522,6 +12550,7 @@ msgstr "[%s]: Δεν υπάρχει τέτοιο χρώμα" #~ "Datum <%s> δεν αναγνωρίζεται από το GRASS και οι παράμετροι δεν μπορούν " #~ "να βρεθούν." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -12581,6 +12610,8 @@ msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχ <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, c-format #~ msgid "" #~ "Datum <%s> apparently recognised by GRASS but no parameters found. You " @@ -12751,12 +12782,22 @@ msgstr "Το πάνω πρέπει να είναι μεγαλύτερο του <<<<<<< HEAD #~ msgid "Unable to open header file for raster map <%s@%s>" #~ msgstr "" +<<<<<<< HEAD +#~ "Αδυναμία ανοίγματος κεφαλικού (header) αρχείου για τον ράστερ χάρτη " +#~ "<%s@%s>" +======= #~ "Αδυναμία ανοίγματος κεφαλικού (header) αρχείου για τον ράστερ χάρτη <%s@" #~ "%s>" ======= msgid "Unable to open header file for raster map <%s@%s>" msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχείου για τον ράστερ χάρτη <%s@%s>" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main ======= msgid "which is missing." msgstr "το οποίο λείπει" @@ -12813,6 +12854,10 @@ msgid "Unable to open header file for raster map <%s@%s>" msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχείου για τον ράστερ χάρτη <%s@%s>" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> 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 c38494205fc..963e6623eae 100644 --- a/locale/po/grasslibs_es.po +++ b/locale/po/grasslibs_es.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Spanish doesn't match xmapset <%s>" msgstr "" -"G__open_misc(read): El directorio de mapas <%s> no corresponde al xmapset <" -"%s>" +"G__open_misc(read): El directorio de mapas <%s> no corresponde al xmapset " +"<%s>" #: ../lib/gis/open_misc.c:73 #, c-format @@ -2462,16 +2462,16 @@ msgstr "%s: Disculpe, <%c> no es una bandera válida" #, fuzzy, c-format msgid "Please update the usage of <%s>: flag <%c> has been renamed to <%s>" msgstr "" -"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como <" -"%s>" +"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como " +"<%s>" #: ../lib/gis/parser.c:1079 #, fuzzy, c-format msgid "" "Please update the usage of <%s>: flag <%c> has been renamed to option <%s>" msgstr "" -"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como <" -"%s>" +"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como " +"<%s>" #: ../lib/gis/parser.c:1226 #, c-format @@ -2488,23 +2488,23 @@ msgstr "Opción <%s=> coincide" msgid "" "Please update the usage of <%s>: option <%s> has been renamed to flag <%s>" msgstr "" -"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como <" -"%s>" +"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como " +"<%s>" #: ../lib/gis/parser.c:1255 #, fuzzy, c-format msgid "" "Please update the usage of <%s>: option <%s> has been renamed to flag <%c>" msgstr "" -"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como <" -"%s>" +"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como " +"<%s>" #: ../lib/gis/parser.c:1266 #, c-format msgid "Please update the usage of <%s>: option <%s> has been renamed to <%s>" msgstr "" -"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como <" -"%s>" +"Por favor actualice el uso de <%s>: la opción <%s> ha sido renombrada como " +"<%s>" #: ../lib/gis/parser.c:1279 #, c-format @@ -3425,7 +3425,7 @@ msgid "SYNOPSIS" msgstr "SINOPSIS" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "Identificadores." @@ -3435,7 +3435,7 @@ msgid "Force launching GUI dialog" msgstr "Forzar lanzamiento de cuadro de diálogo GUI" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "Parámetros" @@ -3807,11 +3807,13 @@ msgid "'.' for current mapset" msgstr "'.' para Directorio de mapas" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +#, fuzzy +msgid "Project (location) name" msgstr "Nombre de Localización" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +#, fuzzy +msgid "Project name (not path to project)" msgstr "Nombre de Localización (no es ruta de Localización)" #: ../lib/gis/parser_standard_options.c:712 @@ -4289,8 +4291,8 @@ msgstr "Marca de tiempo no válida para mapa vectorial <%s@%s>" #, c-format msgid "Unable to create timestamp file for vector map <%s@%s>" msgstr "" -"No ha sido posible crear archivo de marca de tiempo para mapa vectorial <%s@" -"%s>" +"No ha sido posible crear archivo de marca de tiempo para mapa vectorial " +"<%s@%s>" #: ../lib/gis/timestamp.c:534 #, c-format @@ -4392,6 +4394,7 @@ msgid "Copying %s <%s> to current mapset as <%s>" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4403,6 +4406,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -4413,13 +4421,13 @@ msgstr "Se intentó crear archivo temporal solo de lectura (read-only)" msgid "Unrecognised access mode: %o" msgstr "Modo de acceso no reconocido: %o" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "" "No ha sido posible generar el elemento del Directorio de mapas %s (%s): %s" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "" @@ -5599,8 +5607,8 @@ msgstr "generado por %s" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "No se puede abrir el mapa ráster <%s@%s> ya que es una reclasificación de un " "mapa ráster <%s@%s> que no existe" @@ -6559,30 +6567,32 @@ msgstr "" msgid "WARNING" msgstr "ADVERTENCIA" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "Saliendo..." -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "Uso" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "mostrar este mensaje de ayuda" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "mostrar información de la versión y salir" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +#, fuzzy +msgid "create given database, project or mapset if it doesn't exist" msgstr "" "crear base de datos dada, Localización o Directorio de mapas si es que no " "existe" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +#, fuzzy +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" "salir luego de la creación de la Localización o Directorio de mapas. Solo " "con bandera -c" @@ -6618,146 +6628,159 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 +#: ../lib/init/grass.py:387 msgid "initial GRASS database directory" msgstr "" -#: ../lib/init/grass.py:387 -msgid "directory containing Locations" +#: ../lib/init/grass.py:388 +#, fuzzy +msgid "directory containing GRASS projects" msgstr "directorio que contiene Localizaciones" -#: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +#: ../lib/init/grass.py:389 +#, fuzzy +msgid "initial GRASS project (location)" msgstr "Localización inicial de GRASS" -#: ../lib/init/grass.py:390 +#: ../lib/init/grass.py:391 +#, fuzzy msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +"directory containing mapsets with one common coordinate reference system" msgstr "" "directorio que contiene Directorio de mapas con un sistema de coordenadas " "común (proyección)" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" -msgstr "Directorio de mapas inicial de GRASS" - #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" -msgstr "directorio de mapas inicial completamente cualificado" +#, fuzzy +msgid "initial GRASS mapset" +msgstr "Directorio de mapas inicial de GRASS" #: ../lib/init/grass.py:395 +#, fuzzy +msgid "fully qualified initial mapset directory" +msgstr "directorio de Directorio de mapas inicial totalmente calificado" + +#: ../lib/init/grass.py:396 msgid "Environment variables relevant for startup" msgstr "Variables ambientales relevantes para arranque" -#: ../lib/init/grass.py:396 +#: ../lib/init/grass.py:397 msgid "select GUI (text, gui, gtext)" msgstr "seleccionar GUI (texto, gui, gtext)" -#: ../lib/init/grass.py:397 +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "establecer navegador web para páginas de ayuda" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" "definir ruta(s) adicionales para módulos GRASS locales o scripts del usuario" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "definir GISBASE adicional para Complementos instalados localmente" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "defina el nombre del intérprete Python a sobreescribir 'python'" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "ejecutar módulo GRASS o script" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "el archivo ejecutable será ejecutado en la sesión de GRASS" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "módulo de GRASS, script o cualquier otro ejecutable" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "parámetros del ejecutable" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "banderas estándar" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "GUI <%s> no soportada en esta versión" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "No se encontró la GUI de GRASS. Por favor revise su instalación." -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -6765,87 +6788,90 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" +"Ha fallado la creación de una nueva Localización. La localización <%s> ya " +"existe." -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" +"Ha fallado la creación de una nueva Localización. La localización <%s> ya " +"existe." -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." -msgstr "" +#: ../lib/init/grass.py:1137 +#, fuzzy +msgid "Creating new GRASS GIS project <{}>..." +msgstr "Creando nueva Localización/Directorio de mapas..." -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -6856,22 +6882,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "Ruta '%s' no existe" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "La ruta '%s' no accesable." -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "Usted no es el dueño de '%s'." -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -6886,7 +6912,7 @@ msgstr "" "esta operación). Revise el administrador de procesos nuevamente para " "asegurarse..." -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -6895,7 +6921,7 @@ msgstr "" "%(user)s está usando GRASS en el Directorio de mapas seleccionado (archivo " "%(file)s encontrado). Forzando el inicio de GRASS..." -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" @@ -6904,25 +6930,25 @@ msgstr "" "No ha sido posible acceder '%s' de manera correcta.\n" "Por favor notifique al personal de sistemas." -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "La variable SHELL no está definida" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "Ejecutando <%s> ..." -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" @@ -6931,175 +6957,179 @@ msgstr "" "La ejecución de <{cmd}> ha fallado:\n" "{error}" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "La ejecución de <%s> ha terminado." -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "Imposible cerrar la GUI. {0}" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "Bienvenido a GRASS GIS %s" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "Página web de GRASS GIS:" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "Esta versión corriendo a través de:" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "La ayuda está disponible con el comando:" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "Vea los términos de la licencia con:" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "Leer opciones para citar con:" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "Si lo necesita, reinicie la GUI con:" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "Iniciar GUI con:" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "En cuanto esté listo para salir escriba: " -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "MÁSCARAS ráster 2D y 3D presentes" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "MÁSCARA ráster presente" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "MÁSCARA ráster 3D presente" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Hecho." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "Salió de GRASS GIS, hasta pronto" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "Por favor instale el paquete de desarrolladores de GRASS GIS" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "Parámetro <%s> no soportado" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "La bandera -e requiere también de la bandera -c" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "Iniciando GRASS GIS..." -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "Lanzando GUI <%s> en el fondo, por favor espere..." -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "Ha fallado el iniciar la consola de comandos '%s'" @@ -7220,7 +7250,7 @@ msgid "Unable to position file" msgstr "No ha sido posible encontrar el archivo de posición." #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "No ha sido posible escribir el encabezado para el mapa ráster 3D <%s>" @@ -7241,7 +7271,6 @@ msgid "Error in cache" msgstr "Error en caché" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Añadiendo regla: %lf - %lf" @@ -7727,8 +7756,8 @@ msgstr "" #, c-format msgid "Unable to write into category raster condition file <%s>." msgstr "" -"No ha sido posible escribir en archivo de condiciones de categorías ráster <" -"%s>." +"No ha sido posible escribir en archivo de condiciones de categorías ráster " +"<%s>." #: ../lib/imagery/iscatt_core.c:250 #, c-format @@ -7758,8 +7787,8 @@ msgstr "" #, c-format msgid "Unable to write into category raster conditions file <%s>" msgstr "" -"No ha sido posible escribir en archivo de condiciones de categorías ráster <" -"%s>" +"No ha sido posible escribir en archivo de condiciones de categorías ráster " +"<%s>" #: ../lib/imagery/iscatt_core.c:518 msgid "Unable to read from category raster condition file." @@ -10788,8 +10817,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -10876,8 +10905,8 @@ msgid "" "Database record for line %d (cat = %d, forward/both direction(s)) not found " "(forward/both direction(s) of line skipped)" msgstr "" -"No se ha encontrado el registro de la base de datos para la línea %d (cat =" -"%d, hacia adelante/en una o ambas direcciones) (se omite la línea hacia " +"No se ha encontrado el registro de la base de datos para la línea %d (cat " +"=%d, hacia adelante/en una o ambas direcciones) (se omite la línea hacia " "adelante/en una o ambas direcciones)." #: ../lib/vector/Vlib/net_build.c:878 @@ -11252,6 +11281,7 @@ msgid "Unable to open header file for raster map <%s@%s>. It seems that some pre msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11263,6 +11293,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -11318,8 +11353,8 @@ msgstr "" #, c-format msgid "Unable to open spatial index file for vector map <%s>" msgstr "" -"No ha sido posible abrir archivo de índices espaciales del mapa vectorial <" -"%s>" +"No ha sido posible abrir archivo de índices espaciales del mapa vectorial " +"<%s>" #: ../lib/vector/Vlib/open.c:439 #, c-format @@ -11606,8 +11641,8 @@ msgstr "Índice espacial no disponible, no puede ser guardado" #, c-format msgid "Unable to create spatial index file for vector map <%s>" msgstr "" -"No ha sido posible crear archivo de índices espaciales del mapa vectorial <" -"%s>" +"No ha sido posible crear archivo de índices espaciales del mapa vectorial " +"<%s>" #: ../lib/vector/Vlib/build.c:1293 msgid "Error writing out spatial index file" @@ -11661,7 +11696,7 @@ msgstr "Fuente de datos OGR no definida" msgid "OGR layer not defined" msgstr "Capa OGR no definida" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "No se puede abrir la fuente de datos OGR '%s'." @@ -11680,8 +11715,8 @@ msgstr "" #, c-format msgid "Unable to open feature index file for vector map <%s>" msgstr "" -"No ha sido posible abrir archivo de índice de elementos de mapa vectorial <" -"%s>" +"No ha sido posible abrir archivo de índice de elementos de mapa vectorial " +"<%s>" #: ../lib/vector/Vlib/open_ogr.c:199 #, c-format @@ -12687,17 +12722,17 @@ msgstr "No ha sido establecida la base de datos predeterminada." msgid "Requested dblink %d, maximum link number %d" msgstr "Dblink solicitado %d, número máximo de enlace %d." -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "Error en la regla en la fila %d en <%s>" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "No se puede abrir la capa OGR <%s>" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." @@ -12705,22 +12740,22 @@ msgstr "" "Tabla de elementos <%s> no tiene definida una llave primaria. No ha sido " "posible definir enlaces DB." -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "GRASS no está compilado con soporte PostgreSQL" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "Formato de mapa vectorial" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" "No ha sido posible crear archivo de definición de base de datos para mapa " "vectorial <%s>" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" "Bug: se intentó actualizar mapa que no se encuentra en el Directorio de " @@ -13213,6 +13248,7 @@ msgid "" "%.8e3E" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -13305,6 +13341,8 @@ msgstr "El archivo de coordenadas del mapa vectorial <%s@%s> es menor de lo que <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../lib/vector/diglib/test.c:105 #, c-format msgid "" @@ -13373,30 +13411,30 @@ msgstr "" "versión. Por favor reconstruya la topología." #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "Vectorial excede el límite de tamaño soportado" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "No se puede eliminar el nodo %d del índice espacial" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "No se puede eliminar la línea %d del índice espacial" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Se intentó eliminar sidx para un área muerta (inexistente)" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "No se puede eliminar el área %d del índice espacial" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "No se puede eliminar la isla %d del índice espacial" @@ -13414,7 +13452,7 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Modo de memoria vectorial no soportado, utilizando 'AUTO'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " @@ -13424,7 +13462,7 @@ msgstr "" "topología. Trate de reconstruir la topología o actualizar al menos a la " "versión %d de GRASS." -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " @@ -13433,7 +13471,7 @@ msgstr "" "Su versión de GRASS no soporta totalmente el formato de topología %d.%d del " "vectorial. Considere reconstruir la topología o actualizar GRASS." -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -13528,48 +13566,48 @@ msgstr "Formato vectorial '%s' no soportado" msgid "Format definition is not correct: %s" msgstr "Definición de formato no es correcta: %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "La línea %d ya tiene a la izquierda un área/isla %d" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "La línea %d ya tiene a la derecha un área/isla %d" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "Isla ya registrada en área" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Se intentó eliminar una isla del área muerta (inexistente)" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Intento de eliminar una isla no registrada %d del área %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Se intentó eliminar un área muerta (inexistente)" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Centroide muerto (inexistente) %d registrado para área (bug en la biblioteca " "de vectorial)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" "Se intentó eliminar la información del área %d de la isla %d muerta " "(inexistente)" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Se intentó eliminar la isla %d del área %d muerta (inexistente)" @@ -13613,6 +13651,9 @@ msgstr "Ícono no soportado %d" msgid "[%s]: No such color" msgstr "[%s]: No existe tal color" +#~ msgid "fully qualified initial Mapset directory" +#~ msgstr "directorio de mapas inicial completamente cualificado" + #, python-format #~ msgid "" #~ "Unable to create temporary directory ! Exiting." @@ -13672,8 +13713,8 @@ msgstr "[%s]: No existe tal color" #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" #~ "No se puede crear el archivo de firma <%s> para el subgrupo <%s> del " #~ "grupo <%s> - <%s> no es el Directorio de mapas actual" @@ -13856,8 +13897,8 @@ msgstr "[%s]: No existe tal color" #~ "Start time must be of type datetime for %(type)s map <%(id)s> with layer: " #~ "%(l)s" #~ msgstr "" -#~ "Tiempo de inicio debe ser de tipo fecha y hora para %(type)s mapa <" -#~ "%(id)s> con capa: %(l)s" +#~ "Tiempo de inicio debe ser de tipo fecha y hora para %(type)s mapa " +#~ "<%(id)s> con capa: %(l)s" #, python-format #~ msgid "Start time must be of type datetime for %(type)s map <%(id)s>" @@ -13869,28 +13910,28 @@ msgstr "[%s]: No existe tal color" #~ "End time must be of type datetime for %(type)s map <%(id)s> with layer: " #~ "%(l)s" #~ msgstr "" -#~ "Tiempo de término debe ser de tipo fecha y hora para %(type)s mapa <" -#~ "%(id)s> con capa: %(l)s" +#~ "Tiempo de término debe ser de tipo fecha y hora para %(type)s mapa " +#~ "<%(id)s> con capa: %(l)s" #, python-format #~ msgid "End time must be of type datetime for %(type)s map <%(id)s>" #~ msgstr "" -#~ "Tiempo de término debe ser de tipo fecha y hora para %(type)s mapa <" -#~ "%(id)s>" +#~ "Tiempo de término debe ser de tipo fecha y hora para %(type)s mapa " +#~ "<%(id)s>" #, python-format #~ msgid "" #~ "End time must be greater than start time for %(type)s map <%(id)s> with " #~ "layer: %(l)s" #~ msgstr "" -#~ "Tiempo de término debe ser mayor al tiempo de inicio para %(type)s mapa <" -#~ "%(id)s> con capa: %(l)s" +#~ "Tiempo de término debe ser mayor al tiempo de inicio para %(type)s mapa " +#~ "<%(id)s> con capa: %(l)s" #, python-format #~ msgid "End time must be greater than start time for %(type)s map <%(id)s>" #~ msgstr "" -#~ "Tiempo de término debe mayor que el tiempo de inicio para %(type)s mapa <" -#~ "%(id)s>" +#~ "Tiempo de término debe mayor que el tiempo de inicio para %(type)s mapa " +#~ "<%(id)s>" #, python-format #~ msgid "" @@ -13906,22 +13947,22 @@ msgstr "[%s]: No existe tal color" #~ "Unsupported relative time unit type for %(type)s map <%(id)s> with layer " #~ "%(l)s: %(u)s" #~ msgstr "" -#~ "Tipo de unidad relativa de tiempo no soportada para %(type)s mapa <" -#~ "%(id)s> con capa %(l)s: %(u)s" +#~ "Tipo de unidad relativa de tiempo no soportada para %(type)s mapa " +#~ "<%(id)s> con capa %(l)s: %(u)s" #, python-format #~ msgid "Unsupported relative time unit type for %(type)s map <%(id)s>: %(u)s" #~ msgstr "" -#~ "Tipo de unidad relativa de tiempo no soportada para %(type)s mapa <" -#~ "%(id)s>: %(u)s" +#~ "Tipo de unidad relativa de tiempo no soportada para %(type)s mapa " +#~ "<%(id)s>: %(u)s" #, python-format #~ msgid "" #~ "End time must be greater than start time for %(typ)s map <%(id)s> with " #~ "layer %(l)s" #~ msgstr "" -#~ "Tiempo de término debe ser mayor que tiempo inicial para %(typ)s mapa <" -#~ "%(id)s> con capa %(l)s" +#~ "Tiempo de término debe ser mayor que tiempo inicial para %(typ)s mapa " +#~ "<%(id)s> con capa %(l)s" #, python-format #~ msgid "" @@ -14297,16 +14338,16 @@ msgstr "[%s]: No existe tal color" #~ "Relative time units of space time dataset <%(id)s> and map <%(map)s> with " #~ "layer %(l)s are different" #~ msgstr "" -#~ "Son diferentes las unidades de tiempo relativas de conjunto de datos <" -#~ "%(id)s> y mapa <%(map)s> con capa %(l)s" +#~ "Son diferentes las unidades de tiempo relativas de conjunto de datos " +#~ "<%(id)s> y mapa <%(map)s> con capa %(l)s" #, python-format #~ msgid "" #~ "Relative time units of space time dataset <%(id)s> and map <%(map)s> are " #~ "different" #~ msgstr "" -#~ "Son diferentes las unidades de tiempo relativas de conjunto de datos <" -#~ "%(id)s> y mapa <%(map)s>" +#~ "Son diferentes las unidades de tiempo relativas de conjunto de datos " +#~ "<%(id)s> y mapa <%(map)s>" #~ msgid "Only maps from the same mapset can be registered" #~ msgstr "Solamente se pueden registrar mapas del mismo Directorio de mapas" @@ -14325,15 +14366,15 @@ msgstr "[%s]: No existe tal color" #~ "temporal database. The mapset of the dataset does not match the current " #~ "mapset" #~ msgstr "" -#~ "No ha sido posible quitar el registro del mapa del conjunto de datos <" -#~ "%(ds)s> del tipo %(type)s en la base de datos temporales. El Directorio " +#~ "No ha sido posible quitar el registro del mapa del conjunto de datos " +#~ "<%(ds)s> del tipo %(type)s en la base de datos temporales. El Directorio " #~ "de mapas del conjunto de mapas no coincide con el Directorio de mapas " #~ "actual" #, python-format #~ msgid "" -#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset <" -#~ "%(base)s>" +#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset " +#~ "<%(base)s>" #~ msgstr "" #~ "Mapa <%(map)s> con capa %(l)s no está registrado en conjunto de datos " #~ "espacio temporales <%(base)s>" @@ -14346,8 +14387,8 @@ msgstr "[%s]: No existe tal color" #, python-format #~ msgid "" -#~ "Update metadata, spatial and temporal extent from all registered maps of <" -#~ "%s>" +#~ "Update metadata, spatial and temporal extent from all registered maps of " +#~ "<%s>" #~ msgstr "" #~ "Actualizar metadato, extensión espacial y temporal para todos los mapas " #~ "registrados es de <%s>" @@ -14442,11 +14483,11 @@ msgstr "[%s]: No existe tal color" #, python-format #~ msgid "" -#~ "Wrong temporal type of space time dataset <" -#~ "%s> <%s> time is required" +#~ "Wrong temporal type of space time dataset " +#~ "<%s> <%s> time is required" #~ msgstr "" -#~ "El tipo temporal del conjunto de datos espacio temporales es incorrecto <" -#~ "%s> <%s> tiempo es requerido" +#~ "El tipo temporal del conjunto de datos espacio temporales es incorrecto " +#~ "<%s> <%s> tiempo es requerido" #~ msgid "Wrong type of input " #~ msgstr "Tipo de entrada incorrecto" @@ -14795,8 +14836,8 @@ msgstr "[%s]: No existe tal color" #, python-format #~ msgid "Unable to read timestamp file for raster map <%s>" #~ msgstr "" -#~ "No ha sido posible leer el archivo de marca de tiempo para mapa ráster <" -#~ "%s>" +#~ "No ha sido posible leer el archivo de marca de tiempo para mapa ráster " +#~ "<%s>" #, python-format #~ msgid "Unable to create timestamp file for raster map <%s>" @@ -14846,8 +14887,8 @@ msgstr "[%s]: No existe tal color" #, python-format #~ msgid "Unable to create timestamp file for vector map <%s>" #~ msgstr "" -#~ "No ha sido posible crear archivo de marca de tiempo del mapa vectorial <" -#~ "%s>" +#~ "No ha sido posible crear archivo de marca de tiempo del mapa vectorial " +#~ "<%s>" #, python-format #~ msgid "Invalid datetime in timestamp for vector map <%s>" @@ -14894,8 +14935,8 @@ msgstr "[%s]: No existe tal color" #~ "Unable to perform aggregation. Output raster map <%(name)s> exists and " #~ "overwrite flag was not set" #~ msgstr "" -#~ "No ha sido posible realizar la agregación. El mapa ráster de salida <" -#~ "%(name)s> ya existe y la bandera overwrite no fue definida" +#~ "No ha sido posible realizar la agregación. El mapa ráster de salida " +#~ "<%(name)s> ya existe y la bandera overwrite no fue definida" #, python-format #~ msgid "" @@ -15098,8 +15139,8 @@ msgstr "[%s]: No existe tal color" #~ "Unable to write history for <%(map)s>. Raster map <%(map)s> not found in " #~ "current mapset." #~ msgstr "" -#~ "No ha sido posible escribir historia para <%(map)s>. Mapa ráster >" -#~ "%(map)s> no encontrado en el Directorio de mapas actual." +#~ "No ha sido posible escribir historia para <%(map)s>. Mapa ráster " +#~ ">%(map)s> no encontrado en el Directorio de mapas actual." #~ msgid "No data" #~ msgstr "No hay datos" @@ -15378,10 +15419,6 @@ msgstr "[%s]: No existe tal color" #~ msgid "initial mapset" #~ msgstr "Directorio de mapas inicial" -#, fuzzy -#~ msgid "fully qualified initial mapset directory" -#~ msgstr "directorio de Directorio de mapas inicial totalmente calificado" - #~ msgid "select GUI (text, gui)" #~ msgstr "seleccionar GUI (texto, gui)" @@ -15558,14 +15595,6 @@ msgstr "[%s]: No existe tal color" #~ msgid "Unable to read find raster <%s>" #~ msgstr "No se puede leer \"Encontrar ráster <% s>\"." -#~ msgid "Failed to create new location. The location <%s> already exists." -#~ msgstr "" -#~ "Ha fallado la creación de una nueva Localización. La localización <%s> ya " -#~ "existe." - -#~ msgid "Creating new GRASS GIS location/mapset..." -#~ msgstr "Creando nueva Localización/Directorio de mapas..." - #~ msgid "Option %s requires all of %s" #~ msgstr "La opción %s necesita todas las %s" @@ -15814,6 +15843,9 @@ msgid "Coor file of vector <%s@%s> is shorter than it should be (%ld bytes missi msgstr "El archivo de coordenadas del mapa vectorial <%s@%s> es menor de lo que debería ser (faltan %ld bytes)." <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15824,6 +15856,10 @@ msgid "To run the module <%s> add underscore at the end of the option <%s> to av 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." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_fi.po b/locale/po/grasslibs_fi.po index 1397d548739..6323637d568 100644 --- a/locale/po/grasslibs_fi.po +++ b/locale/po/grasslibs_fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Finnish since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4166,28 +4166,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4221,143 +4221,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4365,87 +4373,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4456,22 +4462,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4481,214 +4487,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -4805,7 +4815,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -4826,7 +4836,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8230,8 +8239,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -8932,7 +8941,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -9889,36 +9898,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10440,30 +10449,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10480,21 +10489,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -10584,44 +10593,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_fr.po b/locale/po/grasslibs_fr.po index 127bb3e930f..665d2bafcd0 100644 --- a/locale/po/grasslibs_fr.po +++ b/locale/po/grasslibs_fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: French >>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main #, c-format msgid "Failed to print %s" msgstr "" @@ -2968,6 +2972,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:68 ../lib/gis/adj_cellhd.c:190 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2979,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 #, c-format msgid "Illegal e-w resolution value: %g" msgstr "" @@ -2994,6 +3004,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:81 ../lib/gis/adj_cellhd.c:219 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3005,6 +3016,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3015,6 +3031,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:85 ../lib/gis/adj_cellhd.c:223 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3026,6 +3043,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3036,6 +3058,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:93 ../lib/gis/adj_cellhd.c:231 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3047,6 +3070,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3061,6 +3089,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:117 ../lib/gis/adj_cellhd.c:280 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3072,6 +3101,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3093,6 +3127,7 @@ msgstr "Les résolutions NS et EO sont différentes" #: ../lib/gis/adj_cellhd.c:175 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3104,6 +3139,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 "" @@ -3119,6 +3159,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:193 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3130,6 +3171,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3145,6 +3191,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:208 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3156,6 +3203,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3166,6 +3218,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:213 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3177,6 +3230,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3187,6 +3245,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:236 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3198,6 +3257,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3378,7 +3442,7 @@ msgid "SYNOPSIS" msgstr "SYNOPSIS" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "Drapeaux" @@ -3388,7 +3452,7 @@ msgid "Force launching GUI dialog" msgstr "Force le lancement de la boite de dialogue" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "Paramètres" @@ -3756,11 +3820,13 @@ msgid "'.' for current mapset" msgstr "'.' pour le jeu de cartes courant" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +#, fuzzy +msgid "Project (location) name" msgstr "Nom du Secteur" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +#, fuzzy +msgid "Project name (not path to project)" msgstr "Nom du Secteur (pas son chemin)" #: ../lib/gis/parser_standard_options.c:712 @@ -4027,6 +4093,7 @@ msgstr "Champ Est dupliqué" msgid "Invalid east field: %s" msgstr "Champ d'est invalide : %s" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -4034,6 +4101,8 @@ msgstr "Champ d'est invalide : %s" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/rd_cellhd.c:217 msgid "Duplicate west field" msgstr "Champ Ouest dupliqué" @@ -4301,6 +4370,9 @@ msgstr "Tentative de création d'un fichier temporaire en lecture-seule" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5629,12 +5701,12 @@ msgstr "Le numéro de couche doit être supérieur ou égal à 1" msgid "Unrecognised access mode: %o" msgstr "Mode d'accès non reconnu : %o" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "Impossible de créer l'élément %s du jeu de cartes %s : %s" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "Impossible d'accéder à l'élément %s du jeu de données (%s): %s" @@ -5719,6 +5791,7 @@ msgstr[0] "" msgstr[1] "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5730,6 +5803,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 @@ -6060,8 +6138,8 @@ msgstr "généré par %s" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Impossible d'ouvrir la carte raster <%s@%s> car il s'agit d'une " "reclassification de la carte raster <%s@%s> qui n'existe pas" @@ -6262,15 +6340,15 @@ msgstr "Impossible de lire <%s> pour la carte raster <%s@%s>" #, c-format msgid "Error closing <%s> metadata file for raster map <%s@%s>" msgstr "" -"Erreur à la fermeture du fichier de métadonnées <%s> pour la carte raster <" -"%s@%s>" +"Erreur à la fermeture du fichier de métadonnées <%s> pour la carte raster " +"<%s@%s>" #: ../lib/raster/raster_metadata.c:236 #, c-format msgid "Unable to create <%s> metadata file for raster map <%s@%s>" msgstr "" -"Impossible de créer le fichier de métadonnées <%s> pour la carte raster <%s@" -"%s>" +"Impossible de créer le fichier de métadonnées <%s> pour la carte raster " +"<%s@%s>" #: ../lib/raster/alloc_cell.c:150 #, c-format @@ -6434,6 +6512,7 @@ msgstr "Impossible de lire le fichier de statistiques pour <%s>" msgid "Unable to write range file for <%s>" msgstr "Impossible d'écrire le fichier de plage pour <%s>" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -6441,6 +6520,8 @@ msgstr "Impossible d'écrire le fichier de plage pour <%s>" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/raster/range.c:465 ../lib/raster/range.c:479 #: ../lib/raster/range.c:497 ../lib/raster/range.c:502 #, c-format @@ -6529,8 +6610,8 @@ msgstr "" #, c-format msgid "Error uncompressing fp raster data for row %d of <%s>: error code %d" msgstr "" -"Erreur lors de la décompression des données raster fp pour la ligne %d de <" -"%s> : code d'erreur %d" +"Erreur lors de la décompression des données raster fp pour la ligne %d de " +"<%s> : code d'erreur %d" #: ../lib/raster/get_row.c:142 #, c-format @@ -6604,8 +6685,8 @@ msgstr "L'intervalle de données entières pour la carte raster <%s> est vide" #, c-format msgid "Attempt to open quantization table for CELL raster map <%s>" msgstr "" -"Tentative d'ouverture de la table de quantification de la carte raster CELL <" -"%s>" +"Tentative d'ouverture de la table de quantification de la carte raster CELL " +"<%s>" #: ../lib/raster/quant_io.c:136 #, c-format @@ -6621,28 +6702,30 @@ msgstr "Le fichier de quantification de la carte raster <%s> est vide" msgid "WARNING" msgstr "ATTENTION" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "Sortie ..." -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "Utilisation" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "afficher ce message d'aide" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "afficher les informations de version et quitter" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +#, fuzzy +msgid "create given database, project or mapset if it doesn't exist" msgstr "créer la base de données, secteur ou jeu de cartes si non existants" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +#, fuzzy +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" "quitter après la création du secteur ou du jeu de cartes. Uniquement avec " "l'argument -c" @@ -6681,6 +6764,9 @@ msgstr "afficher les paramètres de configuration GRASS" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6765,103 +6851,117 @@ msgid "" "version" msgstr "options: arch,build,compiler,date,path,revision,svn_revision,version" -#: ../lib/init/grass.py:386 +#: ../lib/init/grass.py:387 msgid "initial GRASS database directory" msgstr "répertoire initial de la base de données GRASS" -#: ../lib/init/grass.py:387 -msgid "directory containing Locations" +#: ../lib/init/grass.py:388 +#, fuzzy +msgid "directory containing GRASS projects" msgstr "répertoire contenant les Secteurs" -#: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +#: ../lib/init/grass.py:389 +#, fuzzy +msgid "initial GRASS project (location)" msgstr "Secteur GRASS initial" -#: ../lib/init/grass.py:390 +#: ../lib/init/grass.py:391 +#, fuzzy msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +"directory containing mapsets with one common coordinate reference system" msgstr "" "répertoire contenant les jeux de données qui utilisent un système de " "coordonnées (projection) commun" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:394 +#, fuzzy +msgid "initial GRASS mapset" msgstr "Jeu de cartes GRASS initial" -#: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +#: ../lib/init/grass.py:395 +#, fuzzy +msgid "fully qualified initial mapset directory" msgstr "répertoire complet du jeu de cartes initial" -#: ../lib/init/grass.py:395 +#: ../lib/init/grass.py:396 msgid "Environment variables relevant for startup" msgstr "Variables d'environnement pour le démarrage" -#: ../lib/init/grass.py:396 +#: ../lib/init/grass.py:397 msgid "select GUI (text, gui, gtext)" msgstr "sélectionner l'UI (text, gui, gtext)" -#: ../lib/init/grass.py:397 +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "définir le navigateur web pour les pages d'aide" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" "définir des chemins supplémentaires pour les modules GRASS locaux ou les " "scripts utilisateurs" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" "définir un GISBASE supplémentaire pour les extentions GRASS installées " "localement" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "définir le nom du shell python pour supplanter 'python'" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "exécuter le module ou script GRASS" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "l'exécutable fourni sera exécuté dans la sesion GRASS" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "module, script ou tout autre exécutable GRASS" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "paramètres de l'exécutable" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "options standards" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" -msgstr "créer un Secteur temporaire (utiliser avec l'option --exec)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" +msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +#, fuzzy +msgid "create temporary project (use with the --exec flag)" +msgstr "créer un Secteur temporaire (utiliser avec l'option --exec)" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" "La variable APPDATA n'est pas définie, demandez à vous administrateur système" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" @@ -6869,49 +6969,49 @@ msgstr "" "La variable APPDATA pointe vers un répertoire qui n'existe pas, demandez à " "votre administrateur système" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" "Échec de création du répertoire de configuration '%s' avec l'erreur : %s" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "Ligne invalide dans le fichier RC ({file}) : '{line}' ({error})\n" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "Fichier RC ({file}) vide" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "Interface <%s> non supportée par cette version" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "GRASS GUI non trouvée. Merci de vérifier votre installation." -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -6919,74 +7019,73 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" "Impossible de créer le nouveau Secteur car le Secteur <{location}> existe " "déjà." -#: ../lib/init/grass.py:994 -#, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +#: ../lib/init/grass.py:995 +#, fuzzy, python-brace-format +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" "Impossible de créer le novueau Secteur <{location}> car <{path}> est un " "fichier." -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" "Impossible de créer le nouveau Secteur <{location}> car le répertoire <{path}" "> existe déjà." -#: ../lib/init/grass.py:1004 -#, python-brace-format +#: ../lib/init/grass.py:1005 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" "Impossible de créer le nouveau Secteur dans le répertoire <{path}> pour une " "raison inconnue." -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." -msgstr "Création du nouveau Secteur GRASS <{}> ..." +#: ../lib/init/grass.py:1137 +#, fuzzy +msgid "Creating new GRASS GIS project <{}>..." +msgstr "Création du nouveau jeux de cartes GRASS <{}> ..." -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" "Impossible de créer le novueau jeux de cartes <{mapset}> car <{path}> est un " "fichier." -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." @@ -6995,27 +7094,28 @@ msgstr "" "Cela va être corrigé. Cet avertissement pourra devenir une erreur dans les " "versions futures." -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "Création du nouveau jeux de cartes GRASS <{}> ..." -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 +#, fuzzy msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" "Répertoire de base de données GRASS, Secteur et jeu de cartes non définis " "correctement. Utiliser l'interface graphique ou la ligne de commande pour " "les définir." -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -7032,22 +7132,22 @@ msgstr "" "\n" "Vérifier le fichier <{file}>." -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "Le chemin '%s' n'existe pas" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "Le chemin '%s' n'est pas accessible." -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "Vous n'êtes pas le propriétaire de '%s'." -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -7062,7 +7162,7 @@ msgstr "" "les permissions pour cette opération). Vérifiez le gestionnaire de processus " "pour être sûr ..." -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -7071,7 +7171,7 @@ msgstr "" "%(user)s utilise GRASS dans le jeu de cartes sélectionné (fichier %(file)s " "trouvé). Lancement de GRASS forcé ..." -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" @@ -7080,25 +7180,25 @@ msgstr "" "Impossible d'accéder correctement à '%s'.\n" "Merci d'en notifier votre administrateur système." -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "Construction des caractère utilisateur ..." -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "La variable SHELL n'est pas définie" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "Shell <{sh}> non supporté : {env_file}" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "Exécution de <%s> ..." -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" @@ -7107,152 +7207,158 @@ msgstr "" "La commande <{cmd}> a échoué :\n" "{error}" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "Exécution de <%s> terminée." -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "Impossible de fermer l'interface graphique. {0}" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "Bienvenue dans le SIG GRASS %s" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "Page d'accueil du SIG GRASS :" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "Cette version fonctionne avec :" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "L'aide est disponible par la commande :" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "Voir les termes de la licence avec :" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "Voir les termes de la licence avec :" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "Si requis, redémarrer l'interface graphique avec :" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "Démarrer l'interface graphique avec :" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "Lors prêt pour la fermeture entrer :" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "MASKs raster 2D et 3D présents" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "MASK raster présent" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "MASK raster 3D présent" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Terminé." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "GRASS vous dit au revoir" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "Merci d'installer le paquet développement de GRASS" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "Paramètres <%s> on supporté" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "L'option -e nécessite également l'option -c" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 +#, fuzzy msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" "L'argument du système de coordonnées de référence (ex EPSG) est nécessaire " "pour --tmp-location" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 +#, fuzzy msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" "Un seul argument (ex EPSG) est nécessaire pour --tmp-location, le jeu de " "cartes <{}> est déjà fourni" -#: ../lib/init/grass.py:2528 -#, python-brace-format +#: ../lib/init/grass.py:2544 +#, fuzzy, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" @@ -7268,29 +7374,29 @@ msgstr "" " {cmd_name} --help\n" "Voir également : https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "Démarrage du SIG GRASS ..." -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" "Lancement de l'interface graphique <%s> en tâche de fond, merci de " "patienter ..." -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "Échec au lancement du shell '%s'" @@ -7413,7 +7519,7 @@ msgid "Unable to position file" msgstr "Impossible de positionner le fichier" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "Impossible d'écrire l'en-tête de la carte raster 3D <%s>" @@ -7434,7 +7540,6 @@ msgid "Error in cache" msgstr "Erreur de cache" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Ajout d'une règle : %lf - %lf" @@ -11753,8 +11858,8 @@ msgstr "Mix d'IDs de surfaces et de primitives" #, c-format msgid "Unable to create category index file for vector map <%s>" msgstr "" -"Impossible de créer le fichier d'index de catégories pour la carte vecteur <" -"%s>" +"Impossible de créer le fichier d'index de catégories pour la carte vecteur " +"<%s>" #: ../lib/vector/Vlib/cindex.c:503 msgid "Error writing out category index file" @@ -11891,13 +11996,13 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" -"Il existe plus de un point du noeud <%d> avec le champ de catégorie unique <" -"%d> .\n" +"Il existe plus de un point du noeud <%d> avec le champ de catégorie unique " +"<%d> .\n" "La couche de catégories uniques n'est pas valide, les résultats seront " "probablement incorrects." @@ -11925,8 +12030,8 @@ msgid "" "The unique categories layer is not valid therefore you will probably get " "incorrect results." msgstr "" -"Impossible de trouver un noeud pour le point représentant l'intersection <" -"%d> dans le champ ee catégories uniques <%d>.\n" +"Impossible de trouver un noeud pour le point représentant l'intersection " +"<%d> dans le champ ee catégories uniques <%d>.\n" "Le coût pour l'intersection a été défini à 0.\n" "La couche de catégories uniques n'est pas valide, vous allez sans doute " "obtenir des résultats incorrects." @@ -11958,8 +12063,8 @@ msgid "" "The unique categories layer is not valid therefore you will probably get " "incorrect results." msgstr "" -"La ligne avec l'id <%d> a plus d'une catégorie unique définie dans le champ <" -"%d>.\n" +"La ligne avec l'id <%d> a plus d'une catégorie unique définie dans le champ " +"<%d>.\n" "La couche de catégories uniques n'est pas valide, vous allez probablement " "obtenir des résultats incorrects." @@ -12596,8 +12701,8 @@ msgstr "Index spatial non disponible, impossible d'enregistrer" #, c-format msgid "Unable to create spatial index file for vector map <%s>" msgstr "" -"Impossible de créer le fichier d'index spatial pour la couche vectorielle <" -"%s>" +"Impossible de créer le fichier d'index spatial pour la couche vectorielle " +"<%s>" #: ../lib/vector/Vlib/build.c:1293 msgid "Error writing out spatial index file" @@ -12652,7 +12757,7 @@ msgstr "Source de données OGR non définie" msgid "OGR layer not defined" msgstr "Couche OGR non définie" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Impossible d'ouvrir la source de données OGR '%s'" @@ -13666,17 +13771,17 @@ msgstr "La base de données par défaut n'est pas définie" msgid "Requested dblink %d, maximum link number %d" msgstr "dblink demandé %d, nombre maximum du lien %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "Erreur dans la règle à la ligne %d dans <%s>" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "Impossible d'ouvrir la couche OGR <%s>" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." @@ -13684,22 +13789,22 @@ msgstr "" "La table <%s> n'a pas de clef primaire définie. Impossible de définir les " "liens bases de données." -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "GRASS n'est pas compilé avec le support PostgreSQL" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "Format de carte vecteur inconnu" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" "Impossible de créer le fichier de définition de base de données pour la " "carte vecteur <%s>" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" "Bug: tentative de mise à jour d'une couche qui n'est pas dans le jeu de " @@ -14171,6 +14276,7 @@ msgstr "" "de catégories. Essayez de reconstruire la topologie ou de mettre à jour " "GRASS vers la version %d." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -14308,6 +14414,8 @@ msgstr "Le fichier coor de la carte vecteur <%s@%s> est plus petit qu'il ne devr <<<<<<< HEAD ======= >>>>>>> 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" @@ -14406,30 +14514,30 @@ msgstr "" "version. Merci de reconstruire la topologie." #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "Le vecteur dépasse la limite de taille de fichier supportée" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Impossible de supprimer le noeud %d de l'index spatial" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Impossible de supprimer la ligne %d de l'index spatial" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Tentative de supprimer sidx pour une surface morte" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Impossible de supprimer la surface %d de l'index spatial" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Impossible de supprimer l'île %d de l'index spatial" @@ -14446,7 +14554,7 @@ msgstr "Impossible de charger le fichier en mémoire, fichier non ouvert" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Mode vectoriel en mémoire non supporté, utilisation de 'AUTO'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " @@ -14456,7 +14564,7 @@ msgstr "" "topologie. Essayez de reconstruire la topologie ou de mettre à jour GRASS " "vers la version %d." -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " @@ -14465,7 +14573,7 @@ msgstr "" "Votre version de GRASS ne supporte pas entièrement le format de topologie %d." "%d du vecteur. Merci de reconstruire la topologie ou de mettre à jour GRASS." -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -14559,46 +14667,46 @@ msgstr "Format vecteur '%s' non supporté" msgid "Format definition is not correct: %s" msgstr "Définition du format incorrecte : %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "La ligne %d a déjà une surface/île %d à gauche" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "La ligne %d a déjà une surface/île %d à droite" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "L'île est déjà enregistrée dans la surface" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Tentative de supprimer une île d'une surface morte" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Tentative de supprimer l'île %d non référencée de la zone %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Tentative de supprimer une surface morte" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Centroïde mort %d référencée pour une surface (bug dans la librairie vecteur)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" "Tentative de suppression des information de la surface %d de l'île morte %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -14643,6 +14751,9 @@ msgstr "Icône %d non supportée" msgid "[%s]: No such color" msgstr "[%s] : cette couleur n'existe pas" +#~ msgid "Creating new GRASS GIS location <{}>..." +#~ msgstr "Création du nouveau Secteur GRASS <{}> ..." + #, python-format #~ msgid "" #~ "Unable to create temporary directory ! Exiting." @@ -14736,17 +14847,17 @@ msgstr "[%s] : cette couleur n'existe pas" #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" -#~ "Impossible de créer le fichier de signatures <%s> pour le sous-groupe <" -#~ "%s> du groupe <%s> - <%s> n'est pas le jeux de cartes courant" +#~ "Impossible de créer le fichier de signatures <%s> pour le sous-groupe " +#~ "<%s> du groupe <%s> - <%s> n'est pas le jeux de cartes courant" #, c-format #~ msgid "Unable to create signature file <%s> for subgroup <%s> of group <%s>" #~ msgstr "" -#~ "Impossible de créer le fichier de signatures <%s> pour le sous-groupe <" -#~ "%s> du groupe <%s>" +#~ "Impossible de créer le fichier de signatures <%s> pour le sous-groupe " +#~ "<%s> du groupe <%s>" #~ msgid "Attempt to access feature with invalid id (%" #~ msgstr "Tentative d'accéder à une entité avec un id invalide (%" @@ -14949,8 +15060,8 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "Start time must be of type datetime for %(type)s map <%(id)s> with layer: " #~ "%(l)s" #~ msgstr "" -#~ "La date de début doit être du type datetime pour la carte %(type)s <" -#~ "%(id)s> avec la couche : %(l)s" +#~ "La date de début doit être du type datetime pour la carte %(type)s " +#~ "<%(id)s> avec la couche : %(l)s" #, python-format #~ msgid "Start time must be of type datetime for %(type)s map <%(id)s>" @@ -14975,14 +15086,14 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "End time must be greater than start time for %(type)s map <%(id)s> with " #~ "layer: %(l)s" #~ msgstr "" -#~ "La date de fin doit être après la date de début pour la carte %(type)s <" -#~ "%(id)s> avec la couche : %(l)s" +#~ "La date de fin doit être après la date de début pour la carte %(type)s " +#~ "<%(id)s> avec la couche : %(l)s" #, python-format #~ msgid "End time must be greater than start time for %(type)s map <%(id)s>" #~ msgstr "" -#~ "La date de fin doit être après la date de début pour la carte %(type)s <" -#~ "%(id)s>" +#~ "La date de fin doit être après la date de début pour la carte %(type)s " +#~ "<%(id)s>" #, python-format #~ msgid "" @@ -14998,14 +15109,14 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "Unsupported relative time unit type for %(type)s map <%(id)s> with layer " #~ "%(l)s: %(u)s" #~ msgstr "" -#~ "Type d'unité de temps relatif non supporté pour la carte %(type)s <" -#~ "%(id)s> avec la couche %(l)s : %(u)s" +#~ "Type d'unité de temps relatif non supporté pour la carte %(type)s " +#~ "<%(id)s> avec la couche %(l)s : %(u)s" #, python-format #~ msgid "Unsupported relative time unit type for %(type)s map <%(id)s>: %(u)s" #~ msgstr "" -#~ "Type d'unité de temps relatif non dupporté pour la carte %(type)s <" -#~ "%(id)s> : %(u)s" +#~ "Type d'unité de temps relatif non dupporté pour la carte %(type)s " +#~ "<%(id)s> : %(u)s" #, python-format #~ msgid "" @@ -15401,16 +15512,16 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "Relative time units of space time dataset <%(id)s> and map <%(map)s> with " #~ "layer %(l)s are different" #~ msgstr "" -#~ "Les unité de temps relatif du jeu de données <%(id)s> et de la carte <" -#~ "%(map)s> avec la couche %(l)s sont différents" +#~ "Les unité de temps relatif du jeu de données <%(id)s> et de la carte " +#~ "<%(map)s> avec la couche %(l)s sont différents" #, python-format #~ msgid "" #~ "Relative time units of space time dataset <%(id)s> and map <%(map)s> are " #~ "different" #~ msgstr "" -#~ "Les unités de temps relatif du jeu de données <%(id)s> et de la carte <" -#~ "%(map)s> sont différents" +#~ "Les unités de temps relatif du jeu de données <%(id)s> et de la carte " +#~ "<%(map)s> sont différents" #~ msgid "Only maps from the same mapset can be registered" #~ msgstr "Seules les cartes du même jeu de cartes peuvent être référencées" @@ -15435,8 +15546,8 @@ msgstr "[%s] : cette couleur n'existe pas" #, python-format #~ msgid "" -#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset <" -#~ "%(base)s>" +#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset " +#~ "<%(base)s>" #~ msgstr "" #~ "La carte <%(map)s> avec la couche %(l)s n'est pas référencée dans le jeu " #~ "de données temporel <%(base)s>" @@ -15444,13 +15555,13 @@ msgstr "[%s] : cette couleur n'existe pas" #, python-format #~ msgid "Map <%(map)s> is not registered in space time dataset <%(base)s>" #~ msgstr "" -#~ "La carte <%(map)s> n'est pas référencée dans le jeu de données temporel <" -#~ "%(base)s>" +#~ "La carte <%(map)s> n'est pas référencée dans le jeu de données temporel " +#~ "<%(base)s>" #, python-format #~ msgid "" -#~ "Update metadata, spatial and temporal extent from all registered maps of <" -#~ "%s>" +#~ "Update metadata, spatial and temporal extent from all registered maps of " +#~ "<%s>" #~ msgstr "" #~ "Mettre à jour les métadonnées, l'emprise spatiale et temporelle de toutes " #~ "les cartes référencées de <%s>" @@ -15562,8 +15673,8 @@ msgstr "[%s] : cette couleur n'existe pas" #, python-format #~ msgid "" -#~ "Wrong temporal type of space time dataset <" -#~ "%s> <%s> time is required" +#~ "Wrong temporal type of space time dataset " +#~ "<%s> <%s> time is required" #~ msgstr "Mauvais type temporel pour le jeu de données <%s> <%s> est requis" #~ msgid "Wrong type of input " @@ -15574,8 +15685,8 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "The resulting space time dataset type <%(a)s> is different from the " #~ "requested type <%(b)s>" #~ msgstr "" -#~ "Le jeu de données temporel de type <%(a)s> est différent du type requis <" -#~ "%(b)s>" +#~ "Le jeu de données temporel de type <%(a)s> est différent du type requis " +#~ "<%(b)s>" #~ msgid "" #~ "Maps that should be registered in the resulting space time dataset have " @@ -16167,8 +16278,8 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "avoid conflict with Python keywords. Underscore at the beginning is " #~ "deprecated 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 " +#~ "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." #, fuzzy, python-brace-format @@ -16477,16 +16588,16 @@ msgstr "[%s] : cette couleur n'existe pas" #~ "Unable to fetch one. There is no temporal database connection defined for " #~ "mapset <%(mapset)s>" #~ msgstr "" -#~ "Impossible d'ouvrir le fichier d'historique pour la couche vectorielle <" -#~ "%s>" +#~ "Impossible d'ouvrir le fichier d'historique pour la couche vectorielle " +#~ "<%s>" #, fuzzy #~ msgid "" #~ "Unable to fetch all. There is no temporal database connection defined for " #~ "mapset <%(mapset)s>" #~ msgstr "" -#~ "Impossible d'ouvrir le fichier d'historique pour la couche vectorielle <" -#~ "%s>" +#~ "Impossible d'ouvrir le fichier d'historique pour la couche vectorielle " +#~ "<%s>" #, fuzzy #~ msgid "Unable to find a temporary null file <%s>" @@ -17191,6 +17302,9 @@ msgstr "Le fichier coor de la carte vecteur <%s@%s> est plus petit qu'il ne devr >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17200,6 +17314,7 @@ msgstr "Copie %s <%s> vers <%s> dans le jeu de cartes courant" 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." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #~ msgid "Invalid value <%s> for parameter <%s>" @@ -17208,13 +17323,15 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio <<<<<<< HEAD ======= >>>>>>> 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 " +#~ "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." ======= #~ msgid "Invalid value <%s> for parameter <%s>" @@ -17227,6 +17344,9 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_hu.po b/locale/po/grasslibs_hu.po index cb58206f0b7..8b0c115abbf 100644 --- a/locale/po/grasslibs_hu.po +++ b/locale/po/grasslibs_hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Hungarian since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -5856,28 +5856,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5911,143 +5911,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -6055,87 +6063,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -6146,22 +6152,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -6171,214 +6177,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -6495,7 +6505,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -6516,7 +6526,6 @@ msgid "Error in cache" msgstr "Hiba az átmeneti tárolóban" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Szabály hozzáadás: %lf - %lf" @@ -9921,8 +9930,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -10623,7 +10632,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -11580,36 +11589,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -12131,30 +12140,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -12171,21 +12180,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -12275,44 +12284,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_id_ID.po b/locale/po/grasslibs_id_ID.po index 83afa842cfe..754762050b0 100644 --- a/locale/po/grasslibs_id_ID.po +++ b/locale/po/grasslibs_id_ID.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_id_ID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Indonesian since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -6277,28 +6277,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -6332,143 +6332,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -6476,87 +6484,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -6567,22 +6573,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -6592,214 +6598,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -6917,7 +6927,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -6938,7 +6948,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -10344,8 +10353,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -10382,6 +10391,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10393,6 +10403,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -11064,7 +11079,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -12016,36 +12031,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -12540,12 +12555,15 @@ msgstr "" msgid "Attempt to delete not registered line %d from node %d" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 "" @@ -12572,30 +12590,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -12612,21 +12630,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -12716,44 +12734,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -12817,6 +12835,9 @@ msgstr "[%s]: Tidak ada warna seperti itu" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_it.po b/locale/po/grasslibs_it.po index 0a0d85b1fcf..b117f6dd72c 100644 --- a/locale/po/grasslibs_it.po +++ b/locale/po/grasslibs_it.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Italian since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" -"impossibile aprire il raster <%s@%s> poiché è una riclassificazione di <%s@" -"%s> che non esiste" +"impossibile aprire il raster <%s@%s> poiché è una riclassificazione di " +"<%s@%s> che non esiste" #: ../lib/raster/open.c:197 #, c-format @@ -6402,8 +6402,8 @@ msgstr "L'intervallo dei dati interi per la mappa raster <%s> è vuoto" #, c-format msgid "Attempt to open quantization table for CELL raster map <%s>" msgstr "" -"Tentativo di apertura della tabella di quantizzazione per la mappa raster <" -"%s> di tipo CELL" +"Tentativo di apertura della tabella di quantizzazione per la mappa raster " +"<%s> di tipo CELL" #: ../lib/raster/quant_io.c:136 #, c-format @@ -6419,28 +6419,30 @@ msgstr "Il file di quantizzazione per la mappa raster <%s> è vuoto" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "stampa questo messaggio di aiuto" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "mostra le informazioni di versione ed esci" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +#, fuzzy +msgid "create given database, project or mapset if it doesn't exist" msgstr "crea il database, la location o il mapset se non esiste" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +#, fuzzy +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" "esci dopo la creazione della location o del mapset. Solo con l'opzione -c" @@ -6475,145 +6477,153 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 +msgid "fully qualified initial mapset directory" +msgstr "" + +#: ../lib/init/grass.py:396 msgid "Environment variables relevant for startup" msgstr "Variabili di sistema rilevanti per l'avvio" -#: ../lib/init/grass.py:396 +#: ../lib/init/grass.py:397 msgid "select GUI (text, gui, gtext)" msgstr "" -#: ../lib/init/grass.py:397 +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "definire il browser web html per le pagine del manuale" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" "definire percorsi aggiuntivi ai moduli GRASS locali o agli script dell'utente" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" "definire un GISBASE aggiuntivo per gli addon di GRASS installati in locale" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -6621,87 +6631,88 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" +"Creazione della nuova location fallita. La location <%s> è già presente." -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" +"Creazione della nuova location fallita. La location <%s> è già presente." -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." -msgstr "" +#: ../lib/init/grass.py:1137 +#, fuzzy +msgid "Creating new GRASS GIS project <{}>..." +msgstr "Sto creando una nuova location/mapset GRASS GIS" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -6712,22 +6723,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -6737,39 +6748,39 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "Eseguendo <%s> ..." -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" @@ -6778,175 +6789,179 @@ msgstr "" "Esecuzione di <{cmd}> fallita:\n" "{error}" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "Esecuzione di <%s> finita." -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "Impossibile chiudere la GUI. {0}" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "Benvenuto in GRASS GIS%s" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "Homepage di GRASS GIS:" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "Questa versione è eseguita tramite:" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "VIsualizza i termini di licenza con:" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "Se necessario, riavvia la GUI con:" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "Avvia la GUI con:" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "Per uscire digitare:" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "Maschere raster 2D e 3D presenti" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "Maschera raster presente" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "Maschera raster 3D presente" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Fatto." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "Arrivederci da GRASS GIS" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "Installare il pacchetto di sviluppo di GRASS GIS" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "Parametro <%s> non supportato" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "Sto avviando GRASS GIS..." -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "Sto avviando <%s> GUI in background, attendere prego..." -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -7049,8 +7064,8 @@ msgstr "Impossibile scrive la storia per la mappa raster 3D <%s>" #, c-format msgid "Unable to move temp raster map <%s> to 3D raster map <%s>" msgstr "" -"Impossibile spostare la mappa raster temporanea <%s> nella mappa raster 3D <" -"%s>" +"Impossibile spostare la mappa raster temporanea <%s> nella mappa raster 3D " +"<%s>" #: ../lib/raster3d/close.c:81 msgid "Unable to flush all tiles" @@ -7065,7 +7080,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "Impossibile scrivere l'intestazione per la mappa raster 3D <%s>" @@ -7086,7 +7101,6 @@ msgid "Error in cache" msgstr "Errore nella cache" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Aggiungendo la regola: %lf - %lf" @@ -10415,8 +10429,8 @@ msgstr "Caricando raster <%s>" #, c-format msgid "Color table range doesn't match data (mincol=%d, maxcol=%d" msgstr "" -"Il range della tabella di colori non corrisponde ai dati (mincol=%d, maxcol=" -"%d" +"Il range della tabella di colori non corrisponde ai dati (mincol=%d, " +"maxcol=%d" #: ../lib/ogsf/gs3.c:654 ../lib/ogsf/gs3.c:725 #, c-format @@ -10858,8 +10872,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -11572,7 +11586,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Impossibile aprire la sorgente dei dati OGR '%s'" @@ -12180,6 +12194,7 @@ msgid "Illegal vector map name <%s>. Must start with a letter." msgstr "" "Nome non valido per il vettoriale <%s>. Deve cominciare con una lettera." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -12246,6 +12261,8 @@ msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../lib/vector/Vlib/legal_vname.c:61 #, c-format msgid "Illegal vector map name <%s>. Character '%c' not allowed." @@ -12611,36 +12628,36 @@ msgstr "Il valore predefinito del database non è impostato" msgid "Requested dblink %d, maximum link number %d" msgstr "Richiesto dblink %d, massimo numero di link %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" "Bug: attesa di aggiornamento di una mappa non presente nel mapset in uso" @@ -13171,30 +13188,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "Il vettoriale supporta il limite di dimensione del file" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Impossibile eliminare il nodo %d dall'indice spaziale" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Impossibile eliminare la linea %d dall'indice spaziale" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Tentativo di cancellare sidx da area inesistente" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Impossibile eliminare l'area %d dall'indice spaziale" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Impossibile eliminare l'isola %d dall'indice spaziale" @@ -13211,7 +13228,7 @@ msgstr "Impossibile caricare file in memoria, file non aperto" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " @@ -13221,14 +13238,14 @@ msgstr "" "topologico. Provare a ricompilare la topologia o aggiornare GRASS almeno " "alla versione %d." -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -13320,48 +13337,48 @@ msgstr "Il formato vettoriale '%s' non supportato" msgid "Format definition is not correct: %s" msgstr "La definizione del formato non è corretta: %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "La linea %d ha già un'area/isola %d alla propria sinistra" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "La linea %d ha già un'area/isola %d alla propria destra" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Tentativo di cancellare isola da area inesistente" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Tentativo di cancellare isola %d non registrata dall'area %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Tentativo di cancellare area inesistente" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Centroide inesistente %d registrato per l'area (baco nella libreria " "vettoriale)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" "Tentativo di cancellare le informazioni dell'area %d dall'isola inesistente " "%d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -13429,8 +13446,8 @@ msgstr "[%s]: Colore sconosciuto" #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" #~ "Impossibile creare il file <%s> per il sottogruppo <%s> del gruppo <%s> - " #~ "<%s> non è nel mapset attuale" @@ -13617,8 +13634,8 @@ msgstr "[%s]: Colore sconosciuto" #, python-format #~ msgid "" -#~ "Update metadata, spatial and temporal extent from all registered maps of <" -#~ "%s>" +#~ "Update metadata, spatial and temporal extent from all registered maps of " +#~ "<%s>" #~ msgstr "" #~ "Aggiorna i metadati e l'estensione spazio-temporale da tutte le mappe " #~ "registrate di <%s>" @@ -13670,8 +13687,8 @@ msgstr "[%s]: Colore sconosciuto" #, python-format #~ msgid "" -#~ "Wrong temporal type of space time dataset <" -#~ "%s> <%s> time is required" +#~ "Wrong temporal type of space time dataset " +#~ "<%s> <%s> time is required" #~ msgstr "" #~ "Tipo temporale del database spazio-temporale <%s> " #~ "errato <%s> richiesto" @@ -13792,8 +13809,8 @@ msgstr "[%s]: Colore sconosciuto" #~ "Unable to perform aggregation. Output raster map <%(name)s> exists and " #~ "overwrite flag was not set" #~ msgstr "" -#~ "Non riesco ad eseguire l'aggregazione. La mappa raster di output <" -#~ "%(name)s> esiste e l'opzione di sovrascrittura non è stata impostata" +#~ "Non riesco ad eseguire l'aggregazione. La mappa raster di output " +#~ "<%(name)s> esiste e l'opzione di sovrascrittura non è stata impostata" #~ msgid "Empty map list" #~ msgstr "Lista di mappe vuota" @@ -14173,13 +14190,6 @@ msgstr "[%s]: Colore sconosciuto" #~ msgid "Unable allocate PNG structure" #~ msgstr "Impossibile allocare struttura PNG" -#~ msgid "Failed to create new location. The location <%s> already exists." -#~ msgstr "" -#~ "Creazione della nuova location fallita. La location <%s> è già presente." - -#~ msgid "Creating new GRASS GIS location/mapset..." -#~ msgstr "Sto creando una nuova location/mapset GRASS GIS" - #~ msgid "Option %s requires all of %s" #~ msgstr "L'opzione %s richiede tutte le seguenti %s" @@ -14253,12 +14263,20 @@ msgstr "Il Nord deve essere più grande del Sud" #~ "Unable to read header file for raster map <%s@%s>. It is a reclass of " #~ "raster map <%s@%s> %s" #~ msgstr "" +<<<<<<< HEAD +#~ "Impossibile leggere il file dell'intestazione per la mappa raster " +#~ "<%s@%s>. È una riclassificazione della mappa raster <%s@%s> %s" +======= #~ "Impossibile leggere il file dell'intestazione per la mappa raster <%s@" #~ "%s>. È una riclassificazione della mappa raster <%s@%s> %s" ======= msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of raster map <%s@%s> %s" msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s>. È una riclassificazione della mappa raster <%s@%s> %s" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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>" @@ -14344,6 +14362,9 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s>. È una riclassificazione della mappa raster <%s@%s> %s" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -14354,6 +14375,10 @@ msgid "To run the module <%s> add underscore at the end of the option <%s> to av 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." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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 f5f6a449819..916704b8d71 100644 --- a/locale/po/grasslibs_ja.po +++ b/locale/po/grasslibs_ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:51+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Japanese " msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -3631,6 +3634,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/timestamp.c:534 #, c-format msgid "Invalid timestamp specified for vector map <%s@%s>" @@ -3692,12 +3697,12 @@ msgstr "" msgid "Unrecognised access mode: %o" msgstr "" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "マップセットの要素が作成できません %s (%s): %s" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "マップセット要素にアクセスできません %s (%s): %s" @@ -3929,6 +3934,9 @@ msgstr "<%s> マップセット <%s>" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4635,8 +4643,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -5153,28 +5161,28 @@ msgstr "" msgid "WARNING" msgstr "警告" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5208,143 +5216,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5352,87 +5368,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5443,22 +5457,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5468,214 +5482,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "完了 " -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5792,7 +5810,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5813,7 +5831,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "ルールの追加: %lf - %lf " @@ -9228,8 +9245,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9268,6 +9285,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9279,6 +9297,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -9952,7 +9975,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "OGRデータソースを開けません '%s'" @@ -10910,36 +10933,36 @@ msgstr "既定のデータベースが設定されていません" msgid "Requested dblink %d, maximum link number %d" msgstr "要求された dbリンク %d, 最大のリンク数 %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "バグ: このマップセットにないマップをアップデートしようとしています" @@ -11460,30 +11483,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "空間インデックスからノード %d を削除できません" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "空間インデックスからライン%d を削除できません" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "不要なエリアの sidx を削除しようとしています" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "空間インデックスから領域%d を削除できません" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "空間インデックスから島 %d を削除できません" @@ -11501,21 +11524,21 @@ msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" "ベクトルメモリーモードはサポートされていません。, 'AUTO'を使用してください" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11605,46 +11628,46 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "ライン %d は既に左にエリア/島を持っています %d " -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "ライン %d は既に右にエリア/島を持っています %d" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "不要エリアから島を削除しようとしています" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr " エリア %dから記録されていない島 %dを削除しようとしています" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "不必要なエリアを削除しようとしています" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "エリアに不必要なセントロイドが %d 個記録されました (ベクトルライブラリ内のバ" "グ)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "不要な島 %dからエリア %d 情報 を削除しようとしています " -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "不要なエリア %dから島%d 情報を削除しようとしています " @@ -11881,6 +11904,7 @@ msgstr "[%s]: そのような色はありません" #~ msgid "Example: income < 1000 and inhab >= 10000" #~ msgstr "例: 収入 < 1000 かつ 住人 >= 10000" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -11943,6 +11967,8 @@ msgstr "無効なオフセット (%ld)" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Absurd polygon." #~ msgstr "不正なポリゴン" @@ -12081,6 +12107,9 @@ msgstr "無効なオフセット (%ld)" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_ko.po b/locale/po/grasslibs_ko.po index eae932c376c..c46d0f7c52a 100644 --- a/locale/po/grasslibs_ko.po +++ b/locale/po/grasslibs_ko.po @@ -9,13 +9,21 @@ msgstr "" "Project-Id-Version: grasslibs_ko\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD +======= +"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" ======= "POT-Creation-Date: 2021-02-17 23:13-0500\n" "PO-Revision-Date: 2022-05-25 05:05+0000\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27,6 +35,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -37,11 +50,14 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "X-Generator: Weblate 5.0\n" #: ../lib/nviz/render.c:43 @@ -49,6 +65,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1544,8 +1563,8 @@ msgstr "" #: ../lib/rst/interp_float/vinput2d.c:273 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../lib/rst/interp_float/vinput2d.c:279 @@ -1871,7 +1890,7 @@ msgstr "" #: ../lib/vector/Vlib/read_ogr.c:157 ../lib/vector/Vlib/read_ogr.c:239 #: ../lib/vector/Vlib/write_ogr.c:70 ../lib/vector/Vlib/write_ogr.c:105 #: ../lib/vector/Vlib/write_ogr.c:146 ../lib/vector/Vlib/rewind_ogr.c:47 -#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:732 +#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:751 #: ../lib/vector/Vlib/build_sfa.c:720 msgid "GRASS is not compiled with OGR support" msgstr "" @@ -3444,7 +3463,7 @@ msgid "SYNOPSIS" msgstr "" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "플래그" @@ -3454,7 +3473,7 @@ msgid "Force launching GUI dialog" msgstr "GUI 대화상자를 강제시작합니다" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "매개변수" @@ -3811,11 +3830,11 @@ msgid "'.' for current mapset" msgstr "" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +msgid "Project (location) name" msgstr "" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +msgid "Project name (not path to project)" msgstr "" #: ../lib/gis/parser_standard_options.c:712 @@ -5917,12 +5936,12 @@ msgstr "읽기 전용 임시 파일의 생성을 시도하세요" msgid "Unrecognised access mode: %o" msgstr "" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "" @@ -9927,8 +9946,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -10434,28 +10453,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "사용법" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -10490,143 +10509,151 @@ msgid "" "version" msgstr "옵션: arch,build,compiler,date,path,revision,svn_revision,version" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "표준 플래그" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -10634,87 +10661,86 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." -msgstr "" +#: ../lib/init/grass.py:1137 +#, fuzzy +msgid "Creating new GRASS GIS project <{}>..." +msgstr "새 GRASS GIS 로케이션/지도세트를 생성하는 중입니다..." -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -10725,22 +10751,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "경로 '%s'가 존재하지 않습니다" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "경로 '%s'에 접근할 수 없습니다" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "당신은 '%s'의 소유자가 아닙니다" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -10750,197 +10776,202 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "사용자 글꼴캡을 생성하는 중입니다..." -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "SHELL 변수가 설정되지 않았습니다" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "<%s>를 실행하는 중입니다..." -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "<%s>의 실행을 종료했습니다." -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "GUI를 닫을 수 없습니다. {0}" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "GRASS GIS %s에 오신 것을 환영합니다" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "GRASS GIS 홈페이지:" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "실행 셸:" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "도움말:" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "사용권 조건:" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "인용:" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "GUI 재시작:" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "GUI 시작:" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "종료:" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "2차원 및 3차원 래스터 마스크가 존재합니다" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "래스터 마스크가 존재합니다" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "3차원 래스터 마스크가 존재합니다" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "완료." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "GRASS GIS를 종료합니다" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "GRASS GIS 개발 패키지를 설치하세요" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "매개변수 <%s>를 지원하지 않습니다" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "GRASS GIS를 시작하는 중입니다..." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "whose header file can't be opened." @@ -11016,23 +11047,29 @@ 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 "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "<%s> GUI를 배경프로세스에서 시작합니다. 기다려주세요..." -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -11150,7 +11187,7 @@ msgid "Unable to position file" msgstr "파일 포인터를 옮길 수 없습니다" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "3차원 래스터 지도 <%s>의 헤더를 쓸 수 없습니다" @@ -11171,7 +11208,6 @@ msgid "Error in cache" msgstr "캐시 내에 오류" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "규칙 추가: %lf - %lf" @@ -12728,8 +12764,8 @@ msgstr "가상의 교점 연결을 위한 네트워크 호를 추가할 수 없 #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -13433,7 +13469,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -14387,36 +14423,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "<%2$s> 안의 행 %1$d 상에 있는 규칙 내에 오류" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "알려지지 않은 벡터 지도 포맷" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -14947,30 +14983,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "공간 색인으로부터 교점 %d를 삭제할 수 없습니다" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "공간 색인으로부터 선 %d를 삭제할 수 없습니다" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "무효한 면을 위한 sidx의 삭제를 시도합니다" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "공간 색인으로부터 면 %d를 삭제할 수 없습니다" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "공간 색인으로부터 섬 %d를 삭제할 수 없습니다" @@ -14987,21 +15023,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -15091,44 +15127,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "무효한 면으로부터 섬의 삭제를 시도합니다" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "면 %2$d로부터 등록되지 않은 섬 %1$d의 삭제를 시도합니다" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "무효한 면의 삭제를 시도합니다" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "무효한 섬 %2$d로부터 면 %1$d 정보의 삭제를 시도합니다" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "무효한 면 %d로부터 섬 %d 정보의 삭제를 시도합니다" @@ -15523,11 +15559,19 @@ msgstr "" #~ "다음 문서를 읽어 보세요: https://grass.osgeo.org/{cmd_name}/manuals/" #~ "helptext.html" +<<<<<<< HEAD +#~ msgid "whose header file can't be opened." +#~ msgstr "헤더 파일을 열 수 없습니다" +======= #~ msgid "Creating new GRASS GIS location/mapset..." #~ msgstr "새 GRASS GIS 로케이션/지도세트를 생성하는 중입니다..." msgid "whose header file can't be opened." msgstr "헤더 파일을 열 수 없습니다" +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Illegal row value" msgstr "잘못된 row 값" @@ -15697,6 +15741,9 @@ msgstr "" "진행하려면 RETURN을 누르세요.\n" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -15707,6 +15754,10 @@ msgid "To run the module <%s> add underscore at the end of the option <%s> to av msgstr "모듈 <%s>를 실행하기 위해서는 옵션 <%s>의 끝에 언더스코어를 추가해서 파이썬 키위드와의 충돌을 방지해야 합니다. 앞부분의 언더스코어는 GRASS GIS 7.0에서는 추천하지 않으며 버전 7.1부터는 지원하지 않을 것입니다." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_lv.po b/locale/po/grasslibs_lv.po index 5e194f38095..08b32be6dd7 100644 --- a/locale/po/grasslibs_lv.po +++ b/locale/po/grasslibs_lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_lv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:52+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Latvian since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4181,28 +4181,28 @@ msgstr "" msgid "WARNING" msgstr "BRĪDINĀJUMS" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "Iziet..." -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "Lietojums" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "izdrukā šo palīdzības paziņojumu" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "parāda versijas informāciju un iziet" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4236,143 +4236,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4380,93 +4388,92 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" "Nebija iespējams izveidot jaunu novietojumu. Novietojums <%s> jau eksistē." -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, fuzzy, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" "Nebija iespējams izveidot jaunu novietojumu. Novietojums <%s> jau eksistē." -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" "Nebija iespējams izveidot jaunu novietojumu. Novietojums <%s> jau eksistē." -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, fuzzy, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" "Nebija iespējams izveidot jaunu novietojumu. Novietojums <%s> jau eksistē." -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" -msgstr "" +#: ../lib/init/grass.py:1133 +#, fuzzy +msgid "Provide CRS to create a project" +msgstr "Nevar ierakstīt mezglus" -#: ../lib/init/grass.py:1136 +#: ../lib/init/grass.py:1137 #, fuzzy -msgid "Creating new GRASS GIS location <{}>..." +msgid "Creating new GRASS GIS project <{}>..." msgstr "Startē GRASS GIS..." -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 #, fuzzy msgid "Creating new GRASS GIS mapset <{}>..." msgstr "Startē GRASS GIS..." -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4477,22 +4484,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "Ceļš '%s' neeksitē" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "Ceļš '%s' nav pieejams." -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "Jūs neesat '%s' īpašnieks." -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4502,214 +4509,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "Izpilda <%s>...." -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "GRASS GIS mājas lapa:" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "Šo versiju darbina:" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "Palīdzība ir pieejama ar komandu:" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "Licences informācija ir pieejama:" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "Ja nepieciešams, grafisko vidi var pārstartēt ar:" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "Grafiskās vides startēšana: " -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "Lai izietu, izpildiet:" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Pabeigts." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "Uz redzēšanos" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "Parametrs <%s> nav atbalstīts" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "Startē GRASS GIS..." -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "Startē <%s> grafisko vidi fona režīmā. Lūdzu uzgaidiet..." -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -4826,7 +4837,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -4847,7 +4858,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8398,8 +8408,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9100,7 +9110,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "OGR slānis nav definēts" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -10062,36 +10072,36 @@ msgstr "Noklusējuma datubāze nav iestatīta" msgid "Requested dblink %d, maximum link number %d" msgstr "Pieprasītā dbsaite %d, maksimāli iespējamo saišu skaits %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "GRASS nav kompilēts ar PostgreSQL atbalstu" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "Nezināms vektordatu kartes formāts" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10614,30 +10624,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10654,21 +10664,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -10758,44 +10768,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -10837,6 +10847,10 @@ msgstr "" msgid "[%s]: No such color" msgstr "" +#, fuzzy +#~ msgid "Creating new GRASS GIS location <{}>..." +#~ msgstr "Startē GRASS GIS..." + #~ msgid "" #~ "Exit was requested in GUI.\n" #~ "GRASS GIS will not start. Bye." diff --git a/locale/po/grasslibs_ml.po b/locale/po/grasslibs_ml.po index 02f870451b3..5f5fe1d8ae3 100644 --- a/locale/po/grasslibs_ml.po +++ b/locale/po/grasslibs_ml.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ml\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:52+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Malayalam >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/mapset.c:38 msgid "MAPSET is not set" msgstr "" @@ -3534,6 +3537,9 @@ msgstr "<%s> മാപ്പ്സെറ്റിൽ <%s>" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4284,8 +4290,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4805,28 +4811,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4860,143 +4866,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5004,87 +5018,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5095,22 +5107,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5120,214 +5132,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5444,7 +5460,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5465,7 +5481,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8870,8 +8885,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9572,7 +9587,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "OGR ഡേറ്റയുടെ ഉറവിടം തുറക്കാൻ പറ്റുന്നില്ല '%s'" @@ -10529,36 +10544,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "തെറ്റ്: നിലവിലുള്ള മാപ്പ്സെറ്റിലില്ലാത്ത മാപ്പിനെ മാറ്റം വരുത്താൻ ശ്രമിക്കുന്നു" @@ -11080,30 +11095,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -11120,21 +11135,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11224,44 +11239,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_pl.po b/locale/po/grasslibs_pl.po index 718a725b335..063aa038823 100644 --- a/locale/po/grasslibs_pl.po +++ b/locale/po/grasslibs_pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:52+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Polish >>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -4685,8 +4688,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Nie można otworzyć mapy rastrowej <%s@%s> ponieważ jest ona reklasyfikacją " "mapy rastrowej <%s@%s>, która nie istnieje" @@ -5209,28 +5212,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5264,143 +5267,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5408,87 +5419,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5499,22 +5508,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "Ścieżka '%s' nie istnieje" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "Ścieżka '%s' jest niedostępna." -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "Nie jesteś właścicielem '%s'." -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5524,214 +5533,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5848,7 +5861,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5869,7 +5882,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -9291,8 +9303,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9331,6 +9343,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9342,6 +9355,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -10019,7 +10037,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Nie można otworzyć źródła danych OGR '%s'" @@ -10637,6 +10655,7 @@ msgstr "" "Niedozwolona nazwa mapy wektorowej <%s>. Słowo kluczowe SQL nie może być " "użyte jako nazwa mapy wektorowej." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -10697,6 +10716,8 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>" <<<<<<< HEAD ======= >>>>>>> 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)" @@ -11052,36 +11073,36 @@ msgstr "Domyślna baza danych nie jest ustawiona" msgid "Requested dblink %d, maximum link number %d" msgstr "Zażądano połączenia %d, najwyższy numer połączenia %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" "Bug: próba aktualizacji mapy, która nie znajduje się w bieżącym mapsecie" @@ -11605,30 +11626,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Nie można usunąć węzła %d z indeksu przestrzennego" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Nie można usunąć linii %d z indeksu przestrzennego" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Próba usunięcia sidx dla martwego obszaru" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Nie można usunąć obszaru %d z indeksu przestrzennego" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Nie można usunąć wyspy %d z indeksu przestrzennego" @@ -11645,21 +11666,21 @@ msgstr "Nie można wczytać pliku do pamięci; plik nie został otwarty" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Tryb wektorów w pamięci nie jest obsługiwany; użyto 'AUTO'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11749,45 +11770,45 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "Linia %d już ma obszar/wyspę %d po lewej" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "Linia %d już ma obszar/wyspę %d po prawej" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Próba usunięcia wyspy z martwego obszaru" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Próba usunięcia nie zarejestrowanej wyspy %d z obszaru %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Próba usunięcia martwego obszaru" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Martwy centroid %d zarejestrowany dla obszaru (bug w bibliotece vector)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Próba usunięcia informacji o obszarze %d z martwej wyspy %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Próba usunięcia informacji o wyspie %d z martwego obszaru %d" @@ -11840,8 +11861,8 @@ msgstr "[%s]: Nie ma takiego koloru" #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" #~ "Nie można utworzyć pliku <%s> dla podgrupy <%s> grupy <%s> - <%s> nie " #~ "jest bieżącym mapsetem" @@ -12148,6 +12169,9 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_pt.po b/locale/po/grasslibs_pt.po index ef2766ab342..98d059fd68e 100644 --- a/locale/po/grasslibs_pt.po +++ b/locale/po/grasslibs_pt.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:52+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Portuguese >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/mapset.c:38 msgid "MAPSET is not set" msgstr "MAPSET não foi definido" @@ -3947,6 +3950,9 @@ msgid "none" msgstr "nenhum" ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5083,8 +5089,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Não foi possível abrir o mapa raster <%s@%s> porque este é uma " "reclassificação do mapa raster <%s@%s> que não existe" @@ -5609,28 +5615,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5664,143 +5670,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5808,87 +5822,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5899,22 +5911,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5924,214 +5936,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -6248,7 +6264,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -6269,7 +6285,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -9423,6 +9438,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9434,6 +9450,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -9540,8 +9561,8 @@ msgstr "A carregar o mapa raster <%s>..." #, c-format msgid "Color table range doesn't match data (mincol=%d, maxcol=%d" msgstr "" -"O intervalo de valores da tabela de cor não corresponde aos dados (mincol=" -"%d, maxcol=%d" +"O intervalo de valores da tabela de cor não corresponde aos dados " +"(mincol=%d, maxcol=%d" #: ../lib/ogsf/gs3.c:654 ../lib/ogsf/gs3.c:725 #, c-format @@ -9978,8 +9999,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -10358,8 +10379,8 @@ msgstr "" #, c-format msgid "Unable to open topology file for vector map <%s>" msgstr "" -"Não foi possível abrir o ficheiro de topologia relativo ao mapa vectorial <" -"%s>" +"Não foi possível abrir o ficheiro de topologia relativo ao mapa vectorial " +"<%s>" #: ../lib/vector/Vlib/open.c:383 ../lib/vector/Vlib/open.c:904 #: ../lib/vector/Vlib/build.c:881 @@ -10388,8 +10409,8 @@ msgstr "" #, c-format msgid "Unable to open history file for vector map <%s>" msgstr "" -"Não foi possível abrir o ficheiro do histórico relativo ao mapa vectorial <" -"%s>" +"Não foi possível abrir o ficheiro do histórico relativo ao mapa vectorial " +"<%s>" #: ../lib/vector/Vlib/open.c:804 #, c-format @@ -10696,7 +10717,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Não foi possível abrir a fonte de dados OGR '%s'" @@ -11667,36 +11688,36 @@ msgstr "Base de dados padrão não foi especificada" msgid "Requested dblink %d, maximum link number %d" msgstr "dblink %d solicitado, %d ligações no máximo" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "Bug: tentativa de atualizar mapa que não está no mapset atual" @@ -12218,30 +12239,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Não foi possível apagar o nó %d do índice espacial" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Não foi possível apagar a linha %d do índice espacial" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Tentativa de remover sidx de uma área morta" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Não foi possível apagar a área %d do índice espacial" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Não foi possível apagar a ilha %d do índice espacial" @@ -12258,21 +12279,21 @@ msgstr "Não foi possível carregar o ficheiro para a memória, ficheiro não ab msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Mode de memória vectorial não suportado, a usar 'AUTO'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -12364,45 +12385,45 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "A linha %d já tem área/ilha %d à esquerda" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "A linha %d já tem área/ilha %d à direita" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Tentativa de remover ilha de uma área morta" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Tentativa de remover ilha não registrada %d da área %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Tentativa de remover área morta" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Centróide inexistente %d registado para área (erro na biblioteca vectorial)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Tentativa de remover informação da área %d da ilha morta %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Tentativa de remover informação da ilha %d da área morta %d" @@ -12455,8 +12476,8 @@ msgstr "[%s]: Cor não existe" #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" #~ "Não foi possível criar o ficheiro <%s> para o subgrupo <%s> do grupo <%s> " #~ "- <%s> não está no mapset actual" @@ -12517,13 +12538,13 @@ msgstr "[%s]: Cor não existe" #~ msgid "Fixing subtle input data rounding error of west boundary (%g>%g)" #~ msgstr "" -#~ "Corrigindo erro subtil de arredondamento na entrada do limite Oeste (%g>" -#~ "%g)" +#~ "Corrigindo erro subtil de arredondamento na entrada do limite Oeste " +#~ "(%g>%g)" #~ msgid "Fixing subtle input data rounding error of east boundary (%g>%g)" #~ msgstr "" -#~ "Corrigindo erro subtil de arredondamento na entrada do limite Leste (%g>" -#~ "%g)" +#~ "Corrigindo erro subtil de arredondamento na entrada do limite Leste " +#~ "(%g>%g)" #, fuzzy #~ msgid "Out of memmory" @@ -12617,6 +12638,7 @@ msgstr "[%s]: Cor não existe" #~ msgid "R/G/B not in range 0-255" #~ msgstr "R/G/B fora do intervalo 0-255" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -12676,6 +12698,8 @@ msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s> <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "invalid color name" #~ msgstr "nome de cor inválido" @@ -12814,6 +12838,9 @@ msgid "Unable to open header file for raster map <%s@%s>" msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s>" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_pt_BR.po b/locale/po/grasslibs_pt_BR.po index cd90b7f1fc5..684b5aecf66 100644 --- a/locale/po/grasslibs_pt_BR.po +++ b/locale/po/grasslibs_pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:52+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Portuguese (Brazil) >>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2899,6 +2900,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -2909,6 +2915,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:68 ../lib/gis/adj_cellhd.c:190 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2920,6 +2927,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -2935,6 +2947,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:81 ../lib/gis/adj_cellhd.c:219 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2946,6 +2959,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -2956,6 +2974,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:85 ../lib/gis/adj_cellhd.c:223 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2967,6 +2986,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -2977,6 +3001,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:93 ../lib/gis/adj_cellhd.c:231 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2988,6 +3013,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3002,6 +3032,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:117 ../lib/gis/adj_cellhd.c:280 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3013,6 +3044,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3034,6 +3070,7 @@ msgstr "As resoluções para NS e EW são diferentes" #: ../lib/gis/adj_cellhd.c:175 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3045,6 +3082,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 "" @@ -3060,6 +3102,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:193 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3071,6 +3114,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3086,6 +3134,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:208 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3097,6 +3146,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3107,6 +3161,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:213 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3118,6 +3173,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3128,6 +3188,7 @@ msgstr "" #: ../lib/gis/adj_cellhd.c:236 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3139,6 +3200,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -3317,7 +3383,7 @@ msgid "SYNOPSIS" msgstr "SINOPSE" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "Flags" @@ -3327,7 +3393,7 @@ msgid "Force launching GUI dialog" msgstr "Forçando abertura da caixa de diálogo" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "Parâmetros" @@ -4090,6 +4156,7 @@ msgid "The dimensions of the tiles used in the output raster3d map (XxYxZ or def msgstr "As dimensões dos mosaicos usados ​​no mapa raster3d de saída (XxYxZ ou padrão: 16x16x8)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) @@ -4101,6 +4168,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" @@ -4236,11 +4308,13 @@ msgid "'.' for current mapset" msgstr "'.' para mapset atual" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +#, fuzzy +msgid "Project (location) name" msgstr "Nome de Location" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +#, fuzzy +msgid "Project name (not path to project)" msgstr "Nome de Location (não o caminho da location)" #: ../lib/gis/parser_standard_options.c:712 @@ -6211,6 +6285,10 @@ msgid "Invalid offset (%" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -7173,7 +7251,7 @@ msgid "Unrecognised access mode: %o" msgstr "Modo de acesso não reconhecido: %o" >>>>>>> osgeo-main -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format <<<<<<< HEAD msgid "One isle built" @@ -7185,7 +7263,7 @@ msgid "Unable to make mapset element %s (%s): %s" msgstr "Não foi possível fazer elemento do mapset %s (%s): %s" >>>>>>> osgeo-main -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "Não foi possível acessar elemento do mapset %s (%s): %s" @@ -7798,8 +7876,8 @@ msgstr "gerado por %s" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Não foi possível abrir o mapa raster <%s@%s> uma vez que é uma " "reclassificaçãao do mapa raster <%s@%s> que não existe" @@ -7830,8 +7908,8 @@ msgid "" "Raster map <%s> is in different projection than current region. Found <%s>, " "should be <%s>." msgstr "" -"Mapa raster <%s> está em uma projeção diferente da região atual. Encontrado <" -"%s>, deveria ser <%s>." +"Mapa raster <%s> está em uma projeção diferente da região atual. Encontrado " +"<%s>, deveria ser <%s>." #: ../lib/raster/open.c:250 #, c-format @@ -8166,10 +8244,13 @@ msgid "Could not delete line from coor" msgstr "Não foi possível excluir linha de coor" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) #: ../lib/raster/histogram.c:53 @@ -8402,28 +8483,30 @@ msgstr "O arquivo de quantização para o mapa raster <%s> está vazio" msgid "WARNING" msgstr "ATENÇÃO: " -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "Saindo..." -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "Uso" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "imprime esta mensagem de ajuda" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "mostrar informações de versão e sair" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +#, fuzzy +msgid "create given database, project or mapset if it doesn't exist" msgstr "cria determinado banco de dados, location ou mapset se não existir" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +#, fuzzy +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "sair após a criação da location ou mapset. Apenas com a flag -c" #: ../lib/init/grass.py:372 @@ -8466,6 +8549,7 @@ msgstr "opções: arch,build,compiler,date,path,revision,svn_revision,version" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgid "Unable to rewrite feature/offset %" msgstr "" +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -8683,25 +8767,235 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main -#: ../lib/init/grass.py:386 +======= + +#: ../lib/vector/Vlib/remove_areas.c:458 +msgid "dissolve_neighbour > 0, failed to build new area" +msgstr "dissolve_neighbour> 0, falha ao construir uma nova área" + +#: ../lib/vector/Vlib/remove_areas.c:463 ../lib/vector/Vlib/remove_areas.c:501 +msgid "Dissolve with neighbour area: corrupt topology" +msgstr "Dissolver com área vizinha: topologia corrompida" + +#: ../lib/vector/Vlib/remove_areas.c:497 +msgid "Failed to build new area" +msgstr "Falha ao construir nova área" + +#: ../lib/vector/Vlib/remove_areas.c:544 ../lib/vector/Vlib/remove_areas.c:571 +msgid "Failed to build new isle" +msgstr "Falha ao construir nova ilha" + +#: ../lib/vector/Vlib/remove_areas.c:549 ../lib/vector/Vlib/remove_areas.c:576 +msgid "Dissolve with outer isle: corrupt topology" +msgstr "Dissolver com a ilha externa: topologia corrompida" + +#: ../lib/vector/Vlib/remove_areas.c:581 +msgid "Area merging failed" +msgstr "Falha ao mesclar áreas" + +#: ../lib/vector/Vlib/copy.c:81 +#, c-format +msgid "Unable to copy features. Input vector map <%s> is not open" +msgstr "Não foi possível copiar feições. O mapa vetorial de entrada <%s> não está aberto" + +#: ../lib/vector/Vlib/copy.c:102 +#, c-format +msgid "Unable to create PostGIS layer <%s>" +msgstr "Não foi possível criar camada PostGIS <%s>" + +#: ../lib/vector/Vlib/copy.c:134 +#, c-format +msgid "Vector map <%s> not open on topological level. Areas will be skipped!" +msgstr "Mapa vetorial <%s> não está aberto no nível topológico. As áreas serão ignoradas!" + +#: ../lib/vector/Vlib/copy.c:169 ../lib/vector/Vlib/copy.c:246 +#: ../lib/ogsf/gp3.c:92 +#, c-format +msgid "Unable to read vector map <%s>" +msgstr "Não foi possível ler mapa vetorial <%s>" + +#: ../lib/vector/Vlib/copy.c:230 ../lib/vector/Vlib/copy.c:235 +msgid "Copying features..." +msgstr "Copiando feições..." + +#: ../lib/vector/Vlib/copy.c:232 +#, c-format +msgid "Copying features (%s)..." +msgstr "Copiando feições (%s)..." + +#: ../lib/vector/Vlib/copy.c:358 +msgid "Writing new feature failed" +msgstr "Falha ao escrever nova feição" + +#: ../lib/vector/Vlib/copy.c:364 +#, c-format +msgid "%d features without category or from different layer skipped" +msgstr "%d feições sem categoria ou de camada diferente ignoradas" + +#: ../lib/vector/Vlib/copy.c:396 +msgid "Exporting nodes..." +msgstr "Exportando nós..." + +#: ../lib/vector/Vlib/copy.c:424 +#, c-format +msgid "Writing node %d failed" +msgstr "Falha ao escrever o nó %d" + +#: ../lib/vector/Vlib/copy.c:502 +msgid "Exporting areas..." +msgstr "Exportando áreas..." + +#: ../lib/vector/Vlib/copy.c:560 ../lib/vector/Vlib/copy.c:568 +#, c-format +msgid "Writing area %d failed" +msgstr "Falha ao escrever a área %d" + +#: ../lib/vector/Vlib/copy.c:576 +#, c-format +msgid "%d areas without category or from different layer skipped" +msgstr "%d áreas sem categoria ou de camada diferente ignoradas" + +#: ../lib/vector/Vlib/copy.c:630 +#, c-format +msgid "Unable to copy table <%s> for layer %d from <%s> to <%s>" +msgstr "Não é possível copiar a tabela <%s> para a camada %d de <%s> para <%s>" + +#: ../lib/vector/Vlib/copy.c:749 +#, c-format +msgid "Unable to add database link for vector map <%s>" +msgstr "Não foi possível adicionar link do banco de dados para o mapa vetorial <%s>" + +#: ../lib/vector/Vlib/copy.c:773 +#, c-format +msgid "Unable to open database <%s> with driver <%s>" +msgstr "Não foi possível abrir banco de dados <%s> com driver <%s>" + +#: ../lib/vector/Vlib/copy.c:780 +msgid "Unable to create index" +msgstr "Não foi possível criar índice" + +#: ../lib/vector/Vlib/copy.c:786 +#, c-format +msgid "Unable to grant privileges on table <%s>" +msgstr "Não é possível dar privilégios na tabela <%s>" + +#: ../lib/vector/Vlib/write.c:194 +#, c-format +msgid "Unable to write feature in vector map <%s>" +msgstr "Não foi possível escrever feição no mapa vetorial <%s>" + +#: ../lib/vector/Vlib/write.c:234 +msgid "Unable to rewrite feature/offset %" +msgstr "" + +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +#: ../lib/vector/Vlib/write.c:266 +msgid "Unable to delete feature/offset %" +msgstr "" + +#: ../lib/vector/Vlib/write.c:299 +msgid "Unable to restore feature/offset %" +msgstr "Não foi possível restaurar feição/offset %" + +#: ../lib/vector/Vlib/write.c:308 +#, c-format +msgid "Vector map <%s> is not opened" +msgstr "Mapa vetorial <%s> não está aberto" + +#: ../lib/vector/Vlib/write.c:313 +#, c-format +msgid "Vector map <%s> is not opened in write mode" +msgstr "Mapa vetorial <%s> não está aberto em modo de escrita" + +#: ../lib/vector/Vlib/line.c:184 ../lib/vector/Vlib/line.c:217 +#: ../lib/vector/Vlib/line.c:250 +msgid "Index out of range in" +msgstr "Índice fora do intervalo em" + +#: ../lib/vector/Vlib/line.c:550 +msgid "Segment outside line, no segment created" +msgstr "Segmento fora da linha, nenhum segmento criado" + +#: ../lib/vector/Vlib/net_build.c:101 ../lib/vector/Vlib/net_build.c:727 +msgid "Building graph..." +msgstr "Construindo gráfico..." + +#: ../lib/vector/Vlib/net_build.c:143 ../lib/vector/Vlib/net_build.c:775 +msgid "Unable to build network graph" +msgstr "" + +#: ../lib/vector/Vlib/net_build.c:149 ../lib/vector/Vlib/net_build.c:781 +msgid "Forward costs column not specified" +msgstr "" + +#: ../lib/vector/Vlib/net_build.c:156 +msgid "Turntable field < 1" +msgstr "" + +#: ../lib/vector/Vlib/net_build.c:172 +#, c-format +msgid "Turntable column <%s> not found in table <%s>" +msgstr "" + +#: ../lib/vector/Vlib/net_build.c:182 ../lib/vector/Vlib/net_build.c:223 +#: ../lib/vector/Vlib/net_build.c:508 ../lib/vector/Vlib/net_build.c:526 +#: ../lib/vector/Vlib/net_build.c:809 ../lib/vector/Vlib/net_build.c:827 +#: ../lib/vector/Vlib/net_build.c:988 +#, c-format +msgid "Data type of column <%s> not supported (must be numeric)" +msgstr "Tipo de dados da coluna <%s> não suportado (deve ser numérico)" + +#: ../lib/vector/Vlib/net_build.c:202 ../lib/vector/Vlib/net_build.c:967 +msgid "Setting node costs..." +msgstr "Definindo custos de nó..." + +#: ../lib/vector/Vlib/net_build.c:277 ../lib/vector/Vlib/net_build.c:1032 +#, c-format +msgid "Database record for node %d (cat = %d) not found (cost set to 0)" +msgstr "Registro do banco de dados para o nó %d (cat = %d) não encontrado (cost set to 0)" + +#: ../lib/vector/Vlib/net_build.c:332 ../lib/vector/Vlib/net_build.c:352 +msgid "Cannot add network arc for virtual node connection." +msgstr "Não é possível adicionar arco de rede para conexão de nó virtual." + +#: ../lib/vector/Vlib/net_build.c:364 +#, c-format +msgid "" +"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 incorrect results." +msgstr "" +"Existe mais de um ponto de nó <%d> com campo de categoria exclusivo <%d>.\n" +"A camada de categorias exclusivas não é válida, portanto, você provavelmente obterá resultados incorretos." +<<<<<<< HEAD +>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) + +#: ../lib/init/grass.py:387 msgid "initial GRASS database directory" msgstr "Diretório do banco de dados GRASS inicial" -#: ../lib/init/grass.py:387 -msgid "directory containing Locations" +#: ../lib/init/grass.py:388 +#, fuzzy +msgid "directory containing GRASS projects" msgstr "diretório contendo Locations" -#: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +#: ../lib/init/grass.py:389 +#, fuzzy +msgid "initial GRASS project (location)" msgstr "Location GRASS inicial" -#: ../lib/init/grass.py:390 +#: ../lib/init/grass.py:391 +#, fuzzy msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +"directory containing mapsets with one common coordinate reference system" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8739,82 +9033,120 @@ msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +"diretório contendo Mapsets com um sistema de coordenadas comum (projeção)" + +>>>>>>> osgeo-main #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" -msgstr "diretório Mapset inicial totalmente qualificado" +#, fuzzy +msgid "initial GRASS mapset" +msgstr "Mapset GRASS inicial" +======= +"Não foi possível encontrar o ponto que representa a interseção <%d> no campo de categorias exclusivas <%d>.\n" +"O custo da interseção foi definido como 0.\n" +"A camada de categorias exclusivas não é válida, portanto, você provavelmente obterá resultados incorretos." + +#: ../lib/vector/Vlib/net_build.c:407 +#, c-format +msgid "" +"Unable to find node for point representing intersection <%d> in unique categories field <%d>.\n" +"Cost for the intersection was set to 0.\n" +"The unique categories layer is not valid therefore you will probably get incorrect results." +msgstr "" +"Não foi possível encontrar o nó para o ponto que representa a interseção <%d> no campo de categorias exclusivas <%d>.\n" +"O custo da interseção foi definido como 0.\n" +"A camada de categorias exclusivas não é válida, portanto, você provavelmente obterá resultados incorretos." +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) #: ../lib/init/grass.py:395 +#, fuzzy +msgid "fully qualified initial mapset directory" +msgstr "diretório Mapset inicial totalmente qualificado" + +#: ../lib/init/grass.py:396 msgid "Environment variables relevant for startup" msgstr "Variáveis ​​de ambiente relevantes para a inicialização" -#: ../lib/init/grass.py:396 +#: ../lib/init/grass.py:397 msgid "select GUI (text, gui, gtext)" msgstr "seleciona GUI (text, gui, gtext)" -#: ../lib/init/grass.py:397 +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "define navegador web html para páginas de ajuda" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" "define caminho(s) adicional(is) para módulos GRASS locais ou scripts de " "usuário" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "define GISBASE adicional para complementos GRASS instalados localmente" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "define o nome do interpretador Python para substituir 'python'" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "execute o módulo GRASS ou script" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "executável fornecido será executado na sessão GRASS" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "Módulo GRASS, script ou qualquer outro executável" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "parâmetros do executável" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "flags padrão" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" -msgstr "cria location temporário (use com a flag --exec)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" +msgstr "" +"Não foi possível encontrar o ponto que representa a interseção <%d> no campo de categorias exclusivas <%d>.\n" +"O custo da interseção foi definido como 0.\n" +"A camada de categorias exclusivas não é válida, portanto, você provavelmente obterá resultados incorretos." #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +#, fuzzy +msgid "create temporary project (use with the --exec flag)" +msgstr "cria location temporário (use com a flag --exec)" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" "Não foi possível encontrar o ponto que representa a interseção <%d> no campo de categorias exclusivas <%d>.\n" "O custo da interseção foi definido como 0.\n" "A camada de categorias exclusivas não é válida, portanto, você provavelmente obterá resultados incorretos." -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" "A variável APPDATA não está definida, pergunte ao suporte do seu sistema " "operacional" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" @@ -8822,12 +9154,12 @@ msgstr "" "A variável APPDATA aponta para um diretório que não existe, pergunte ao seu " "suporte de sistema operacional" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "Falhou na criação do diretório de configuração '%s' com erro: %s" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" @@ -8835,38 +9167,38 @@ msgstr "" "O custo da interseção foi definido como 0.\n" "A camada de categorias exclusivas não é válida, portanto, você provavelmente obterá resultados incorretos." -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "Linha inválida no arquivo RC ({arquivo}): '{linha}' ({erro})\n" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "Arquivo RC vazio ({file})" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "GUI <%s> não suportado nesta versão" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "GRASS GUI não encontrado. Por favor verifique sua instalação." -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -8874,62 +9206,62 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" "Não foi possível criar um novo location porque o location <{location}> já " "existe." -#: ../lib/init/grass.py:994 -#, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +#: ../lib/init/grass.py:995 +#, fuzzy, python-brace-format +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" "Não foi possível criar um novo location <(location)> porque <{path}> é um " "arquivo." -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" "Não foi possível criar um novo location <{location}> porque o diretório " "<{path}> já existe." -#: ../lib/init/grass.py:1004 -#, python-brace-format +#: ../lib/init/grass.py:1005 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" "Não foi possível criar um novo location no diretório <{path}> por um motivo " "desconhecido." -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" -msgstr "" +#: ../lib/init/grass.py:1133 +#, fuzzy +msgid "Provide CRS to create a project" +msgstr "Não é possível criar objeto PROJ" +<<<<<<< HEAD <<<<<<< HEAD #: ../lib/vector/Vlib/snap.c:527 ../lib/vector/Vlib/snap.c:890 #, c-format @@ -8939,15 +9271,21 @@ msgstr "Novos vértices: %d" #: ../lib/init/grass.py:1136 msgid "Creating new GRASS GIS location <{}>..." msgstr "Criando novo location GRASS GIS <{}>..." +======= +#: ../lib/init/grass.py:1137 +#, fuzzy +msgid "Creating new GRASS GIS project <{}>..." +msgstr "Criando novo mapset GRASS GIS <{}>..." +>>>>>>> osgeo-main -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" "Não foi possível criar um novo mapset <{mapset}> porque <{path}> é um " "arquivo." -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." @@ -8956,27 +9294,28 @@ msgstr "" "consertado agora. Observe que este aviso pode se tornar um erro em versões " "futuras." -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" >>>>>>> osgeo-main -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "Criando novo mapset GRASS GIS <{}>..." -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 +#, fuzzy msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" "Diretório do banco de dados GRASS GIS, location e mapset não definidos de " "modo apropriado. Use GUI ou a linha de comando para defini-los." -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -8993,22 +9332,22 @@ msgstr "" "\n" "Verifique o arquivo <{file}>." -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "Caminho '%s' não existe" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "Caminho '%s' não acessível." -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "Você não é o proprietário de '%s'." -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -9023,7 +9362,7 @@ msgstr "" "precisa de permissão para esta operação). Dê uma outra olhada no gerenciador " "do processador para ter certeza..." -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -9032,7 +9371,7 @@ msgstr "" "%(user)sestá atualmente executando GRASS no mapset selecionado (arquivo " "%(file)sencontrado). Forçando o lançamento do GRASS..." -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" @@ -9041,25 +9380,25 @@ msgstr "" "Não foi possível acessar '%s' corretamente.\n" "Notifique o pessoal do sistema." -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "Construindo o fontcap do usuário..." -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "A variável SHELL não está definida" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "Shell não suportado <{sh}>: {env_file}" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "Executando <%s> ..." -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" @@ -9068,21 +9407,22 @@ msgstr "" "A execução de <{cmd}> falhou:\n" "{error}" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "Execução de <%s> terminou." -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "Não foi possível fechar a GUI. {0}" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "Bem-vindo ao GRASS GIS %s" +<<<<<<< HEAD <<<<<<< HEAD #: ../lib/vector/Vlib/build_pg.c:464 #, c-format @@ -9149,137 +9489,146 @@ msgstr "Quebras: %d" msgid "Point not in search tree!" ======= #: ../lib/init/grass.py:1865 +======= +#: ../lib/init/grass.py:1868 +>>>>>>> osgeo-main msgid "GRASS GIS homepage:" msgstr "GRASS GIS homepage:" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "Esta versão em execução através de:" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "A ajuda está disponível com o comando:" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "Veja os termos de licença com:" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "Veja opções de citação com:" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "Caso necessário, reinicie o GUI com:" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "Inicie o GUI com:" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "Quando estiver pronto para sair, digite:" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" >>>>>>> osgeo-main msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Feito." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "Por favor instale o pacote de desenvolvimento GRASS GIS" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "Parâmetro <%s> não suportado" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 -#, python-format -msgid "use temporary mapset in location %(metavar)s" -msgstr "" +#: ../lib/init/grass.py:2288 +#, fuzzy, python-format +msgid "use temporary mapset in project %(metavar)s" +msgstr "usar mapset temporário" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "usar mapset temporário" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "Flag -e também requer flag -c" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 +#, fuzzy msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" "O argumento do sistema de referência de coordenadas (por exemplo, EPSG) é " "necessário para --tmp-location" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 +#, fuzzy msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" "Apenas um argumento (por exemplo, EPSG) é necessário para --tmp-location, " "mapset name <{}> fornecido" -#: ../lib/init/grass.py:2528 -#, python-brace-format +#: ../lib/init/grass.py:2544 +#, fuzzy, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" @@ -9298,27 +9647,27 @@ msgstr "" "{cmd_name} --help\n" "Veja também: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "Iniciando GRASS GIS..." -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "Iniciando <%s> GUI em segundo plano, por favor aguarde..." -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "Falha ao iniciar o shell '%s'" @@ -9423,8 +9772,8 @@ msgstr "Não foi possível escrever o histórico para o mapa raster 3D <%s>" #, c-format msgid "Unable to move temp raster map <%s> to 3D raster map <%s>" msgstr "" -"Não foi possível mover o mapa raster temporário <%s> para o mapa raster 3D <" -"%s>" +"Não foi possível mover o mapa raster temporário <%s> para o mapa raster 3D " +"<%s>" #: ../lib/raster3d/close.c:81 msgid "Unable to flush all tiles" @@ -9439,7 +9788,7 @@ msgid "Unable to position file" msgstr "Não foi possível posicionar o arquivo" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "Não foi possível escrever o cabeçalho para o mapa raster 3D <%s>" @@ -9460,7 +9809,6 @@ msgid "Error in cache" msgstr "Erro de cache" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Adicionando regra: %lf - %lf" @@ -12598,10 +12946,13 @@ msgid "Unable to flush file %s for raster map %s: %s" msgstr "Não foi possível limpar o arquivo %s para o mapa raster %s: %s" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) #: ../lib/ogsf/gsds.c:109 @@ -12628,6 +12979,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12803,8 +13157,8 @@ msgstr "Carregando mapa raster <%s>..." #, c-format msgid "Color table range doesn't match data (mincol=%d, maxcol=%d" msgstr "" -"O intervalo da tabela de cores não corresponde aos dados (mincol=%d, maxcol=" -"%d" +"O intervalo da tabela de cores não corresponde aos dados (mincol=%d, " +"maxcol=%d" #: ../lib/ogsf/gs3.c:654 ../lib/ogsf/gs3.c:725 #, c-format @@ -13194,8 +13548,8 @@ msgstr "Misturando IDs de áreas e primitivas" #, c-format msgid "Unable to create category index file for vector map <%s>" msgstr "" -"Não foi possível criar arquivo de índice de categoria para o mapa vetorial <" -"%s>" +"Não foi possível criar arquivo de índice de categoria para o mapa vetorial " +"<%s>" #: ../lib/vector/Vlib/cindex.c:503 msgid "Error writing out category index file" @@ -13205,8 +13559,8 @@ msgstr "Erro ao gravar arquivo de índice ce categoria" #, c-format msgid "Unable to open category index file for vector map <%s>" msgstr "" -"Não foi possível abrir arquivo de índice de categoria para o mapa vetorial <" -"%s>" +"Não foi possível abrir arquivo de índice de categoria para o mapa vetorial " +"<%s>" #: ../lib/vector/Vlib/simple_features.c:228 #, c-format @@ -13329,8 +13683,8 @@ msgstr "Não é possível adicionar arco de rede para conexão de nó virtual." #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -13362,8 +13716,8 @@ msgid "" "The unique categories layer is not valid therefore you will probably get " "incorrect results." msgstr "" -"Não foi possível encontrar o nó para o ponto que representa a interseção <" -"%d> no campo de categorias exclusivas <%d>.\n" +"Não foi possível encontrar o nó para o ponto que representa a interseção " +"<%d> no campo de categorias exclusivas <%d>.\n" "O custo da interseção foi definido como 0.\n" "A camada de categorias exclusivas não é válida, portanto, você provavelmente " "obterá resultados incorretos." @@ -13557,8 +13911,8 @@ msgid "" "The unique categories layer is not valid therefore you will probably get " "incorrect results." msgstr "" -"A linha com id <%d> possui mais categorias exclusivas definidas no campo <" -"%d>.\n" +"A linha com id <%d> possui mais categorias exclusivas definidas no campo " +"<%d>.\n" "A camada de categorias exclusivas não é válida, portanto, você provavelmente " "obterá resultados incorretos." @@ -13647,8 +14001,8 @@ msgstr "Não foi possível abrir o arquivo fidx para escrita <%s>" #, c-format msgid "Unable to save feature index file for vector map <%s>" msgstr "" -"Não foi possível salvar o arquivo de índice de feição para o mapa vetorial <" -"%s>" +"Não foi possível salvar o arquivo de índice de feição para o mapa vetorial " +"<%s>" #: ../lib/vector/Vlib/level.c:34 msgid "Map structure was never initialized" @@ -14271,7 +14625,7 @@ msgstr "Fonte de dados OGR não definida" msgid "OGR layer not defined" msgstr "Camada OGR não definida" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Não foi possível abrir a fonte de dados OGR '%s'" @@ -14290,8 +14644,8 @@ msgstr "" #, c-format msgid "Unable to open feature index file for vector map <%s>" msgstr "" -"Não foi possível abrir o arquivo de índice de feição para o mapa vetorial <" -"%s>" +"Não foi possível abrir o arquivo de índice de feição para o mapa vetorial " +"<%s>" #: ../lib/vector/Vlib/open_ogr.c:199 #, c-format @@ -15267,17 +15621,17 @@ msgstr "Banco de dados padrão não foi especificado" msgid "Requested dblink %d, maximum link number %d" msgstr "dblink %d solicitado, %d links no máximo" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "Erro na regra na linha %d em <%s>" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "Não foi possível abrir a camada OGR <%s>" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." @@ -15285,22 +15639,22 @@ msgstr "" "A tabela de feição <%s> não possui uma chave primária definida. Não foi " "possível definir links de banco de dados." -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "GRASS não compilado com suporte PostgreSQL" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "Formato de mapa vetorial desconhecido" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" "Não foi possível criar arquivo para definição de banco de dados para mapa " "vetorial <%s>" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "Bug: tentativa de atualizar o mapa que não está no mapset atual" @@ -15848,30 +16202,30 @@ msgstr "" "Por favor, reconstrua a topologia." #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "O vetor excede o limite de tamanho de arquivo suportado" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Não foi possível excluir o nó %d do índice espacial" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Não foi possível excluir a linha %d do índice espacial" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Não foi possível excluir a área %d do índice espacial" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Não foi possível excluir ilha %d do índice espacial" @@ -15889,7 +16243,7 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Modo de memória vetorial não suportado, usando 'AUTO'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " @@ -15899,7 +16253,7 @@ msgstr "" "topologia. Tente reconstruir a topologia ou atualizar o GRASS para pelo " "menos a versão %d. " -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " @@ -15908,7 +16262,7 @@ msgstr "" "Sua versão GRASS não suporta totalmente o formato de topologia %d.%d do " "vetor. Considere reconstruir a topologia ou atualizar o GRASS." -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -16002,44 +16356,44 @@ msgstr "Formato vetorial '%s' não suportado" msgid "Format definition is not correct: %s" msgstr "A definição do formato não está correta: %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "A linha %d já tem área/ilha %d para a esquerda" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "A linha %d já tem área/ilha %d para a direita" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "Ilha já registrada na área" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Tentativa de excluir ilha da área morta" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Tentativa de excluir a ilha não registrada %d da área %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Tentativa de excluir a área morta" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Tentativa de excluir informações de área %d da ilha morta %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Tentativa de excluir informações da ilha%d da área morta %d" @@ -16083,6 +16437,9 @@ msgstr "Ícone não suportado %d" msgid "[%s]: No such color" msgstr "[%s]: cor não existe" +#~ msgid "Creating new GRASS GIS location <{}>..." +#~ msgstr "Criando novo location GRASS GIS <{}>..." + #, python-format #~ msgid "" #~ "Unable to create temporary directory ! Exiting." @@ -16406,14 +16763,14 @@ msgstr "[%s]: cor não existe" #~ "Unsupported relative time unit type for %(type)s map <%(id)s> with layer " #~ "%(l)s: %(u)s" #~ msgstr "" -#~ "Tipo de unidade de tempo relativo não suportado para mapa %(type)s<" -#~ "%(id)s> com camada %(l)s:%(u)s" +#~ "Tipo de unidade de tempo relativo não suportado para mapa " +#~ "%(type)s<%(id)s> com camada %(l)s:%(u)s" #, python-format #~ msgid "Unsupported relative time unit type for %(type)s map <%(id)s>: %(u)s" #~ msgstr "" -#~ "Tipo de unidade de tempo relativo não suportado para mapa %(type)s<" -#~ "%(id)s>:%(u)s" +#~ "Tipo de unidade de tempo relativo não suportado para mapa " +#~ "%(type)s<%(id)s>:%(u)s" #, python-format #~ msgid "" @@ -16679,8 +17036,8 @@ msgstr "[%s]: cor não existe" #, python-format #~ msgid "Created register table <%s> for space time %s dataset <%s>" #~ msgstr "" -#~ "Criada tabela de registro <%s> para conjunto de dados <%s> tempo espacial" -#~ "%s" +#~ "Criada tabela de registro <%s> para conjunto de dados <%s> tempo " +#~ "espacial%s" #~ msgid "The space time datasets must be of the same temporal type" #~ msgstr "Os conjuntos de dados espaço-tempo devem ser do mesmo tipo temporal" @@ -16767,16 +17124,16 @@ msgstr "[%s]: cor não existe" #~ "Temporal type of space time dataset <%(id)s> and map <%(map)s> with layer " #~ "%(l)s are different" #~ msgstr "" -#~ "O tipo temporal do conjunto de dados espaço-tempo <%(id)s> e o mapa <" -#~ "%(map)s> com camada %(l)s são diferentes" +#~ "O tipo temporal do conjunto de dados espaço-tempo <%(id)s> e o mapa " +#~ "<%(map)s> com camada %(l)s são diferentes" #, python-format #~ msgid "" #~ "Temporal type of space time dataset <%(id)s> and map <%(map)s> are " #~ "different" #~ msgstr "" -#~ "O tipo temporal do conjunto de dados espaço-tempo <%(id)s> e mapa <" -#~ "%(map)s> são diferentes" +#~ "O tipo temporal do conjunto de dados espaço-tempo <%(id)s> e mapa " +#~ "<%(map)s> são diferentes" #, python-format #~ msgid "Set temporal unit for space time %s dataset <%s> to %s" @@ -16789,16 +17146,16 @@ msgstr "[%s]: cor não existe" #~ "Relative time units of space time dataset <%(id)s> and map <%(map)s> with " #~ "layer %(l)s are different" #~ msgstr "" -#~ "As unidades de tempo relativo do conjunto de dados de espaço-tempo <" -#~ "%(id)s> e mapa <%(map)s> com camada %(l)s são diferentes" +#~ "As unidades de tempo relativo do conjunto de dados de espaço-tempo " +#~ "<%(id)s> e mapa <%(map)s> com camada %(l)s são diferentes" #, python-format #~ msgid "" #~ "Relative time units of space time dataset <%(id)s> and map <%(map)s> are " #~ "different" #~ msgstr "" -#~ "As unidades de tempo relativo do conjunto de dados de espaço-tempo <" -#~ "%(id)s> e mapa <%(map)s> são diferentes" +#~ "As unidades de tempo relativo do conjunto de dados de espaço-tempo " +#~ "<%(id)s> e mapa <%(map)s> são diferentes" #~ msgid "Only maps from the same mapset can be registered" #~ msgstr "Apenas mapas do mesmo mapset podem ser registrados" @@ -16817,14 +17174,14 @@ msgstr "[%s]: cor não existe" #~ "temporal database. The mapset of the dataset does not match the current " #~ "mapset" #~ msgstr "" -#~ "Não foi possível desfazer o registro do mapa do conjunto de dados <" -#~ "%(ds)s> do tipo %(type)sno banco de dados temporal. O mapset do conjunto " +#~ "Não foi possível desfazer o registro do mapa do conjunto de dados " +#~ "<%(ds)s> do tipo %(type)sno banco de dados temporal. O mapset do conjunto " #~ "de dados não corresponde ao mapset atual" #, python-format #~ msgid "" -#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset <" -#~ "%(base)s>" +#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset " +#~ "<%(base)s>" #~ msgstr "" #~ "Mapa <%(map)s> com camada %(l)snão está registrado no conjunto de dados " #~ "espaço-tempo <%(base)s>" @@ -16832,13 +17189,13 @@ msgstr "[%s]: cor não existe" #, python-format #~ msgid "Map <%(map)s> is not registered in space time dataset <%(base)s>" #~ msgstr "" -#~ "Mapa <%(map)s> não está registrado no conjunto de dados espaço-tempo <" -#~ "%(base)s>" +#~ "Mapa <%(map)s> não está registrado no conjunto de dados espaço-tempo " +#~ "<%(base)s>" #, python-format #~ msgid "" -#~ "Update metadata, spatial and temporal extent from all registered maps of <" -#~ "%s>" +#~ "Update metadata, spatial and temporal extent from all registered maps of " +#~ "<%s>" #~ msgstr "" #~ "Atualizar metadados, extensão espacial e temporal de todos os mapas " #~ "registrados de <%s>" @@ -16941,11 +17298,11 @@ msgstr "[%s]: cor não existe" #, python-format #~ msgid "" -#~ "Wrong temporal type of space time dataset <" -#~ "%s> <%s> time is required" +#~ "Wrong temporal type of space time dataset " +#~ "<%s> <%s> time is required" #~ msgstr "" -#~ "Tipo incorreto de conjunto de dados de espaço-tempo <" -#~ "%s> <%s> tempo é necessário" +#~ "Tipo incorreto de conjunto de dados de espaço-tempo " +#~ "<%s> <%s> tempo é necessário" #~ msgid "Wrong type of input " #~ msgstr "Tipo errado de entrada" @@ -17598,8 +17955,8 @@ msgstr "[%s]: cor não existe" #~ "Unable to write history for <%(map)s>. Raster map <%(map)s> not found in " #~ "current mapset." #~ msgstr "" -#~ "Não foi possivel escrever o histórico para <%(map)s>. Mapa raster <" -#~ "%(map)s> não encontrado no mapset atual." +#~ "Não foi possivel escrever o histórico para <%(map)s>. Mapa raster " +#~ "<%(map)s> não encontrado no mapset atual." #, python-format #~ msgid "An error occurred while running r.mapcalc with expression: %s" @@ -17748,6 +18105,7 @@ msgstr "[%s]: cor não existe" #~ msgid "Attributes for category %d not found" #~ msgstr "Registro no banco de dados para categoria %d não encontrado" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "whose header file can't be opened." @@ -17808,6 +18166,8 @@ msgstr "script de shell a ser processado como trabalho em lote" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, fuzzy #~ msgid "Cannot fetch row" #~ msgstr "não consegui obter informações da camada" @@ -17931,6 +18291,9 @@ msgstr "script de shell a ser processado como trabalho em lote" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -17970,6 +18333,7 @@ msgstr "" "\n" "Pressione RETURN para continuar.\n" +<<<<<<< HEAD <<<<<<< HEAD msgid "Mapset <{mapset}> doesn't exist in GRASS Location <{loc}>. A new mapset can be created by '-c' switch." msgstr "Mapset <{mapset}> não existe em Location GRASS <{loc}>. Um novo mapset pode ser criado pelo switch '-c'." @@ -18053,6 +18417,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Mapset <{mapset}> doesn't exist in GRASS Location <{loc}>. A new mapset " #~ "can be created by '-c' switch." @@ -18244,6 +18610,9 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <% #~ msgstr "Valor inválido <%s> para o parâmetro <%s>" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_ro.po b/locale/po/grasslibs_ro.po index 6e99e57da95..e056b702569 100644 --- a/locale/po/grasslibs_ro.po +++ b/locale/po/grasslibs_ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:52+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Romanian since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4554,28 +4554,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4609,143 +4609,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4753,87 +4761,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4844,22 +4850,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4869,214 +4875,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5193,7 +5203,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5214,7 +5224,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8868,8 +8877,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9570,7 +9579,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -10546,36 +10555,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -11098,30 +11107,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Nu s-a putut şterge nodul %d din indexul spaţial" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Nu s-a putut şterge linia %d din indexul spaţial" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -11138,21 +11147,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11242,44 +11251,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_ru.po b/locale/po/grasslibs_ru.po index 7b4d7a6aee7..aa2b9752c24 100644 --- a/locale/po/grasslibs_ru.po +++ b/locale/po/grasslibs_ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-06-28 19:08+0000\n" "Last-Translator: Sergey Kazorin \n" "Language-Team: Russian =2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"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" "X-Generator: Weblate 4.16.4\n" #: ../lib/nviz/render.c:43 @@ -1007,8 +1007,8 @@ msgstr "Проигнорировано точек: %d (слишком высок #: ../lib/rst/interp_float/vinput2d.c:273 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "%d точек для интерполяции (после прореживания) меньше чем NPMIN=%d" #: ../lib/rst/interp_float/vinput2d.c:279 @@ -1345,7 +1345,7 @@ msgstr "Ошибка выполнения proj_trans(): %d" #: ../lib/vector/Vlib/read_ogr.c:157 ../lib/vector/Vlib/read_ogr.c:239 #: ../lib/vector/Vlib/write_ogr.c:70 ../lib/vector/Vlib/write_ogr.c:105 #: ../lib/vector/Vlib/write_ogr.c:146 ../lib/vector/Vlib/rewind_ogr.c:47 -#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:732 +#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:751 #: ../lib/vector/Vlib/build_sfa.c:720 msgid "GRASS is not compiled with OGR support" msgstr "GRASS собран без поддержки OGR" @@ -1889,8 +1889,8 @@ msgstr "" #, c-format msgid "Bug in UI description. Description for option <%s> missing" msgstr "" -"Ошибка в описании графического интерфейса. Отсутствует описания для опции <" -"%s>" +"Ошибка в описании графического интерфейса. Отсутствует описания для опции " +"<%s>" #: ../lib/gis/parser.c:419 #, c-format @@ -2373,6 +2373,7 @@ msgid "Illegal e-w resolution value: %g" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2384,12 +2385,18 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 msgid "Illegal number of columns: %d (resolution is %g)" msgstr "Неверное число столбцов: %d (разрешение: %g)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../lib/gis/adj_cellhd.c:81 ../lib/gis/adj_cellhd.c:219 @@ -2401,6 +2408,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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" @@ -2433,6 +2442,9 @@ msgid "North must be north of South, but %g (north) <= %g (south" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2448,6 +2460,7 @@ msgid "East must be larger than West, but %g (east) <= %g (west)" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2459,11 +2472,17 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" msgstr "Недопустимые координаты: отрицательное число столбцов" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../lib/gis/adj_cellhd.c:117 ../lib/gis/adj_cellhd.c:280 @@ -2474,6 +2493,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/adj_cellhd.c:115 ../lib/gis/adj_cellhd.c:274 msgid "Invalid coordinates: negative number of rows" msgstr "Недопустимые координаты: отрицательное число рядов" @@ -2488,6 +2509,9 @@ msgid "Invalid coordinates: negative number of rows" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2504,6 +2528,7 @@ msgstr "Разрешение восток-запад было изменено" msgid "NS and EW resolutions are different" msgstr "Отличаются разрешения север-юг и восток-запад" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../lib/gis/adj_cellhd.c:175 @@ -2515,6 +2540,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/adj_cellhd.c:173 #, c-format msgid "Illegal n-s resolution value for 3D: %g" @@ -2532,6 +2559,9 @@ msgid "Illegal n-s resolution value for 3D: %g" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2541,6 +2571,7 @@ msgstr "" msgid "Illegal number of rows for 3D: %d (resolution is %g)" msgstr "Неверное число рядов для 3D: %d (разрешение: %g)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../lib/gis/adj_cellhd.c:193 @@ -2552,6 +2583,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/adj_cellhd.c:191 #, c-format msgid "Illegal e-w resolution value for 3D: %g" @@ -2569,6 +2602,9 @@ msgid "Illegal e-w resolution value for 3D: %g" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2605,6 +2641,7 @@ msgid "Illegal t-b resolution value: %g" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../lib/gis/adj_cellhd.c:208 @@ -2618,12 +2655,17 @@ msgid "Illegal depths value: %d" ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../lib/gis/adj_cellhd.c:213 #, c-format msgid "Illegal depths value: %d" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2828,7 +2870,7 @@ msgid "SYNOPSIS" msgstr "СИНОПСИС" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "Флаги" @@ -2838,7 +2880,7 @@ msgid "Force launching GUI dialog" msgstr "Принудительный вывод диалогового окна интерфейса" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "Параметры" @@ -3212,11 +3254,13 @@ msgid "'.' for current mapset" msgstr "«.» для текущего набора" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +#, fuzzy +msgid "Project (location) name" msgstr "Имя области" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +#, fuzzy +msgid "Project name (not path to project)" msgstr "Имя области (не путь расположения)" #: ../lib/gis/parser_standard_options.c:712 @@ -4601,6 +4645,7 @@ msgstr "Должны быть включены все или ни одна из msgid "Internal error: invalid rule type: %d" msgstr "Внутренняя ошибка: недопустимый тип правила: %d" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../lib/vector/Vlib/write_pg.c:327 ../lib/vector/Vlib/write_ogr.c:134 @@ -4610,6 +4655,8 @@ msgid "Invalid offset (%" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/parser_dependencies.c:514 #, fuzzy msgid "Internal error: the number of options is < 0" @@ -4621,6 +4668,9 @@ msgid "Invalid offset (%" #: ../lib/vector/Vlib/write_pg.c:327 ../lib/vector/Vlib/write_ogr.c:134 msgid "Invalid offset (%" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4961,12 +5011,12 @@ msgstr "Попытка создания временного файла, пре msgid "Unrecognised access mode: %o" msgstr "Не распознан режим доступа: %o" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "Не удалось создать элемент набора %s (%s): %s" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "Не удалось получить доступ к элементу набора %s (%s): %s" @@ -9100,8 +9150,8 @@ msgstr "сформировано с помощью %s" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "Не удалось открыть растровую карту <%s@%s>, так как она является " "реклассификацей несуществующей растровой карты <%s@%s>" @@ -9652,28 +9702,30 @@ msgstr "Файл квантования для растровой карты <%s msgid "WARNING" msgstr "ПРЕДУПРЕЖДЕНИЕ" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "Завершение работы…" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "Использование" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "вывести эту справку" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "вывести информацию о версии и выйти" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +#, fuzzy +msgid "create given database, project or mapset if it doesn't exist" msgstr "в случае отсутствия создать указанную базу данных, область или набор" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +#, fuzzy +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "выйти после создания области или набора. Только с флагом -c" #: ../lib/init/grass.py:372 @@ -9712,102 +9764,117 @@ msgid "" "version" msgstr "параметры: arch,build,compiler,date,path,revision,svn_revision,version" -#: ../lib/init/grass.py:386 +#: ../lib/init/grass.py:387 msgid "initial GRASS database directory" msgstr "исходный каталог базы данных GRASS" -#: ../lib/init/grass.py:387 -msgid "directory containing Locations" +#: ../lib/init/grass.py:388 +#, fuzzy +msgid "directory containing GRASS projects" msgstr "каталог для размещения областей" -#: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +#: ../lib/init/grass.py:389 +#, fuzzy +msgid "initial GRASS project (location)" msgstr "исходная область GRASS" -#: ../lib/init/grass.py:390 +#: ../lib/init/grass.py:391 +#, fuzzy msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +"directory containing mapsets with one common coordinate reference system" msgstr "" "каталог для размещения наборов с единой общей системой координат (проекция)" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:394 +#, fuzzy +msgid "initial GRASS mapset" msgstr "исходный набор GRASS" -#: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +#: ../lib/init/grass.py:395 +#, fuzzy +msgid "fully qualified initial mapset directory" msgstr "полное имя исходного каталога наборов" -#: ../lib/init/grass.py:395 +#: ../lib/init/grass.py:396 msgid "Environment variables relevant for startup" msgstr "Переменные окружения, имеющие отношение к запуску" -#: ../lib/init/grass.py:396 +#: ../lib/init/grass.py:397 msgid "select GUI (text, gui, gtext)" msgstr "выбор графического интерфейса (text, gui, gtext)" -#: ../lib/init/grass.py:397 +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "задать браузер html-файлов для просмотра справки" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" "задать дополнительный путь (пути) к локальным модулям GRASS или " "пользовательским сценариям" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" "задать дополнительный GISBASE для локально установленных расширений GRASS" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "задать имя интерпретатора Python для переопределения значения «python»" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "запустить модуль или сценарий GRASS" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "данный исполняемый файл будет выполнен в сеансе GRASS" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "модуль, сценарий или любой другой исполняемый файл GRASS" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "параметры исполняемого файла" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "стандартные флаги" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" -msgstr "создать временную область (используется с флагом --exec)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" +msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +#, fuzzy +msgid "create temporary project (use with the --exec flag)" +msgstr "создать временный набор (используется с флагом --exec)" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "создаётся во временном каталоге и удаляется при выходе" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "создать временный набор (используется с флагом --exec)" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +#, fuzzy +msgid "created in the specified project and deleted at exit" msgstr "создаётся в указанном расположении и удаляется при выходе" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" "Переменная APPDATA не задана, обратитесь в службу поддержки операционной " "системы" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" @@ -9815,33 +9882,33 @@ msgstr "" "Переменная APPDATA указывает на несуществующий каталог, обратитесь в службу " "поддержки операционной системы" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "Сбой создания каталога конфигурации «%s» с ошибкой: %s" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" "Не удалось создать временный каталог <{tmpdir_name}>! Завершение работы." -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "Недопустимая строка в файле RC ({file}): «{line}» ({error})\n" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "Пустой файл RC ({file})" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "Графический интерфейс <%s> не поддерживается в этой версии" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." @@ -9850,12 +9917,12 @@ msgstr "" "Проверьте правильность установки или задайте переменную окружения " "GRASS_PYTHON." -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" "Не найден графический интерфейс GRASS. Проверьте правильность установки." -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." @@ -9863,7 +9930,7 @@ msgstr "" "{}\n" "Выполняется переключение на текстовый режим работы." -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -9875,40 +9942,38 @@ msgstr "" "(переменная DISPLAY не установлена.)\n" "Выполняется переключение на текстовый режим работы." -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" "Не удалось создать новую область, так как область <{location}> уже " "существует." -#: ../lib/init/grass.py:994 -#, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +#: ../lib/init/grass.py:995 +#, fuzzy, python-brace-format +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" "Не удалось создать новую область <{location}>, потому что <{path}> является " "файлом." -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" "Не удалось создать новую область <{location}>, потому что каталог <{path}> " "уже существует." -#: ../lib/init/grass.py:1004 -#, python-brace-format +#: ../lib/init/grass.py:1005 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" "Не удалось создать новую область в каталоге <{path}> по неизвестной причине." -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." @@ -9916,34 +9981,36 @@ msgstr "" "Набор <{}> уже существует. Не удалось создать новый временный наборс таким " "именем." -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "Набор <{}> уже существует." -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "Новый набор может быть создан с помощью флага «-c»." -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "Вероятно, имелся в виду другой каталог." -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +#, fuzzy +msgid "Provide CRS to create a project" msgstr "Для создания области необходимо предоставить CRS" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." -msgstr "Создание новой области GRASS GIS <{}>…" +#: ../lib/init/grass.py:1137 +#, fuzzy +msgid "Creating new GRASS GIS project <{}>..." +msgstr "Создание нового набора GRASS GIS <{}>…" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" "Не удалось создать новый набор <{mapset}>, потому что <{path}> является " "файлом." -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." @@ -9952,28 +10019,29 @@ msgstr "" "будет исправлена. Имейте в виду, что данное предупреждение в будущих версиях " "программы может перейти в разряд ошибки." -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, fuzzy, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" "Для создания набора не требуется CRS. Вероятно, предполагалось создать новую " "область?" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "Создание нового набора GRASS GIS <{}>…" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 +#, fuzzy msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" "Каталог базы данных, область и набор GRASS GIS заданы неверно. Задайте их в " "графическом интерфейсе или командной строке." -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -9990,22 +10058,22 @@ msgstr "" "\n" "Проверьте файл <{file}>." -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "Путь «%s» не существует" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "Путь «%s» недоступен." -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "Данный пользователь не является владельцем «%s»." -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -10020,7 +10088,7 @@ msgstr "" "что для проведения этой операции необходимо соответствующее разрешение). " "Для уверенности следите за работой программы в диспетчер задач…" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -10029,7 +10097,7 @@ msgstr "" "%(user)s в данный момент использует GRASS в выбранном наборе (найден файл " "%(file)s). Выполняется принудительный запуск GRASS…" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" @@ -10038,25 +10106,25 @@ msgstr "" "Не удалось получить доступ к «%s».\n" "Поставьте в известность обслуживающий персонал." -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "Построение файла fontcap пользователя…" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "Переменная SHELL не установлена" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "Командная оболочка <{sh}> не поддерживается: {env_file}" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "Выполнение <%s> …" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" @@ -10065,157 +10133,166 @@ msgstr "" "Сбой выполнения <{cmd}>:\n" "{error}" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "Выполнение <%s> завершено." -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "Не удалось закрыть графический интерфейс. {0}" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "Добро пожаловать в GRASS GIS %s" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "Домашняя страница GRASS GIS:" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "Эта версия работает в командной оболочке:" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "Вывод справки:" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "Вывод условий лицензии:" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "Вывод параметров ссылки:" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "При необходимости перезагрузки графического интерфейса:" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "Запуск графического интерфейса:" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "Завершение работы:" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "Имеются двух- и трёхмерные растровые маски" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "Имеется растровая маска" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "Имеется трёхмерная растровая маска" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "Готово." -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "До новых встреч с GRASS GIS" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "Установите пакет для разработки GRASS GIS" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "Параметр <%s> не поддерживается" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "используйте набор %(metavar)s" -#: ../lib/init/grass.py:2285 -#, python-format -msgid "use temporary mapset in location %(metavar)s" +#: ../lib/init/grass.py:2288 +#, fuzzy, python-format +msgid "use temporary mapset in project %(metavar)s" msgstr "используйте временный набор в области %(metavar)s" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +#, fuzzy +msgid "path to mapset (or project if creating one)" msgstr "путь к набору (или области при её создании)" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "используйте временный набор" -#: ../lib/init/grass.py:2303 -#, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +#: ../lib/init/grass.py:2306 +#, fuzzy, python-format +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" "используйте временную область с %(metavar)s (EPSG, файл географической " "привязки, …)" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "снять блокировку при её наличии" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" "выполнить модуль или сценарий (следует за исполняемым файлом с аргументами)" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "Флаг -e требует наличия флага -c" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +#, fuzzy +msgid "Flag -c requires name of project or mapset" msgstr "Флаг -c требует имени области или набора" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +#, fuzzy +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" "Аргументы --tmp-location или --tmp-mapset могут использоваться только " "отдельно, совместное использование не допускается" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 +#, fuzzy msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" "Аргумент базовой системы координат (например, EPSG) необходим для --tmp-" "location" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 +#, fuzzy msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" "--tmp-location требует наличия только одного аргумента (например, EPSG), " "предоставлено имя набора <{}>" -#: ../lib/init/grass.py:2528 -#, python-brace-format +#: ../lib/init/grass.py:2544 +#, fuzzy, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" @@ -10235,31 +10312,32 @@ msgstr "" " {cmd_name} --help\n" "См. также: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "Запуск GRASS GIS…" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" "При запуске GRASS GIS возникла ошибка, каталог grassdata не может быть " "найден или удалён." -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 +#, fuzzy msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" "Ошибка при запуске GRASS GIS, отсутствует область по умолчанию для " "копирования в место установки или произошла ошибка копирования." -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "Запуск <%s> графического интерфейса в фоновом режиме, подождите…" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "Ошибка при запуске командной оболочки «%s»" @@ -10379,7 +10457,7 @@ msgid "Unable to position file" msgstr "Не удалось выполнить позиционирование в файле" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "Не удалось записать заголовок для трёхмерной растровой карты <%s>" @@ -10400,7 +10478,6 @@ msgid "Error in cache" msgstr "Ошибка в кэше" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "Добавление правила: %lf - %lf" @@ -10946,6 +11023,7 @@ msgstr "Не удалось открыть файл условий для кат msgid "Corrupted category raster conditions file (fseek failed)" msgstr "Повреждён файл условий для категорий растра (ошибка fseek)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -11003,6 +11081,8 @@ msgstr "Верх должен быть больше Низа" <<<<<<< HEAD ======= >>>>>>> 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." @@ -11894,8 +11974,8 @@ msgstr "Ошибка dglShortestPath: %s" #, c-format msgid "Unable to find point with defined unique category for node <%d>." msgstr "" -"Не удалось найти точку, в которой определена уникальная категория для узла <" -"%d>." +"Не удалось найти точку, в которой определена уникальная категория для узла " +"<%d>." #: ../lib/vector/Vlib/net_analyze.c:301 ../lib/vector/Vlib/net_analyze.c:342 #, c-format @@ -11904,8 +11984,8 @@ msgid "" "<%d>.\n" "The unique category layer may not be valid." msgstr "" -"Присутствует более одной точки на узел <%d> с уникальной категорией в поле <" -"%d>.\n" +"Присутствует более одной точки на узел <%d> с уникальной категорией в поле " +"<%d>.\n" "Слой уникальной категории может быть недопустимым." #: ../lib/vector/Vlib/net_analyze.c:454 @@ -12063,8 +12143,8 @@ msgstr "Не удалось добавить сетевую дугу для со #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -12129,8 +12209,8 @@ msgid "" "The unique categories layer is not valid therefore you will probably get " "incorrect results." msgstr "" -"Линия с ИД <%d> имеет больше уникальных категорий, определённых в поле <" -"%d>.\n" +"Линия с ИД <%d> имеет больше уникальных категорий, определённых в поле " +"<%d>.\n" "Слой уникальных категорий не является допустимым, в связи с чем результаты " "могут оказаться некорректными." @@ -12810,7 +12890,7 @@ msgstr "Не определён источник данных OGR" msgid "OGR layer not defined" msgstr "Не определён слой OGR" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "Не удалось открыть источник данных OGR «%s»" @@ -13818,17 +13898,17 @@ msgstr "База данных по умолчанию не задана" msgid "Requested dblink %d, maximum link number %d" msgstr "Запрашиваемый dblink %d, максимальное число связей %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "Ошибка в правиле, ряд %d в <%s>" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "Не удалось открыть слой OGR <%s>" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." @@ -13836,21 +13916,21 @@ msgstr "" "В таблице объектов <%s> не определён первичный ключ. Не удалось определить " "связи базы данных." -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "GRASS собран без поддержки PostgreSQL" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "Неизвестный формат векторной карты" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" "Не удалось создать файл определения базы данных для векторной карты <%s>" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "Ошибка: попытка обновить карту, отсутствующую в текущем наборе" @@ -14422,30 +14502,30 @@ msgstr "" "выпуском. Перестройте топологию." #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "Вектор превышает поддерживаемое ограничение на размер файла" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Не удалось удалить узел %d из пространственного индекса" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Не удалось удалить линию %d из пространственного индекса" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Попытка удаления sidx для уже удалённого полигона" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Не удалось удалить полигон %d из пространственного индекса" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Не удалось удалить остров %d из пространственного индекса" @@ -14462,7 +14542,7 @@ msgstr "Не удалось загрузить файл в память, фай msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Векторный режим памяти не поддерживается, используется «AUTO»" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " @@ -14472,7 +14552,7 @@ msgstr "" "GRASS (%d.%d). Попробуйте перестроить топологию или обновить GRASS по " "крайней мере до версии %d." -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " @@ -14481,7 +14561,7 @@ msgstr "" "Данная версия GRASS не полностью поддерживает формат %d.%d топологии " "вектора. Рекомендуется перестроить топологию или обновить GRASS." -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -14573,46 +14653,46 @@ msgstr "Формат вектора «%s» не поддерживается" msgid "Format definition is not correct: %s" msgstr "Некорректное определение формата: %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "У линии %d уже есть полигон или остров %d слева" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "У линии %d уже есть полигон или остров %d справа" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "Остров уже зарегистрирован в полигоне" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Попытка удаления острова из уже удалённого полигона" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Попытка удаления незарегистрированного острова %d из полигона %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Попытка удаления уже удалённого полигона" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" "Для полигона зарегистрирован удалённый центроид %d (ошибка в векторной " "библиотеке)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Попытка удаления информации о полигоне %d из уже удалённого острова %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -14657,6 +14737,12 @@ msgstr "Неподдерживаемый значок %d" msgid "[%s]: No such color" msgstr "[%s]: Нет такого цвета" +#~ msgid "create temporary location (use with the --exec flag)" +#~ msgstr "создать временную область (используется с флагом --exec)" + +#~ msgid "Creating new GRASS GIS location <{}>..." +#~ msgstr "Создание новой области GRASS GIS <{}>…" + #, python-format #~ msgid "" #~ "Unable to create temporary directory ! Exiting." @@ -14753,11 +14839,11 @@ msgstr "[%s]: Нет такого цвета" #, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "" -#~ "Не удалось создать файл сигнатуры <%s> для подгруппы <%s> группы <%s> — <" -#~ "%s> не является текущим набором" +#~ "Не удалось создать файл сигнатуры <%s> для подгруппы <%s> группы <%s> — " +#~ "<%s> не является текущим набором" #, c-format #~ msgid "Unable to create signature file <%s> for subgroup <%s> of group <%s>" @@ -14994,14 +15080,14 @@ msgstr "[%s]: Нет такого цвета" #~ "End time must be greater than start time for %(type)s map <%(id)s> with " #~ "layer: %(l)s" #~ msgstr "" -#~ "Время завершения должно быть больше времени начала для карты %(type)s <" -#~ "%(id)s> со слоем: %(l)s" +#~ "Время завершения должно быть больше времени начала для карты %(type)s " +#~ "<%(id)s> со слоем: %(l)s" #, python-format #~ msgid "End time must be greater than start time for %(type)s map <%(id)s>" #~ msgstr "" -#~ "Время завершения должно быть больше времени начала для карты %(type)s <" -#~ "%(id)s>" +#~ "Время завершения должно быть больше времени начала для карты %(type)s " +#~ "<%(id)s>" #, python-format #~ msgid "" @@ -15016,22 +15102,22 @@ msgstr "[%s]: Нет такого цвета" #~ "Unsupported relative time unit type for %(type)s map <%(id)s> with layer " #~ "%(l)s: %(u)s" #~ msgstr "" -#~ "Неподдерживаемый тип единицы относительного времени для карты %(type)s <" -#~ "%(id)s> со слоем %(l)s: %(u)s" +#~ "Неподдерживаемый тип единицы относительного времени для карты %(type)s " +#~ "<%(id)s> со слоем %(l)s: %(u)s" #, python-format #~ msgid "Unsupported relative time unit type for %(type)s map <%(id)s>: %(u)s" #~ msgstr "" -#~ "Неподдерживаемый тип единицы относительного времени для карты %(type)s <" -#~ "%(id)s>: %(u)s" +#~ "Неподдерживаемый тип единицы относительного времени для карты %(type)s " +#~ "<%(id)s>: %(u)s" #, python-format #~ msgid "" #~ "End time must be greater than start time for %(typ)s map <%(id)s> with " #~ "layer %(l)s" #~ msgstr "" -#~ "Время завершения должно быть больше времени начала для карты %(typ)s <" -#~ "%(id)s> со слоем %(l)s" +#~ "Время завершения должно быть больше времени начала для карты %(typ)s " +#~ "<%(id)s> со слоем %(l)s" #, python-format #~ msgid "" @@ -15128,8 +15214,8 @@ msgstr "[%s]: Нет такого цвета" #, python-format #~ msgid "Unable to export color rules for raster map <%s> r.out.gdal" #~ msgstr "" -#~ "Не удалось выполнить экспорт правил выделения цветом для растровой карты <" -#~ "%s> r.out.gdal" +#~ "Не удалось выполнить экспорт правил выделения цветом для растровой карты " +#~ "<%s> r.out.gdal" #, python-format #~ msgid "Unable to export raster map <%s> with r.pack" @@ -15468,8 +15554,8 @@ msgstr "[%s]: Нет такого цвета" #, python-format #~ msgid "" -#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset <" -#~ "%(base)s>" +#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset " +#~ "<%(base)s>" #~ msgstr "" #~ "Карта <%(map)s> со слом %(l)s не зарегистрирована в пространственно-" #~ "временном наборе данных <%(base)s>" @@ -15482,8 +15568,8 @@ msgstr "[%s]: Нет такого цвета" #, python-format #~ msgid "" -#~ "Update metadata, spatial and temporal extent from all registered maps of <" -#~ "%s>" +#~ "Update metadata, spatial and temporal extent from all registered maps of " +#~ "<%s>" #~ msgstr "" #~ "Обновление метаданных, пространственной и временной протяжённости из всех " #~ "зарегистрированных карт набора данных <%s>" @@ -15595,11 +15681,11 @@ msgstr "[%s]: Нет такого цвета" #, python-format #~ msgid "" -#~ "Wrong temporal type of space time dataset <" -#~ "%s> <%s> time is required" +#~ "Wrong temporal type of space time dataset " +#~ "<%s> <%s> time is required" #~ msgstr "" -#~ "Неверный временной тип пространственно-временного набора данных <" -#~ "%s> время должно иметь тип <%s>" +#~ "Неверный временной тип пространственно-временного набора данных " +#~ "<%s> время должно иметь тип <%s>" #~ msgid "Wrong type of input " #~ msgstr "Неверный тип ввода " @@ -15999,8 +16085,8 @@ msgstr "[%s]: Нет такого цвета" #, python-format #~ msgid "Invalid datetime in timestamp for raster map <%s>" #~ msgstr "" -#~ "Недопустимое значение даты и времени в метке времени для растровой карты <" -#~ "%s>" +#~ "Недопустимое значение даты и времени в метке времени для растровой карты " +#~ "<%s>" #~ msgid "Internal error" #~ msgstr "Внутренняя ошибка" @@ -16021,8 +16107,8 @@ msgstr "[%s]: Нет такого цвета" #, python-format #~ msgid "Unable to read timestamp file for 3D raster map <%s>" #~ msgstr "" -#~ "Не удалось прочитать метку времени файла для трёхмерной растровой карты <" -#~ "%s>" +#~ "Не удалось прочитать метку времени файла для трёхмерной растровой карты " +#~ "<%s>" #, python-format #~ msgid "Unable to create timestamp file for 3D raster map <%s>" @@ -16311,8 +16397,8 @@ msgstr "[%s]: Нет такого цвета" #~ "avoid conflict with Python keywords. Underscore at the beginning is " #~ "deprecated in GRASS GIS 7.0 and will be removed in version 7.1." #~ msgstr "" -#~ "Для запуска модуля <%s> добавьте символ подчёркивания в конце параметра <" -#~ "%s> во избежание конфликта с ключевыми словами языка Python. Добавление " +#~ "Для запуска модуля <%s> добавьте символ подчёркивания в конце параметра " +#~ "<%s> во избежание конфликта с ключевыми словами языка Python. Добавление " #~ "символа подчёркивания в начале параметра в ГИС GRASS 7.0 не " #~ "рекомендуется, и не будет поддерживаться в версии 7.1." @@ -16723,6 +16809,9 @@ msgstr "Верх должен быть больше Низа" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_si.po b/locale/po/grasslibs_si.po index 6429c700dcc..aeb693b1448 100644 --- a/locale/po/grasslibs_si.po +++ b/locale/po/grasslibs_si.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_si\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:53+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Sinhala since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4166,28 +4166,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4221,143 +4221,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4365,87 +4373,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4456,22 +4462,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4481,214 +4487,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -4805,7 +4815,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -4826,7 +4836,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8230,8 +8239,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -8932,7 +8941,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -9889,36 +9898,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10440,30 +10449,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10480,21 +10489,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -10584,44 +10593,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_sl.po b/locale/po/grasslibs_sl.po index 4f05bd27bc2..1199a79e48a 100644 --- a/locale/po/grasslibs_sl.po +++ b/locale/po/grasslibs_sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_sl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:53+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Slovenian since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" "ne morem odpreti [%s] v [%s], ker je reklasificiran iz [%s] v [%s], ki ne " "obstaja" @@ -4420,12 +4420,12 @@ msgstr "Ne morem odpreti datoteke z zgodovino za vektor '%s'" msgid "WARNING" msgstr "OPOZORILO: " -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 #, fuzzy msgid "Exiting..." msgstr "Pripajanje centroidov: " -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 #, fuzzy msgid "Usage" msgstr "" @@ -4433,20 +4433,20 @@ msgstr "" "Uporaba:\n" " " -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4481,149 +4481,160 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 +#: ../lib/init/grass.py:387 #, fuzzy msgid "initial GRASS database directory" msgstr "" "\n" "neveljavna projekcija\n" -#: ../lib/init/grass.py:387 -msgid "directory containing Locations" +#: ../lib/init/grass.py:388 +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:388 +#: ../lib/init/grass.py:389 #, fuzzy -msgid "initial GRASS Location" +msgid "initial GRASS project (location)" msgstr "" "\n" "neveljavna projekcija\n" -#: ../lib/init/grass.py:390 +#: ../lib/init/grass.py:391 msgid "" -"directory containing Mapsets with one common coordinate system (projection)" -msgstr "" - -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +#, fuzzy +msgid "initial GRASS mapset" msgstr "" +"\n" +"neveljavna projekcija\n" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, fuzzy, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "ne morem spremeniti direktorija v %s" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, fuzzy, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "Nezmožen dodeliti spomin\n" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, fuzzy, python-format msgid "GUI <%s> not supported in this version" msgstr "Zahtevani format ni bil preveden v tej verziji" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4631,88 +4642,87 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 -#, python-brace-format +#: ../lib/init/grass.py:989 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." -msgstr "" +"Unable to create new project because the project <{location}> already exists." +msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/init/grass.py:994 -#, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." -msgstr "" +#: ../lib/init/grass.py:995 +#, fuzzy, python-brace-format +msgid "Unable to create new project <{location}> because <{path}> is a file." +msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/init/grass.py:998 -#, python-brace-format +#: ../lib/init/grass.py:999 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." -msgstr "" +msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/init/grass.py:1004 -#, python-brace-format +#: ../lib/init/grass.py:1005 +#, fuzzy, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." -msgstr "" +"Unable to create new project in the directory <{path}> for an unknown reason." +msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 #, fuzzy msgid "Mapset <{}> already exists." msgstr "Ne morem odpreti datoteke z zgodovino za vektor '%s'" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" -msgstr "" +#: ../lib/init/grass.py:1133 +#, fuzzy +msgid "Provide CRS to create a project" +msgstr "ne morem ustvariti novega procesa" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, fuzzy, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4723,22 +4733,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4748,218 +4758,222 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 #, fuzzy msgid "Building user fontcap..." msgstr "Gradim topologijo ...\n" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 #, fuzzy msgid "The SHELL variable is not set" msgstr "GISRC - spremenljivka ni nastavljena" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, fuzzy, python-format msgid "Executing <%s> ..." msgstr "Pripajanje centroidov: " -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, fuzzy, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "Povezava ni uspela.\n" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, fuzzy, python-format msgid "Execution of <%s> finished." msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, fuzzy, python-brace-format msgid "Unable to close GUI. {0}" msgstr "Ne morem odpreti %s" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 #, fuzzy msgid "Help is available with the command:" msgstr "Za ukaz [%s] ni na voljo pomoči\n" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 #, fuzzy msgid "Done." msgstr "ga ni" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, fuzzy, python-format msgid "Parameter <%s> not supported" msgstr "Vneseni vektor '%s' ni bil najden" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, fuzzy, python-format msgid "Failed to start shell '%s'" msgstr "Nezmožen odpreti datoteko %s v %s" @@ -5084,7 +5098,7 @@ msgid "Unable to position file" msgstr "Nezmožen odpreti datoteko %s v %s" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, fuzzy, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "ne morem spremeniti direktorija v %s" @@ -5105,7 +5119,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -7442,8 +7455,8 @@ msgstr "Ne morem odpreti datoteke topo za pisanje: %s\n" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -8176,7 +8189,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, fuzzy, c-format msgid "Unable to open OGR data source '%s'" msgstr "ne morem spremeniti direktorija v %s" @@ -9197,37 +9210,37 @@ msgstr "Privzeta baza podatkov ni podana" msgid "Requested dblink %d, maximum link number %d" msgstr "Zahtevan dblink %d, največja vrednost števila povezave %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, fuzzy, c-format msgid "Error in rule on row %d in <%s>" msgstr "Napaka v pravilu na vrstici %d v %s" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, fuzzy, c-format msgid "Unable to open OGR layer <%s>" msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 #, fuzzy msgid "Unknown vector map format" msgstr "Nepoznan \"location\"" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, fuzzy, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "Ne morem odpreti datoteke z zgodovino za vektor '%s'" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 #, fuzzy msgid "Bug: attempt to update map which is not in current mapset" msgstr "Hrošč: poskus posodobitve sloja, ki ni v trenutnem mapset." @@ -9773,31 +9786,31 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, fuzzy, c-format msgid "Unable to delete node %d from spatial index" msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, fuzzy, c-format msgid "Unable to delete line %d from spatial index" msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 #, fuzzy msgid "Attempt to delete sidx for dead area" msgstr "Ne morem prebrati histograma za [%s v %s]" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, fuzzy, c-format msgid "Unable to delete area %d from spatial index" msgstr "Nezmožen odpreti datoteko %s v %s" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, fuzzy, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Nezmožen odpreti datoteko %s v %s" @@ -9815,21 +9828,21 @@ msgstr "Nezmožen odpreti datoteko %s v %s" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -9928,44 +9941,44 @@ msgstr "Vect_write_line() za ta format/nivo ni podprt" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, fuzzy, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Ne morem prebrati histograma za [%s v %s]" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, fuzzy, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Ne morem prebrati histograma za [%s v %s]" @@ -10028,8 +10041,8 @@ msgstr "" #, fuzzy, c-format #~ msgid "" -#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - <" -#~ "%s> is not current mapset" +#~ "Unable to create signature file <%s> for subgroup <%s> of group <%s> - " +#~ "<%s> is not current mapset" #~ msgstr "Nezmožen ustvariti datoteko z vzglavjem za [%s v %s]" #, fuzzy, c-format @@ -10409,8 +10422,8 @@ msgstr "" #, fuzzy, python-format #~ msgid "" -#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset <" -#~ "%(base)s>" +#~ "Map <%(map)s> with layer %(l)s is not registered in space time dataset " +#~ "<%(base)s>" #~ msgstr "Hrošč: poskus posodobitve sloja, ki ni v trenutnem mapset." #, fuzzy, python-format diff --git a/locale/po/grasslibs_ta.po b/locale/po/grasslibs_ta.po index c164879c9f9..d92a62d5321 100644 --- a/locale/po/grasslibs_ta.po +++ b/locale/po/grasslibs_ta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:53+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Tamil since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4293,28 +4293,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4348,143 +4348,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4492,87 +4500,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4583,22 +4589,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4608,214 +4614,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -4932,7 +4942,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -4953,7 +4963,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8357,8 +8366,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9059,7 +9068,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -10016,36 +10025,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10567,30 +10576,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10607,21 +10616,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -10711,44 +10720,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_th.po b/locale/po/grasslibs_th.po index 8c3a036aea6..3797673e08a 100644 --- a/locale/po/grasslibs_th.po +++ b/locale/po/grasslibs_th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_th\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:53+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Thai >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/mapset.c:38 msgid "MAPSET is not set" msgstr "ยังไม่ได้กำหนด ชุดแผนที่" @@ -3851,6 +3854,9 @@ msgid "none" msgstr "none" ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4862,8 +4868,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -5383,28 +5389,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5438,143 +5444,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5582,87 +5596,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5673,22 +5685,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5698,214 +5710,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -6022,7 +6038,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -6043,7 +6059,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8211,8 +8226,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -8915,7 +8930,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -9867,36 +9882,36 @@ msgstr "ไม่ได้กำหนด ฐานข้อมูล ตั้ msgid "Requested dblink %d, maximum link number %d" msgstr "ต้องการ dblink %d, จำนวนการเชื่อมมากสุด %d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10417,30 +10432,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10457,21 +10472,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -10561,44 +10576,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "ตั้งใจที่จะลบ isle จากพื้นที่" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "ตั้งใจที่จะลบพื้นที่" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -10733,6 +10748,7 @@ msgstr "[%s]: ไม่ใช่ค่าสี" #~ msgid "Mode type: {0} not supported." #~ msgstr "ไม่รองรับ ชนิด Column นี้" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Illegal row value" @@ -10781,6 +10797,8 @@ msgstr "ค่าความลึก ไม่ถูกต้อง" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, fuzzy #~ msgid "Attributes for category %d not found" #~ msgstr "ไม่พบ ข้อมูลสำหรับแสดง %d จากฐานข้อมูล" @@ -10899,6 +10917,9 @@ msgstr "ค่าความลึก ไม่ถูกต้อง" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_tr.po b/locale/po/grasslibs_tr.po index c0bf5292dfa..27d16c5eb94 100644 --- a/locale/po/grasslibs_tr.po +++ b/locale/po/grasslibs_tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_tr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:53+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Turkish >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/mapset.c:38 msgid "MAPSET is not set" msgstr "MAPSET ayarlanmadı" @@ -3947,6 +3950,9 @@ msgstr "<%s> harita takımındaki <%s>" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4677,8 +4683,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -5198,28 +5204,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "yardım mesajını yazdır" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5253,143 +5259,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5397,87 +5411,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5488,22 +5500,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5513,214 +5525,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5837,7 +5853,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5858,7 +5874,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -9263,8 +9278,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9301,6 +9316,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9312,6 +9328,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -9983,7 +10004,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "'%s' OGR veri kaynağı açılamıyor" @@ -10940,36 +10961,36 @@ msgstr "Varsayılan veritabanı ayarlanamadı" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -11491,30 +11512,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "%d düğümü konumsal indeksten silinemiyor" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "%d çizgisi konumsal indeksten silinemiyor" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "%d alanı konumsal indeksten silinemiyor" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "%d adası konumsal indeksten silinemiyor" @@ -11531,21 +11552,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11635,44 +11656,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -11787,6 +11808,7 @@ msgstr "[%s]:Böyle bir renk yok" #~ msgid "Unable to find a temporary null file <%s>" #~ msgstr "%s geçici boş dosyası bulunamadı" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "which is missing." @@ -11841,6 +11863,8 @@ msgstr "Uygun olmayan derinlik değeri" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, fuzzy #~ msgid "Unable to open null file <%s>" #~ msgstr "datum tablo dosyası açılamıyor <%s>" @@ -11998,6 +12022,9 @@ msgstr "Uygun olmayan derinlik değeri" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_uk.po b/locale/po/grasslibs_uk.po index e0e77f3c0ec..486d5583efc 100644 --- a/locale/po/grasslibs_uk.po +++ b/locale/po/grasslibs_uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:53+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Ukrainian =2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"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" "X-Generator: Weblate 4.16.4\n" #: ../lib/nviz/render.c:43 @@ -938,8 +938,8 @@ msgstr "" #: ../lib/rst/interp_float/vinput2d.c:273 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../lib/rst/interp_float/vinput2d.c:279 @@ -1265,7 +1265,7 @@ msgstr "" #: ../lib/vector/Vlib/read_ogr.c:157 ../lib/vector/Vlib/read_ogr.c:239 #: ../lib/vector/Vlib/write_ogr.c:70 ../lib/vector/Vlib/write_ogr.c:105 #: ../lib/vector/Vlib/write_ogr.c:146 ../lib/vector/Vlib/rewind_ogr.c:47 -#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:732 +#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:751 #: ../lib/vector/Vlib/build_sfa.c:720 msgid "GRASS is not compiled with OGR support" msgstr "" @@ -2804,7 +2804,7 @@ msgid "SYNOPSIS" msgstr "" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "" @@ -2814,7 +2814,7 @@ msgid "Force launching GUI dialog" msgstr "" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "" @@ -3171,11 +3171,11 @@ msgid "'.' for current mapset" msgstr "" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +msgid "Project (location) name" msgstr "" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +msgid "Project name (not path to project)" msgstr "" #: ../lib/gis/parser_standard_options.c:712 @@ -3706,12 +3706,12 @@ msgstr "" msgid "Unrecognised access mode: %o" msgstr "" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "" @@ -4077,8 +4077,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4598,28 +4598,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4653,143 +4653,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4797,87 +4805,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4888,22 +4894,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4913,214 +4919,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -5237,7 +5247,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -5258,7 +5268,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8662,8 +8671,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -9364,7 +9373,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -10326,36 +10335,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10878,30 +10887,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10918,21 +10927,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11022,44 +11031,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grasslibs_vi.po b/locale/po/grasslibs_vi.po index b7b544c2d00..b48cd995853 100644 --- a/locale/po/grasslibs_vi.po +++ b/locale/po/grasslibs_vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_vi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:54+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Vietnamese since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -6309,28 +6309,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -6364,143 +6364,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -6508,87 +6516,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -6599,22 +6605,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -6624,214 +6630,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -6948,7 +6958,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -6969,7 +6979,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -10200,6 +10209,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10211,6 +10221,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -10396,8 +10411,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -11098,7 +11113,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -12061,36 +12076,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -12634,30 +12649,30 @@ msgstr "" "xây dựng lại tô-pô." #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "Vector vượt quá giới hạn kích thước tập tin được hỗ trợ" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "Không thể xóa nốt %d khỏi chỉ mục không gian" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "Không thể xóa đường %d khỏi chỉ mục không gian" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "Nỗ lực xóa sidx khỏi vùng chết" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "Không thể xóa vùng %d khỏi chỉ mục không gian" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "Không thể xóa đảo %d khỏi chỉ mục không gian" @@ -12674,7 +12689,7 @@ msgstr "Không thể nạp tập tin vào bộ nhớ, tập tin không mở" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "Chế độ bộ nhớ vector không được hỗ trợ, dùng 'TỰ ĐỘNG'" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " @@ -12683,7 +12698,7 @@ msgstr "" "Phiên bản GRASS này (%d.%d) quá cũ để có thể đọc định dạng tô-pô này. Hãy cố " "xây dựng lại tô-pô hoặc nâng cấp lên phiên bản GRASS tối thiểu là %d." -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " @@ -12692,7 +12707,7 @@ msgstr "" "Phiên bản GRASS của bạn không hỗ trợ hoàn toàn định dạng tô-pô %d.%d của " "vector. Xem xét xây dựng lại tô-pô hoặc nâng cấp GRASS." -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -12785,44 +12800,44 @@ msgstr "Định dạng vector '%s' không được hỗ trợ" msgid "Format definition is not correct: %s" msgstr "Định nghĩa định dạng không đúng: %s" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "Đường %d đã có vùng/đảo %d ở bên trái" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "Đường %d đã có vùng/đảo %d ở bên phải" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "Đảo đã được đăng ký trong vùng" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "Nỗ lực xóa đảo khỏi vùng chết" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "Nỗ lực xóa đảo chưa đăng ký %d khỏi vùng %d" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "Nỗ lực xóa vùng chết" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "Trọng tâm chết %d được đăng ký cho vùng (lỗi trong thư viện vector)" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "Nỗ lực xóa thông tin vùng %d khỏi đảo chết %d" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "Nỗ lực xóa thông tin đảo %d khỏi vùng chết %d" @@ -12957,6 +12972,7 @@ msgstr "[%s]: Không có màu này" #~ "Ghi chú cho nhà phát triển: Thư viện sites thích nghi được dùng cho các " #~ "điểm vec-tơ. (mô-đun phải được cập nhật vào thư viện vec-tơ của GRASS 6)" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Invalid offset (%ld)" @@ -12967,6 +12983,8 @@ msgstr "Độ lệch không hợp lệ (%ld)" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "Cannot fetch row" #~ msgstr "Không thể lấy hàng" @@ -12983,6 +13001,9 @@ msgstr "Độ lệch không hợp lệ (%ld)" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_zh.po b/locale/po/grasslibs_zh.po index ade77ae10f6..ba09af804ee 100644 --- a/locale/po/grasslibs_zh.po +++ b/locale/po/grasslibs_zh.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_zh\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-04-29 23:54+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Chinese (Simplified) >>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../lib/gis/parser_help.c:198 msgid "Flags:" msgstr "" @@ -3782,12 +3785,12 @@ msgstr "" msgid "Unrecognised access mode: %o" msgstr "" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "" @@ -4017,6 +4020,9 @@ msgstr "<%s>在地图集<%s>中" #: ../lib/manage/do_copy.c:43 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4946,8 +4952,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -5467,28 +5473,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -5522,143 +5528,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -5666,87 +5680,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -5757,22 +5769,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -5782,214 +5794,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -6106,7 +6122,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -6127,7 +6143,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -9531,8 +9546,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -10233,7 +10248,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -11185,36 +11200,36 @@ msgstr "默认数据库未设置" msgid "Requested dblink %d, maximum link number %d" msgstr "请求的dblink %d，最大链接数%d" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -11735,30 +11750,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -11775,21 +11790,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -11879,44 +11894,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" @@ -12027,6 +12042,7 @@ msgstr "[%s]: 没有此颜色" #~ msgid "Unable to open null file <%s>" #~ msgstr "G_spawn：无法打开文件%s" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Illegal row value" @@ -12075,6 +12091,8 @@ msgstr "非法的深度值" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "ERROR: option <%s>: <%s> exists.\n" #~ msgstr "错误：选项<%s>：<%s>已存在。\n" @@ -12222,6 +12240,9 @@ msgstr "非法的深度值" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasslibs_zh_CN.po b/locale/po/grasslibs_zh_CN.po index a867df80e05..e832d651deb 100644 --- a/locale/po/grasslibs_zh_CN.po +++ b/locale/po/grasslibs_zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_zh_CN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-01-25 08:30+0000\n" "Last-Translator: \n" "Language-Team: Chinese (China) (https://www.transifex.com/grass-gis/" @@ -937,8 +937,8 @@ msgstr "" #: ../lib/rst/interp_float/vinput2d.c:273 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../lib/rst/interp_float/vinput2d.c:279 @@ -1264,7 +1264,7 @@ msgstr "" #: ../lib/vector/Vlib/read_ogr.c:157 ../lib/vector/Vlib/read_ogr.c:239 #: ../lib/vector/Vlib/write_ogr.c:70 ../lib/vector/Vlib/write_ogr.c:105 #: ../lib/vector/Vlib/write_ogr.c:146 ../lib/vector/Vlib/rewind_ogr.c:47 -#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:732 +#: ../lib/vector/Vlib/rewind_ogr.c:71 ../lib/vector/Vlib/field.c:751 #: ../lib/vector/Vlib/build_sfa.c:720 msgid "GRASS is not compiled with OGR support" msgstr "" @@ -2388,7 +2388,7 @@ msgid "SYNOPSIS" msgstr "" #: ../lib/gis/parser_html.c:159 ../lib/gis/parser_rest_md.c:215 -#: ../lib/init/grass.py:364 +#: ../lib/init/grass.py:366 msgid "Flags" msgstr "" @@ -2398,7 +2398,7 @@ msgid "Force launching GUI dialog" msgstr "" #: ../lib/gis/parser_html.c:207 ../lib/gis/parser_rest_md.c:255 -#: ../lib/init/grass.py:385 +#: ../lib/init/grass.py:386 msgid "Parameters" msgstr "" @@ -2755,11 +2755,11 @@ msgid "'.' for current mapset" msgstr "" #: ../lib/gis/parser_standard_options.c:701 -msgid "Location name" +msgid "Project (location) name" msgstr "" #: ../lib/gis/parser_standard_options.c:702 -msgid "Location name (not location path)" +msgid "Project name (not path to project)" msgstr "" #: ../lib/gis/parser_standard_options.c:712 @@ -3290,12 +3290,12 @@ msgstr "" msgid "Unrecognised access mode: %o" msgstr "" -#: ../lib/gis/mapset_msc.c:222 +#: ../lib/gis/mapset_msc.c:223 #, c-format msgid "Unable to make mapset element %s (%s): %s" msgstr "" -#: ../lib/gis/mapset_msc.c:228 +#: ../lib/gis/mapset_msc.c:229 #, c-format msgid "Unable to access mapset element %s (%s): %s" msgstr "" @@ -3661,8 +3661,8 @@ msgstr "" #: ../lib/raster/open.c:192 #, c-format msgid "" -"Unable to open raster map <%s@%s> since it is a reclass of raster map <%s@" -"%s> which does not exist" +"Unable to open raster map <%s@%s> since it is a reclass of raster map " +"<%s@%s> which does not exist" msgstr "" #: ../lib/raster/open.c:197 @@ -4166,28 +4166,28 @@ msgstr "" msgid "WARNING" msgstr "" -#: ../lib/init/grass.py:210 ../lib/init/grass.py:2671 +#: ../lib/init/grass.py:210 ../lib/init/grass.py:2687 msgid "Exiting..." msgstr "" -#: ../lib/init/grass.py:363 +#: ../lib/init/grass.py:365 msgid "Usage" msgstr "" -#: ../lib/init/grass.py:365 +#: ../lib/init/grass.py:367 msgid "print this help message" msgstr "" -#: ../lib/init/grass.py:366 +#: ../lib/init/grass.py:368 msgid "show version information and exit" msgstr "" -#: ../lib/init/grass.py:367 -msgid "create given database, location or mapset if it doesn't exist" +#: ../lib/init/grass.py:369 +msgid "create given database, project or mapset if it doesn't exist" msgstr "" -#: ../lib/init/grass.py:369 -msgid "exit after creation of location or mapset. Only with -c flag" +#: ../lib/init/grass.py:370 +msgid "exit after creation of project or mapset. Only with -c flag" msgstr "" #: ../lib/init/grass.py:372 @@ -4221,143 +4221,151 @@ msgid "" "version" msgstr "" -#: ../lib/init/grass.py:386 -msgid "initial GRASS database directory" -msgstr "" - #: ../lib/init/grass.py:387 -msgid "directory containing Locations" +msgid "initial GRASS database directory" msgstr "" #: ../lib/init/grass.py:388 -msgid "initial GRASS Location" +msgid "directory containing GRASS projects" msgstr "" -#: ../lib/init/grass.py:390 -msgid "" -"directory containing Mapsets with one common coordinate system (projection)" +#: ../lib/init/grass.py:389 +msgid "initial GRASS project (location)" msgstr "" -#: ../lib/init/grass.py:393 -msgid "initial GRASS Mapset" +#: ../lib/init/grass.py:391 +msgid "" +"directory containing mapsets with one common coordinate reference system" msgstr "" #: ../lib/init/grass.py:394 -msgid "fully qualified initial Mapset directory" +msgid "initial GRASS mapset" msgstr "" #: ../lib/init/grass.py:395 -msgid "Environment variables relevant for startup" +msgid "fully qualified initial mapset directory" msgstr "" #: ../lib/init/grass.py:396 -msgid "select GUI (text, gui, gtext)" +msgid "Environment variables relevant for startup" msgstr "" #: ../lib/init/grass.py:397 +msgid "select GUI (text, gui, gtext)" +msgstr "" + +#: ../lib/init/grass.py:398 msgid "set html web browser for help pages" msgstr "" -#: ../lib/init/grass.py:399 +#: ../lib/init/grass.py:400 msgid "set additional path(s) to local GRASS modules or user scripts" msgstr "" -#: ../lib/init/grass.py:402 +#: ../lib/init/grass.py:403 msgid "set additional GISBASE for locally installed GRASS Addons" msgstr "" -#: ../lib/init/grass.py:404 +#: ../lib/init/grass.py:405 msgid "set Python interpreter name to override 'python'" msgstr "" -#: ../lib/init/grass.py:405 +#: ../lib/init/grass.py:406 msgid "execute GRASS module or script" msgstr "" -#: ../lib/init/grass.py:406 +#: ../lib/init/grass.py:407 msgid "provided executable will be executed in GRASS session" msgstr "" -#: ../lib/init/grass.py:407 +#: ../lib/init/grass.py:408 msgid "GRASS module, script or any other executable" msgstr "" -#: ../lib/init/grass.py:408 +#: ../lib/init/grass.py:409 msgid "parameters of the executable" msgstr "" -#: ../lib/init/grass.py:409 +#: ../lib/init/grass.py:410 msgid "standard flags" msgstr "" -#: ../lib/init/grass.py:410 -msgid "create temporary location (use with the --exec flag)" +#: ../lib/init/grass.py:411 ../lib/init/grass.py:2313 +msgid "deprecated, use --tmp-project instead" msgstr "" #: ../lib/init/grass.py:412 +msgid "location was renamed to project" +msgstr "" + +#: ../lib/init/grass.py:413 +msgid "create temporary project (use with the --exec flag)" +msgstr "" + +#: ../lib/init/grass.py:415 msgid "created in a temporary directory and deleted at exit" msgstr "" -#: ../lib/init/grass.py:414 +#: ../lib/init/grass.py:417 msgid "create temporary mapset (use with the --exec flag)" msgstr "" -#: ../lib/init/grass.py:416 -msgid "created in the specified location and deleted at exit" +#: ../lib/init/grass.py:418 +msgid "created in the specified project and deleted at exit" msgstr "" -#: ../lib/init/grass.py:442 +#: ../lib/init/grass.py:443 msgid "The APPDATA variable is not set, ask your operating system support" msgstr "" -#: ../lib/init/grass.py:449 +#: ../lib/init/grass.py:450 msgid "" "The APPDATA variable points to directory which does not exist, ask your " "operating system support" msgstr "" -#: ../lib/init/grass.py:464 +#: ../lib/init/grass.py:465 #, python-format msgid "Failed to create configuration directory '%s' with error: %s" msgstr "" -#: ../lib/init/grass.py:506 +#: ../lib/init/grass.py:507 #, python-brace-format msgid "Unable to create temporary directory <{tmpdir_name}>! Exiting." msgstr "" -#: ../lib/init/grass.py:566 +#: ../lib/init/grass.py:567 #, python-brace-format msgid "Invalid line in RC file ({file}): '{line}' ({error})\n" msgstr "" -#: ../lib/init/grass.py:573 +#: ../lib/init/grass.py:574 #, python-brace-format msgid "Empty RC file ({file})" msgstr "" -#: ../lib/init/grass.py:668 +#: ../lib/init/grass.py:669 #, python-format msgid "GUI <%s> not supported in this version" msgstr "" -#: ../lib/init/grass.py:897 +#: ../lib/init/grass.py:898 msgid "" "The python command does not work as expected.\n" "Please check your installation or set the GRASS_PYTHON environment variable." msgstr "" -#: ../lib/init/grass.py:902 +#: ../lib/init/grass.py:903 msgid "GRASS GUI not found. Please check your installation." msgstr "" -#: ../lib/init/grass.py:904 +#: ../lib/init/grass.py:905 msgid "" "{}\n" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:913 +#: ../lib/init/grass.py:914 msgid "" "It appears that the X Windows system is not active.\n" "A graphical based user interface is not supported.\n" @@ -4365,87 +4373,85 @@ msgid "" "Switching to text based interface mode." msgstr "" -#: ../lib/init/grass.py:988 +#: ../lib/init/grass.py:989 #, python-brace-format msgid "" -"Unable to create new location because the location <{location}> already " -"exists." +"Unable to create new project because the project <{location}> already exists." msgstr "" -#: ../lib/init/grass.py:994 +#: ../lib/init/grass.py:995 #, python-brace-format -msgid "Unable to create new location <{location}> because <{path}> is a file." +msgid "Unable to create new project <{location}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:998 +#: ../lib/init/grass.py:999 #, python-brace-format msgid "" -"Unable to create new location <{location}> because the directory <{path}> " +"Unable to create new project <{location}> because the directory <{path}> " "already exists." msgstr "" -#: ../lib/init/grass.py:1004 +#: ../lib/init/grass.py:1005 #, python-brace-format msgid "" -"Unable to create new location in the directory <{path}> for an unknown " -"reason." +"Unable to create new project in the directory <{path}> for an unknown reason." msgstr "" -#: ../lib/init/grass.py:1088 +#: ../lib/init/grass.py:1089 msgid "" "Mapset <{}> already exists. Unable to create a new temporary mapset of that " "name." msgstr "" -#: ../lib/init/grass.py:1093 +#: ../lib/init/grass.py:1094 msgid "Mapset <{}> already exists." msgstr "" -#: ../lib/init/grass.py:1101 +#: ../lib/init/grass.py:1102 msgid "A new mapset can be created using '-c' flag." msgstr "" -#: ../lib/init/grass.py:1103 +#: ../lib/init/grass.py:1104 msgid "Maybe you meant a different directory." msgstr "" -#: ../lib/init/grass.py:1132 -msgid "Provide CRS to create a location" +#: ../lib/init/grass.py:1133 +msgid "Provide CRS to create a project" msgstr "" -#: ../lib/init/grass.py:1136 -msgid "Creating new GRASS GIS location <{}>..." +#: ../lib/init/grass.py:1137 +msgid "Creating new GRASS GIS project <{}>..." msgstr "" -#: ../lib/init/grass.py:1149 +#: ../lib/init/grass.py:1150 #, python-brace-format msgid "Unable to create new mapset <{mapset}> because <{path}> is a file." msgstr "" -#: ../lib/init/grass.py:1158 +#: ../lib/init/grass.py:1159 msgid "" "The mapset <{}> is missing the WIND file (computational region). It will be " "fixed now. Note that this warning may become an error in future versions." msgstr "" -#: ../lib/init/grass.py:1168 +#: ../lib/init/grass.py:1169 #, python-brace-format msgid "" "No CRS is needed for creating mapset <{mapset}>, but <{geofile}> was " -"provided as CRS. Did you mean to create a new location?" +"provided as CRS. Did you mean to create a new project?" msgstr "" -#: ../lib/init/grass.py:1175 +#: ../lib/init/grass.py:1176 msgid "Creating new GRASS GIS mapset <{}>..." msgstr "" -#: ../lib/init/grass.py:1206 +#: ../lib/init/grass.py:1207 msgid "" -"GRASS GIS database directory, location and mapset not set properly. Use GUI " +"GRASS GIS database directory, project and mapset not set properly. Use GUI " "or command line to set them." msgstr "" -#: ../lib/init/grass.py:1266 +#: ../lib/init/grass.py:1267 #, python-brace-format msgid "" "Error reading data path information from g.gisenv.\n" @@ -4456,22 +4462,22 @@ msgid "" "Check the <{file}> file." msgstr "" -#: ../lib/init/grass.py:1566 +#: ../lib/init/grass.py:1569 #, python-format msgid "Path '%s' doesn't exist" msgstr "" -#: ../lib/init/grass.py:1568 +#: ../lib/init/grass.py:1571 #, python-format msgid "Path '%s' not accessible." msgstr "" -#: ../lib/init/grass.py:1575 +#: ../lib/init/grass.py:1578 #, python-format msgid "You are not the owner of '%s'." msgstr "" -#: ../lib/init/grass.py:1585 +#: ../lib/init/grass.py:1588 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " @@ -4481,214 +4487,218 @@ msgid "" "sure..." msgstr "" -#: ../lib/init/grass.py:1596 +#: ../lib/init/grass.py:1599 #, python-format msgid "" "%(user)s is currently running GRASS in selected mapset (file %(file)s " "found). Forcing to launch GRASS..." msgstr "" -#: ../lib/init/grass.py:1603 +#: ../lib/init/grass.py:1606 #, python-format msgid "" "Unable to properly access '%s'.\n" "Please notify system personnel." msgstr "" -#: ../lib/init/grass.py:1632 +#: ../lib/init/grass.py:1635 msgid "Building user fontcap..." msgstr "" -#: ../lib/init/grass.py:1701 +#: ../lib/init/grass.py:1704 msgid "The SHELL variable is not set" msgstr "" -#: ../lib/init/grass.py:1718 +#: ../lib/init/grass.py:1721 #, python-brace-format msgid "Unsupported shell <{sh}>: {env_file}" msgstr "" -#: ../lib/init/grass.py:1738 +#: ../lib/init/grass.py:1741 #, python-format msgid "Executing <%s> ..." msgstr "" -#: ../lib/init/grass.py:1762 +#: ../lib/init/grass.py:1765 #, python-brace-format msgid "" "Execution of <{cmd}> failed:\n" "{error}" msgstr "" -#: ../lib/init/grass.py:1775 +#: ../lib/init/grass.py:1778 #, python-format msgid "Execution of <%s> finished." msgstr "" -#: ../lib/init/grass.py:1819 +#: ../lib/init/grass.py:1822 #, python-brace-format msgid "Unable to close GUI. {0}" msgstr "" -#: ../lib/init/grass.py:1838 +#: ../lib/init/grass.py:1841 #, python-format msgid "Welcome to GRASS GIS %s" msgstr "" -#: ../lib/init/grass.py:1865 +#: ../lib/init/grass.py:1868 msgid "GRASS GIS homepage:" msgstr "" #. GTC Running through: SHELL NAME -#: ../lib/init/grass.py:1867 +#: ../lib/init/grass.py:1870 msgid "This version running through:" msgstr "" -#: ../lib/init/grass.py:1870 +#: ../lib/init/grass.py:1873 msgid "Help is available with the command:" msgstr "" -#: ../lib/init/grass.py:1871 +#: ../lib/init/grass.py:1874 msgid "See the licence terms with:" msgstr "" -#: ../lib/init/grass.py:1872 +#: ../lib/init/grass.py:1875 msgid "See citation options with:" msgstr "" -#: ../lib/init/grass.py:1877 +#: ../lib/init/grass.py:1880 msgid "If required, restart the GUI with:" msgstr "" -#: ../lib/init/grass.py:1879 +#: ../lib/init/grass.py:1882 msgid "Start the GUI with:" msgstr "" -#: ../lib/init/grass.py:1881 +#: ../lib/init/grass.py:1884 msgid "When ready to quit enter:" msgstr "" -#: ../lib/init/grass.py:2071 +#: ../lib/init/grass.py:2074 msgid "2D and 3D raster MASKs present" msgstr "" -#: ../lib/init/grass.py:2072 +#: ../lib/init/grass.py:2075 msgid "Raster MASK present" msgstr "" -#: ../lib/init/grass.py:2073 +#: ../lib/init/grass.py:2076 msgid "3D raster MASK present" msgstr "" -#: ../lib/init/grass.py:2118 +#: ../lib/init/grass.py:2121 msgid "Done." msgstr "" -#: ../lib/init/grass.py:2120 +#: ../lib/init/grass.py:2123 msgid "Goodbye from GRASS GIS" msgstr "" -#: ../lib/init/grass.py:2181 +#: ../lib/init/grass.py:2184 msgid "Please install the GRASS GIS development package" msgstr "" -#: ../lib/init/grass.py:2230 +#: ../lib/init/grass.py:2233 #, python-format msgid "Parameter <%s> not supported" msgstr "" -#: ../lib/init/grass.py:2279 +#: ../lib/init/grass.py:2282 #, python-format msgid "use mapset %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2285 +#: ../lib/init/grass.py:2288 #, python-format -msgid "use temporary mapset in location %(metavar)s" +msgid "use temporary mapset in project %(metavar)s" msgstr "" -#: ../lib/init/grass.py:2293 -msgid "path to mapset (or location if creating one)" +#: ../lib/init/grass.py:2296 +msgid "path to mapset (or project if creating one)" msgstr "" -#: ../lib/init/grass.py:2296 +#: ../lib/init/grass.py:2299 msgid "use temporary mapset" msgstr "" -#: ../lib/init/grass.py:2303 +#: ../lib/init/grass.py:2306 #, python-format -msgid "use temporary location with %(metavar)s (EPSG, georeferenced file, ...)" +msgid "use temporary project with %(metavar)s (EPSG, georeferenced file, ...)" msgstr "" -#: ../lib/init/grass.py:2310 +#: ../lib/init/grass.py:2319 msgid "remove lock if present" msgstr "" -#: ../lib/init/grass.py:2359 +#: ../lib/init/grass.py:2331 +msgid "Option --tmp-location is deprecated, use --tmp-project instead\n" +msgstr "" + +#: ../lib/init/grass.py:2375 msgid "execute module or script (followed by executable with arguments)" msgstr "" -#: ../lib/init/grass.py:2415 +#: ../lib/init/grass.py:2431 msgid "Flag -e requires also flag -c" msgstr "" -#: ../lib/init/grass.py:2417 -msgid "Flag -c requires name of location or mapset" +#: ../lib/init/grass.py:2433 +msgid "Flag -c requires name of project or mapset" msgstr "" -#: ../lib/init/grass.py:2420 -msgid "Either --tmp-location or --tmp-mapset can be used, not both" +#: ../lib/init/grass.py:2436 +msgid "Either --tmp-project or --tmp-mapset can be used, not both" msgstr "" -#: ../lib/init/grass.py:2427 +#: ../lib/init/grass.py:2443 msgid "" -"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-location" +"Coordinate reference system argument (e.g. EPSG) is needed for --tmp-project" msgstr "" -#: ../lib/init/grass.py:2434 +#: ../lib/init/grass.py:2450 msgid "" -"Only one argument (e.g. EPSG) is needed for --tmp-location, mapset name <{}> " +"Only one argument (e.g. EPSG) is needed for --tmp-project, mapset name <{}> " "provided" msgstr "" -#: ../lib/init/grass.py:2528 +#: ../lib/init/grass.py:2544 #, python-brace-format msgid "" "Unable to start GRASS GIS. You have the choice to:\n" " - Launch the graphical user interface with the '--gui' switch\n" " {cmd_name} --gui\n" -" - Launch with path to the location/mapset as an argument\n" -" {cmd_name} /path/to/location/mapset`\n" -" - Create a location with '-c' and launch in its PERMANENT mapset\n" -" {cmd_name} -c EPSG:number /path/to/location\n" -" {cmd_name} -c geofile /path/to/location\n" +" - Launch with path to the project/mapset as an argument\n" +" {cmd_name} /path/to/project/mapset`\n" +" - Create a project with '-c' and launch in its PERMANENT mapset\n" +" {cmd_name} -c EPSG:number /path/to/project\n" +" {cmd_name} -c geofile /path/to/project\n" " - Create manually the GISRC file ({gisrcrc})\n" " - Use '--help' for further options\n" " {cmd_name} --help\n" "See also: https://grass.osgeo.org/{cmd_name}/manuals/helptext.html" msgstr "" -#: ../lib/init/grass.py:2549 +#: ../lib/init/grass.py:2565 msgid "Starting GRASS GIS..." msgstr "" -#: ../lib/init/grass.py:2598 +#: ../lib/init/grass.py:2614 msgid "" "Failed to start GRASS GIS, grassdata directory cannot be found or created." msgstr "" -#: ../lib/init/grass.py:2605 +#: ../lib/init/grass.py:2621 msgid "" -"Failed to start GRASS GIS, no default location to copy in the installation " -"or copying failed." +"Failed to start GRASS GIS, no default project to copy in the installation or " +"copying failed." msgstr "" -#: ../lib/init/grass.py:2708 +#: ../lib/init/grass.py:2724 #, python-format msgid "Launching <%s> GUI in the background, please wait..." msgstr "" -#: ../lib/init/grass.py:2746 +#: ../lib/init/grass.py:2762 #, python-format msgid "Failed to start shell '%s'" msgstr "" @@ -4805,7 +4815,7 @@ msgid "Unable to position file" msgstr "" #: ../lib/raster3d/close.c:101 ../lib/raster3d/close.c:108 -#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:208 +#: ../lib/raster3d/close.c:190 ../lib/raster3d/header.c:282 #, c-format msgid "Unable to write header for 3D raster map <%s>" msgstr "" @@ -4826,7 +4836,6 @@ msgid "Error in cache" msgstr "" #: ../lib/raster3d/maskfn.c:76 -#, c-format msgid "Adding rule: %lf - %lf" msgstr "" @@ -8230,8 +8239,8 @@ msgstr "" #: ../lib/vector/Vlib/net_build.c:359 #, c-format msgid "" -"There exists more than one point of node <%d> with unique category field <" -"%d>.\n" +"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 " "incorrect results." msgstr "" @@ -8932,7 +8941,7 @@ msgstr "" msgid "OGR layer not defined" msgstr "" -#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:746 +#: ../lib/vector/Vlib/open_ogr.c:77 ../lib/vector/Vlib/field.c:765 #, c-format msgid "Unable to open OGR data source '%s'" msgstr "" @@ -9884,36 +9893,36 @@ msgstr "" msgid "Requested dblink %d, maximum link number %d" msgstr "" -#: ../lib/vector/Vlib/field.c:670 ../lib/vector/Vlib/field.c:678 +#: ../lib/vector/Vlib/field.c:689 ../lib/vector/Vlib/field.c:697 #, c-format msgid "Error in rule on row %d in <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:765 +#: ../lib/vector/Vlib/field.c:784 #, c-format msgid "Unable to open OGR layer <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:793 +#: ../lib/vector/Vlib/field.c:812 #, c-format msgid "" "Feature table <%s> has no primary key defined. Unable to define DB links." msgstr "" -#: ../lib/vector/Vlib/field.c:812 +#: ../lib/vector/Vlib/field.c:831 msgid "GRASS not compiled with PostgreSQL support" msgstr "" -#: ../lib/vector/Vlib/field.c:845 +#: ../lib/vector/Vlib/field.c:864 msgid "Unknown vector map format" msgstr "" -#: ../lib/vector/Vlib/field.c:879 +#: ../lib/vector/Vlib/field.c:898 #, c-format msgid "Unable to create database definition file for vector map <%s>" msgstr "" -#: ../lib/vector/Vlib/field.c:976 +#: ../lib/vector/Vlib/field.c:995 msgid "Bug: attempt to update map which is not in current mapset" msgstr "" @@ -10434,30 +10443,30 @@ msgid "" msgstr "" #: ../lib/vector/diglib/portable.c:210 ../lib/vector/diglib/portable.c:243 -#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:576 +#: ../lib/vector/diglib/portable.c:684 ../lib/vector/diglib/plus_struct.c:614 msgid "Vector exceeds supported file size limit" msgstr "" -#: ../lib/vector/diglib/spindex.c:449 +#: ../lib/vector/diglib/spindex.c:457 #, c-format msgid "Unable to delete node %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:492 +#: ../lib/vector/diglib/spindex.c:500 #, c-format msgid "Unable to delete line %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:528 +#: ../lib/vector/diglib/spindex.c:536 msgid "Attempt to delete sidx for dead area" msgstr "" -#: ../lib/vector/diglib/spindex.c:545 +#: ../lib/vector/diglib/spindex.c:553 #, c-format msgid "Unable to delete area %d from spatial index" msgstr "" -#: ../lib/vector/diglib/spindex.c:594 +#: ../lib/vector/diglib/spindex.c:602 #, c-format msgid "Unable to delete isle %d from spatial index" msgstr "" @@ -10474,21 +10483,21 @@ msgstr "" msgid "Vector memory mode not supported, using 'AUTO'" msgstr "" -#: ../lib/vector/diglib/plus_struct.c:529 +#: ../lib/vector/diglib/plus_struct.c:567 #, c-format msgid "" "This version of GRASS (%d.%d) is too old to read this topology format. Try " "to rebuild topology or upgrade GRASS to at least version %d." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:538 +#: ../lib/vector/diglib/plus_struct.c:576 #, c-format msgid "" "Your GRASS version does not fully support topology format %d.%d of the " "vector. Consider to rebuild topology or upgrade GRASS." msgstr "" -#: ../lib/vector/diglib/plus_struct.c:551 +#: ../lib/vector/diglib/plus_struct.c:589 #, c-format msgid "" "Old topology format version %d.%d is not supported by this release. Try to " @@ -10578,44 +10587,44 @@ msgstr "" msgid "Format definition is not correct: %s" msgstr "" -#: ../lib/vector/diglib/plus_area.c:221 ../lib/vector/diglib/plus_area.c:735 +#: ../lib/vector/diglib/plus_area.c:223 ../lib/vector/diglib/plus_area.c:741 #, c-format msgid "Line %d already has area/isle %d to left" msgstr "" -#: ../lib/vector/diglib/plus_area.c:231 ../lib/vector/diglib/plus_area.c:743 +#: ../lib/vector/diglib/plus_area.c:234 ../lib/vector/diglib/plus_area.c:750 #, c-format msgid "Line %d already has area/isle %d to right" msgstr "" -#: ../lib/vector/diglib/plus_area.c:285 +#: ../lib/vector/diglib/plus_area.c:289 msgid "Isle already registered in area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:319 +#: ../lib/vector/diglib/plus_area.c:323 msgid "Attempt to delete isle from dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:328 +#: ../lib/vector/diglib/plus_area.c:332 #, c-format msgid "Attempt to delete not registered isle %d from area %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:375 +#: ../lib/vector/diglib/plus_area.c:379 msgid "Attempt to delete dead area" msgstr "" -#: ../lib/vector/diglib/plus_area.c:415 +#: ../lib/vector/diglib/plus_area.c:419 #, c-format msgid "Dead centroid %d registered for area (bug in the vector library)" msgstr "" -#: ../lib/vector/diglib/plus_area.c:439 +#: ../lib/vector/diglib/plus_area.c:443 #, c-format msgid "Attempt to delete area %d info from dead isle %d" msgstr "" -#: ../lib/vector/diglib/plus_area.c:801 +#: ../lib/vector/diglib/plus_area.c:809 #, c-format msgid "Attempt to delete isle %d info from dead area %d" msgstr "" diff --git a/locale/po/grassmods_ar.po b/locale/po/grassmods_ar.po index bc7a5a152ab..71bc9690360 100644 --- a/locale/po/grassmods_ar.po +++ b/locale/po/grassmods_ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2005-03-09 12:50+0100\n" "Last-Translator: Dr. Alaa Masoud \n" "Language-Team: Arabic \n" @@ -86,7 +86,7 @@ msgstr "نوع المظهر" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 #, fuzzy msgid "settings" @@ -129,32 +129,33 @@ msgid "Print current connection parameters and exit" msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -180,21 +181,21 @@ msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -273,7 +274,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -298,7 +299,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -309,7 +310,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -331,7 +332,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -488,6 +489,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -507,7 +509,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -526,7 +527,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -540,6 +540,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -574,7 +575,7 @@ msgstr "اسم الخريطة الراسترية الموجودة" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -584,8 +585,8 @@ msgstr "اسم الخريطة الراسترية الموجودة" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -600,21 +601,21 @@ msgstr "اسم الخريطة الراسترية الموجودة" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, fuzzy, c-format, python-format msgid "Raster map <%s> not found" msgstr "غير موجودة <%s> الخريطة الراسترية " @@ -623,7 +624,7 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -658,7 +659,6 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -671,7 +671,6 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -710,6 +709,7 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -731,7 +731,7 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -797,7 +797,7 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -812,7 +812,7 @@ msgstr "اسم الخريطة الراسترية الموجودة" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -825,8 +825,8 @@ msgstr "اسم الخريطة الراسترية الموجودة" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, fuzzy, c-format, python-format msgid "Vector map <%s> not found" @@ -842,16 +842,16 @@ msgstr "اسم خريطة النقط الفيكتورية المخرجة" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -897,7 +897,7 @@ msgstr "اسم خريطة النقط الفيكتورية المخرجة" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -913,7 +913,7 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -922,7 +922,7 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -952,13 +952,13 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, fuzzy, c-format, python-format @@ -986,7 +986,7 @@ msgstr "لم يتم الإتصال بقاعدة البيانات\n" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1001,8 +1001,8 @@ msgstr "'%s'لم يمكن بدء المشغل" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1036,10 +1036,10 @@ msgstr "'%s'لم يمكن بدء المشغل" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, fuzzy, c-format @@ -1047,7 +1047,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "%s بالمشغل %s لم يمكن فتح قاعدة البيانات" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1077,23 +1077,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, fuzzy, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr " <%s> فى <%s>لم يمكن قراءة العنوان الرئيسى ل" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, fuzzy, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr " <%s> فى <%s>لم يمكن قراءة العنوان الرئيسى ل" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 #, fuzzy msgid "Supported formats:" msgstr "عرض الهيئات المدعمة والخروج" @@ -1178,13 +1178,14 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" -msgstr "" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" +msgstr "<%s>فى<%s>لم يمكن فتح الملف الفيكتورى" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 #, fuzzy msgid "Region for the current mapset updated" msgstr "<%s>فى<%s>لم يمكن فتح الملف الفيكتورى" @@ -1238,6 +1239,7 @@ msgstr "<%s>فى<%s>لم يمكن فتح الملف الفيكتورى" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1301,6 +1303,12 @@ msgstr "الملف الراسترى الطلوب إدخالة" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1366,14 +1374,13 @@ msgstr "الملف الراسترى الطلوب إدخالة" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1425,152 +1432,140 @@ msgstr "وصف مبسط للخريطة الراسترية الناتجة" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 #, fuzzy msgid "List supported formats and exit" msgstr "عرض الهيئات المدعمة والخروج" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 #, fuzzy -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "تغلب على الإسقاط مستخدما إسقاط الموقع" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 #, fuzzy -msgid "Assume that the dataset has same projection as the current location" +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "درجة وضوح الخريطة المخرجة" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 #, fuzzy msgid "Perform projection check only and exit" msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 #, fuzzy msgid "Extend region extents based on new dataset" msgstr "مد حدود الموقع معتمدا على مجموعة البيانات الجديدة" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 #, fuzzy msgid "List available bands including band type in dataset and exit" msgstr "عرض ملفات الراستر للموقع والخروج" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, fuzzy, c-format msgid "%s= or %s= must be given" msgstr "طبقتين يجب تحديدهم" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 #, fuzzy msgid "Unable to get current working directory" msgstr "لم يتم تحديث الحدود" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 #, fuzzy msgid "Proceeding with import..." msgstr "كتابة ملف جديد...\n" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, fuzzy, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "خريطة مخرجة حيث ستكتب النقاط" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, fuzzy, c-format msgid "Reading band %d of %d..." msgstr "خريطة الإرتفاعات" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, fuzzy, c-format msgid "Selected band (%d) does not exist" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, fuzzy, c-format msgid "Imagery group <%s> created" msgstr "dig_att لم يمكن العثور على ملف" @@ -1588,36 +1583,35 @@ msgstr "" msgid "No projection information available" msgstr "طباعة الأحصاء فى صورة شل سكربت" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." -msgstr "" +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, fuzzy, c-format -msgid "Unable to create new location <%s>" -msgstr "%s:لم يتم إنشاء الجدول" +msgid "Unable to create new project <%s>" +msgstr "اسم الخريطة الراسترية الناتجة" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, fuzzy, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "%s لم يمكن فتح " -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 #, fuzzy msgid "Unable to convert input map projection information to GRASS format." msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1626,58 +1620,60 @@ msgstr "ضبط المنطقة الحالية من ابعاد الخريطة ال msgid "Over-riding projection check" msgstr "طباعة نوع الملف الراسترى فقط" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 #, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 #, fuzzy -msgid "Location PROJ_INFO is:\n" +msgid "Project PROJ_INFO is:\n" msgstr "%s لم يمكن فتح " -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 #, fuzzy -msgid "Projection of input dataset and current location appear to match" +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" #: ../raster/r.quantile/main.c:94 @@ -1762,12 +1758,10 @@ msgstr "الملف الراسترى المدخل" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1811,7 +1805,7 @@ msgstr "عدد النقاط المطلوب تخصيصها" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1828,7 +1822,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1880,24 +1874,18 @@ msgstr "اسم ملف الإرتفاعات الراسترى" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 #, fuzzy msgid "Outputs" msgstr "الخريطة المخرجة" @@ -2021,7 +2009,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2031,7 +2019,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2160,7 +2147,7 @@ msgstr "طباعة نوع الملف الراسترى فقط" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2190,6 +2177,7 @@ msgstr "لم يتم حساب شبه مركز المساحة" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2331,7 +2319,13 @@ msgstr "عدد نقاط الإستيفاء" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2341,8 +2335,8 @@ msgid "The minimum number of input raster maps is two" msgstr "اسم الخريطة الراسترية المدخلة" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 #, fuzzy msgid "Percent complete..." msgstr "مقلوب فرق العزم" @@ -2376,7 +2370,7 @@ msgstr "اسم الخريطة الراسترية الناتجة" msgid "Statistics for <%s> updated" msgstr "الملف الراستري للسطح" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2439,7 +2433,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 #, fuzzy msgid "resample" msgstr "الخريطة الراسترية المطلوب تسجيلها" @@ -2489,7 +2482,7 @@ msgid "Unknown method <%s>" msgstr "%c :نوع غير معروف" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, fuzzy, c-format msgid "Unable to read color table for %s" @@ -2545,7 +2538,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, fuzzy, c-format msgid "Please specify %s= or %s=" msgstr "اسم الملف المخرج" @@ -2996,7 +2989,7 @@ msgstr "dig قراءة ملف...\n" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, fuzzy, c-format msgid "Writing output raster map <%s>..." @@ -3085,14 +3078,16 @@ msgstr "الملف الراسترى المدخل" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3263,7 +3258,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3588,6 +3583,15 @@ msgstr "إخراج ملف زاوية السقوط الراسترى" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3676,17 +3680,15 @@ msgstr "إخراج ملف زاوية السقوط الراسترى" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3707,7 +3709,7 @@ msgstr "إخراج ملف زاوية السقوط الراسترى" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 #, fuzzy msgid "Output" msgstr "الخريطة المخرجة" @@ -3787,7 +3789,7 @@ msgstr "الزمن الشمسى المحلى - ساعات عشرية" msgid "Number of threads which will be used for parallel computing" msgstr "عدد مستويات الألوان لكل مركب" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "(عامل المرحلة المسافية لأخذ العينات(0.5-1.5" @@ -3821,7 +3823,7 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, fuzzy, c-format msgid "Number of threads <%d>" msgstr "" @@ -3829,161 +3831,159 @@ msgstr "" "\n" "%d :عدد النقاط\n" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 #, fuzzy msgid "Error reading civil time zone value" msgstr "خطا فى محاولة قراءة ملف قاعدة البيانات dbmscap\n" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 #, fuzzy msgid "Invalid civil time zone value" msgstr "تقرير الإحصائيات للخرائط الراسترية" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 #, fuzzy msgid "Error reading time step size" msgstr "خطا فى محاولة قراءة ملف قاعدة البيانات dbmscap\n" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 #, fuzzy msgid "Invalid time step size" msgstr "مساحة: %d عدد الجزر: %d\n" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 #, fuzzy msgid "Error reading horizon step size" msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, fuzzy, c-format +#: ../raster/r.sun/main.c:698 +#, fuzzy msgid "Using Linke constant: %lf" msgstr "استخدام احداثيات مركز الخريطة\n" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, fuzzy, c-format msgid "Using Linke map <%s>" msgstr "خريطة الراستر االناتجة" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, fuzzy, c-format msgid "Using albedo map <%s>" msgstr "%s:منطقة غير صالحة" -#: ../raster/r.sun/main.c:710 -#, fuzzy, c-format +#: ../raster/r.sun/main.c:714 +#, fuzzy msgid "Using slope constant: %lf" msgstr "استخدام احداثيات مركز الخريطة\n" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, fuzzy, c-format msgid "Using slope map <%s>" msgstr "خريطة الراستر االناتجة" -#: ../raster/r.sun/main.c:719 -#, fuzzy, c-format +#: ../raster/r.sun/main.c:723 +#, fuzzy msgid "Using aspect constant: %lf" msgstr "استخدام احداثيات مركز الخريطة\n" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, fuzzy, c-format msgid "Using aspect map <%s>" msgstr "خريطة الراستر االناتجة" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" -msgstr "" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" -msgstr "" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" +msgstr "درجة وضوح الخريطة المخرجة" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" -msgstr "" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 #, fuzzy msgid "Unable to initialize coordinate transformation" msgstr "%s:لم يتم إنشاء الجدول" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -4016,19 +4016,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4101,9 +4101,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 #, fuzzy msgid "Raster mode" msgstr "اسم الخريطة الراسترية" @@ -4118,36 +4118,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4202,6 +4202,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4223,49 +4226,60 @@ msgstr "" msgid "Optional" msgstr "اسم ااملف المخرج" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 #, fuzzy msgid "Point mode" msgstr "اسم الطبقة المدخلة" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "الخريطة المخرجة" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "(اسم الملف المخرج (استخدم -= للإظهار على الشاشة" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "شمول عناوين الفئات فى المخرج" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 #, fuzzy msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "إحداثيات الشرق والشمال لنقطة البدء" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 #, fuzzy msgid "Coordinates are outside of the current region" msgstr "استخدام المنطقة الحالية" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4274,87 +4288,99 @@ msgstr "استخدام المنطقة الحالية" msgid "Unable to open file <%s>" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 #, fuzzy msgid "You specify a start grater than the end angle. Aborting." msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 #, fuzzy msgid "You didn't specify an angle step size. Aborting." msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 #, fuzzy msgid "Could not read bufferzone size. Aborting." msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, fuzzy, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 #, fuzzy msgid "east" msgstr "اسم الخريطة الراسترية" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 #, fuzzy msgid "Could not read maximum distance. Aborting." msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, fuzzy, c-format msgid "Error in %s" msgstr "%s:خطأ " -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, fuzzy, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "بدء بالقيم فى الخريطة الراسترية" @@ -5206,7 +5232,7 @@ msgstr "أستخدام القيم الراسترية كفئات بدلا من ت #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 #, fuzzy msgid "Attributes" msgstr "عدم انشاء جدول الخواص" @@ -5289,7 +5315,7 @@ msgstr "لم يتم تحديث الحدود" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, fuzzy, c-format msgid "Unable to grant privileges on table <%s>" msgstr "%s لم يتم منح الإمتياز على الجدول" @@ -5428,7 +5454,7 @@ msgstr "dig_att عطل فى فتح ملف المدخل" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5641,10 +5667,9 @@ msgid "Cannot open file %s for reading" msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 #, fuzzy -msgid "GRASS LOCATION PROJ_INFO is:\n" +msgid "GRASS project PROJ_INFO is:\n" msgstr "%s لم يمكن فتح " #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5661,7 +5686,7 @@ msgstr "%s لم يمكن فتح " #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5894,9 +5919,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 #, fuzzy msgid "Transform" @@ -5916,7 +5941,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -6001,10 +6026,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -6049,31 +6074,31 @@ msgstr "تقرير الإحصائيات للخرائط الراسترية" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 #, fuzzy msgid "Projection" msgstr "التوقيع ..." -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6207,133 +6232,133 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 #, fuzzy msgid "Print LAS file info and exit" msgstr "طباعة نوع الملف الراسترى فقط" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, fuzzy, c-format msgid "File <%s> does not exist" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, fuzzy, c-format msgid "Input file <%s> does not exist" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 #, fuzzy msgid "Output map type set to CELL" msgstr "%d راستر%s, %d فيكتور%s\n" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, fuzzy, c-format msgid "Invalid input <%s=%s>" msgstr "%s:منطقة غير صالحة" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, fuzzy, c-format msgid "Option '%s' must be > 0.0" msgstr "%s لم يمكن فتح " -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 #, fuzzy msgid "Reading data..." msgstr "التوقيع ..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "تغلب على الإسقاط مستخدما إسقاط الموقع" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "تغلب على الإسقاط مستخدما إسقاط الموقع" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 #, fuzzy msgid "The input dataset has undefined projection" msgstr "لم تحدد خرائط مدخلة" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "الخريطة الفيكتورية لنقاط البدء" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 #, fuzzy msgid "Writing output raster map..." msgstr "اسم خريطة الراستر المخرجة" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "%d نقاط تم تحميلها\n" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "dig_att لم يمكن العثور على ملف" @@ -6442,7 +6467,7 @@ msgstr "طبقتين يجب تحديدهم" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, fuzzy, c-format msgid "-%c and %s= are mutually exclusive" msgstr "طبقتين يجب تحديدهم" @@ -6478,7 +6503,7 @@ msgstr "وصف مبسط للملف الراسترى المخرج" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6510,7 +6535,7 @@ msgstr "لم يتم تحديث الحدود" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, fuzzy, c-format msgid "Error writing temporary file <%s>" msgstr "خطا فى محاولة قراءة ملف قاعدة البيانات dbmscap\n" @@ -6567,9 +6592,9 @@ msgstr "ترقيق الخلايا غير الصفرية التى تميز مظا msgid "Maximal number of iterations" msgstr "عدد نقاط الإستيفاء" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6586,8 +6611,8 @@ msgstr "عدد نقاط الإستيفاء" msgid "surface" msgstr "تباين المجموع" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6598,27 +6623,59 @@ msgstr "تباين المجموع" msgid "random" msgstr "نوع المظهر" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 #, fuzzy msgid "Generates a raster map using gaussian random number generator." msgstr "انشاء خريطة راسترية بها مساحات متجاورة نمت بخلية واحدة" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 #, fuzzy msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "إنتاج خريطة راسترية بإنحراف عشوائى موحد يحدد مداه بواسطة المستخدم" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "متوسط التوزيع" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 #, fuzzy msgid "Standard deviation" msgstr "الإنحراف المعيارى" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +#, fuzzy +msgid "Seed for random number generator" +msgstr "نوع غير معروف" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 #, fuzzy @@ -6682,7 +6739,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -7004,7 +7061,7 @@ msgstr "تغلب على الخريطة المخرجة" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -7120,7 +7177,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 #, fuzzy msgid "geomorphology" @@ -7215,7 +7271,7 @@ msgstr "" #: ../raster/r.param.scale/main.c:39 #, fuzzy -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "نوع العمود غير مدعم" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7884,7 +7940,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 #, fuzzy msgid "No raster map name found in input file" msgstr "اسم الملف المخرج" @@ -7895,7 +7951,7 @@ msgid "Only one raster map name found in input file" msgstr "اسم الملف المخرج" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 #, fuzzy msgid "Raster map not found" msgstr "غير موجودة <%s> الخريطة الراسترية " @@ -8011,7 +8067,7 @@ msgid "longitude" msgstr "خريطة الإرتفاعات" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -8039,17 +8095,17 @@ msgstr "اسم الخريطة المخرجة" msgid "Longitude output" msgstr "خريطة الإرتفاعات" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 #, fuzzy msgid "Unable to get projection info of current location" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 #, fuzzy msgid "Unable to get projection units of current location" msgstr "درجة وضوح الخريطة المخرجة" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 #, fuzzy msgid "Unable to get projection key values of current location" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" @@ -8130,7 +8186,7 @@ msgstr "قيم الغطاء المستنبطة من عناوين الفئات ل #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -8183,17 +8239,15 @@ msgid "Output raster map required" msgstr "وصف مبسط للملف الراسترى المخرج" #: ../raster/r.random.surface/init.c:138 -#, fuzzy, c-format +#, fuzzy msgid "Distance value (%d): %lf must be >= 0.0" msgstr "طبقتين يجب تحديدهم" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -8256,6 +8310,7 @@ msgstr "%-5d dig_att قراءة ملف...\n" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 #, fuzzy msgid "regression" @@ -8402,7 +8457,7 @@ msgstr "(إدخال الملف الشبكى الأسكى من نوع سرفر(ج #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, fuzzy, c-format msgid "Unable to open temporary file <%s>" @@ -8489,7 +8544,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, fuzzy, c-format msgid "Raster map <%s> created." @@ -8550,7 +8605,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, fuzzy, c-format msgid "3D raster map <%s> not found" @@ -8614,7 +8669,7 @@ msgstr "حساب إحصائيات المتغير الأحادى من خلايا msgid "zones option and region flag -r are mutually exclusive" msgstr "طبقتين يجب تحديدهم" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, fuzzy, c-format msgid "Raster <%s> type mismatch" msgstr "dig_att لم يمكن العثور على ملف" @@ -8745,7 +8800,6 @@ msgid "Calculating flow directions..." msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8896,7 +8950,7 @@ msgstr "تطبيق المرشح على القيم الصفرية فقط" msgid "<%d> is not valid number of threads." msgstr "عدد نقاط الإستيفاء" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 #, fuzzy msgid "Raster map too small for the size of the filter" msgstr "اسم لخريطة الراسترية انسخ جدول ألوانها" @@ -8998,8 +9052,8 @@ msgstr "النسبة من الخريطة للحفظ بالذاكرة" msgid "Pth percentile of the values" msgstr "طريقة تقرير الإنحدار" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -9008,8 +9062,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 #, fuzzy msgid "In scan mode, print using shell script style" @@ -9028,7 +9082,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 #, fuzzy msgid "Invalid zrange" msgstr "%s:منطقة غير صالحة" @@ -9419,9 +9473,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, fuzzy, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "نوع العمود غير مدعم" #: ../raster/r.solute.transport/main.c:259 @@ -9657,13 +9711,12 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, fuzzy, c-format +#, fuzzy msgid "Root Mean Square (RMS) = %.5lf" msgstr "%d نقاط تم تحميلها\n" @@ -9676,7 +9729,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9937,31 +9989,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, fuzzy, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "طبقتين يجب تحديدهم" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, fuzzy, c-format msgid "Either %s= or %s=/%s= required" msgstr "طبقتين يجب تحديدهم" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, fuzzy, c-format msgid "Both %s= and %s= required" msgstr "%s لم يمكن فتح " -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 #, fuzzy msgid "At least one filter must be finite" msgstr "طبقتين يجب تحديدهم" @@ -9978,13 +10030,12 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 #, fuzzy -msgid "create location" +msgid "create project" msgstr "%s لم يمكن فتح " #: ../raster/r.in.gdal/main.c:118 @@ -10002,20 +10053,19 @@ msgstr "الملف الراسترى الطلوب إدخالة" msgid "Band(s) to select (default is all bands)" msgstr "band الشريحة المطلوبة والأساس كل الشرائح" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 #, fuzzy -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "اسم الخريطة الناتجة" #: ../raster/r.in.gdal/main.c:143 #, fuzzy -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "الموقع المستخدم لقراءة الإسقاط منه لنقاط السيطرة الأرضية " #: ../raster/r.in.gdal/main.c:161 @@ -10041,10 +10091,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "اسم ملف الإرتفاعات الراسترى" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "اسم المقع الجديد" #: ../raster/r.in.gdal/main.c:195 @@ -10078,7 +10128,7 @@ msgstr "عرض القيم مفصولة بفاصلة" msgid "GDAL dataset open options" msgstr "الملف الراسترى الطلوب إدخالة" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -10088,222 +10138,240 @@ msgstr "الملف الراسترى الطلوب إدخالة" msgid "Region" msgstr "dig قراءة ملف...\n" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 #, fuzzy msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "الإحداثى الشمالى للخريطة\n" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "الإحتفاظ بأعداد الشرائح بدلا من استخدام اسماء لون الشرائح" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 #, fuzzy msgid "Limit import to the current region" msgstr "استخدام المنطقة الحالية" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 #, fuzzy msgid "Print number of bands and exit" msgstr "طباعة الجداول والخروج" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, fuzzy, c-format msgid "No raster bands found in <%s>" msgstr "اسم الملف المخرج" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, fuzzy, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "خريطة مخرجة حيث ستكتب النقاط" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, fuzzy, c-format msgid "Raster map <%s> already exists" msgstr "dig_att لم يمكن العثور على ملف" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 #, fuzzy msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "الخريطة المدخلة حاوية الخطوط" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, fuzzy, c-format msgid "Importing %d raster bands..." msgstr "خريطة الراستر االناتجة" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 #, fuzzy msgid "Unable to open the map names output text file" msgstr "dig_att عطل فى فتح ملف المدخل" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, fuzzy, c-format msgid "Unable to get raster band number %d" msgstr "اسم الخريطة الراسترية" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, fuzzy, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "%s لم يتم فتح قاعدة البيانات" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 #, fuzzy msgid "Re-projecting GCPs table:" msgstr "كتابة ملف جديد...\n" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, fuzzy, c-format msgid "* Output projection for GCP table: %s" msgstr "خريطة الإتجاه المخرجة" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 #, fuzzy msgid "Unable to translate projection key values of input GCPs" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.in.gdal/main.c:1137 +#: ../raster/r.in.gdal/main.c:1134 #, fuzzy -msgid "Unable to get projection info of target location" +msgid "Unable to get CRS info of target project" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.in.gdal/main.c:1140 +#: ../raster/r.in.gdal/main.c:1136 #, fuzzy -msgid "Unable to get projection units of target location" +msgid "Unable to get CRS units of target project" msgstr "درجة وضوح الخريطة المخرجة" -#: ../raster/r.in.gdal/main.c:1143 +#: ../raster/r.in.gdal/main.c:1138 #, fuzzy -msgid "Unable to get projection key values of target location" +msgid "Unable to get CRS key values of target project" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, fuzzy, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 #, fuzzy msgid "not found" msgstr "غير موجود <%s> الراستر" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, fuzzy, c-format msgid "Importing raster map <%s>..." msgstr "خريطة الراستر االناتجة" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 #, fuzzy msgid "Invalid row" msgstr "%s:منطقة غير صالحة" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, fuzzy, c-format msgid "Unable to read row %d" msgstr "%s لم يمكن فتح ملف المدى ل" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, fuzzy, c-format msgid "Unable to open file <%s>: %s." msgstr "[%s]لم يتم فتح ملف الخلية ل " +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 #, fuzzy msgid "rclist out of memory" @@ -11006,7 +11074,7 @@ msgid "Number of intermediate images to produce" msgstr "عدد الصور الوسيطة المطلوب إنتاجها" #: ../raster/r.surf.fractal/main.c:75 -#, fuzzy, c-format +#, fuzzy msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "(2 < D < 3) البعد الفراكتالى للسطح" @@ -11136,6 +11204,18 @@ msgstr "عدد الصفوف" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -11168,27 +11248,6 @@ msgstr "الخرائط الراسترية المدخلة" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -#, fuzzy -msgid "Seed for random number generator" -msgstr "نوع غير معروف" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -11214,12 +11273,6 @@ msgstr "عدد مستويات الألوان لكل مركب" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -11227,8 +11280,8 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, fuzzy, c-format msgid "Number of threads: %d" msgstr "" @@ -11236,36 +11289,36 @@ msgstr "" "\n" "%d :عدد النقاط\n" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 #, fuzzy msgid "You are not outputting any raster or site files" msgstr "اسم الملف الفيكتورى المخرج" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 #, fuzzy msgid "Input failed" msgstr "ملف المدخل" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 #, fuzzy msgid "Cannot write raster maps" msgstr "%s:لم يتم إنشاء الجدول" @@ -11428,7 +11481,7 @@ msgstr "" msgid "Time-series output" msgstr "إستبدال المخرجات" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 #, fuzzy msgid "You are not outputting any raster maps" msgstr "اسم الملف الفيكتورى المخرج" @@ -11697,30 +11750,30 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 #, fuzzy msgid "Weights must be positive" msgstr "حجم التجاور" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, fuzzy, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "%-5d dig_att قراءة ملف...\n" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, fuzzy, c-format msgid "Unable to open input raster <%s>" msgstr "<%s> لم يمكن فتح" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11779,122 +11832,122 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "حجم التجاور" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 #, fuzzy msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "إنتاج خريطة راسترية بإنحراف عشوائى موحد يحدد مداه بواسطة المستخدم" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "القيمة العشوائية الصغري" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "القيمة العشوائية الكبري" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 #, fuzzy msgid "Create an integer raster map" msgstr "خريطة الراستر االناتجة" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 +#: ../raster/r.flow/mem.c:40 +#, fuzzy, c-format +msgid "Unable to write segment file for %s" +msgstr "القيمة التى تعنى قيمة منعدمة" + +#: ../raster/r.flow/precomp.c:47 +#, fuzzy +msgid "Precomputing e/w distances..." +msgstr "خرائط حساب المسافات بين الأصناف" + +#: ../raster/r.flow/precomp.c:49 +#, fuzzy +msgid "Precomputing quantization tolerances..." +msgstr "لم يتم نسخ الجدول" + +#: ../raster/r.flow/precomp.c:52 +msgid "Precomputing inverted elevations..." +msgstr "" + +#: ../raster/r.flow/precomp.c:56 +msgid "Precomputing interpolated border elevations..." +msgstr "" + +#: ../raster/r.flow/precomp.c:62 +#, fuzzy +msgid "Precomputing re-oriented aspects..." +msgstr "خرائط حساب المسافات بين الأصناف" + +#: ../raster/r.flow/precomp.c:66 +#, fuzzy +msgid "Precomputing aspects..." +msgstr "خرائط حساب المسافات بين الأصناف" + +#: ../raster/r.flow/precomp.c:109 +#, c-format +msgid "" +"Resolution too unbalanced:\n" +"atan2(%f deg, %f deg) =%f < %f tolerance\n" +"please resample input map" +msgstr "" + +#: ../raster/r.flow/precomp.c:114 +#, c-format +msgid "Resolution too unbalanced (%f x %f); please resample input map" +msgstr "" + +#: ../raster/r.flow/flow_io.c:89 #, fuzzy msgid "Elevation raster map resolution differs from current region resolution" msgstr "(دقة الوضوح عبر التضاريس (الأساس : دقة وضوح المنطقة الحالية" -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 #: ../raster/r.buffer/read_map.c:51 #, fuzzy, c-format msgid "Reading input raster map <%s>..." msgstr "%-5d dig_att قراءة ملف...\n" -#: ../raster/r.flow/io.c:107 +#: ../raster/r.flow/flow_io.c:107 #, fuzzy msgid "Resolution of aspect file differs from current region resolution" msgstr "(دقة الوضوح عبر التضاريس (الأساس : دقة وضوح المنطقة الحالية" -#: ../raster/r.flow/io.c:124 +#: ../raster/r.flow/flow_io.c:124 #, fuzzy msgid "Reading input files: barrier" msgstr "dig عطل فى فتح ملف المدخل" -#: ../raster/r.flow/io.c:152 +#: ../raster/r.flow/flow_io.c:152 #, fuzzy, c-format msgid "Cannot create segment file %s" msgstr "%s:لم يتم إنشاء الجدول" -#: ../raster/r.flow/io.c:157 +#: ../raster/r.flow/flow_io.c:157 #, fuzzy, c-format msgid "Cannot format segment file %s" msgstr "%s لم يتم منح الإمتياز على الجدول" -#: ../raster/r.flow/io.c:163 +#: ../raster/r.flow/flow_io.c:163 #, fuzzy, c-format msgid "Cannot open segment file %s" msgstr "dig_cats لم يتم فتح ملف" -#: ../raster/r.flow/mem.c:40 -#, fuzzy, c-format -msgid "Unable to write segment file for %s" -msgstr "القيمة التى تعنى قيمة منعدمة" - -#: ../raster/r.flow/precomp.c:47 -#, fuzzy -msgid "Precomputing e/w distances..." -msgstr "خرائط حساب المسافات بين الأصناف" - -#: ../raster/r.flow/precomp.c:49 -#, fuzzy -msgid "Precomputing quantization tolerances..." -msgstr "لم يتم نسخ الجدول" - -#: ../raster/r.flow/precomp.c:52 -msgid "Precomputing inverted elevations..." -msgstr "" - -#: ../raster/r.flow/precomp.c:56 -msgid "Precomputing interpolated border elevations..." -msgstr "" - -#: ../raster/r.flow/precomp.c:62 -#, fuzzy -msgid "Precomputing re-oriented aspects..." -msgstr "خرائط حساب المسافات بين الأصناف" - -#: ../raster/r.flow/precomp.c:66 -#, fuzzy -msgid "Precomputing aspects..." -msgstr "خرائط حساب المسافات بين الأصناف" - -#: ../raster/r.flow/precomp.c:109 -#, c-format -msgid "" -"Resolution too unbalanced:\n" -"atan2(%f deg, %f deg) =%f < %f tolerance\n" -"please resample input map" -msgstr "" - -#: ../raster/r.flow/precomp.c:114 -#, c-format -msgid "Resolution too unbalanced (%f x %f); please resample input map" -msgstr "" - #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 #, fuzzy @@ -12654,7 +12707,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "%s:لم يتم إنشاء الجدول" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12670,13 +12723,12 @@ msgstr "عدد نقاط الإستيفاء" #: ../raster/r.proj/main.c:150 #, fuzzy -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 #, fuzzy -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "الخريطة الفيكتورية لنقاط البدء" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12706,10 +12758,9 @@ msgstr "ضبط من المنطقة الحالية" msgid "Name of input raster map to re-project" msgstr "اسم الخريطة الراسترية المدخلة" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "الطريق لقاعدة البيانات للموقع المدخل" #: ../raster/r.proj/main.c:174 @@ -12772,13 +12823,13 @@ msgstr "طباعة الأحصاء فى صورة شل سكربت" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 #, fuzzy -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "خريطة مدخلة: أماكن المنخفضات الحقيقية" #: ../raster/r.proj/main.c:268 @@ -12798,12 +12849,12 @@ msgstr "اسم الخريطة المخرجة" #: ../raster/r.proj/main.c:289 #, fuzzy, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, fuzzy, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "خريطة الراستر االناتجة" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12811,7 +12862,7 @@ msgstr "خريطة الراستر االناتجة" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, fuzzy, c-format, python-format msgid "Required parameter <%s> not set" @@ -12819,7 +12870,7 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " #: ../raster/r.proj/main.c:315 #, fuzzy, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "لم توجد<%s>الخريطة الفيكتورية" #: ../raster/r.proj/main.c:323 @@ -12838,12 +12889,13 @@ msgid "Unable to get projection key values of input map" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" -msgstr "" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" +msgstr "%s:لم يتم إنشاء الجدول" #: ../raster/r.proj/main.c:379 #, fuzzy, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../raster/r.proj/main.c:524 @@ -12927,7 +12979,7 @@ msgid "Sorting events..." msgstr "كتابة رؤوس قمم الخطوط" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -13189,8 +13241,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -13362,7 +13415,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -13373,6 +13426,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "درجة وضوح الخريطة المخرجة" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" + #: ../raster/r.sunmask/main.c:122 #, fuzzy msgid "" @@ -14047,17 +14115,17 @@ msgstr "" #: ../raster/r.sunhours/main.c:221 #, fuzzy -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" #: ../raster/r.sunhours/main.c:224 #, fuzzy -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "درجة وضوح الخريطة المخرجة" #: ../raster/r.sunhours/main.c:228 #, fuzzy -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" #: ../raster/r.sunhours/main.c:367 @@ -14149,7 +14217,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -14159,7 +14227,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -14252,7 +14320,7 @@ msgstr "بدء بالقيم فى الخريطة الراسترية" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, fuzzy, c-format msgid "Unable to create table: '%s'" msgstr "[%s]لم يتم فتح ملف الخلية ل " @@ -14261,7 +14329,7 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, fuzzy, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "<%s> لم يمكن فتح" @@ -14608,7 +14676,7 @@ msgstr "" "\n" "%d :عدد النقاط\n" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -14620,20 +14688,20 @@ msgstr "" msgid "position" msgstr "غير موجود <%s> الراستر" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 #, fuzzy msgid "Queries raster maps on their category values and category labels." msgstr "أستفهام قيم وعناوين الفئات للخريطة الراسترية" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "اسم الخريطة الراسترية المطلوب استفهامها" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "الإحداثيات للإستفهام" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14642,16 +14710,29 @@ msgstr "الإحداثيات للإستفهام" msgid "Query" msgstr "بهدوء" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 #, fuzzy msgid "Name of vector points map for query" msgstr "اسم الخريطة الراسترية المدخلة" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "حجم رصيد النقط" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14660,65 +14741,75 @@ msgstr "حجم رصيد النقط" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 #, fuzzy msgid "Output header row" msgstr "اسم خريطة الراستر المخرجة" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 #, fuzzy msgid "Show the category labels of the grid cell(s)" msgstr "عرض عنوان الفئة فى خلية الشبكة" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "اخراج قيم فئات صحيحة وليست قيم الخلايا" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "السماح بتقرير الرصيد" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 #, fuzzy msgid "Show the category for vector points map" msgstr "اسم الخريطة الراسترية المدخلة" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, fuzzy, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "اسم الملف الفيكتورى المخرج" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, fuzzy, c-format msgid "Unable to read category file for <%s>" msgstr "%s لم يمكن فتح ملف المدى ل" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +#, fuzzy +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "لم يتم حساب شبه مركز المساحة" + +#: ../raster/r.what/main.c:352 #, fuzzy, c-format msgid "Unable to read vector map <%s>" msgstr "اسم الخريطة الراسترية الناتجة" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, fuzzy, c-format msgid "%s %s is outside your current region" msgstr "استخدام المنطقة الحالية" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "لم يتم حساب شبه مركز المساحة" + #: ../raster/r.in.mat/main.c:97 #, fuzzy msgid "Imports a binary MAT-File(v4) to a GRASS raster." @@ -14900,9 +14991,6 @@ msgstr "طباعة مجموع المساحة" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -15273,21 +15361,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "(دقة الوضوح عبر التضاريس (الأساس : دقة وضوح المنطقة الحالية" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -15493,80 +15581,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "Anisotropy زاوية تباين الخواص فى صورة درجات" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, fuzzy, c-format msgid "Wrong raster type: %s" msgstr "%c :نوع غير معروف" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, fuzzy, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "<%s> لم يمكن فتح" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, fuzzy, c-format msgid "Aspect raster map <%s> complete" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, fuzzy, c-format msgid "Slope raster map <%s> complete" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, fuzzy, c-format msgid "Profile curve raster map <%s> complete" msgstr "اسم ملف انحناء التضاريس" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, fuzzy, c-format msgid "Tangential curve raster map <%s> complete" msgstr "%s:لم يتم إنشاء الجدول" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, fuzzy, c-format msgid "E-W slope raster map <%s> complete" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, fuzzy, c-format msgid "N-S slope raster map <%s> complete" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, fuzzy, c-format msgid "Dxx raster map <%s> complete" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, fuzzy, c-format msgid "Dyy raster map <%s> complete" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, fuzzy, c-format msgid "Dxy raster map <%s> complete" msgstr "غير موجودة <%s> الخريطة الراسترية " @@ -16466,32 +16554,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -16507,61 +16595,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -16585,7 +16673,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -17630,46 +17717,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, fuzzy, c-format msgid "Calculation time: %g" msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, fuzzy, c-format msgid "Maximum difference between this and last increment: %g" msgstr "المسافة العظمى بين النقاط بوحدات الخريطة" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 #, fuzzy msgid "Unable to create and solve the linear equation system" msgstr "اسم الخريطة الراسترية" @@ -18021,7 +18108,7 @@ msgstr "التوقيع ..." #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 #, fuzzy msgid "Unable to create temporary vector map" msgstr "اسم الخريطة الراسترية الناتجة" @@ -18519,8 +18606,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -18657,98 +18744,98 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 #, fuzzy msgid "Use only valid points" msgstr "الخريطة الفيكتورية لنقاط البدء" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, fuzzy, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, fuzzy, c-format msgid "Unable to read LAS header of <%s>" msgstr "%s لم يمكن فتح ملف المدى ل" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, fuzzy, c-format msgid "Unknown filter option <%s>" msgstr "نوع غير معروف" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, fuzzy, c-format msgid "Invalid %s" msgstr "%s:منطقة غير صالحة" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, fuzzy, c-format msgid "Pass #%d (of %d)..." msgstr "التوقيع ..." -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, fuzzy, c-format msgid "%lu points found in input file(s)" msgstr "%d نقاط تم تحميلها\n" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, fuzzy, c-format msgid "%lu input points were invalid and filtered out" msgstr "%d نقاط تم تحميلها\n" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, fuzzy, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "%d نقاط تم تحميلها\n" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, fuzzy, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "%d نقاط تم تحميلها\n" @@ -19034,11 +19121,11 @@ msgstr "<%s> فى <%s>لم يمكن فتح الملف للمنظر ثلاثى ا #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -19259,32 +19346,32 @@ msgstr "حجم التجاور" msgid "Neighborhood size must be odd" msgstr "حجم التجاور" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, fuzzy, c-format msgid "Computing %s weights..." msgstr "لم يتم نسخ الجدول" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, fuzzy, c-format msgid "Opening selection map <%s>" msgstr "كتابة ملف جديد...\n" @@ -19378,7 +19465,7 @@ msgstr "" #: ../misc/m.measure/main.c:56 #, fuzzy -msgid "Default: location map units" +msgid "Default: project map units" msgstr "المسافة العظمى بين النقاط بوحدات الخريطة" #: ../misc/m.measure/main.c:60 @@ -19404,8 +19491,9 @@ msgstr "المساحة\n" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -20228,8 +20316,8 @@ msgid "Not enough points, %d are required" msgstr "الإحداثيات للإستفهام" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, fuzzy, c-format msgid "Error conducting transform (%d)" msgstr "طباعة نوع الملف الراسترى فقط" @@ -20239,30 +20327,30 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 #, fuzzy msgid "Parameter error" msgstr "الملف الراسترى المدخل" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 #, fuzzy msgid "No active control points" msgstr "اسم الطبقة المستخدمة كدرجة لون" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, fuzzy, c-format msgid "Invalid coordinates: [%s]" msgstr "%s:منطقة غير صالحة" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -20271,63 +20359,63 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 #, fuzzy msgid "point index" msgstr "التوقيع ..." #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 #, fuzzy msgid "source coordinates" msgstr "استخدام احداثيات مركز الخريطة\n" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 #, fuzzy msgid "destination coordinates" msgstr "الإحداثى ااشرقى للخريطة\n" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 #, fuzzy msgid "forward coordinates (destination)" msgstr "طباعة احداثيات الشبكة - الشرق والشمال" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 #, fuzzy msgid "reverse coordinates (source)" msgstr "طباعة احداثيات الشبكة - الشرق والشمال" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 #, fuzzy msgid "forward error (destination)" msgstr "الصفر قيمة حقيقية" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 #, fuzzy msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "الملف الأسكى الراسترى المطلوب ادخاله" @@ -20338,7 +20426,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "طباعة احداثيات الشبكة - الشرق والشمال" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -20348,7 +20436,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "استخدام احداثيات مركز الخريطة\n" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -20893,6 +20981,11 @@ msgstr "بدء بالقيم فى الخريطة الراسترية" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +#, fuzzy +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "%s لم يمكن فتح " + #: ../raster3d/r3.in.lidar/filters.c:26 #, fuzzy, c-format msgid "Invalid range <%s> for option %s" @@ -20958,70 +21051,79 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "تغلب على الإسقاط مستخدما إسقاط الموقع" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, fuzzy, c-format msgid "Unable to create 3D raster map <%s>" msgstr "اسم الخريطة الراسترية الناتجة" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 #, fuzzy msgid "Preparing the maps..." msgstr "%-5d dig_att قراءة ملف...\n" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 #, fuzzy msgid "Reading points..." msgstr "dig قراءة ملف...\n" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 #, fuzzy msgid "Computing proportional count map..." msgstr "اسم الخريطة المدخلة" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 #, fuzzy msgid "Computing proportional sum map..." msgstr "لم يتم نسخ الجدول" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 #, fuzzy msgid "Computing mean map..." msgstr "لم يتم نسخ الجدول" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 #, fuzzy msgid "Closing the maps..." msgstr "خريطة الراستر الاساس" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, fuzzy, c-format msgid "%lu input points were not valid and filtered out" msgstr "%d نقاط تم تحميلها\n" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, fuzzy, c-format msgid "%lu input points were filtered out by return number" msgstr "%d نقاط تم تحميلها\n" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, fuzzy, c-format msgid "%lu input points were filtered out by class number" msgstr "%d نقاط تم تحميلها\n" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, fuzzy, c-format msgid "%lu input points had intensity out of range" msgstr "%d نقاط تم تحميلها\n" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, fuzzy, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "%d نقاط تم تحميلها\n" @@ -21138,7 +21240,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -21151,10 +21252,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -21168,11 +21267,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -21721,10 +21820,10 @@ msgstr "خطا فى محاولة قراءة ملف قاعدة البيانات d #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -21785,9 +21884,9 @@ msgstr "غير موجودة <%s> المنطقة" msgid "command line interface with GUI startup screen" msgstr "غير موجودة <%s> المنطقة" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 #, fuzzy msgid "Type" msgstr "نوع غير معروف" @@ -21849,14 +21948,14 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 #, fuzzy msgid "support" msgstr "الملف الراسترى المدخل" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 #, fuzzy msgid "scripts" @@ -22258,70 +22357,70 @@ msgstr "ضبط المنطقة الحالية من ابعاد الخريطة ال msgid "Save current region settings in named region file" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المسماه" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, fuzzy, c-format, python-format msgid "Region <%s> not found" msgstr "غير موجودة <%s> المنطقة" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, fuzzy, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "بدء بالقيم فى الخريطة الراسترية" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 #, fuzzy msgid "Unable to get map bounding box" msgstr "<%s>لم يتم العثور على الخريطة المدخلة\n" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, fuzzy, c-format msgid "Unable to set region <%s>" msgstr "لم يمكن حشر صف جديد: %s" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 #, fuzzy msgid "Unable to update current region" msgstr "لم يتم تحديث الحدود" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 #, fuzzy msgid "Unable to update lat/long projection parameters" msgstr "لم يتم تحديث الحدود" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -22588,8 +22687,8 @@ msgstr "طباعة الجداول والخروج" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -22875,165 +22974,165 @@ msgstr "نوع العمود غير مدعم" msgid "Unable to open init file <%s>" msgstr "<%s> لم يمكن فتح" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 +#: ../general/g.proj/main.c:75 #, fuzzy -msgid "Can also be used to create new GRASS locations." +msgid "Can also be used to create new GRASS projects." msgstr "%s:لم يتم إنشاء الجدول" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 #, fuzzy msgid "Print projection information in shell script style" msgstr "طباعة الأحصاء فى صورة شل سكربت" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 #, fuzzy msgid "Specification" msgstr "اسم ملف ناتج التصنيف" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 #, fuzzy msgid "Name of georeferenced data file to read projection information from" msgstr "الموقع المستخدم لقراءة الإسقاط منه لنقاط السيطرة الأرضية " -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 #, fuzzy msgid "Name of ASCII file containing a WKT projection description" msgstr "اسم الخريطة الراسترية الحاوية على درجات الإنحدار" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 #, fuzzy msgid "PROJ.4 projection description" msgstr "طريقة الاستيفاء المستخدمة" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 #, fuzzy msgid "EPSG projection code" msgstr "طريقة الاستيفاء المستخدمة" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 #, fuzzy msgid "Index number of datum transform parameters" msgstr "اسم ملف التنعيم" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 +#: ../general/g.proj/main.c:216 #, fuzzy -msgid "Modify current location projection files" +msgid "Modify current project's projection files" msgstr "%s:لم يتم إنشاء الجدول" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 #, fuzzy msgid "Create" msgstr "مضاهاة" -#: ../general/g.proj/main.c:223 +#: ../general/g.proj/main.c:224 #, fuzzy -msgid "Name of new location to create" +msgid "Name of new project (location) to create" msgstr "اسم المقع الجديد" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, fuzzy, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "طبقتين يجب تحديدهم" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "طبقتين يجب تحديدهم" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -23128,7 +23227,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, fuzzy, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "%s:لم يتم إنشاء الجدول" #: ../general/g.proj/create.c:21 @@ -23138,98 +23237,98 @@ msgstr "%s:لم يتم إنشاء الجدول" #: ../general/g.proj/create.c:25 #, fuzzy, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "%s:لم يتم إنشاء الجدول" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 #, fuzzy msgid "Text of the message to be printed" msgstr "اسم الخريطة المدخلة" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 #, fuzzy msgid "Unable to parse input message" msgstr "اسم مجموعة الخرائط للخريطة المدخلة" @@ -23385,7 +23484,8 @@ msgstr "ضبط من المنطقة الحالية" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -23476,37 +23576,61 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +#, fuzzy +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "اسم الخريطة المخرجة" + +#: ../general/g.mapsets/list.c:22 +#, fuzzy +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "لم يتم حساب شبه مركز المساحة" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 #, fuzzy msgid "Available mapsets:" msgstr "عرض الهيئات المدعمة والخروج" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 #, fuzzy msgid "Accessible mapsets:" msgstr "عرض الهيئات المدعمة والخروج" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 #, fuzzy msgid "Modifies/prints the user's current mapset search path." msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 #, fuzzy msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "اسم الخريطة الراسترية المطلوب استفهامها" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -23516,72 +23640,77 @@ msgstr "اسم الخريطة الراسترية المطلوب استفهامه msgid "Operation to be performed" msgstr "غير موجودة <%s> المنطقة" -#: ../general/g.mapsets/main.c:86 +#: ../general/g.mapsets/main.c:112 #, fuzzy -msgid "Field separator for printing (-l and -p flags)" +msgid "Output format for printing (-l and -p flags)" msgstr "الفاصل الحقلي للمخرج" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 #, fuzzy msgid "List all available mapsets in alphabetical order" msgstr "عرض الهيئات المدعمة والخروج" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 #, fuzzy msgid "Print mapsets in current search path" msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, fuzzy, c-format msgid "Unknown operation '%s'" msgstr "نوع غير معروف" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "ادخال القواعد فى هيئة من الهيئات التالية:\n" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, fuzzy, c-format msgid "Option <%s> ignored" msgstr "%s لم يمكن فتح " -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, fuzzy, c-format msgid "Mapset <%s> not found" msgstr "غير موجود <%s> الراستر" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, fuzzy, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, fuzzy, c-format msgid "Mapset <%s> already in the path" msgstr "dig_att لم يمكن العثور على ملف" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 #, fuzzy msgid "Unable to open SEARCH_PATH for write" msgstr "[%s]لم يتم فتح ملف الخلية ل " @@ -23598,37 +23727,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 -#, c-format +#: ../general/g.mkfontcap/main.c:98 +#, fuzzy, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" -msgstr "" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" +msgstr "خريطة مخرجة حيث ستكتب النقاط" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, fuzzy, c-format msgid "Cannot open %s for writing: %s" msgstr "%s لم يتم فتح قاعدة البيانات" @@ -23993,7 +24119,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -25236,7 +25362,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -25338,9 +25464,10 @@ msgid "No group '%s' in current mapset" msgstr "<%s>فى<%s>لم يمكن فتح الملف الفيكتورى" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." @@ -25348,7 +25475,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 #, fuzzy -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "اسم الخريطة الناتجة" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -25387,35 +25514,36 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, fuzzy, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "غير موجودة <%s> المنطقة" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, fuzzy, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 #, fuzzy msgid "permission denied\n" msgstr "التوقيع ..." -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 #, fuzzy msgid "not found\n" msgstr "غير موجود <%s> الراستر" @@ -25472,65 +25600,70 @@ msgstr "اسم الخريطة الراسترية" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, fuzzy, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" msgstr "غير موجودة <%s> المنطقة" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 #, fuzzy msgid "Poorly placed image to photo control points" msgstr "اسم الطبقة المستخدمة كدرجة لون" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 #, fuzzy msgid "Poorly placed image to target control points" msgstr "اسم الطبقة المستخدمة كدرجة لون" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 #, fuzzy msgid "Local x,y,z coordinates to target east,north,height" msgstr "طباعة احداثيات الشبكة - الشرق والشمال" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 #, fuzzy msgid "Target east,north,height coordinates to local x,y,z" msgstr "استخدام احداثيات مركز الخريطة\n" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, fuzzy, c-format msgid "Can not read reference points for group <%s>" msgstr " <%s> فى <%s>لم يمكن قراءة العنوان الرئيسى ل" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, fuzzy, c-format msgid "Bad format in camera file for group <%s>" msgstr "%s:لم يتم إنشاء الجدول" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, fuzzy, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "%s:لم يتم إنشاء الجدول" @@ -25541,7 +25674,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 #, fuzzy -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "اسم الخرائط الراسترية المطلوب ترقيعها ببعضها " #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -25551,22 +25684,22 @@ msgstr "<%s> اسم الملف المستخدم لل" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, fuzzy, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "%s:لم يتم إنشاء الجدول" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 #, fuzzy -msgid "Target locations with XY (unreferenced) are not supported" +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "نوع العمود غير مدعم" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 #, fuzzy -msgid "Target locations with lon/lat are not supported" +msgid "Target projects (locations) with lon/lat are not supported" msgstr "نوع العمود غير مدعم" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, fuzzy, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -25691,15 +25824,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, fuzzy, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "dig قراءة ملف...\n" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, fuzzy, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -25740,104 +25871,102 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 #, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المسماه" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 #, fuzzy msgid "Rectify all raster maps in group" msgstr "تسجيل الخرائط الراسترية " -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, fuzzy, c-format msgid "Group <%s> not found" msgstr "غير موجودة <%s> المنطقة" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, fuzzy, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "%s لم يمكن فتح " -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, fuzzy, c-format msgid "Mapset: %s" msgstr "%c :نوع غير معروف" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, fuzzy, c-format msgid "Could not read REF file for group <%s>" msgstr "%s لم يمكن فتح ملف المدى ل" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, fuzzy, c-format msgid "Extension <%s> is illegal" msgstr "اسم ااملف المخرج" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 #, fuzzy msgid "The following raster map already exists in" msgstr "dig_att لم يمكن العثور على ملف" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, fuzzy, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "الخريطة الراسترية المطلوب الضبط عليها" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -25975,6 +26104,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, fuzzy, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "dig قراءة ملف...\n" + +#: ../imagery/i.rectify/rectify.c:45 +#, fuzzy, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -25992,6 +26131,12 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +#, fuzzy +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المسماه" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -26001,6 +26146,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, fuzzy, c-format +msgid "Location: %s" +msgstr "%s لم يمكن فتح " + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, fuzzy, c-format +msgid "Target location <%s> not found" +msgstr "غير موجودة <%s> المنطقة" + +#: ../imagery/i.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -26402,6 +26567,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "طباعة نوع الملف الراسترى فقط" @@ -28111,8 +28277,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -28456,17 +28622,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -28475,17 +28638,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -28494,17 +28654,15 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, fuzzy, c-format +#, fuzzy msgid "* Standard deviation: %.2lf" msgstr "الإنحراف المعيارى" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -28514,17 +28672,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -28534,12 +28689,10 @@ msgid "Maximum temperature:" msgstr "نوع المظهر" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -29391,12 +29544,16 @@ msgstr "<%s> لم يمكن فتح" msgid "Unable to describe table." msgstr "لم يمكن وصف الجدول" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 #, fuzzy msgid "Connection failed." msgstr "مضاهاة" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 #, fuzzy msgid "Unable parse MySQL embedded database name" @@ -29456,7 +29613,7 @@ msgstr "%s:لم يتم إنشاء الجدول" msgid "Unable to commit transaction:" msgstr "%s:لم يتم إنشاء الجدول" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 #, fuzzy @@ -29565,16 +29722,15 @@ msgid "OGR layer <%s> not found" msgstr "غير موجود <%s> الراستر" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, fuzzy, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "غير موجودة <%s> المنطقة" @@ -30214,6 +30370,43 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +#, fuzzy +msgid "histogram" +msgstr "الخريطة الفيكتورية لنقاط البدء" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "<%s> اسم الملف المستخدم لل" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "عدد النقاط المطلوب تخصيصها" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 #, fuzzy msgid "Merges several space time datasets into a single space time dataset." @@ -30259,6 +30452,8 @@ msgstr "اسم الخريطة المدخلة" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 #, fuzzy @@ -30297,66 +30492,78 @@ msgstr "اسم الخريطة المدخلة" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "اسم الخريطة الراسترية المخرجة" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "اسم الخريطة الراسترية المخرجة" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "اسم الخريطة الراسترية المخرجة" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "اسم الخريطة الراسترية المخرجة" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#, fuzzy +msgid "Name of output raster shadow mask" +msgstr "اسم الخريطة الراسترية المخرجة" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#, fuzzy +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr " القيمة الصغري للانحدار (نسبية) المحسوب اتجاه الانحدار لها" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "اسم الخريطة الراسترية الجديدة" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "عامل المقياس الرأسى" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 #, fuzzy msgid "Set computational region to maximum image extent" msgstr "ضبط المنطقة الحالية من ابعاد هذه الخريطة " -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "لم يتم تحديث الحدود" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "dig قراءة ملف...\n" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "الإحداثى الشمالى للخريطة\n" @@ -30444,245 +30651,15 @@ msgstr "اسم الخريطة الراسترية الموجودة" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 #, fuzzy msgid "input" msgstr "اسم الخريطة المدخلة" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -#, fuzzy -msgid "Name of input vector map" -msgstr "اسم الخريطة الراسترية المدخلة" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "اسم الخريطة الراسترية المدخلة" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "اسم الملف الراسترى الموجود" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "اسم الملف الراسترى الموجود" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -#, fuzzy -msgid "layer number/name for the ML results" -msgstr "اسم الملف الراسترى الموجود" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -#, fuzzy -msgid "Data with statistics in npy format." -msgstr "ملف المدخل" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -#, fuzzy -msgid "Numpy array with vector cats." -msgstr "%d نقطة كتبت للمخرج\n" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "لاتشمل اسماء الأعمدة في المخرج" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "عدد الأعمدة" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "اسم الملف المخرج" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "نوع التخزين للخريطة الراسترية الناتجة " - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "اسم ملف ناتج التصنيف" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "اسم الخريطة ااراسترية الكنتورية" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -30892,6 +30869,535 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "خريطة الراستر االناتجة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "اسم الطبقة المستخدمة كدرجة لون" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "اسم الخريطة الناتجة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "تنعيم الأركان" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "اسم الخريطة المخرجة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "عدم انشاء جدول الخواص" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "خريطة مخرجة حيث ستكتب النقاط" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "اسم الخريطة الراسترية المدخلة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "اسم الخريطة المخرجة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "اسم الخريطة الراسترية المدخلة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "اسم الخريطة الراسترية" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "اسم الخريطة الراسترية للعرض كخلفية" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "كتابة ملف جديد...\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "كتابة رؤوس قمم الخطوط" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +#, fuzzy +msgid "Disable quadratic features" +msgstr "كتابة رؤوس قمم الخطوط" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "كتابة رؤوس قمم الخطوط" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "كتابة رؤوس قمم الخطوط" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "%s لم يمكن فتح " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "الصفر قيمة حقيقية" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "طريقة تقرير الإنحدار" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "اسم خريطة النقط الفيكتورية المخرجة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "اسم الطبقة المستخدمة كدرجة لون" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "عدد نقاط الإستيفاء" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "عامل الضرب لقيم الإرتفاعات" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "طريقة الاستيفاء المستخدمة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "طريقة الاستيفاء المستخدمة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "طريقة الاستيفاء المستخدمة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "عدد مرات تكرار المرشح" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +#, fuzzy +msgid "Regularization parameter for categorical features" +msgstr "اسم ااملف المخرج" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +#, fuzzy +msgid "Default prevalence of the species" +msgstr "اسم الطبقة المستخدمة كدرجة لون" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "لم يتم حساب شبه مركز المساحة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "وصف مبسط للخريطة الراسترية الجدىدة" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "عدد النقاط المطلوب تخصيصها" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +#, fuzzy +msgid "Show the Maxent user interface" +msgstr "التباين" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 #, fuzzy msgid "Imports SRTM HGT files into raster map." @@ -31107,10 +31613,16 @@ msgstr "" msgid "Name for output vector map" msgstr "اسم الخريطة الراسترية المخرجة" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +#, fuzzy +msgid "Override projection check (use current location's projection)" +msgstr "تغلب على الإسقاط مستخدما إسقاط الموقع" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 #, fuzzy msgid "Assume that the dataset has the same projection as the current location" msgstr "درجة وضوح الخريطة المخرجة" @@ -31369,6 +31881,15 @@ msgstr "اسم الملف المخرج" msgid "Default: taken from input file internals" msgstr "اسم خريطة الراستر المخرجة" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "درجة وضوح الخريطة المخرجة" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 #, fuzzy @@ -32647,7 +33168,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 #, fuzzy msgid "features" msgstr "كتابة رؤوس قمم الخطوط" @@ -32695,11 +33216,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -33836,7 +34352,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "اسم الخريطة الراسترية" @@ -33875,6 +34390,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "!تم تحديد إحداثى شمال فارغ" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -34266,7 +34793,6 @@ msgstr "عدد نقاط الإستيفاء" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -34467,7 +34993,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "اسم الخريطة المدخلة" @@ -34504,6 +35030,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "الطريق لقاعدة البيانات للموقع المدخل" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -35600,11 +36135,8 @@ msgstr "اسم ااملف المخرج" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -35657,47 +36189,61 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +#, fuzzy +msgid "Thin species and background points" +msgstr "عدد نقاط الإستيفاء" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 #, fuzzy msgid "CSV file with alias and map names" msgstr "الخريطة المدخلة حاوية الخطوط" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 #, fuzzy msgid "Automatically adapt resolution" msgstr "وصف مبسط للملف الراسترى المخرج" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "اسم الملف المخرج" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "الصفر قيمة حقيقية" @@ -36552,8 +37098,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -36564,6 +37119,7 @@ msgid "Group of raster layers to be classified" msgstr "الخريطة الراسترية المطلوب إعادة تصنيفها" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -36606,11 +37162,13 @@ msgid "" msgstr "<%s> اسم الملف المستخدم لل" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "الخريطة المخرجة" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -36927,6 +37485,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -36938,6 +37497,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -36967,6 +37527,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "لون قيمة\n" @@ -37359,70 +37920,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "اسم الملف الراسترى الجديد" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "اسم الخريطة الراسترية المخرجة" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -#, fuzzy -msgid "Flow accumulation units" -msgstr "موقع قاعدة البيانات" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -#, fuzzy -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "عامل المضاعفة لتحويل وحدات الارتفاعات الي امتار" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "%s:خط %d:%s\n" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -#, fuzzy -msgid "Plots to generate" -msgstr "عدد النقاط المطلوب تخصيصها" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -37786,11 +38283,14 @@ msgid "" msgstr "dig_att لم يمكن العثور على ملف" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "مد حدود الموقع معتمدا على مجموعة البيانات الجديدة" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +#, fuzzy +msgid "Assume that the dataset has same projection as the current location" +msgstr "درجة وضوح الخريطة المخرجة" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -38699,6 +39199,15 @@ msgid "" "mapset." msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +#, fuzzy +msgid "Location containing input raster map" +msgstr "الخريطة الفيكتورية لنقاط البدء" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "الطريق لقاعدة البيانات للموقع المدخل" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -38839,7 +39348,7 @@ msgid "WFS standard" msgstr "الإنحراف المعيارى" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 #, fuzzy msgid "Maximum number of features to download" msgstr "" @@ -38848,7 +39357,7 @@ msgstr "" "%d :عدد النقاط\n" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -39001,9 +39510,8 @@ msgstr "طباعة نوع الملف الراسترى فقط" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 #, fuzzy @@ -39051,10 +39559,9 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 @@ -39062,11 +39569,25 @@ msgstr "" msgid "Set the current region from the last map that was imported" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "مد حدود الموقع معتمدا على مجموعة البيانات الجديدة" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "درجة وضوح الخريطة المخرجة" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." -msgstr "" +msgstr "إنشاء وتعديل جدول الألوان المصاحب لطبقة الخريطة الراسترية" #: ../locale/scriptstrings/v.external.all_to_translate.c:1 #, fuzzy @@ -39074,7 +39595,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "عرض ملفات الراستر للموقع والخروج" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 #, fuzzy msgid "List available layers in data source and exit" msgstr "عرض ملفات الراستر للموقع والخروج" @@ -39217,34 +39738,6 @@ msgstr "اسم قاعدة بيانات المدخل" msgid "Base name for output file" msgstr "اسم الملف المخرج" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "الملف الراسترى المدخل" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "اسم الخريطة الراسترية المحتوية على معلومات التكلفة لخلية الشبكة" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "عدد النقاط المطلوب تخصيصها" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -39943,6 +40436,11 @@ msgstr "اسم الملف المخرج" msgid "Queries projection information spatially." msgstr "طباعة الأحصاء فى صورة شل سكربت" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +#, fuzzy +msgid "create location" +msgstr "%s لم يمكن فتح " + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -40245,7 +40743,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -40278,7 +40776,7 @@ msgstr "اسم الخريطة الراسترية" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 #, fuzzy -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "<%s> اسم الملف المستخدم لل" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -41029,9 +41527,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "اسم الخريطة الراسترية" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -41310,6 +41814,15 @@ msgstr "درجة وضوح الخريطة المخرجة" msgid "Estimate resolution only" msgstr "اسم ااملف المخرج" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "درجة وضوح الخريطة المخرجة" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -42369,8 +42882,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -42469,39 +42982,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "الملف الراسترى الطلوب إدخالة" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -45928,8 +46450,8 @@ msgstr "اختيار الخط الذى سيعرض به النص على الشا #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -45970,6 +46492,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -46400,6 +46923,14 @@ msgstr "اسم ملف ناتج التصنيف" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +#, fuzzy +msgid "Name of input vector map" +msgstr "اسم الخريطة الراسترية المدخلة" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -46456,6 +46987,20 @@ msgstr "" msgid "Register empty maps" msgstr "اسم الراستر المدخل" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "لم توجد<%s>الخريطة الفيكتورية" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "لم توجد<%s>الخريطة الفيكتورية" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -46498,6 +47043,38 @@ msgstr "الملف الراسترى المدخل" msgid "Number of tiles in y direction" msgstr "اسم الملف المخرج" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "الخريطة الراسترية المطلوب إعادة تصنيفها" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "عدد مرات تكرار المرشح" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -46946,8 +47523,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -47731,6 +48308,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "اسم خريطة الراستر المخرجة" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "اسم المقع الجديد" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -48037,6 +48618,10 @@ msgstr "اسم الملف المخرج" msgid "Offset factor for input" msgstr "استخدام احداثيات مركز الخريطة\n" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 #, fuzzy msgid "Adjacent downstream segment category" @@ -48493,10 +49078,95 @@ msgstr "عامل المقياس الرأسى" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "لون قيمة\n" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "اسم الملف المخرج" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "<%s> اسم الملف المستخدم لل" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr " nv لون\n" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +#, fuzzy +msgid "csv file with variable and layer names" +msgstr "الخريطة المدخلة حاوية الخطوط" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "اسم الخريطة الراسترية المدخلة" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "اسم الملف الراسترى الموجود" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "الملف الراسترى المدخل" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "طباعة المدى فقط" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "الملف الراسترى المدخل" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "اسم الخريطة الراسترية المحتوية على معلومات التكلفة لخلية الشبكة" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -49026,17 +49696,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -49064,23 +49724,20 @@ msgid "categorical map with zones" msgstr "لم توجد<%s>الخريطة الفيكتورية" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "اسم الملف المخرج" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -49091,9 +49748,8 @@ msgid "Default font size" msgstr "المسافة العظمى بين النقاط بوحدات الخريطة" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -49113,14 +49769,12 @@ msgid "Create a vector point layer of outliers" msgstr "اسم الخريطة الراسترية المدخلة" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "غير موجود <%s> الراستر" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -49131,14 +49785,12 @@ msgid "Draw notches" msgstr "%f : الطول\n" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -49172,14 +49824,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -49191,27 +49835,23 @@ msgid "Plot format" msgstr "ملف المدخل" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "اسم الطبقة المدخلة" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -49259,15 +49899,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -49287,7 +49918,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -49297,51 +49927,42 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "لم توجد<%s>الخريطة الفيكتورية" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "عرض قائمة مستويات الكنتور" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 #, fuzzy msgid "Whisker and cap linewidth" msgstr "لم توجد<%s>الخريطة الفيكتورية" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -49349,114 +49970,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "اسم الجدول" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "اسم الجدول" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr " nv لون\n" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr " اللون الأساس\n" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "عرض ملفات الراستر للموقع والخروج" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "اسم الخريطة الراسترية الناتجة" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "درجة وضوح الخريطة المخرجة" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "%f : الطول\n" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "اسم الجدول" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "الخريطة المخرجة" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -#, fuzzy -msgid "limit value axis" -msgstr "عرض القيم مفصولة بفاصلة" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "عرض قائمة مستويات الكنتور" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr " اللون الأساس\n" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -50745,6 +51279,14 @@ msgstr "اسم ااملف المخرج" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -50769,6 +51311,15 @@ msgstr "وصل الفئات...\n" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr " اللون الأساس\n" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -50870,315 +51421,315 @@ msgid "" "layer in a scatterplot." msgstr "اسم الخريطة الراسترية الموجودة" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "عدد الأعمدة" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "<%s> اسم الملف المستخدم لل" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "عدد الأعمدة" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "<%s> اسم الملف المستخدم لل" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "نوع المظهر" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "اسم ملف التقرير" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "اسم ملف التقرير" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "درجة وضوح الخريطة المخرجة" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "%s لم يمكن فتح " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "قيمة الحافة الشرقية" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "عدم انشاء جدول الخواص" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "المساحة\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 #, fuzzy msgid "Set marker size" msgstr "المساحة\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr " nv لون\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "عدد الأعمدة" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 #, fuzzy msgid "Density" msgstr "التوقيع ..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "اسم الخريطة الراسترية" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "الصفر قيمة حقيقية" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "الخريطة الفيكتورية لنقاط البدء" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "%s لم يمكن فتح " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "اسم الخريطة الراسترية الجديدة" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "عرض قائمة مستويات الكنتور" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 #, fuzzy msgid "Line style trendline" msgstr " nv لون\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "عرض قائمة مستويات الكنتور" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 #, fuzzy msgid "standard deviations" msgstr "الإنحراف المعيارى" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr " nv لون\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 #, fuzzy msgid "Ellipse edge style" msgstr "طباعة الأحصاء فى صورة شل سكربت" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 #, fuzzy msgid "Line style of the ellipse" msgstr "عرض قائمة مستويات الكنتور" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "عرض قائمة مستويات الكنتور" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 #, fuzzy msgid "Column grouping the features in categories" msgstr "كتابة ملف جديد...\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 #, fuzzy msgid "RGB column for ellipse categories" msgstr "<%s> اسم الملف المستخدم لل" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 #, fuzzy msgid "legend for ellipses" msgstr "كتابة رؤوس قمم الخطوط" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "min,max :المدى الصحيح" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "اسم الخريطة الراسترية للعرض كخلفية" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "min,max :المدى الصحيح" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "اسم الخريطة الراسترية للعرض كخلفية" @@ -51539,8 +52090,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -51624,186 +52175,6 @@ msgid "" "map of a space time vector dataset" msgstr "حساب إحصائيات المتغير الأحادى من خلايا ذات قيمة بالخريطة الراسترية" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -#, fuzzy -msgid "density" -msgstr "التوقيع ..." - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "لم توجد<%s>الخريطة الفيكتورية" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "خروج" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "اسم الخريطة الراسترية المحتوية على معلومات التكلفة لخلية الشبكة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "اسم الخريطة الراسترية المحتوية على معلومات التكلفة لخلية الشبكة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "ملف المدخل" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "اسم خريطة الراستر المخرجة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -#, fuzzy -msgid "Optional inputs" -msgstr "اسم ااملف المخرج" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "اسم ملف ناتج التصنيف" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "المسافة العظمى بين النقاط بوحدات الخريطة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "درجة وضوح الخريطة المخرجة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "إسم الجدول المخرج" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "اسم خريطة النقط الفيكتورية المخرجة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "اسم ملف التقرير" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "اسم ملف التقرير" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "اسم الخريطة الراسترية للعرض كخلفية" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "الخريطة المخرجة" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "اسم الخريطة الراسترية للعرض كخلفية" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "عدد نقاط الإستيفاء" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "الصفر قيمة حقيقية" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -52672,12 +53043,6 @@ msgstr "%s لم يمكن فتح " msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -#, fuzzy -msgid "histogram" -msgstr "الخريطة الفيكتورية لنقاط البدء" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -58192,6 +58557,47 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "الخريطة المخرجة" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +#, fuzzy +msgid "Download whole tiles" +msgstr "%s لم يتم فتح قاعدة البيانات" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "استخدام المنطقة الحالية" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 #, fuzzy msgid "Extracts a subset of a space time 3D raster dataset." @@ -58789,8 +59195,8 @@ msgid "Unable to open file '%s': %s" msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, fuzzy, c-format msgid "" "Required parameter <%s> not set:\n" @@ -59124,8 +59530,8 @@ msgstr "(1/0) اسم الملف البينرى " #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -59321,7 +59727,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, fuzzy, c-format msgid "Invalid zrange <%s>" @@ -59335,7 +59741,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -59909,7 +60315,7 @@ msgstr "اسم الخريطة المدخلة" msgid "Add points on nodes" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -60224,7 +60630,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 #, fuzzy msgid "Data type of key column must be integer" msgstr "لم توجد<%s>الخريطة الفيكتورية" @@ -60321,52 +60727,47 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -#, fuzzy -msgid "Overwrite connection parameter for certain layer" -msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 #, fuzzy msgid "Unable to modify vector map stored in other mapset" msgstr "<%s>فى<%s>لم يمكن فتح الملف الفيكتورى" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, fuzzy, c-format msgid "Map <%s> is not connected to a database" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, fuzzy, c-format msgid "Vector map <%s> is connected by:\n" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 #, fuzzy msgid "Database connection not defined" msgstr "لم يتم الإتصال بقاعدة البيانات\n" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -60376,33 +60777,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "لم يتم الإتصال بقاعدة البيانات\n" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" -msgstr "" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" +msgstr "%s:لم يتم إنشاء الجدول" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "%s لم يتم منح الإمتياز على الجدول" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -60441,7 +60842,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 #, fuzzy msgid "Categories" msgstr "%-5d فئات الخط قرات\n" @@ -60531,181 +60932,181 @@ msgstr "عدد نقاط الإستيفاء" msgid "Invert mask when selecting points" msgstr "الخريطة المدخلة حاوية الخطوط" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 #, fuzzy msgid "Create only requested layers and categories" msgstr "اسم خريطة الراستر المخرجة" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, fuzzy, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 #, fuzzy msgid "ID layer is required to store attribute table" msgstr "عدم انشاء جدول الخواص" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, fuzzy, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "اسم الخريطة الراسترية" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, fuzzy, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "خريطة مخرجة حيث ستكتب النقاط" -#: ../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 +#: ../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 #, fuzzy, c-format, python-format msgid "Vector map <%s> already exists" msgstr "dig_att لم يمكن العثور على ملف" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, fuzzy, c-format msgid "Scanning %llu points..." msgstr "الخريطة الفيكتورية لنقاط البدء" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, fuzzy, c-format msgid "Scanning %lu points..." msgstr "الخريطة الفيكتورية لنقاط البدء" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, fuzzy, c-format msgid "%llu points imported (limit was %llu)" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, fuzzy, c-format msgid "%llu points imported" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, fuzzy, c-format msgid "%llu input points were not valid and filtered out" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, fuzzy, c-format msgid "%llu input points were outside of the selected area" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, fuzzy, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, fuzzy, c-format msgid "%llu input points were filtered out by return number" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, fuzzy, c-format msgid "%llu input points were filtered out by class number" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, fuzzy, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, fuzzy, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, fuzzy, c-format msgid "%lu points imported (limit was %d)" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, fuzzy, c-format msgid "%lu points imported" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, fuzzy, c-format msgid "%lu input points were outside of the selected area" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, fuzzy, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, fuzzy, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, fuzzy, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, fuzzy, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 #, fuzzy msgid "The rest of points was ignored" msgstr "الإحداثيات للإستفهام" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, fuzzy, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "%d نقاط تم تحميلها\n" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -61215,7 +61616,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, fuzzy, c-format, python-format msgid "Column <%s> not found" @@ -61467,12 +61868,12 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "اسم خريطة الراستر المخرجة" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 #, fuzzy msgid "List available layers including feature type in data source and exit" msgstr "عرض ملفات الراستر للموقع والخروج" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -61500,7 +61901,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, fuzzy, c-format msgid "Layer <%s> not available" msgstr "اسم الخريطة الراسترية" @@ -61510,7 +61911,7 @@ msgstr "اسم الخريطة الراسترية" msgid "No layer defined" msgstr "لم تحدد خرائط مدخلة" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, fuzzy, c-format msgid "Unable to open data source <%s>" msgstr "<%s> لم يمكن فتح" @@ -61530,7 +61931,7 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " msgid "Link to vector map <%s> created." msgstr "dig_att لم يمكن العثور على ملف" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, fuzzy, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -61568,12 +61969,12 @@ msgstr "الخريطة الراسترية المطلوب الضبط عليها" #: ../vector/v.proj/main.c:78 #, fuzzy -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" #: ../vector/v.proj/main.c:84 #, fuzzy -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "الخريطة الفيكتورية لنقاط البدء" #: ../vector/v.proj/main.c:88 @@ -61612,6 +62013,11 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "خريطة مدخلة: أماكن المنخفضات الحقيقية" + #: ../vector/v.proj/main.c:242 #, fuzzy msgid "No vector maps found" @@ -61619,7 +62025,7 @@ msgstr "إدخال خريطة راسترية بينرية " #: ../vector/v.proj/main.c:256 #, fuzzy, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "لم توجد<%s>الخريطة الفيكتورية" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -61634,13 +62040,13 @@ msgid "Input vector map <%s> is empty" msgstr "لم توجد<%s>الخريطة الفيكتورية" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../vector/v.proj/main.c:371 #, fuzzy, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " #: ../vector/v.proj/main.c:517 @@ -62213,7 +62619,7 @@ msgstr "%s:منطقة غير صالحة" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62898,7 +63304,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 #, fuzzy msgid "Import failed" msgstr "ملف المدخل" @@ -63236,13 +63642,13 @@ msgid "Cleaning output topology" msgstr "التوقيع ..." #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 #, fuzzy msgid "Removing dangles..." msgstr "لم يتم حساب شبه مركز المساحة" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 #, fuzzy msgid "Removing bridges..." msgstr "لم يتم حساب شبه مركز المساحة" @@ -63459,7 +63865,7 @@ msgid "Snapping boundaries..." msgstr "وصل الفئات...\n" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 #, fuzzy msgid "Breaking polygons..." msgstr "التوقيع ..." @@ -63467,13 +63873,13 @@ msgstr "التوقيع ..." #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 #, fuzzy msgid "Removing duplicates..." msgstr "الخريطة الفيكتورية لنقاط البدء" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 #, fuzzy msgid "Breaking boundaries..." msgstr "وصل الفئات...\n" @@ -63705,7 +64111,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, fuzzy, c-format msgid "Layer <%s> not found" msgstr "غير موجود <%s> الراستر" @@ -63877,10 +64283,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, fuzzy, c-format msgid "Not enough memory for %s" msgstr "%c :نوع غير معروف" @@ -63925,6 +64331,11 @@ msgstr "اسم الخريطة الراسترية المدخلة" msgid "Name of input surface raster map for cross-section" msgstr "اسم ملف التنعيم" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +#, fuzzy +msgid "Optional inputs" +msgstr "اسم ااملف المخرج" + #: ../vector/v.vol.rst/main.c:244 #, fuzzy msgid "Name of column containing w-values attribute to interpolate" @@ -64043,9 +64454,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, fuzzy, c-format msgid "Unable to create %s" msgstr "[%s]لم يتم فتح ملف الخلية ل " @@ -64060,7 +64471,7 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " msgid "Vector is not 3D" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, fuzzy, c-format msgid "Unable to create table '%s'" msgstr "[%s]لم يتم فتح ملف الخلية ل " @@ -64156,7 +64567,6 @@ msgid "Cannot allocate memory for point" msgstr "لم يتم حساب شبه مركز المساحة" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -64185,8 +64595,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -64847,7 +65257,7 @@ msgid "Categories already exist in layer %d" msgstr "%d فئات محملة من الجدول\n" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 #, fuzzy msgid "Unable to calculate area centroid" msgstr "لم يتم حساب شبه مركز المساحة" @@ -64998,8 +65408,8 @@ msgstr "خطا فى محاولة قراءة ملف قاعدة البيانات d #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -66911,18 +67321,18 @@ msgstr "كتابة ملف جديد...\n" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, fuzzy, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "وصل الفئات...\n" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 #, fuzzy msgid "Cleaning boundaries at nodes..." msgstr "وصل الفئات...\n" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 #, fuzzy msgid "Merging boundaries..." msgstr "وصل الفئات...\n" @@ -67114,13 +67524,13 @@ msgstr "%s:لم يتم إنشاء الجدول" msgid "No default DB defined" msgstr "لم تحدد خرائط مدخلة" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -67384,42 +67794,47 @@ msgstr "الفاصل الحقلي للمخرج" #: ../vector/v.to.db/parse.c:127 #, fuzzy +msgid "Print header" +msgstr "اسم الطبقة المدخلة" + +#: ../vector/v.to.db/parse.c:132 +#, fuzzy msgid "Only print SQL statements" msgstr "اسم الملف بتعبير اس.كيو.ال" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -68490,16 +68905,6 @@ msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" msgid "Writing shortest paths..." msgstr "كتابة ملف جديد...\n" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 #, fuzzy msgid "Prints vector map attributes." @@ -70032,71 +70437,71 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, fuzzy, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "طبقتين يجب تحديدهم" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 #, fuzzy msgid "You are not outputting any raster or vector maps" msgstr "اسم الملف الفيكتورى المخرج" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 #, fuzzy msgid "Input is 2D: using attribute values for approximation" msgstr "عامل الضرب لقيم الإرتفاعات" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 #, fuzzy msgid "Input is 2D: using category values for approximation" msgstr "عامل الضرب لقيم الإرتفاعات" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 #, fuzzy msgid "Processing segments in parallel..." msgstr "التوقيع ..." -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 #, fuzzy msgid "Processing segments..." msgstr "التوقيع ..." -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 #, fuzzy msgid "Unable to write raster maps - try to increase resolution" msgstr "اسم الخريطة الراسترية" @@ -70417,7 +70822,7 @@ msgstr "التوقيع ..." msgid "Querying vector map <%s>..." msgstr "كتابة ملف جديد...\n" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 #, fuzzy msgid "Writing centroids..." msgstr "كتابة رؤوس قمم الخطوط" @@ -70904,187 +71309,187 @@ msgstr "لم يتم الإتصال بقاعدة البيانات\n" msgid "Unable to open driver <%s>" msgstr "<%s> لم يمكن فتح" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 +#: ../vector/v.info/print.c:306 #, fuzzy -msgid "Location:" -msgstr "%s لم يمكن فتح " +msgid "Project:" +msgstr "التوقيع ..." -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 #, fuzzy msgid "Database:" msgstr ":اسم قاعدة البيانات" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 #, fuzzy msgid "Name of creator:" msgstr "اسم الخريطة الراسترية" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 #, fuzzy msgid "Map format:" msgstr "الخريطة المخرجة" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 #, fuzzy msgid "OGR layer:" msgstr "اسم الطبقة المدخلة" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 #, fuzzy msgid "OGR datasource:" msgstr "اسم قاعدة البيانات" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 #, fuzzy msgid "Feature type:" msgstr "نوع المظهر" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 #, fuzzy msgid "DB table:" msgstr "اسم الخريطة الراسترية الجديدة" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 #, fuzzy msgid "Geometry column:" msgstr "عدد الأعمدة" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 #, fuzzy msgid "Topology:" msgstr "الملف الراسترى المدخل" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 #, fuzzy msgid "Topology column:" msgstr "عدد الأعمدة" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 #, fuzzy msgid "Type of map" msgstr "اسم الخريطة المدخلة" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 #, fuzzy msgid "Number of points:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 #, fuzzy msgid "Number of centroids:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 #, fuzzy msgid "Number of lines:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 #, fuzzy msgid "Number of boundaries:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 #, fuzzy msgid "Number of areas:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 #, fuzzy msgid "Number of islands:" msgstr "عدد الأعمدة" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 #, fuzzy msgid "Number of faces:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 #, fuzzy msgid "Number of kernels:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 #, fuzzy msgid "Number of volumes:" msgstr "عدد الأعمدة" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 #, fuzzy msgid "Number of holes:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 #, fuzzy msgid "Number of dblinks:" msgstr "عدد الصفوف" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -71283,28 +71688,53 @@ msgstr "%-5d تم تخطى فئات النقط الميت\n" msgid "An error occurred, nothing to be exported" msgstr "%-5d تم تخطى فئات النقط الميت\n" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "ادخال ملف راسترى ثنائى كطبقة خريطة راسترية جراسية" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -71379,239 +71809,239 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "اجبار المخرج للقيم الصحيحة" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 #, fuzzy msgid "No OGR layers available" msgstr "اسم الخريطة الراسترية" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, fuzzy, c-format msgid "Illegal output name <%s>" msgstr "اسم ااملف المخرج" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, fuzzy, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr " 2-%d اسماء الخرائط المدخلة" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, fuzzy, c-format msgid "Error setting attribute filter '%s'" msgstr "خطا فى محاولة قراءة ملف قاعدة البيانات dbmscap\n" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, fuzzy, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "غير موجودة <%s> المنطقة" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, fuzzy, c-format msgid "Boundary splitting distance in map units: %G" msgstr "المسافة العظمى بين النقاط بوحدات الخريطة" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, fuzzy, c-format msgid "Using temporary vector <%s>" msgstr "اسم الخريطة الراسترية الناتجة" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, fuzzy, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "غير موجودة <%s> المنطقة" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, fuzzy, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "نوع العمود غير مدعم" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, fuzzy, c-format msgid "Creating attribute table for layer <%s>..." msgstr "غير موجود <%s> الراستر" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, fuzzy, c-format msgid "Column name <%s> renamed to <%s>" msgstr "غير موجودة <%s> المنطقة" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, fuzzy, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "غير موجودة <%s> المنطقة" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, fuzzy, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, fuzzy, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "لم يمكن حشر صف جديد: %s" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, fuzzy, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "%-5d تم تخطى فئات النقط الميت\n" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 #, fuzzy msgid "feature" msgstr "نوع المظهر" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, fuzzy, c-format msgid "Unable to drop table: '%s'" msgstr "<%s> لم يمكن فتح" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 #, fuzzy msgid "Cleaning polygons" msgstr "التوقيع ..." -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 #, fuzzy msgid "Changing boundary dangles to lines..." msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 #, fuzzy msgid "Changing boundary bridges to lines..." msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, fuzzy, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, fuzzy, c-format msgid "The order of features in input layer <%s> has changed" msgstr "نوع العمود غير مدعم" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, fuzzy, c-format msgid "Total area: %G (%d areas)\n" msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, fuzzy, c-format msgid "Total area: %G (%d areas)" msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, fuzzy, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, fuzzy, c-format msgid "Overlapping area: %G (%d areas)" msgstr "وصل الفئات...\n" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, fuzzy, c-format msgid "Area without category: %G (%d areas)\n" msgstr "%-5d تم تخطى فئات النقط الميت\n" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, fuzzy, c-format msgid "Area without category: %G (%d areas)" msgstr "%-5d تم تخطى فئات النقط الميت\n" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, fuzzy, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "لم يتم حساب شبه مركز المساحة" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, fuzzy, c-format msgid "Number of incorrect boundaries: %d" msgstr "" @@ -71619,42 +72049,42 @@ msgstr "" "\n" "%d :عدد النقاط\n" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, fuzzy, c-format msgid "Number of centroids outside area: %d" msgstr "عدد الصفوف" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, fuzzy, c-format msgid "Number of duplicate centroids: %d" msgstr "عدد الصفوف" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -71663,51 +72093,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, fuzzy, c-format msgid "The snapping threshold %g might be too large." msgstr "حجم التجاور" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -71877,10 +72307,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "dig_att لم يمكن العثور على ملف" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "غير موجودة <%s> المنطقة" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -72057,7 +72497,7 @@ msgstr "اسم الخريطة الراسترية الموجودة" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, fuzzy, c-format msgid "%d col" msgid_plural "%d cols" @@ -72065,7 +72505,7 @@ msgstr[0] " nv لون\n" msgstr[1] " nv لون\n" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -72073,7 +72513,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -73122,6 +73562,10 @@ msgstr "dig قراءة ملف...\n" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -73737,6 +74181,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "[%s]لم يتم فتح ملف الخلية ل " + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "[%s]لم يتم فتح ملف الخلية ل " + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -74353,7 +74814,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, fuzzy, c-format, python-format msgid "Unable to open file '%s'" msgstr "[%s]لم يتم فتح ملف الخلية ل " @@ -74605,22 +75066,15 @@ msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد msgid "Input DSN <%s> not found or not readable" msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, fuzzy, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -88353,39 +88807,39 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, fuzzy, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "مساحة: %d عدد الجزر: %d\n" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 #, fuzzy msgid "Key column must be of type integer or string" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -88468,12 +88922,12 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 #, fuzzy msgid "Computing tiling..." msgstr "لم يتم نسخ الجدول" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -88500,106 +88954,106 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 #, fuzzy msgid "Restoring user mask (MASK)..." msgstr "%-5d dig_att قراءة ملف...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, fuzzy, python-format msgid "Processing %d map holes" msgstr "التوقيع ..." #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, fuzzy, python-format msgid "Interpolating %d points" msgstr "الخريطة الفيكتورية لنقاط البدء" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 #, fuzzy msgid "No points to interpolate" msgstr "عدد النقاط المطلوب تخصيصها" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, fuzzy, python-format msgid "Failed to fill hole %s" msgstr "dig عطل فى فتح ملف المدخل" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, fuzzy, python-format msgid "Using %s bspline interpolation" msgstr "عدد نقاط الإستيفاء" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 #, fuzzy msgid "Patching fill data into NULL areas..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, fuzzy, python-format msgid "Filled raster map is: %s" msgstr "%-5d dig_att قراءة ملف...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -88611,349 +89065,349 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 #, fuzzy msgid "Importing raster map into GRASS..." msgstr "خريطة الراستر االناتجة" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 #, fuzzy msgid "JPEG format does not support transparency" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, fuzzy, python-format msgid "Invalid EPSG code %d" msgstr "%s:منطقة غير صالحة" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 #, fuzzy msgid "Unable to get projection info" msgstr "%s:لم يتم إنشاء الجدول" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 #, fuzzy msgid "Maxcols must be greater than 100" msgstr "طبقتين يجب تحديدهم" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 #, fuzzy msgid "Maxrows must be greater than 100" msgstr "طبقتين يجب تحديدهم" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, fuzzy, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "لم يمكن اختيار البيانات من الجدول" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, fuzzy, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 #, fuzzy msgid "Unable to write data into tempfile" msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, fuzzy, python-format msgid "Unable to determine region, %s failed" msgstr "لم يمكن حشر صف جديد: %s" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 #, fuzzy msgid "Region definition: 4 points required" msgstr "الإحداثيات للإستفهام" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 #, fuzzy msgid "Reprojecting raster..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, fuzzy, python-format msgid "%s failed" msgstr "ملف المدخل" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 #, fuzzy msgid "Unable to create temporary files" msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 #, fuzzy msgid "WMS import failed, nothing imported" msgstr "%d نقاط تم تحميلها\n" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, fuzzy, python-format msgid "<%s> created." msgstr "%s لم يمكن فتح " -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, fuzzy, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "لم يمكن اختيار البيانات من الجدول" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, fuzzy, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, fuzzy, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, fuzzy, python-format msgid "WMS server error: %s" msgstr "الملف الراسترى المدخل" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, fuzzy, python-format msgid "Driver %s does not supports Create() method" msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, fuzzy, python-format msgid "Unable to open %s " msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, fuzzy, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, fuzzy, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "غير موجود <%s> الراستر" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, fuzzy, python-format msgid "Layer '%s' is not available with %s code." msgstr "اسم الخريطة الراسترية" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, fuzzy, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 #, fuzzy msgid "Unable to open GDAL WMS driver" msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, fuzzy, python-format msgid "Unable to find %s driver" msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 #, fuzzy msgid "Unable to parse XML file" msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, fuzzy, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 #, fuzzy msgid "Root node was not found." msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -89007,53 +89461,53 @@ msgstr "%-5d تم تخطى فئات النقط الميت\n" msgid "Imported <%s> vector map <%s>." msgstr "%d نقطة كتبت للمخرج\n" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, fuzzy, python-format msgid "File '%s' or '%s' not found" msgstr "غير موجود <%s> الراستر" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, fuzzy, python-format msgid "Extracting '%s'..." msgstr "وصل الفئات...\n" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 #, fuzzy msgid "Unable to unzip file." msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 #, fuzzy msgid "Converting input file to BIL..." msgstr "dig قراءة ملف...\n" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 #, fuzzy msgid "Unable to import data" msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -89081,13 +89535,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, fuzzy, python-format msgid "Converting %d place names..." msgstr "كتابة ملف جديد...\n" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 #, fuzzy msgid "Forcing ..." msgstr "التوقيع ..." @@ -89145,87 +89599,87 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, fuzzy, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "استخدام احداثيات مركز الخريطة\n" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, fuzzy, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, fuzzy, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "<%s> لم يمكن فتح" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, fuzzy, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "لم يتم تحديث الحدود" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 #, fuzzy msgid "Unable to get reprojected map extent" msgstr "%s:لم يتم إنشاء الجدول" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 #, fuzzy -msgid "Unable to reproject to source location" +msgid "Unable to reproject to source project" msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, fuzzy, python-format msgid "Reprojecting <%s>..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, fuzzy, python-format msgid "Unable to to reproject raster <%s>" msgstr "اسم الخريطة الراسترية الناتجة" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, fuzzy, python-format msgid "The reprojected raster <%s> is empty" msgstr "لم توجد<%s>الخريطة الفيكتورية" @@ -89275,28 +89729,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, fuzzy, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "اسم الخريطة الراسترية الموجودة" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, fuzzy, python-format msgid "Column <%s> not found in table" msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, fuzzy, python-format msgid "Column <%s> would be deleted." msgstr "غير موجودة <%s> الخريطة الراسترية " -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -89356,27 +89810,27 @@ msgstr "استخدام احداثيات مركز الخريطة\n" msgid "Unable to import <%s>" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, fuzzy, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "%s:لم يتم إنشاء الجدول" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, fuzzy, python-format msgid "Importing <%s> ..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, fuzzy, python-format msgid "Unable to import OGR datasource <%s>" msgstr "<%s> لم يمكن فتح" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, fuzzy, python-format msgid "option <%s>: <%s> exists." msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, fuzzy, python-format msgid "Unable to to reproject vector <%s>" msgstr "[%s]لم يتم فتح ملف الخلية ل " @@ -89386,7 +89840,6 @@ msgstr "[%s]لم يتم فتح ملف الخلية ل " #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, fuzzy, python-format msgid "Vector map <%s> not found in current mapset" msgstr "لم توجد<%s>الخريطة الفيكتورية" @@ -89396,14 +89849,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, fuzzy, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -89411,76 +89864,76 @@ msgid "" msgstr "اسم الخريطة الراسترية الموجودة" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, fuzzy, python-format msgid "Processing input data (%d categories)..." msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 #, fuzzy msgid "Updating the database ..." msgstr "لم يتم نسخ الجدول" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, fuzzy, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 #, fuzzy msgid "An error occurred while converting vector to raster" msgstr "%-5d تم تخطى فئات النقط الميت\n" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 #, fuzzy msgid "No categories found in raster map" msgstr "إدخال خريطة راسترية بينرية " -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 #, fuzzy msgid "Use -c flag to update values in this column." msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -89715,7 +90168,7 @@ msgstr "%s لم يمكن فتح " msgid "Input file <%s> not found" msgstr "غير موجود <%s>الملف للمنظر ثلاثى الأبعاد " -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 #, fuzzy msgid "Importing data..." msgstr "التوقيع ..." @@ -89735,66 +90188,67 @@ msgstr "الخريطة الفيكتورية لنقاط البدء" msgid "An error occurred on creating \"%s\", please check" msgstr "%-5d تم تخطى فئات النقط الميت\n" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, fuzzy, python-format msgid "Mosaicing %d images..." msgstr "لم يتم حساب شبه مركز المساحة" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, fuzzy, python-format msgid "Done. Raster map <%s> created." msgstr "dig_att لم يمكن العثور على ملف" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 #, fuzzy msgid "Invalid maximum number of features" msgstr "عدد نقاط الإستيفاء" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 #, fuzzy msgid "Retrieving data..." msgstr "التوقيع ..." -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, fuzzy, python-format msgid "Vector map <%s> imported from WFS." msgstr "لم توجد<%s>الخريطة الفيكتورية" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 #, fuzzy msgid "WFS import failed" msgstr "ملف المدخل" @@ -89945,84 +90399,84 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 #, fuzzy msgid "cleaning up temp files" msgstr "لم يتم تحديث الحدود" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 #, fuzzy msgid "Calculating Brovey transformation..." msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 #, fuzzy msgid "Transforming to IHS color space..." msgstr "التوقيع ..." -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 #, fuzzy msgid "Input has no data. Check region settings." msgstr "ضبط المنطقة الحالية من ابعاد الخريطة المدخلة" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 #, fuzzy msgid "Performing inverse PCA ..." msgstr "التوقيع ..." -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -90138,44 +90592,44 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 #, fuzzy msgid "MASK already exists and will be overwritten" msgstr "خريطة مخرجة حيث ستكتب النقاط" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, fuzzy, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "اسم الخريطة الراسترية الناتجة" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 #, fuzzy msgid "Creating inverted raster MASK..." msgstr "خريطة الراستر االناتجة" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 #, fuzzy msgid "Inverted raster MASK created" msgstr "dig_att لم يمكن العثور على ملف" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 #, fuzzy msgid "Raster MASK created" msgstr "dig_att لم يمكن العثور على ملف" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -90211,7 +90665,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "خريطة مخرجة حيث ستكتب النقاط" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -90222,35 +90676,35 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 +#: ../scripts/r.unpack/r.unpack.py:143 #, fuzzy -msgid "Overriding projection check (using current location's projection)." +msgid "Overriding projection check (using current project's CRS)." msgstr "تغلب على الإسقاط مستخدما إسقاط الموقع" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -90349,35 +90803,35 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 #, fuzzy msgid "Projection information does not match. Proceeding..." msgstr "إعادة توقيع خريطة راسترية من مكان إلى المكان الحالى" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, fuzzy, python-format msgid "Coping table <%s> as table <%s>" msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, fuzzy, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "<%s> لم يمكن فتح" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, fuzzy, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, fuzzy, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, fuzzy, python-format msgid "Vector map <%s> successfully unpacked" msgstr "dig_att لم يمكن العثور على ملف" @@ -90466,335 +90920,335 @@ msgstr "%s لم يتم العثور على الخريطة الراسترية" msgid "No metadata available for module '{}':" msgstr "طباعة الأحصاء فى صورة شل سكربت" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 #, fuzzy msgid "Failed to get Git version." msgstr "لم يتم تحديث الحدود" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 #, fuzzy msgid "Cannot write to working directory {}." msgstr "لم يتم انشاء الدليل" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 #, fuzzy msgid "No extension (toolbox) installed" msgstr "اسم المقع الجديد" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 #, fuzzy msgid "No extension (module) installed" msgstr "اسم المقع الجديد" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 #, fuzzy msgid "List of available extensions (toolboxes):" msgstr "عرض الهيئات المدعمة والخروج" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 #, fuzzy msgid "List of available extensions (modules):" msgstr "عرض الهيئات المدعمة والخروج" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 #, fuzzy msgid "Unable to fetch addons metadata file" msgstr "لم يمكن اختيار البيانات من الجدول" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, fuzzy, python-format msgid "Unable to fetch '%s'" msgstr "لم يتم جلب البيانات" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 #, fuzzy msgid "$GISBASE not defined" msgstr "اسم الجدول" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, fuzzy, python-format msgid "Installing toolbox <%s>..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 #, fuzzy msgid "Nothing to install" msgstr "لم يتم الثور على شيئ\n" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 #, fuzzy msgid "Updating extensions metadata file..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 #, fuzzy msgid "Updating extension modules metadata file..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 #, fuzzy msgid "Unable to read addons metadata file from the remote server" msgstr "<%s> لم يمكن فتح" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, fuzzy, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "<%s> لم يمكن فتح" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, fuzzy, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "<%s> لم يمكن فتح" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, fuzzy, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "طباعة الأحصاء فى صورة شل سكربت" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, fuzzy, python-format msgid "GRASS Addons <%s> not found" msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, fuzzy, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "ملف المدخل محمول\n" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 #, fuzzy msgid "Path to the source code:" msgstr "اسم الملف المخرج" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 #, fuzzy msgid "Compiling..." msgstr "التوقيع ..." -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 #, fuzzy msgid "Installing..." msgstr "موقع قاعدة البيانات" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 #, fuzzy msgid "List of removed files:" msgstr "عرض قائمة مستويات الكنتور" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 #, fuzzy msgid "Files to be removed:" msgstr "الملف الراسترى الطلوب إدخالة" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 #, fuzzy msgid "Updating addons metadata file..." msgstr "كتابة ملف جديد...\n" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, fuzzy, python-format msgid "Extension <%s> successfully uninstalled." msgstr "اسم ااملف المخرج" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, fuzzy, python-format msgid "Extension <%s> not found" msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -90802,60 +91256,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, fuzzy, python-format msgid "Unable to create '%s': %s" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, fuzzy, python-format msgid "Manual page for <%s> updated" msgstr "الملف الراستري للسطح" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, fuzzy, python-format msgid "Unable to read manual page: %s" msgstr "<%s> لم يمكن فتح" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, fuzzy, python-format msgid "Unable for write manual page: %s" msgstr "[%s]لم يتم فتح ملف الخلية ل " -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, fuzzy, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "%s لم يمكن فتح " -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -90910,27 +91364,39 @@ msgstr "%s:منطقة غير صالحة" msgid "Building topology for vector map <%s> failed" msgstr "dig قراءة ملف...\n" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "[%s]لم يتم فتح ملف الخلية ل " + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, fuzzy, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "غير موجودة <%s> المنطقة" + +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" msgstr "%s لم يتم العثور على الخريطة الراسترية" -#: ../scripts/v.db.join/v.db.join.py:191 -#, fuzzy, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:224 +#, fuzzy, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "%-5d dig_att قراءة ملف...\n" -#: ../scripts/v.db.join/v.db.join.py:197 -#, fuzzy, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" msgstr "%s لم يتم العثور على الخريطة الراسترية" #: ../scripts/g.download.location/g.download.location.py:105 @@ -90978,16 +91444,6 @@ msgstr "لم يتم نسخ الجدول" msgid "Path to the location now <{path}>" msgstr "%s:لم يتم إنشاء الجدول" -#: ../scripts/d.redraw/d.redraw.py:53 -#, fuzzy, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "[%s]لم يتم فتح ملف الخلية ل " - -#: ../scripts/d.redraw/d.redraw.py:64 -#, fuzzy, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "[%s]لم يتم فتح ملف الخلية ل " - #: ../scripts/r.plane/r.plane.py:84 #, fuzzy msgid "Input coordinates seems to be invalid" @@ -91070,41 +91526,52 @@ msgstr "غير موجودة <%s> الخريطة الراسترية " msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "لم توجد<%s>الخريطة الفيكتورية" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, fuzzy, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +#, fuzzy +msgid "Column <{}> is already in the table. Skipping." msgstr "غير موجودة <%s> المنطقة" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, fuzzy, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +#, fuzzy +msgid "Adding column <{}> to the table" msgstr "<%s> اسم الملف المستخدم لل" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, fuzzy, python-format -msgid "Unable to add column <%s>." -msgstr "[%s]لم يتم فتح ملف الخلية ل " +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "%s لم يتم العثور على الخريطة الراسترية" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 #, fuzzy msgid "xy-locations are not supported" msgstr "نوع العمود غير مدعم" @@ -91156,21 +91623,234 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 #, fuzzy msgid "Latitude-longitude locations are not supported" msgstr "نوع العمود غير مدعم" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, fuzzy, python-format msgid "Generating output raster map <%s>..." msgstr "اسم خريطة الراستر المخرجة" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy, c-format +#~ msgid "Unable to create new location <%s>" +#~ msgstr "%s:لم يتم إنشاء الجدول" + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "اسم الخريطة الراسترية المدخلة" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "اسم الملف الراسترى الموجود" + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "اسم الملف الراسترى الموجود" + +#, fuzzy +#~ msgid "layer number/name for the ML results" +#~ msgstr "اسم الملف الراسترى الموجود" + +#, fuzzy +#~ msgid "Data with statistics in npy format." +#~ msgstr "ملف المدخل" + +#, fuzzy +#~ msgid "Numpy array with vector cats." +#~ msgstr "%d نقطة كتبت للمخرج\n" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "لاتشمل اسماء الأعمدة في المخرج" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "عدد الأعمدة" + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "اسم الملف المخرج" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "نوع التخزين للخريطة الراسترية الناتجة " + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "اسم ملف ناتج التصنيف" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "اسم الخريطة ااراسترية الكنتورية" + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "اسم الملف الراسترى الجديد" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "اسم الخريطة الراسترية المخرجة" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "حساب الظلال من نموذج الإرتفاعت الرقمى" + +#, fuzzy +#~ msgid "Flow accumulation units" +#~ msgstr "موقع قاعدة البيانات" + +#, fuzzy +#~ msgid "Multiplier to convert flow accumulation to your chosen unit" +#~ msgstr "عامل المضاعفة لتحويل وحدات الارتفاعات الي امتار" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "%s:خط %d:%s\n" + +#, fuzzy +#~ msgid "Plots to generate" +#~ msgstr "عدد النقاط المطلوب تخصيصها" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "عرض ملفات الراستر للموقع والخروج" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "اسم الخريطة الراسترية الناتجة" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "درجة وضوح الخريطة المخرجة" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "%f : الطول\n" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "اسم الجدول" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "الخريطة المخرجة" + +#, fuzzy +#~ msgid "limit value axis" +#~ msgstr "عرض القيم مفصولة بفاصلة" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "عرض قائمة مستويات الكنتور" + +#, fuzzy +#~ msgid "density" +#~ msgstr "التوقيع ..." + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "لم توجد<%s>الخريطة الفيكتورية" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "خروج" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "اسم الخريطة الراسترية المحتوية على معلومات التكلفة لخلية الشبكة" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "اسم الخريطة الراسترية المحتوية على معلومات التكلفة لخلية الشبكة" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "ملف المدخل" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "اسم خريطة الراستر المخرجة" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "اسم ملف ناتج التصنيف" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "المسافة العظمى بين النقاط بوحدات الخريطة" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "درجة وضوح الخريطة المخرجة" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "إسم الجدول المخرج" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "اسم خريطة النقط الفيكتورية المخرجة" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "اسم ملف التقرير" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "اسم ملف التقرير" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "اسم الخريطة الراسترية للعرض كخلفية" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "الخريطة المخرجة" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "اسم الخريطة الراسترية للعرض كخلفية" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "عدد نقاط الإستيفاء" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "الصفر قيمة حقيقية" + +#, fuzzy +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "طباعة إحداثيات الإتصال الحلى و الخروج" + +#, fuzzy +#~ msgid "Location:" +#~ msgstr "%s لم يمكن فتح " + +#, fuzzy, python-format +#~ msgid "Unable to open file '%s' for reading. Details: %s" +#~ msgstr "[%s]لم يتم فتح ملف الخلية ل " + +#, fuzzy, python-format +#~ msgid "Unable to open file '%s' for writing. Details: %s" +#~ msgstr "[%s]لم يتم فتح ملف الخلية ل " + +#, fuzzy, python-format +#~ msgid "Unable to add column <%s>." +#~ msgstr "[%s]لم يتم فتح ملف الخلية ل " + +======= +<<<<<<< HEAD +>>>>>>> osgeo-main ======= #: ../scripts/r.fillnulls/r.fillnulls.py:161 msgid "A user raster mask (MASK) is present. Saving it..." @@ -93050,6 +93730,10 @@ msgstr "" #~ msgstr "%-5d تم تخطى فئات النقط الميت\n" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Creates a raster map from LAS LiDAR points using univariate statistics " @@ -93122,10 +93806,6 @@ msgstr "" #~ msgid "evaluation area" #~ msgstr "انحياز الإرتفاعات" -#, fuzzy -#~ msgid "Prevalence of presence points" -#~ msgstr "اسم الطبقة المستخدمة كدرجة لون" - #, fuzzy #~ msgid "Output buffer map" #~ msgstr "الخريطة المخرجة" diff --git a/locale/po/grassmods_bn.po b/locale/po/grassmods_bn.po index 92398dfad1e..5b74181d5be 100644 --- a/locale/po/grassmods_bn.po +++ b/locale/po/grassmods_bn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_bn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2018-09-28 23:33+0200\n" "Last-Translator: \n" "Language-Team: Bengali (https://www.transifex.com/grass-gis/teams/45198/" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1585,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1715,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1756,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1772,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1829,24 +1821,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1962,7 +1948,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1972,7 +1958,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2092,7 +2077,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2121,6 +2106,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2254,7 +2240,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2263,8 +2255,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2296,7 +2288,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2352,7 +2344,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2397,7 +2388,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2450,7 +2441,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2862,7 +2853,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2950,14 +2941,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3116,7 +3109,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3424,6 +3417,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3512,17 +3514,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3543,7 +3543,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3615,7 +3615,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3648,160 +3648,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3834,19 +3826,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3915,9 +3907,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3931,36 +3923,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4015,6 +4007,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4035,46 +4030,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4083,82 +4087,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4958,7 +4974,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5037,7 +5053,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5166,7 +5182,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5365,9 +5381,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5383,7 +5398,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5590,9 +5605,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5610,7 +5625,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5695,10 +5710,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5737,30 +5752,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5880,123 +5895,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6096,7 +6111,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6130,7 +6145,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6162,7 +6177,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6216,9 +6231,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6234,8 +6249,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6245,24 +6260,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6314,7 +6360,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6614,7 +6660,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6720,7 +6766,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6806,7 +6851,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7425,7 +7470,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7434,7 +7479,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7539,7 +7584,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7563,15 +7608,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7644,7 +7689,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7694,17 +7739,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7762,6 +7804,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7899,7 +7942,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7982,7 +8025,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8041,7 +8084,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8102,7 +8145,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8225,7 +8268,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8364,7 +8406,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8456,8 +8498,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8466,8 +8508,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8485,7 +8527,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8865,9 +8907,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9092,13 +9134,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9111,7 +9151,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9353,31 +9392,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9393,12 +9432,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9413,18 +9451,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9448,10 +9485,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9481,7 +9517,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9490,210 +9526,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10359,7 +10411,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10472,6 +10523,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10503,26 +10566,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10547,12 +10590,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10560,40 +10597,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10744,7 +10781,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10988,29 +11025,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11065,71 +11102,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11172,6 +11176,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11875,7 +11912,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11889,12 +11926,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11920,10 +11956,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11979,12 +12013,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12001,12 +12035,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12014,7 +12048,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12022,7 +12056,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12038,12 +12072,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12122,7 +12156,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12374,8 +12408,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12541,7 +12576,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12552,6 +12587,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13163,15 +13210,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13250,7 +13297,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13260,7 +13307,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13348,7 +13395,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13357,7 +13404,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13669,7 +13716,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13680,19 +13727,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13700,15 +13747,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13717,62 +13777,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13942,9 +14010,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14284,21 +14349,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14483,80 +14548,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15431,32 +15496,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15472,61 +15537,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15550,7 +15615,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16490,46 +16554,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16854,7 +16918,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17308,8 +17372,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17436,97 +17500,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17789,11 +17853,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17992,32 +18056,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18100,7 +18164,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18123,8 +18187,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18878,8 +18943,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18889,28 +18954,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18919,57 +18984,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18978,7 +19043,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18987,7 +19052,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19479,6 +19544,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19537,64 +19606,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19700,7 +19777,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19713,10 +19789,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19730,11 +19804,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20228,10 +20302,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20287,9 +20361,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20349,13 +20423,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20716,67 +20790,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21020,8 +21094,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21287,154 +21361,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21523,7 +21597,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21533,97 +21607,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21766,7 +21840,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21849,33 +21924,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21884,69 +21981,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21961,37 +22062,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22344,7 +22442,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23531,7 +23629,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23627,7 +23725,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23635,7 +23734,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23669,34 +23768,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23749,61 +23849,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23813,7 +23918,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23822,20 +23927,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23950,15 +24055,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23998,101 +24101,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24216,6 +24317,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24232,6 +24343,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24241,6 +24357,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24607,6 +24743,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26166,8 +26303,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26491,17 +26628,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26510,17 +26644,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26529,17 +26660,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26549,17 +26677,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26568,12 +26693,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27354,11 +27477,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27407,7 +27534,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27500,16 +27627,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28078,6 +28204,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28120,6 +28280,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28154,58 +28316,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28283,231 +28455,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28706,6 +28661,500 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +msgid "Validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28896,10 +29345,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29125,6 +29579,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30287,7 +30749,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30331,11 +30793,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31384,7 +31841,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31418,6 +31874,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31769,7 +32236,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31962,7 +32428,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -31995,6 +32461,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33000,11 +33474,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33050,44 +33521,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33852,8 +34336,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33863,6 +34356,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33900,10 +34394,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34194,6 +34690,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34205,6 +34702,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34233,6 +34731,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34592,63 +35091,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -34981,11 +35423,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35813,6 +36257,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35939,12 +36391,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36080,9 +36532,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36125,19 +36576,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36146,7 +36607,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36273,31 +36734,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36919,6 +37355,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37199,7 +37639,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37230,7 +37670,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37905,9 +38345,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38154,6 +38600,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39151,8 +39605,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39244,39 +39698,47 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 -msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgid "Name of data layers to import" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42407,8 +42869,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42446,6 +42908,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42843,6 +43306,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42892,6 +43362,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42927,6 +43409,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43329,8 +43841,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44050,6 +44562,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44329,6 +44845,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44745,10 +45265,84 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45232,17 +45826,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45266,22 +45850,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45291,9 +45872,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45310,13 +45890,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45326,14 +45904,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45366,14 +45942,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45384,26 +45952,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45447,15 +46011,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45473,7 +46028,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45483,48 +46037,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45532,101 +46077,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46799,6 +47266,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46821,6 +47296,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46910,278 +47393,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47510,8 +47993,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47591,166 +48074,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48538,11 +48861,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53289,6 +53607,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53819,8 +54176,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54121,8 +54478,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54302,7 +54659,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54316,7 +54673,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54846,7 +55203,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55136,7 +55493,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55226,49 +55583,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55278,33 +55631,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55341,7 +55694,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55418,178 +55771,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56066,7 +56419,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56304,11 +56657,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56335,7 +56688,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56344,7 +56697,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56364,7 +56717,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56400,11 +56753,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56439,13 +56792,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56460,12 +56817,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57633,7 +57990,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58256,7 +58613,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58563,12 +58920,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58768,19 +59125,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -58989,7 +59346,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59147,10 +59504,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59189,6 +59546,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59289,9 +59650,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59305,7 +59666,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59390,7 +59751,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59418,8 +59778,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -60039,7 +60399,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60173,8 +60533,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -61952,17 +62312,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62138,13 +62498,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62390,42 +62750,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63407,16 +63771,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -64842,66 +65196,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65190,7 +65544,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65647,164 +66001,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -65981,27 +66335,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -66068,274 +66445,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66344,51 +66721,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66544,10 +66921,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66711,7 +67098,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -66719,7 +67106,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66727,7 +67114,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67713,6 +68100,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68281,6 +68672,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -68844,7 +69252,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -69083,22 +69491,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71127,38 +71528,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71238,11 +71639,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71267,103 +71668,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71375,336 +71776,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -71757,50 +72158,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -71828,13 +72229,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -71891,85 +72292,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -72015,28 +72416,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -72093,27 +72494,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -72123,7 +72524,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72133,14 +72533,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72148,72 +72548,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72440,7 +72840,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72458,64 +72858,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72655,79 +73056,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -72839,40 +73240,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -72908,7 +73309,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -72919,34 +73320,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -73038,34 +73439,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73144,316 +73545,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73461,60 +73862,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73566,27 +73967,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73632,16 +74043,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73712,41 +74113,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -73794,15 +74202,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grassmods_cs.po b/locale/po/grassmods_cs.po index fbaba43c57b..b611ff3cf20 100644 --- a/locale/po/grassmods_cs.po +++ b/locale/po/grassmods_cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_cs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2016-04-10 15:14+0200\n" "Last-Translator: \n" "Language-Team: cs@li.org\n" @@ -94,7 +94,7 @@ msgstr "dočasný" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -134,32 +134,33 @@ msgid "Print current connection parameters and exit" msgstr "Vypiš parametry současného připojení a ukonči se" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -185,21 +186,21 @@ msgstr "Vypiš parametry současného připojení a ukonči se" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Tisk" @@ -276,7 +277,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -301,7 +302,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -312,7 +313,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -334,7 +335,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -491,6 +492,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -510,7 +512,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -529,7 +530,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -543,6 +543,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -576,7 +577,7 @@ msgstr "Můj první modul pro zpracování rastrových dat" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -586,8 +587,8 @@ msgstr "Můj první modul pro zpracování rastrových dat" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -602,21 +603,21 @@ msgstr "Můj první modul pro zpracování rastrových dat" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Rastrová mapa <%s> nenalezena" @@ -625,7 +626,7 @@ msgstr "Rastrová mapa <%s> nenalezena" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -660,7 +661,6 @@ msgstr "Rastrová mapa <%s> nenalezena" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -673,7 +673,6 @@ msgstr "Rastrová mapa <%s> nenalezena" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -712,6 +711,7 @@ msgstr "Rastrová mapa <%s> nenalezena" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -733,7 +733,7 @@ msgstr "Rastrová mapa <%s> nenalezena" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -799,7 +799,7 @@ msgstr "Rastrová mapa <%s> nenalezena" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -813,7 +813,7 @@ msgstr "Můj první modul pro zpracování vektorových dat" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -826,8 +826,8 @@ msgstr "Můj první modul pro zpracování vektorových dat" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -842,16 +842,16 @@ msgstr "Nelze nastavit předvybranou vektorovou mapu na úrovni otevření" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -897,7 +897,7 @@ msgstr "Nelze nastavit předvybranou vektorovou mapu na úrovni otevření" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -913,7 +913,7 @@ msgstr "Nelze otevřít vektorovou mapu <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -922,7 +922,7 @@ msgstr "Nelze otevřít vektorovou mapu <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -952,13 +952,13 @@ msgstr "Nelze otevřít vektorovou mapu <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -986,7 +986,7 @@ msgstr "Spojení s databází nebylo definováno pro vrstvu %d " #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1001,8 +1001,8 @@ msgstr "Nelze spustit ovladač <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1036,10 +1036,10 @@ msgstr "Nelze spustit ovladač <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1047,7 +1047,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Nelze otevřít databázi <%s> ovladačem <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1077,24 +1077,24 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "Nelze kopírovat atributovou tabulku do vektorové mapy <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "Nastavuji barevnou tabulku barev na šedou pro <%s> (8bit plný rozsah)" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" "Nastavuji barevnou tabulku barev na šedou pro <%s> (16bit, rozsah obrazu)" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1178,13 +1178,14 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" msgstr "Výchozí oblast pro toto místo byla aktualizována" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1237,6 +1238,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1297,6 +1299,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1362,14 +1370,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1419,144 +1426,133 @@ msgstr "Titulek pro výslednou rastrovou mapu" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadata" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Vypsat podporované formáty a ukončit" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +#, fuzzy +msgid "Override projection check (use current project's CRS)" msgstr "Přepsat kartografické zobrazení (použít zobrazení lokace)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "Rozšířit region podle nového datasetu" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "Pokračuje importování..." -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "Vybraný kanál (%d) neexistuje" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1573,37 +1569,36 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "Nelze převést vstupní mapovou projekci do formátu GRASSu; nelze vytvořit " "novou location." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Nelze vyvořit soubor pro závěrečnou zprávu <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Lokace <%s> vytvořena" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1611,60 +1606,66 @@ msgstr "" msgid "Over-riding projection check" msgstr "Přeskakuje se kontrola kartografického zobrazení." -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" "Vypadá to, že kartografické zobrazení datasetu neodpovídá zobrazení aktuální " "lokace \n" "\n" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "PROJ_INFO lokace je:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "PROJ_INFO datasetu je:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 +#, fuzzy msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" "Zvažte vytvoření nové lokace ze vstupního datasetu pomocí parametru " "'location'.\n" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +#, fuzzy +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "Kartografické zobrazení vstupního datasetu a aktuální lokace souhlasí." #: ../raster/r.quantile/main.c:94 @@ -1744,12 +1745,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1787,7 +1786,7 @@ msgstr "Počet sekcí, které mají být vytvořeny" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1803,7 +1802,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1853,24 +1852,18 @@ msgstr "Název výstupní rastrové mapy profilových křivostí" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Výstupy" @@ -1992,7 +1985,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2002,7 +1995,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2123,7 +2115,7 @@ msgstr "Vypíše historii rastrové mapy namísto infa" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2152,6 +2144,7 @@ msgstr "Nelze alokovat pro řetězec paměť" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2288,7 +2281,13 @@ msgstr "<%s=%s> neplatný počet bodů " msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2297,8 +2296,8 @@ msgid "The minimum number of input raster maps is two" msgstr "Minimální počet vstupních rastrových map jsou dvě" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Hotových procent..." @@ -2330,7 +2329,7 @@ msgstr "Aktualizuj statistiku rastru" msgid "Statistics for <%s> updated" msgstr "Statistika pro pro <%s> byla aktualizována" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2386,7 +2385,6 @@ msgstr "Měl by být zadán \"value=\" nebo \"-i\"" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "převzorkovat" @@ -2431,7 +2429,7 @@ msgid "Unknown method <%s>" msgstr "Neznámá metoda <%s>." #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2484,7 +2482,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2908,7 +2906,7 @@ msgstr "Hledání nákladů cesty..." msgid "Error, ct == pres_cell" msgstr "Chyba, ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2996,14 +2994,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3163,7 +3163,7 @@ msgid "List of cell values to be set to NULL" msgstr "Seznam hodnot buněk pro nastavení NULL" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3483,6 +3483,15 @@ msgstr "Výstupní rastrový soubor íşhlu dopadu paprsku (pouze mód 1)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3571,17 +3580,15 @@ msgstr "Výstupní rastrový soubor íşhlu dopadu paprsku (pouze mód 1)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3602,7 +3609,7 @@ msgstr "Výstupní rastrový soubor íşhlu dopadu paprsku (pouze mód 1)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3682,7 +3689,7 @@ msgstr "Místní (sluneční) čas (nastaveno pouze pro mód 1) [decimální hod msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "Vzorkování koeficient kroku vzdálenosti (0.5-1.5)" @@ -3715,114 +3722,110 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "Je třba zadat rastr se zeměpisnou délkou pokud používáte běžný čas" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "insol_time a incidout jsou neslučitelné volby" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "Chyba při čtení velikosti časového kroku" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "Chyba při čtení velikosti horizontálního kroku" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "velikost horizontálního kroku musí být větší než nula" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" "POkud zadáte volbu obzor, musíte také nastavit parametr 'krok horizontu'" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "time a insol_time jsou neslučitelné volby" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "Mode 1: okamžitý solární ůhel dopadu & ozářenost daná lokálním časem" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "incidout požaduje nastavený parametr času" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "Mode 2: denní ozářenost pro zadaný den roku." -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" "POkud použijete volbu -s a žádnou rastrovou mapu s horizontem, numpartitions " "musí být =1" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." @@ -3830,50 +3833,49 @@ msgstr "" "Pokud chcete ušetřit zabrání množství paměti a zároveň použít stíny, je " "třeba použít před-vypočítané horizonty." -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" -msgstr "" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" +msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "Nelze získat klíčové hodnoty kartografického zobrazení aktuální lokace" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3906,19 +3908,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Paměť vyčerpána" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3988,9 +3990,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "Rastrový režim" @@ -4005,7 +4007,7 @@ msgid "" msgstr "" "Pro rastry s horizontem, načíst z DTM extra území okolo současného regionu" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" @@ -4013,7 +4015,7 @@ msgstr "" "Pro rastry s horizontem, načíst z DTM extra území východním směrem od " "současného regionu" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" @@ -4021,7 +4023,7 @@ msgstr "" "Pro rastry s horizontem, načíst z DTM extra území západním směrem od " "současného regionu" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" @@ -4029,7 +4031,7 @@ msgstr "" "Pro rastry s horizontem, načíst z DTM extra území severním směrem od " "současného regionu" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" @@ -4037,12 +4039,12 @@ msgstr "" "Pro rastry s horizontem, načíst z DTM extra území jižním směrem od " "současného regionu" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "Maximální vzdálenost ve které se se ještě bude hledat výška horizontu" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4097,6 +4099,9 @@ msgstr "Maximální vzdálenost ve které se se ještě bude hledat výška hori #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4117,46 +4122,58 @@ msgstr "Maximální vzdálenost ve které se se ještě bude hledat výška hori msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +#, fuzzy +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "Souřaadnice pro které chcete spočítat obzor" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Výstupní formát (ve stylu printf)" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Název výstupního souboru (pro standardní výstup použijte output=-)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Zahrň do výstupu štítky kategorií" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "Zapsat výstup ve stupních (výchozí je radiány)" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4165,82 +4182,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Nelze otevřít soubor <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "Není zadána hodnota směru, nebo velikost kroku. Přerušuji." -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "Není specifikováno jméno rastrové mapy s horizontem, Přerušuji." -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "Není specifikována velikost kroku úhlu. Přerušuji." -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "Nelze načíst velikost okolní zóny. Přerušuji." -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "Nelze načíst maximální vzdálenost. Přerušuji" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "Nelze získat klíčové hodnoty kartografického zobrazení aktuální lokace" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "JÉMINÁNKU: řádky se změnily z %d na %d" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "JÉMINÁNKU: sloupce se změnily z %d na %d" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -5049,7 +5078,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Atributy" @@ -5130,7 +5159,7 @@ msgstr "Nelze vytvořit index" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Nelze poskytnou práva na tabulku <%s>" @@ -5262,7 +5291,7 @@ msgstr "Soubor obsahující pravidla překódování." #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5463,9 +5492,9 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" msgstr "GRASS LOCATION PROJ_INFO je:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5480,8 +5509,9 @@ msgstr "iMPORT PROJ_INFO datasetu je:\n" #: ../raster/r.in.pdal/projection.c:92 ../raster/r.in.lidar/projection.c:94 #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 +#, fuzzy msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" "Zvažte vytvoření nové location s parametry 'location' ze vstupního " @@ -5698,9 +5728,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5718,7 +5748,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5803,10 +5833,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5847,30 +5877,30 @@ msgstr "Nastavit na z data" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5999,128 +6029,128 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Vypiš statistiku ve stylu pro shell skript" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Čtu data... " -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Přepsat kartografické zobrazení (použít zobrazení lokace)" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "Přepsat kartografické zobrazení (použít zobrazení lokace)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Prohledávání dat ..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "%lu bodů nalezeno v regionu." -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Rastrová mapa <%s> byla vytvořena." @@ -6220,7 +6250,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6254,7 +6284,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6290,7 +6320,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6346,9 +6376,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Maximální počet iterací" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6364,8 +6394,8 @@ msgstr "Maximální počet iterací" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6375,24 +6405,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Průměr rozdělení" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Směrodatná odchylka" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6444,7 +6505,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6748,7 +6809,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6854,7 +6915,6 @@ msgstr "Rozlišení V-Z a S-J jsou různá, beru průměr." #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "geomorfologie" @@ -6943,8 +7003,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "Nesprávná velikost okna (příliš veliké nebo sudé)" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "lat/long projekce není v současnosti podporována" #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7565,7 +7626,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7574,7 +7635,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Rastrová mapa nebyla nalezena" @@ -7679,7 +7740,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7703,15 +7764,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "Nelze získat informace o kartografickém zobrazení aktuální lokace" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "Nelze získat klíčové hodnoty kartografického zobrazení aktuální lokace" @@ -7784,7 +7845,7 @@ msgstr "Hodnoty získané z označení kategorií překrývající mapy (cover m #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7834,17 +7895,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7902,6 +7960,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -8043,7 +8102,7 @@ msgstr "Bude naimportován SURFER (Golden Software) ASCII rastrový soubor" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8128,7 +8187,7 @@ msgstr "" "pro vytvoření binární rastrové mapy" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8188,7 +8247,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8249,7 +8308,7 @@ msgstr "Spočítá univariantní statistiku z ne-nullových buněk rastrové map msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "V rastrové mapě <%s> jsou obsaženy různé typy hodnot." @@ -8374,7 +8433,6 @@ msgid "Calculating flow directions..." msgstr "Počítám směry odtoku...." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8513,7 +8571,7 @@ msgstr "Aplikuj filtr pouze na NULLové hodnoty dat" msgid "<%d> is not valid number of threads." msgstr "<%s=%s> neplatný počet bodů " -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "Rastrové mapa je příliš malá pro velikost filtru" @@ -8607,8 +8665,8 @@ msgstr "Část mapy v procentech, která má být uchována v paměti" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "Projdi soubor, nalezni okrajové hodnoty a ukonči se" @@ -8617,8 +8675,8 @@ msgstr "Projdi soubor, nalezni okrajové hodnoty a ukonči se" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "Ve scan módu tiskni ve stylu pro shell skript" @@ -8636,7 +8694,7 @@ msgstr "Prosím, zadejte přijatelné číslo sloupce." msgid "Please specify reasonable number of lines to skip" msgstr "Prosím, udejte přijatelný počet řádků, které mají být přeskočeny." -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "Neplatné zrange" @@ -9019,9 +9077,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "Lokace Lat/Long není podporována %s. Prosím změňte projekci." #: ../raster/r.solute.transport/main.c:259 @@ -9248,13 +9306,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "Průměr = %.5lf" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9268,7 +9324,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "Minimální hodnota pro test (rms=%lf) byla odvozena s: lambda_i = %.3f" @@ -9512,31 +9567,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9552,13 +9607,13 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" -msgstr "" +#, fuzzy +msgid "create project" +msgstr "Zdrojová projekce" #: ../raster/r.in.gdal/main.c:118 msgid "Imports raster data into a GRASS raster map using GDAL library." @@ -9572,18 +9627,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Název cílové lokace" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9607,10 +9662,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Název nové lokace, která má být vytvořena" #: ../raster/r.in.gdal/main.c:195 @@ -9640,7 +9695,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9649,210 +9704,236 @@ msgstr "" msgid "Region" msgstr "Region" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Ponechej čísla kanálů místo použití jmen jejich barev" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "Limit při importu do současného regionu" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +#, fuzzy +msgid "You have to specify a target project different from output project" msgstr "Musíte zadat cílovou location různou od současné" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Rastrová mapa <%s> již existuje a bude přepsána." -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "Rastrová vrstva <%s> již existuje." -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "Kopíruji %d GCPS v souboru bodů pro <%s>" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "GCPs mají následující OpenGIS WTK souřadnicový systém:" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "Změna projekce GCPs tabulky:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "* Vstupní projekce pro GCP tabulku: %s" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "á Výstupní projekce pro GCP tabulk: %s" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"Nelze převést vstupní mapovou projekci do formátu GRASSu; nelze vytvořit " +"novou location." + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "Nelze získat klíčové hodnoty mapové projekce vstupní GCPs" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "Nelze získat informace o kartografickém zobrazení cílové lokace" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "Nelze získat jednotky kartografického zobrazení cílové lokace" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "Nelze získat klíčové hodnoty kartografického zobrazení cílové lokace" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "Mapset <%s> ve vstupní lokaci <%s> - " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "Přístup odepřen" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "nenalezen" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"Nelze převést vstupní mapovou projekci do formátu GRASSu; nelze vytvořit " +"novou location." + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10535,7 +10616,6 @@ msgid "Number of intermediate images to produce" msgstr "Počet snímků k vytvoření spektrálních koeficientů" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "Fraktální dimenze %.2lf musí být mezi 2 a 3." @@ -10648,6 +10728,18 @@ msgstr "Počet chodců" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10679,26 +10771,6 @@ msgstr "Časový krok pro uložení výstupních map [minuty]" msgid "Water diffusion constant" msgstr "Konstanta prostupnosti vody" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10723,12 +10795,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10736,40 +10802,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "Bude vytvořeno více než 100 souborů!!!!!" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "Základní nwalk=%d, rwalk=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "Používám konverzní faktor %f, krok=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "Není zadán žádný výstupní soubor (ani rastrový ani vektorový)" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Vstup selhal" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "Nelze zapsat rastrové mapy" @@ -10933,7 +10999,7 @@ msgstr "Váhový faktor pro vektor rychlosti proudění vody" msgid "Time-series output" msgstr "Výstup časové řady" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "Není vyplněna žádná výstupní rastrová mapa" @@ -11182,29 +11248,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "output= a method= musí mít stejný počet hodnot" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11263,72 +11329,38 @@ msgstr "Soubor <%s> vytvořen" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Minimální náhodná hodnota" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Maximální náhodná hodnota" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "Načítám rastrový soubor <%s>..." - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" -"Rozlišení rastrové mapy expozice je různé od aktuálního rozlišení regionu" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "Načítám vstupní soubory: barrier" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "Nelze vytvořit soubor segmentů %s" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "Nelze formátovat soubor segmentů %s" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "Nelze otevřít soubor segmentů %s" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11375,6 +11407,40 @@ msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" "Rozlišení je příliš nevyvážené (%fx %f); prosím převzorkujte vstupní mapu" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "Načítám rastrový soubor <%s>..." + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" +"Rozlišení rastrové mapy expozice je různé od aktuálního rozlišení regionu" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "Načítám vstupní soubory: barrier" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "Nelze vytvořit soubor segmentů %s" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "Nelze formátovat soubor segmentů %s" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "Nelze otevřít soubor segmentů %s" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -12092,7 +12158,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12106,13 +12172,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "PřevedeGRASS bodovou vrstvu na vektorovou mapu." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "Lokace obsahující vstupní vektorovou vrstvu" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -12137,10 +12204,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "Název vstupní rastrové mapy" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Cesta k adresáři databáze GRASSu se vstupní lokací" #: ../raster/r.proj/main.c:174 @@ -12196,12 +12262,13 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "Vstupní a výstupní lokace nemohou být stejné." #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +#, fuzzy +msgid "Input and output projects are the same" msgstr "Vstupní a výstupní lokace jsou stejné." #: ../raster/r.proj/main.c:268 @@ -12221,13 +12288,13 @@ msgstr "" "vrstvy" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "Mapset <%s> ve vstupní lokaci <%s> - <%s>" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Kontroluje se lokace <%s>, mapset <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12235,15 +12302,15 @@ msgstr "Kontroluje se lokace <%s>, mapset <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Požadovaný parametr <%s> nebyl zadán" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "Rastrová mapa <%s> v lokaci <%s>, mapsetu <%s> není dostupná" #: ../raster/r.proj/main.c:323 @@ -12259,13 +12326,14 @@ msgid "Unable to get projection key values of input map" msgstr "Nelze získat klíčové hodnoty mapové projekce vstupní mapy" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "Nelze pracovat s nepřipojenými daty (xy location)" #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" -msgstr "" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" +msgstr "Vektorová mapa <%s> není 3D!" #: ../raster/r.proj/main.c:524 msgid "Input:" @@ -12346,7 +12414,7 @@ msgid "Sorting events..." msgstr "Zapisuji body ..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12607,8 +12675,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12780,7 +12849,7 @@ msgstr "S_decode ==> Prosím opravte faktor oblohy stinného pásu: %f" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12791,6 +12860,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "Nelze získat informace o kartografickém zobrazení aktuální lokace" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Nelze získat klíčové hodnoty kartografického zobrazení aktuální lokace" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13409,16 +13493,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Nelze získat jednotky kartografického zobrazení aktuální lokace" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "Nelze získat klíčové hodnoty kartografického zobrazení aktuální lokace" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13496,7 +13583,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s=%s - musí být větší než nula" @@ -13506,7 +13593,7 @@ msgstr "%s=%s - musí být větší než nula" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s=%s - musí být větší než nula" @@ -13598,7 +13685,7 @@ msgstr "Nelze načíst rozsah hodnot pro rastrovou mapu s desetinnou čárkou <% #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Nelze vytvořit tabulku : '%s'" @@ -13607,7 +13694,7 @@ msgstr "Nelze vytvořit tabulku : '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Nelze vytvořit index pro tabulku <%s>, klíč <%s>" @@ -13919,7 +14006,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13930,19 +14017,19 @@ msgstr "" msgid "position" msgstr "pozice" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Název existující(ch) rastrové(ých) map(y) pro dotazování." -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Souřadnice dotazu" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13950,15 +14037,28 @@ msgstr "Souřadnice dotazu" msgid "Query" msgstr "Dotaz" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "Velikost bodové vyrovnávací paměti" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13967,62 +14067,71 @@ msgstr "Velikost bodové vyrovnávací paměti" msgid "Advanced" msgstr "Pokročilé" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "Výstupní barevné hodnoty jako ČČČ:ZZZ:MMM" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Výstup celočíselných hodnot kategorií, ne hodnoty buněk" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "Zapnout cache" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "selhal převod dp na celé číslo" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importuje soubor MAT (v4) jako rastrový soubor GRASSu." @@ -14192,9 +14301,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14546,21 +14652,21 @@ msgstr "Hodnota vyhlazení nesmí být negativní či NULL" msgid "Input map resolution differs from current region resolution!" msgstr "Rozlišení rastrové mapy je různé od aktuálního rozlišení regionu!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "Zpracování všech vybraných vektorových vrstev bude vyžadovat" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14751,82 +14857,82 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -"Musíte specifikovat nejméně jeden z techto parametrů: <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s>, <%s> nebo <%s>" +"Musíte specifikovat nejméně jeden z techto parametrů: <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s>, <%s> nebo <%s>" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Chybný typ rastrové mapy: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "Výškové produkty pro mapset <%s> v <%s>" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "Min vypočtená expozice %.4f, max vypočtená expozice %.4f" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Rastrová mapa orientace <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "Min vypočtený sklon svahu %.4f, max vypočtený sklon svahu %.4f" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Rastrová mapa sklonu <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "Rastrová mapa profilových křivostí <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Rastrová mapa tangenciálních křivostí <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "Rastrová mapa V-Z sklonu <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "Rasztrová mapa S-J sklonu <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Rastrová mapa druhé derivace Dxx <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Rastrová mapa druhé derivace Dyy <%s> je hotova" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Rastrová mapa druhé derivace Dxy <%s> je hotova" @@ -15781,34 +15887,33 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15824,61 +15929,61 @@ msgstr "ČÁST %d: Zavírám mapy" msgid "SECTION %d: Watershed determination." msgstr "ČÁST %d: Určování rozvodí." -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15902,7 +16007,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16850,11 +16954,11 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "proudění podzemní vody" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -16862,36 +16966,36 @@ msgstr "" "Numerický výpočetní program pro soustředěný, nesoustředěný a nejaký tok ve " "dvou dimenzích" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "Prosím zadejte mapy river_head, river_leak a river_bed" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "Prosím zadejte mapy drain_head a dreain_leak" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "Maximální rozdíl mezi tímto a dalším přírůstkem: %g" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Nelze vytvořit a vyřešit soustavu lineárních rovnic" @@ -17222,7 +17326,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17685,8 +17789,8 @@ msgstr "Výstupní barevné hodnoty RRR:GGG:BBB pro každý bod profilu" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17813,97 +17917,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "na rozsah z nebude během hledání brán zřetel" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -18172,11 +18276,11 @@ msgstr "Nemohu otevřít soubor <%s> pro zápis popisků" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18377,32 +18481,32 @@ msgstr "Velikost sousedů musí být větší než nula" msgid "Neighborhood size must be odd" msgstr "Velikost sousedů musí být lichá" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18485,8 +18589,9 @@ msgid "Units" msgstr "Jednotky" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "\"*\" pro všechny sloupce" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18508,8 +18613,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -19264,8 +19370,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -19275,28 +19381,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19305,57 +19411,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "Zobrazit souhrnné informace" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19364,7 +19470,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19373,7 +19479,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19874,6 +19980,10 @@ msgstr "" msgid "Error while reading history file" msgstr "Chyba při čtení souboru s historií" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "GRASS LOCATION PROJ_INFO je:\n" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19932,64 +20042,73 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "Přepsat kartografické zobrazení (použít zobrazení lokace)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -20095,7 +20214,6 @@ msgstr "Vytvořit výlučně soubor s bitmapou 3D NULL-hodnota" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -20108,10 +20226,8 @@ msgstr "Vytvořit výlučně soubor s bitmapou 3D NULL-hodnota" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -20125,11 +20241,11 @@ msgstr "Vytvořit výlučně soubor s bitmapou 3D NULL-hodnota" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "zobrazení" @@ -20623,10 +20739,10 @@ msgstr "Chyba při zavření souboru skriptu" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20682,9 +20798,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Typ" @@ -20744,13 +20860,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -21111,67 +21227,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Region <%s> nebyl nalezen" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21418,8 +21534,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21687,154 +21803,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "Specifikace" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Název nové lokace, která má být vytvořena" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Projekční soubory chybí" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21923,9 +22040,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Nelze vytvořit soubor <%s>" #: ../general/g.proj/create.c:21 #, c-format @@ -21933,98 +22050,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Nelze vytvořit soubor <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Text zprávy, kterou chcete vytisknout" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -22167,7 +22284,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -22250,33 +22368,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "Dostupné sady map:" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "Dostupné mapové sady:" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22285,69 +22425,75 @@ msgstr "" msgid "Operation to be performed" msgstr "Operace bude vykonána" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" -msgstr "" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" +msgstr "Výstupní formát (ve stylu printf)" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Zadejte pravidlo v jednom z těchto formátů:" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22362,37 +22508,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22745,7 +22888,7 @@ msgstr " směr. odchylka" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23940,7 +24083,7 @@ msgstr "Transformace íşspěšná" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -24035,17 +24178,19 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "Skupina <%s> jako cíl pro lokaci [%s], mapset [%s]" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Název cílové lokace" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -24077,35 +24222,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Cílová lokace <%s> nebyla nalezena" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "Mapset <%s> ve vstupní lokaci <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -24158,61 +24304,66 @@ msgstr "Informace o cílové lokaci a mapsetu pro skupinu <%s> nejsou dostupné" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" msgstr "Cílová lokace <%s> nebyla nalezena" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "Mapset <%s> ve vstupní lokaci <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -24222,30 +24373,31 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Nelze získat informace o kartografickém zobrazení cílové lokace" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Nelze vytvořit vektorovou mapu <%s>" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" +msgstr "Skupina <%s> jako cíl pro lokaci [%s], mapset [%s]" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -24359,16 +24511,14 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 -#, c-format -msgid "Rectify <%s@%s> (location <%s>)" +#, fuzzy, c-format +msgid "Rectify <%s@%s> (project <%s>)" msgstr "Rektifikace <%s@%s> (lokace <%s>)" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." -msgstr "" +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." +msgstr "Rektifikace <%s@%s> (lokace <%s>)" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 #, c-format @@ -24407,103 +24557,102 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" "Použít nastavení aktuálního regionu ve cílové location (def.=vypočítat " "nejmenší plochu)" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "Rektifikovat všechna obrazová data ve skupině" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "Skupina <%s> nebyla nalezena" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "Lokace: %s" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "projekce" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "Mapset: %s" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "Skupina <%s> neobsahuje žádné mapové vrstvy. Spusťte i.group" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Skupina <%s> jako cíl pro lokaci [%s], mapset [%s]" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "Používám region: S=%f J=%f V=%f Z=%f" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "Konec!" @@ -24629,6 +24778,16 @@ msgstr "Používaný region: S=%f J=%f V=%f Z=%f" msgid "Resolution EW=%f NS=%f" msgstr "Rozlišení VZ= %f; SJ=%f" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "Rektifikace <%s@%s> (lokace <%s>)" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24647,6 +24806,13 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" +"Použít nastavení aktuálního regionu ve cílové location (def.=vypočítat " +"nejmenší plochu)" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24656,6 +24822,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "Neplatný řád rektifikace (%d) prosím vložte 1 až %d" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "Lokace: %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "Cílová lokace <%s> nebyla nalezena" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "Mapset <%s> ve vstupní lokaci <%s> - " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -25032,6 +25218,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "projekce" @@ -26619,8 +26806,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26951,17 +27138,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26970,17 +27154,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26989,17 +27170,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -27009,17 +27187,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -27028,12 +27203,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27826,6 +27999,9 @@ msgid "Apriori Phi (roll) standard deviation" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -29215,11 +29391,15 @@ msgstr "" msgid "Unable to describe table." msgstr "Nelze popsat tabulku." -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -29268,7 +29448,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -29363,16 +29543,15 @@ msgid "OGR layer <%s> not found" msgstr "Vrstva OGR <%s> nebyla nalezena" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Sloupec <%s> nebyl nalezen v tabulce <%s>" @@ -29951,6 +30130,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "histogram" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Nový atributový sloupec <%s> přidán do tabulky" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Počet sekcí, které mají být vytvořeny" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -29993,6 +30208,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -30029,64 +30246,75 @@ msgstr "Vstup selhal" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Název výstupní rastrové mapy" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Název vstupní liniové vektorové vrstvy" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Název výstupní rastrové mapy" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Název vstupní liniové vektorové vrstvy" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Název výstupní rastrové mapy" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Název souboru databáze" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Vertikální měřítko" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Nelze zapisovat do dočasného souboru" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Počáteční mapové souřadnice" @@ -30169,240 +30397,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "Vstup" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" -"Vytiskne/nastaví připojení databáze pro vektorovou mapu k atributové tabulce" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Název vektorové vrstvy" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Číslo vrstvy (to)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Příliš mnoho názvů sloupců" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Počet sloupců v nové oblasti" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "Formát výstupních souborů" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Typ uložení výsledné rastrové mapy" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Název existující rastrové mapy obsahující výsledky klasifikace" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -30609,6 +30611,535 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Vytvořit 3D vektorovou mapu" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Název cílové lokace" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Jméno pokladové mapy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Název výstupní vrstvy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Rastrová hodnota" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "Výstupní mapa, do které budou zapsány segmenty" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Vytvořit vektorové body jako 3D body" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Název vstupní vrstvy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Vytvořit vektorové body jako 3D body" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Jméno pokladové mapy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Název rastrové vrstvy, která bude zobrazena" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Zapisuji transformovaná data do souboru..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +#, fuzzy +msgid "Multiply all automatic regularization parameters by this number." +msgstr "vynásobit výslednou hustotu touto hodnotou" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Zobrazit směr liniových prvků" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +#, fuzzy +msgid "Disable quadratic features" +msgstr "Zobrazit lomové body prvků" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Vybírám prvky...." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Vybírám prvky...." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Vybírám prvky...." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "alokace" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Procent využití procesoru." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "Referenční poloha" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Počet úrovní, které budou použity pro <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Maximální počet iterací" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Nástroj: Mezní hodnota" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Prahová hodnota pro outsidery" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Prahová hodnota pro outsidery" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Prahová hodnota pro outsidery" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Počet iterací" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +#, fuzzy +msgid "Regularization parameter for treshold features" +msgstr "Váha regularizace pro výpočet zbytkových chyb" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +#, fuzzy +msgid "Regularization parameter for hinge features" +msgstr "Tykhonovův upravující parametr (ovlivňuje vyhlazení)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Zmazat duplicitní centroidy " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Titulek pro novou rastrovou mapu" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Počet sekcí, které mají být vytvořeny" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +#, fuzzy +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "Maximální paměť, která má být použita (v MB)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +#, fuzzy +msgid "Show the Maxent user interface" +msgstr "uživatelské rozhraní" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -30833,10 +31364,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "Přepsat kartografické zobrazení (použít zobrazení lokace)" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -31082,6 +31618,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -32305,7 +32849,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -32350,11 +32894,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -33466,7 +34005,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Číslo nebo název vrstvy." @@ -33505,6 +34043,18 @@ msgstr "WHERE podmínky SQL dotazu pro prvky 'do' ('to') beze slova 'where'" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Nastavuji jméno mapy na <%s>" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -33882,7 +34432,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -34076,7 +34625,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Vstupní formát" @@ -34112,6 +34661,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Cesta k adresáři databáze GRASSu se vstupní lokací" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -35176,11 +35734,8 @@ msgstr "Neplatný konfigurační soubor" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -35231,45 +35786,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Barva pozadí" +msgid "Thin species and background points" +msgstr "Počet bodů pro interpolaci" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Barva pozadí" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Číslo sloupečku hodnot buněk ve vstupním souboru" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Počátek pro generování náhodného čísla" @@ -36082,8 +36651,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -36094,6 +36672,7 @@ msgid "Group of raster layers to be classified" msgstr "Název rastrové mapy, jejíž měřítko má být změněno." #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -36135,11 +36714,13 @@ msgid "" msgstr "Název číselného sloupce obsahujícího úhel otočení symbolu" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Výstupní mapa" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -36449,6 +37030,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -36460,6 +37042,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -36489,6 +37072,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Soubor s popisky" @@ -36863,65 +37447,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Název výstupní rastrové mapy" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "Vzdálenost odstupu fotoaparátu (v mapových jednotkách)" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -37279,11 +37804,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Hranice lokace se zvětší podle nového datasetu" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -38178,6 +38705,14 @@ msgid "" "mapset." msgstr "PřevedeGRASS bodovou vrstvu na vektorovou mapu." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Cesta k adresáři databáze GRASSu se vstupní lokací" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -38308,12 +38843,12 @@ msgid "WFS standard" msgstr "standardní verze WMS" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -38462,9 +38997,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -38507,19 +39041,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Hranice lokace se zvětší podle nového datasetu" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -38529,7 +39074,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "Vypsat dostupné vrstvy OGR ze zdroje dat a ukončit se" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -38664,34 +39209,6 @@ msgstr "Název vstupní databáze" msgid "Base name for output file" msgstr "Název výstupního souboru" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "geomorfologie" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Tabulka atributů s hodnotami pro interpolaci" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Počet sekcí, které mají být vytvořeny" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -39370,6 +39887,10 @@ msgstr "Název výstupního souboru SVG" msgid "Queries projection information spatially." msgstr "Nelze získat informace o projekci vstupní mapy" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -39667,7 +40188,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -39698,8 +40219,9 @@ msgid "Layer number or name." msgstr "Číslo nebo název vrstvy." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Jméno atributového sloupce použitého jako výška" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -40426,9 +40948,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -41048,6 +41576,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -42087,8 +42623,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -42186,39 +42722,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Seznam vrstev určených k importu" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -45546,8 +46091,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -45585,6 +46130,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -46001,6 +46547,13 @@ msgstr "Třídy" msgid "multiple" msgstr "multispektrální" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -46059,6 +46612,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Vektor" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Vektor" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -46100,6 +46667,38 @@ msgstr "dláždění" msgid "Number of tiles in y direction" msgstr "Počet opakování" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Název rastrové mapy, jejíž měřítko má být změněno." + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Počet iterací" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -46538,8 +47137,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -47296,6 +47895,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Jméno výstupní rastrové mapy (saturation-sytost)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Název nové lokace, která má být vytvořena" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -47591,6 +48194,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Měřítkový faktor pro výškový model" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 #, fuzzy msgid "Adjacent downstream segment category" @@ -48042,10 +48649,94 @@ msgstr "Vertikální měřítko" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Soubor s popisky" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Název vstupní vrstvy" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Jméno vektorové mapy k editaci" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Vrstva / tabulka" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Výsledná 2D rastrová mapa průsečíků" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Název vstupu rastrové mapy s reálnými poklesy" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parametry" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Vytiskni x a y (sloupec a řádek)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "geomorfologie" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Tabulka atributů s hodnotami pro interpolaci" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -48570,17 +49261,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -48608,23 +49289,20 @@ msgid "categorical map with zones" msgstr "Vektorové body" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Název výstupního souboru" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Velikost (šířka, výška) výstupního obrazu" @@ -48636,9 +49314,8 @@ msgid "Default font size" msgstr "Základní ovladač není nastaven" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -48658,14 +49335,12 @@ msgid "Create a vector point layer of outliers" msgstr "Vytvořit vektorové body jako 3D body" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "Prahová hodnota pro outsidery" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -48675,14 +49350,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -48716,14 +49389,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -48735,27 +49400,23 @@ msgid "Plot format" msgstr "Vstupní formát" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Vytiskni označení kategorií" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -48804,15 +49465,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -48832,7 +49484,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Šířka hranice" @@ -48844,51 +49495,42 @@ msgid "The width of the boxplots (0,1])" msgstr "Šířka linie textu" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 #, fuzzy msgid "The linewidth of the boxplots" msgstr "Šířka linie textu" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Formát výstupních souborů" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "Barva textu a os" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -48896,109 +49538,24 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Barva prvku" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Název výstupní rastrové mapy" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Název výstupní rastrové mapy" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Rozlišení VZ= %f; SJ=%f" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Vytiskni označení kategorií" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Vstupní formát" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Šířka linie textu" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Barva textu" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -50256,6 +50813,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -50280,6 +50845,15 @@ msgstr "" msgid "add grid lines" msgstr "%d linií označeno" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Barva textu" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -50378,308 +50952,308 @@ msgid "" msgstr "" "Přejmenuje sloupec v atributové tabulce připojené k dané vektorové mapě." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Vektor" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Počet sloupců" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Název sloupce s vyhlazovacími parametry" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Počet sloupců legendy" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Název sloupce s vyhlazovacími parametry" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Typ prvku" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Název výstupní rastrové mapy" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Název výstupního souboru obsahující závěrečnou zprávu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Přípona výstupních souborů" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Vstupní_volby" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "pth percentil hodnot" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "statistika" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Barva textu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Barvy" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "%d sloupec" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Úklid vzad dokončen" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "Linie" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Vstupní_volby" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Barvy" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Barva textu a os" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Šířka linie" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Šířka linie textu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Původní barva linie" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "Barva textu a os" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Neplatná šířka stránky" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Seznam percentilů" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 #, fuzzy msgid "Column grouping the features in categories" msgstr "Exportují se prvky s kategorií..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Rozsah celočíselných hodnot: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Název rastrové vrstvy, která bude zobrazena" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Rozsah celočíselných hodnot: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Název rastrové vrstvy, která bude zobrazena" @@ -51037,8 +51611,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -51120,187 +51694,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -#, fuzzy -msgid "density" -msgstr "zhutnění" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Vektorové body" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Načítám vstupy..." - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Název číselného sloupce obsahujícího šířku linie" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Jméno sloupce obsahujícího souřadnici x" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -#, fuzzy -msgid "Format: All values must be >0" -msgstr "Mezní hodnota musí být >= 0" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Formát vstupního souboru" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Výstupní mapa expozice (nebo fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "Volitelné vstupy" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Výstupní mapa expozice (nebo fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Zóna(y) vzdáleností" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Přípona výstupních souborů" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Název výstupní tabulky" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Jméno výstupního vektoru pro zarovnané body bystřin" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Název sloupce atributu, který má být použit pro velikost bufferu" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Název výstupního souboru" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Název rastrové vrstvy, která bude zobrazena" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Formát" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Název rastrové vrstvy, která bude zobrazena" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Počet úrovní, které budou použity pro každou součást" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Obrácený výběr" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -#, fuzzy -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "Provede proceduru křížové validace bez rastrové aproximace" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -52132,11 +52525,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "histogram" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -57907,6 +58295,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Použij aktuální region" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -58459,8 +58887,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -58767,8 +59195,9 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +#, fuzzy +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "Použít geodetickou kalkulaci pro lokace zadané sférickými souřadnicemi" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -58948,7 +59377,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -58962,7 +59391,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -59498,7 +59927,7 @@ msgstr "Typ komponentů" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -59792,7 +60221,7 @@ msgid "" msgstr "" "Výstupní vektorová tabulka <%s> (ovladač: <%s>, databáze: <%s>) již existuje" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "Sloupec s klíčem musí být typu integer" @@ -59885,50 +60314,46 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "Vypiš typy/názvy sloupců tabulky pro specifikovanou vrstvu a ukonči se" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Přepiš parametry připojení pro danou vrstvu" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Vymaž připojení pro danou vrstvu (nikoliv tabulku)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Prosím, vyberte pouze jeden způsob výstupu" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "Nelze editovat vektorovou vrstvu uloženou v jiném mapsetu." -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Spojení s databází nebylo definováno" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" "vrstva <%d> tabulka<%s> v databázi <%s> přes ovladač <%s> s klíčem <%s>\n" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -59938,17 +60363,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "Použijte -o k přepsání existujícího spojení pro vrstvu <%d>" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "Tabulka <%s> v databázi <%s> neexistuje" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -59957,16 +60382,16 @@ msgstr "" "Tabulka <%s> je nyní součástí vektorové mapy <%s> a může být smazána " "nebopřepsána některým z modulů GRASSu" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Nelze poskytnou práva na tabulku %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Vyberete práva pro tuto tabulku" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -60005,7 +60430,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -60082,56 +60507,63 @@ msgstr "Importuje pouze daný počet bodů" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "Vyberte současné nastavení regionu nebo prostorové volby, ne oboje" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr " 4 parametry vyžadovány pro 'prostorový' parametr." -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "Vektorová mapa '%s' již existuje a bude přepsána." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -60407,127 +60839,131 @@ msgstr[3] "%d záznamů vybráno z tabulky" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -61029,7 +61465,7 @@ msgstr "Sloupec s popisky nebyl určen, nebudou zapsány žádné popisky" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -61273,11 +61709,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -61304,7 +61740,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "Vrstva <%s> není dostupná" @@ -61313,7 +61749,7 @@ msgstr "Vrstva <%s> není dostupná" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "Nelze otevřít zdroj dat <%s>" @@ -61333,7 +61769,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -61500,11 +61936,13 @@ msgid "From and to are identical (id %d)" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "PřevedeGRASS bodovou vrstvu na vektorovou mapu." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "Lokace obsahující vstupní vektorovou vrstvu" #: ../vector/v.proj/main.c:88 @@ -61539,13 +61977,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Vstupní a výstupní lokace nemohou být stejné." + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "Vektorová mapa <%s> v lokaci <%s>, mapsetu <%s> nenalezena" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -61559,13 +62002,13 @@ msgid "Input vector map <%s> is empty" msgstr "" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "Mapset <%s> ve vstupní lokaci <%s> - přístup odepřen" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "Mapset <%s> ve vstupní lokaci <%s> - nebyl nalezen" #: ../vector/v.proj/main.c:517 @@ -64088,7 +64531,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -64725,7 +65168,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -65038,12 +65481,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -65244,19 +65687,19 @@ msgid "Snapping boundaries..." msgstr "Spojování hranic..." #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Odstraňuji duplicitní centroidy ..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "Lámu hranice ..." @@ -65468,7 +65911,7 @@ msgstr[3] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -65626,10 +66069,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "Nedostatek paměti pro %s" @@ -65670,6 +66113,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "Volitelné vstupy" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -65770,9 +66217,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -65786,7 +66233,7 @@ msgstr "Nelze otevřít %s" msgid "Vector is not 3D" msgstr "vekrotová mapa není 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -65873,7 +66320,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "Nelze vložit %lf,%lf,%lf,%lf,%lf a=%d" @@ -65901,8 +66347,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -66566,7 +67012,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "Nelze vypočítat centroid plochy" @@ -66704,8 +67150,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -68564,17 +69010,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "Chyba při čtení souboru <%s> - některá data mohou být poškozena" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "Čistím hranice v uzlech..." -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "Sloučení hranic ..." @@ -68751,13 +69197,13 @@ msgstr "Nelze nastavit výchozí připojení DB" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -69005,42 +69451,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "vrstva bodů" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "pouze vypiš příkaz SQL" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Tato volba vyžaduje jeden sloupec" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Tato volba vyžaduje 2 sloupce" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "tato volba vyžaduje nejméně 2 sloupce" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "Parametr 'qcolumn' musí být zadán, pokud je 'option=query'" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "Volba 'sides' má smysl jenom pro hraniční linie" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "Volba 'sinuous' má smysl pouze pro linie" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -70029,16 +70480,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Vypsat vektorové atributy" @@ -71608,17 +72049,17 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "Jméno výstupní vektorové map <%s> je neplatné" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "Nebyla zadána žádná rastrová nebo vektorová mapa pro výstup" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" @@ -71626,7 +72067,7 @@ msgstr "" "Obě volby křížové validace musí být použity (přepínač -c a výstupní " "vektorový soubor cvdev)" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" @@ -71634,44 +72075,44 @@ msgstr "" "Křížová validace nemůže být počítána spolu s výstupní rastrovou mapou nebo " "souborem s odchylkami (devi)" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "Používám anisotropii - oba parametry theta a scalex musí být zadány" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "Obě volby smatt a smooth jsou zadány -- používám konstanty." -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "Doba výpočtu bude příliš dlouhá - doporučuji snížit hodnotu npmin" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "Interp_segmets selhalo" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "Nelze zapsat rastrové mapy - zkuste zvýšit rozlišení" @@ -71966,7 +72407,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "Dotazuji vektorovou mapu <%s>..." -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Zapisuji centroidy ..." @@ -73149,6 +73590,9 @@ msgstr "" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -73172,6 +73616,7 @@ msgstr "Nelze otevřít ovladač <%s>" ======= msgid "%s=%s,%s: files are the same, no copy required. Skipping." msgstr "" +<<<<<<< HEAD #: ../general/g.copy/main.c:79 #, c-format @@ -74468,165 +74913,1464 @@ msgstr "" msgid "Unable to open directory '%s'" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main -#: ../vector/v.info/print.c:300 -msgid "Name:" -msgstr "Název:" +#: ../general/g.copy/main.c:79 +#, c-format +msgid "<%s> already exists and overwrite is not enabled. Skipping." +msgstr "" -#: ../vector/v.info/print.c:302 -msgid "Mapset:" -msgstr "Mapset:" +#: ../general/g.copy/main.c:84 +#, c-format +msgid "<%s> is an illegal file name. Skipping." +msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "Lokace:" +#: ../general/g.copy/main.c:99 +msgid "All inputs had to be skipped. Nothing to copy. See the warning messages above for details." +msgstr "" + +#: ../general/g.copy/main.c:105 +msgid "Nothing was copied. See the warning messages above for details." +msgstr "" + +#: ../general/g.copy/main.c:111 +msgid "Errors occurred during copying. See the warning messages above for details." +msgstr "" + +#: ../general/g.rename/main.c:49 +msgid "Renames data base element files in the user's current mapset." +msgstr "" + +#: ../general/g.rename/main.c:55 +msgid "renamed" +msgstr "" + +#: ../general/g.rename/main.c:76 +#, c-format +msgid "%s <%s> not found" +msgstr "" + +#: ../general/g.rename/main.c:80 +#, c-format +msgid "<%s> already exists in mapset <%s>" +msgstr "" + +#: ../general/g.rename/main.c:90 +#, c-format +msgid "%s=%s,%s: files could be the same, no rename possible" +msgstr "" + +#: ../general/g.rename/main.c:116 +msgid "Updating reclass maps" +msgstr "" + +#: ../general/g.rename/main.c:184 +#, c-format +msgid "Unable to find reclass information for <%s> in base map <%s@%s>" +msgstr "" + +#: ../general/g.rename/main.c:188 +#, c-format +msgid "Updating base map <%s@%s>" +msgstr "" + +#: ../general/g.rename/main.c:194 +#, c-format +msgid "Unable to update dependency file in <%s@%s>" +msgstr "" + +#: ../general/g.gui/main.c:40 +msgid "GUI" +msgstr "" + +#: ../general/g.gui/main.c:41 +msgid "user interface" +msgstr "uživatelské rozhraní" + +#: ../general/g.gui/main.c:44 +msgid "Launches a GRASS graphical user interface (GUI) session." +msgstr "" + +#: ../general/g.gui/main.c:45 +msgid "Optionally updates default user interface settings." +msgstr "" + +#: ../general/g.gui/main.c:50 +msgid "User interface" +msgstr "" + +#: ../general/g.gui/main.c:54 +msgid "wxPython based GUI (wxGUI)" +msgstr "" + +#: ../general/g.gui/main.c:55 +msgid "command line interface only" +msgstr "" + +#: ../general/g.gui/main.c:56 +msgid "command line interface with GUI startup screen" +msgstr "" + +#: ../general/g.gui/main.c:66 +msgid "Name of workspace file to load on start-up" +msgstr "" + +#: ../general/g.gui/main.c:67 +msgid "This is valid only for wxGUI (wxpython)" +msgstr "" + +#: ../general/g.gui/main.c:71 +msgid "Start GUI in the foreground" +msgstr "" + +#: ../general/g.gui/main.c:72 +msgid "By default the GUI starts in the background and control is immediately returned to the caller. When GUI runs in foregreound, it blocks the command line" +msgstr "" + +#: ../general/g.gui/main.c:78 +msgid "Update default user interface settings" +msgstr "" + +#: ../general/g.gui/main.c:79 ../general/g.gui/main.c:85 +msgid "Default" +msgstr "" + +#: ../general/g.gui/main.c:84 +msgid "Do not launch GUI after updating the default user interface settings" +msgstr "" + +#: ../general/g.gui/main.c:95 +#, c-format +msgid "<%s> is now the default GUI" +msgstr "" + +#: ../general/g.gui/main.c:101 +#, c-format +msgid "Nothing to do. For setting up <%s> as default UI use -%c flag." +msgstr "" + +#: ../general/g.gui/main.c:108 +msgid "Your installation doesn't include GUI, exiting." +msgstr "" + +#: ../general/g.gui/main.c:111 +#, c-format +msgid "Launching <%s> GUI, please wait..." +msgstr "" + +#: ../general/g.gui/main.c:122 +#, c-format +msgid "Launching <%s> GUI in the background, please wait..." +msgstr "" + +#: ../general/g.parser/revoke.c:64 +msgid "G_spawn() failed" +msgstr "" + +#: ../general/g.parser/revoke.c:72 +msgid "execl() failed" +msgstr "" + +#: ../general/g.parser/main.c:74 +msgid "Usage" +msgstr "Užití" + +#: ../general/g.parser/main.c:84 +msgid "Unable to open script file" +msgstr "" + +#: ../general/g.parser/main.c:100 +#, c-format +msgid "Line too long or missing newline at line %d\n" +msgstr "" + +#: ../general/g.parser/main.c:149 +msgid "Error closing script file" +msgstr "Chyba při zavření souboru skriptu" + +#: ../general/g.parser/rules.c:14 +#, c-format +msgid "Unknown flag \"-%c\" in rule\n" +msgstr "" + +#: ../general/g.parser/rules.c:26 +#, c-format +msgid "Unknown option \"%s\" in rule\n" +msgstr "" + +#: ../general/g.parser/rules.c:94 +#, c-format +msgid "Unknown rule type \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.parser/parse.c:22 +#, c-format +msgid "Unknown boolean value \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.parser/parse.c:70 +#, c-format +msgid "Unknown command \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.parser/parse.c:103 +#, c-format +msgid "Unknown module parameter \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.parser/parse.c:140 +#, c-format +msgid "Unknown flag parameter \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.parser/parse.c:155 +#, c-format +msgid "Unknown type \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.parser/parse.c:233 +#, c-format +msgid "Unknown option parameter \"%s\" at line %d\n" +msgstr "" + +#: ../general/g.filename/main.c:42 +msgid "Prints GRASS data base file names." +msgstr "" + +#: ../general/g.filename/main.c:56 +msgid "Name of a database file" +msgstr "Název souboru databáze" + +#: ../general/g.filename/main.c:62 +msgid "Name of a mapset (default: current)" +msgstr "" + +#: ../general/g.access/set_perms.c:26 +msgid "Unable to change mapset permissions" +msgstr "" + +#: ../general/g.access/main.c:39 +msgid "permission" +msgstr "" + +#: ../general/g.access/main.c:41 +msgid "Controls access to the current mapset for other users on the system." +msgstr "" + +#: ../general/g.access/main.c:42 +msgid "If no option given, prints current status." +msgstr "" + +#: ../general/g.access/main.c:49 +msgid "Access for group" +msgstr "" + +#: ../general/g.access/main.c:57 +msgid "Access for others" +msgstr "" + +#: ../general/g.access/main.c:64 +msgid "UNIX filesystem access controls are not supported by MS-Windows" +msgstr "" + +#: ../general/g.access/main.c:72 +msgid "Access to the PERMANENT mapset must be open, nothing changed" +msgstr "" + +#: ../general/g.access/main.c:76 +msgid "Unable to determine mapset permissions" +msgstr "" + +#: ../general/g.access/exp_perms.c:11 ../general/g.access/exp_perms.c:29 +msgid "have" +msgstr "" + +#: ../general/g.access/exp_perms.c:12 +msgid "read " +msgstr "" + +#: ../general/g.access/exp_perms.c:15 +msgid "Everyone" +msgstr "" + +#: ../general/g.access/exp_perms.c:16 +msgid "has" +msgstr "" + +#: ../general/g.access/exp_perms.c:19 +msgid "Only users in your group" +msgstr "" + +#: ../general/g.access/exp_perms.c:22 +msgid "Only users outside your group" +msgstr "" + +#: ../general/g.access/exp_perms.c:25 +msgid "Only you" +msgstr "" + +#: ../general/g.access/exp_perms.c:31 +#, c-format +msgid "%s %s %s %saccess to mapset %s" +msgstr "" + +#: ../general/g.access/exp_perms.c:32 +msgid "will" +msgstr "" + +#: ../general/g.access/exp_perms.c:32 +msgid "now" +msgstr "" + +#: ../general/g.cairocomp/main.c:49 ../scripts/v.in.lines/v.in.lines.py:70 +#: ../scripts/r3.in.xyz/r3.in.xyz.py:208 +#, c-format, python-format +msgid "Unable to read input file <%s>" +msgstr "" + +#: ../general/g.cairocomp/main.c:52 +#, c-format +msgid "Unable to parse input file <%s>" +msgstr "" + +#: ../general/g.cairocomp/main.c:71 +#, c-format +msgid "Unable to write output file <%s>" +msgstr "" + +#: ../general/g.cairocomp/main.c:113 +msgid "Unable to obtain visual" +msgstr "" + +#: ../general/g.cairocomp/main.c:129 +msgid "Failed to initialize output surface" +msgstr "" + +#: ../general/g.cairocomp/main.c:171 +msgid "Failed to initialize input surface" +msgstr "" + +#: ../general/g.cairocomp/main.c:198 +msgid "Overlays multiple X Pixmaps." +msgstr "" + +#: ../general/g.cairocomp/main.c:212 +msgid "Output Visual XID" +msgstr "" + +#: ../general/g.cairocomp/main.c:218 +msgid "Output screen" +msgstr "" + +#: ../general/g.cairocomp/main.c:240 +msgid "Background color (R:G:B:A)" +msgstr "" + +#: ../general/g.cairocomp/main.c:245 +msgid "Do not composite; just delete input Pixmaps" +msgstr "" + +#: ../general/g.cairocomp/main.c:277 +msgid "input= and opacity= must have the same number of values" +msgstr "" + +#: ../general/g.version/main.c:71 +msgid "citing" +msgstr "" + +#: ../general/g.version/main.c:72 +msgid "copyright" +msgstr "" + +#: ../general/g.version/main.c:73 +msgid "version" +msgstr "" + +#: ../general/g.version/main.c:74 +msgid "license" +msgstr "" + +#: ../general/g.version/main.c:75 +msgid "Displays GRASS GIS version info." +msgstr "" + +#: ../general/g.version/main.c:76 +msgid "Optionally also prints build or copyright information." +msgstr "" + +#: ../general/g.version/main.c:80 +msgid "Print also the copyright message" +msgstr "" + +#: ../general/g.version/main.c:81 ../general/g.version/main.c:86 +#: ../general/g.version/main.c:91 ../general/g.version/main.c:101 +#: ../general/g.version/main.c:107 +msgid "Additional info" +msgstr "" + +#: ../general/g.version/main.c:85 +msgid "Print also the citation options" +msgstr "" + +#: ../general/g.version/main.c:90 +msgid "Print also the build information" +msgstr "" + +#: ../general/g.version/main.c:100 +msgid "Print also the GIS library revision number and date" +msgstr "" + +#: ../general/g.version/main.c:105 +msgid "Print also extended info for additional libraries" +msgstr "" + +#: ../general/g.version/main.c:106 +msgid "GDAL/OGR, PROJ, GEOS" +msgstr "" + +#: ../general/g.version/main.c:111 +msgid "Print info in shell script style (including Git reference commit)" +msgstr "" + +#: ../general/g.version/main.c:112 +msgid "Shell" +msgstr "" + +#: ../general/g.version/main.c:172 +#, c-format +msgid "Cannot determine GRASS libgis version and date number. The GRASS build might be broken. Report this to developers or packagers.\n" +msgstr "" + +#: ../general/g.version/main.c:179 +msgid "GRASS GIS libgis version and date number don't have the expected format. Trying to print the original strings..." +msgstr "" + +#: ../general/g.version/main.c:181 +#, c-format +msgid "GIS_H_VERSION=\"%s\"" +msgstr "" + +#: ../general/g.version/main.c:182 +#, c-format +msgid "GIS_H_DATE=\"%s\"" +msgstr "" + +#: ../general/g.version/main.c:216 +msgid "GRASS not compiled with GDAL/OGR support" +msgstr "" + +#: ../general/g.version/main.c:227 +msgid "GRASS not compiled with GEOS support" +msgstr "" + +#: ../general/g.version/main.c:238 +msgid "GRASS not compiled with SQLite support" +msgstr "" + +#: ../doc/vector/v.example/main.c:51 ../doc/raster/r.example/main.c:84 +msgid "keyword2" +msgstr "" + +#: ../doc/vector/v.example/main.c:52 ../doc/raster/r.example/main.c:85 +msgid "keyword3" +msgstr "" + +#: ../doc/vector/v.example/main.c:53 +msgid "My first vector module" +msgstr "Můj první modul pro zpracování vektorových dat" + +#: ../doc/vector/v.example/main.c:175 +#, c-format +msgid "Unable to get attribute data for cat %d" +msgstr "Nelze získat atributová data pro cat= %d" + +#: ../doc/vector/v.example/main.c:184 +#, c-format +msgid "Error while retrieving database record for cat %d" +msgstr "Chyba během získání záznamu databáze pro kategorii %d" + +#: ../doc/vector/v.example/main.c:217 +#, c-format +msgid "Unable to copy attribute table to vector map <%s>" +msgstr "Nelze kopírovat atributovou tabulku do vektorové mapy <%s>" + +#: ../doc/raster/r.example/main.c:86 +msgid "My first raster module" +msgstr "Můj první modul pro zpracování rastrových dat" + +#: ../db/db.select/main.c:53 ../db/db.columns/main.c:44 +#: ../db/db.describe/main.c:50 ../db/db.copy/main.c:100 +#, c-format +msgid "Table <%s> not found in database <%s> using driver <%s>" +msgstr "" + +#: ../db/db.select/main.c:63 ../db/db.execute/main.c:57 +#, c-format +msgid "Unable to open file <%s>: %s" +msgstr "" + +#: ../db/db.select/main.c:105 +#, c-format +msgid "Test %s." +msgstr "Test %s." + +#: ../db/db.select/main.c:105 +msgid "succeeded" +msgstr "úspěch" + +#: ../db/db.select/main.c:207 +msgid "Name of file containing SQL select statement(s)" +msgstr "" + +#: ../db/db.select/main.c:212 +msgid "Name of table to query" +msgstr "" + +#: ../db/db.select/main.c:231 +msgid "Vertical record separator (requires -v flag)" +msgstr "" + +#: ../db/db.select/main.c:250 +msgid "Describe query only (don't run it)" +msgstr "Dotaz pouze popiš (neprováděj)" + +#: ../db/db.select/main.c:260 +msgid "Only test query, do not execute" +msgstr "Pouze otestovat dotaz, neprovádět" + +#: ../db/db.select/main.c:268 +msgid "Selects data from attribute table." +msgstr "" + +#: ../db/db.select/main.c:269 +msgid "Performs SQL query statement(s)." +msgstr "" + +#: ../db/db.select/main.c:304 +#, c-format +msgid "You must provide one of these options: <%s>, <%s>, or <%s>" +msgstr "" + +#: ../db/db.login/main.c:41 ../db/db.connect/main.c:45 +#: ../db/db.drivers/main.c:72 +msgid "connection settings" +msgstr "" + +#: ../db/db.login/main.c:42 +msgid "Sets user/password for DB driver/database." +msgstr "Nastaví uživatelské jméno / heslo pro DB ovladač / databázi." + +#: ../db/db.login/main.c:59 +msgid "Username" +msgstr "" + +#: ../db/db.login/main.c:75 +msgid "Hostname" +msgstr "" + +#: ../db/db.login/main.c:76 ../db/db.login/main.c:85 +msgid "Relevant only for pg and mysql driver" +msgstr "" + +#: ../db/db.login/main.c:84 +msgid "Port" +msgstr "" + +#: ../db/db.login/main.c:90 +msgid "Print connection settings and exit" +msgstr "" + +#: ../db/db.login/main.c:105 +msgid "Unable to set user/password" +msgstr "Nelze nastavit uživatele/heslo" + +#: ../db/db.login/main.c:109 +#, c-format +msgid "The password was stored in file (%s%cdblogin)" +msgstr "" + +#: ../db/db.createdb/main.c:74 +msgid "Creates an empty database." +msgstr "Vytvořit prázdnou databázi." + +#: ../db/db.connect/main.c:47 +msgid "Prints/sets general DB connection for current mapset." +msgstr "" + +#: ../db/db.connect/main.c:52 +msgid "Substitute variables in database settings" +msgstr "" + +#: ../db/db.connect/main.c:57 +msgid "Print current connection parameters using shell style and exit" +msgstr "" + +#: ../db/db.connect/main.c:69 +msgid "Overwrite current settings if already initialized" +msgstr "" + +#: ../db/db.connect/main.c:101 +msgid "Default group of database users to which select privilege is granted" +msgstr "Výchozí skupina uživatelů databáze, které jsou přiřazeny práva na select." + +#: ../db/db.connect/main.c:151 ../db/db.tables/main.c:41 +msgid "Database connection not defined. Run db.connect." +msgstr "Spojení s databází nebylo pro ovladač definováno. Spusťte db.connect" + +#: ../db/db.connect/main.c:176 +msgid "DB settings already defined, nothing to do" +msgstr "" + +#: ../db/db.connect/main.c:182 +msgid "Default driver is not set" +msgstr "Základní ovladač není nastaven" + +#: ../db/db.connect/main.c:185 +msgid "Default database is not set" +msgstr "Název vstupní databáze není nastaven" + +#: ../db/db.connect/main.c:221 +msgid "Unable to set default database connection" +msgstr "" + +#: ../db/db.columns/main.c:101 +msgid "List all columns for a given table." +msgstr "vypíše všechny sloupce pro zadanou tabulku." + +#: ../db/db.execute/main.c:86 ../db/db.execute/main.c:91 +#: ../db/db.execute/main.c:106 ../db/db.execute/main.c:111 +#, c-format +msgid "Error while executing: '%s'" +msgstr "Chyba při vykonávání: '%s'" + +#: ../db/db.execute/main.c:140 +msgid "Executes any SQL statement." +msgstr "Vykoná jakýkoliv příkaz SQL." + +#: ../db/db.execute/main.c:141 +msgid "For SELECT statements use 'db.select'." +msgstr "" + +#: ../db/db.execute/main.c:144 +msgid "SQL statement" +msgstr "Příkaz SQL" + +#: ../db/db.execute/main.c:145 +msgid "Example: update rybniky set kapri = 'hodne' where kapri = 'malo'" +msgstr "" + +#: ../db/db.execute/main.c:150 +msgid "Name of file containing SQL statement(s)" +msgstr "" + +#: ../db/db.execute/main.c:172 +msgid "Ignore SQL errors and continue" +msgstr "Ignoruj chyby SQL a pokračuj" + +#: ../db/db.execute/main.c:179 +#, c-format +msgid "You must provide <%s> or <%s> option" +msgstr "" + +#: ../db/db.databases/main.c:53 +msgid "Unable to list databases. Try to define correct connection settings by db.login." +msgstr "Nelze vytvořit seznam databází. Pokuste se definovat správná nastavení připojení pomocí db.login." + +#: ../db/db.databases/main.c:63 +msgid "No databases found" +msgstr "" + +#: ../db/db.databases/main.c:87 +msgid "Location" +msgstr "" + +#: ../db/db.databases/main.c:88 +msgid "Path for SQLite driver, or connection string for PostgreSQL driver" +msgstr "" + +#: ../db/db.databases/main.c:99 +msgid "Lists all databases for a given driver and location." +msgstr "" + +#: ../db/db.describe/main.c:108 +msgid "Print column names only instead of full column descriptions" +msgstr "vypiš pouze jména sloupců místo plného popisu sloupců" + +#: ../db/db.describe/main.c:113 +msgid "Print table structure" +msgstr "Vypiš strukturu tabulky" + +#: ../db/db.describe/main.c:131 +msgid "Describes a table in detail." +msgstr "Popiš tabulku (detailně)." + +#: ../db/drivers/odbc/cursor.c:36 ../db/drivers/ogr/cursor.c:65 +msgid "Unable to allocate cursor" +msgstr "" + +#: ../db/drivers/odbc/cursor.c:55 ../db/drivers/postgres/cursor.c:50 +#: ../db/drivers/sqlite/cursor.c:56 +msgid "Unable to add new token." +msgstr "" + +#: ../db/drivers/odbc/table.c:159 +#, c-format +msgid "Table %s doesn't exist" +msgstr "" + +#: ../db/drivers/odbc/table.c:176 +#, c-format +msgid "Table %s isn't 'TABLE' or 'VIEW' but %s" +msgstr "" + +#: ../db/drivers/odbc/listdb.c:29 +msgid "Unable to allocate handle." +msgstr "" + +#: ../db/drivers/odbc/listdb.c:40 ../db/drivers/postgres/listdb.c:96 +#: ../db/drivers/sqlite/listdb.c:147 +msgid "Unable to set handle" +msgstr "" + +#: ../db/drivers/postgres/listtab.c:38 +msgid "Unable to select table names." +msgstr "" + +#: ../db/drivers/postgres/listtab.c:65 +msgid "Unable to select view names." +msgstr "" + +#: ../db/drivers/postgres/cursor.c:41 ../db/drivers/mysql/cursor.c:44 +msgid "Unable allocate cursor." +msgstr "" + +#: ../db/drivers/postgres/db.c:71 ../db/drivers/postgres/db.c:250 +#: ../db/drivers/mysql/db.c:61 +msgid "Connection failed." +msgstr "" + +#: ../db/drivers/postgres/db.c:99 +msgid "Unable to set schema:" +msgstr "" + +#: ../db/drivers/postgres/db.c:117 +msgid "Unable to select data types" +msgstr "" + +#: ../db/drivers/postgres/db.c:269 +#, c-format +msgid "Unable to create database <%s>" +msgstr "" + +#: ../db/drivers/postgres/db.c:271 +#, c-format +msgid "Unable to drop database <%s>" +msgstr "" + +#: ../db/drivers/postgres/fetch.c:33 ../db/drivers/ogr/fetch.c:55 +#: ../db/drivers/ogr/fetch.c:195 ../db/drivers/mysql/fetch.c:34 +#: ../db/drivers/mysql/fetch.c:276 ../db/drivers/sqlite/fetch.c:265 +msgid "Cursor not found" +msgstr "Kurzor nenalezen" + +#: ../db/drivers/postgres/fetch.c:129 ../db/drivers/sqlite/fetch.c:171 +msgid "Unable to scan date:" +msgstr "Nelze skenovat datum:" + +#: ../db/drivers/postgres/fetch.c:147 ../db/drivers/sqlite/fetch.c:188 +msgid "Unable to scan time:" +msgstr "" + +#: ../db/drivers/postgres/fetch.c:166 +msgid "Unable to scan timestamp (no idea how to process time zone):" +msgstr "" + +#: ../db/drivers/postgres/fetch.c:174 +msgid "Unable to scan timestamp (not enough arguments):" +msgstr "" + +#: ../db/drivers/postgres/fetch.c:188 +msgid "Unable to recognize boolean value" +msgstr "" + +#: ../db/drivers/postgres/fetch.c:206 +msgid "Taken not found" +msgstr "" + +#: ../db/drivers/postgres/parse.c:60 ../db/drivers/mysql/parse.c:73 +msgid "'user' in database definition is not supported, use db.login" +msgstr "'uživatel' v definici databáze není podporován, použijte db.login" + +#: ../db/drivers/postgres/parse.c:64 ../db/drivers/mysql/parse.c:77 +msgid "'password' in database definition is not supported, use db.login" +msgstr "'heslo' v definici databáze není podporováno, použijte db.login" + +#: ../db/drivers/postgres/parse.c:69 +msgid "Unknown option in database definition for PostgreSQL: " +msgstr "Neznámá volba v definici databáze pro PostgreSQL: " + +#: ../db/drivers/postgres/describe.c:40 ../db/drivers/mysql/select.c:64 +msgid "Unable to describe table." +msgstr "Nelze popsat tabulku." + +#: ../db/drivers/postgres/describe.c:123 +#, c-format +msgid "PostgreSQL driver: column '%s', type %d is not supported" +msgstr "" + +#: ../db/drivers/postgres/describe.c:130 ../db/drivers/ogr/describe.c:186 +#, c-format +msgid "Column '%s' : type int8 (bigint) is stored as integer (4 bytes) some data may be damaged" +msgstr "" + +#: ../db/drivers/postgres/describe.c:134 +#, c-format +msgid "Column '%s' : type character varying is stored as varchar(250) some data may be lost" +msgstr "" + +#: ../db/drivers/postgres/describe.c:140 +#, c-format +msgid "column '%s' : type bool (boolean) is stored as char(1), values: 0 (false), 1 (true)" +msgstr "sloupec '%s' : typ boolean je uložen jako char(1), hodnoty: 0 (false), 1 (true)" + +#: ../db/drivers/postgres/priv.c:53 +msgid "Unable grant on table:" +msgstr "" + +#: ../db/drivers/postgres/execute.c:42 ../db/drivers/mysql/execute.c:41 +msgid "Unable to execute:" +msgstr "" + +#: ../db/drivers/postgres/execute.c:68 +msgid "Unable to 'BEGIN' transaction" +msgstr "" + +#: ../db/drivers/postgres/execute.c:88 +msgid "Unable to 'COMMIT' transaction" +msgstr "" + +#: ../db/drivers/postgres/create_table.c:90 +#, c-format +msgid "Unknown column type (%s)" +msgstr "" + +#: ../db/drivers/postgres/create_table.c:103 +#: ../db/drivers/mysql/create_table.c:108 +#: ../db/drivers/sqlite/create_table.c:122 +msgid "Unable to create table:" +msgstr "" + +#: ../db/drivers/postgres/create_table.c:132 +msgid "Unable to grant select on table:" +msgstr "" + +#: ../db/drivers/postgres/table.c:37 +msgid "Unable to execute():" +msgstr "" + +#: ../db/drivers/postgres/listdb.c:35 ../db/drivers/sqlite/listdb.c:45 +msgid "No path given" +msgstr "" + +#: ../db/drivers/postgres/listdb.c:65 +msgid "Unable to connect to Postgres:" +msgstr "" + +#: ../db/drivers/postgres/listdb.c:76 +msgid "Unable to select from Postgres:" +msgstr "" + +#: ../db/drivers/postgres/select.c:31 +msgid "Unable set DATESTYLE" +msgstr "" + +#: ../db/drivers/postgres/select.c:55 +msgid "Unable to select:" +msgstr "" + +#: ../db/drivers/postgres/select.c:69 ../db/drivers/mysql/describe.c:50 +msgid "Unable to describe table" +msgstr "Nelze popsat tabulku" + +#: ../db/drivers/dbf/dbfexe.c:72 +msgid "SQL parser error" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:74 +msgid "in statement:" +msgstr "v prohlášení:" + +#: ../db/drivers/dbf/dbfexe.c:88 +#, c-format +msgid "Table '%s' doesn't exist." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:96 +msgid "Unable to load table head." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:106 +msgid "Unable to modify table, don't have write permission for DBF file." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:121 ../db/drivers/dbf/dbfexe.c:1023 +#, c-format +msgid "Column '%s' not found" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:145 +msgid "Incompatible value type." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:161 +msgid "Unable to add column." +msgstr "Sloupec nelze přidat." + +#: ../db/drivers/dbf/dbfexe.c:183 +msgid "Unable to delete column." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:191 +#, c-format +msgid "Table %s already exists" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:206 +msgid "Unable to create table." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:263 ../db/drivers/dbf/dbfexe.c:273 +#: ../db/drivers/dbf/dbfexe.c:303 +msgid "Error in selecting rows" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:552 +msgid "Cannot load table." +msgstr "Nelze načíst tabulku." + +#: ../db/drivers/dbf/dbfexe.c:567 +msgid "Incompatible types in WHERE condition." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:572 +msgid "Result of WHERE condition is not of type BOOL." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:588 +msgid "Error in evaluation of WHERE condition." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:600 +#, c-format +msgid "Unknown result (%d) of WHERE evaluation" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:607 +msgid "Unknown WHERE condition type (bug in DBF driver)." +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:633 +#, c-format +msgid "Unable to find order column '%s'" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:778 +msgid "Division by zero" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:917 +msgid "Value operand for AND" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:931 +msgid "Value operand for OR" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:946 +msgid "Value operand for NOT" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:954 ../db/drivers/dbf/dbfexe.c:1151 +#, c-format +msgid "Unknown operator %d" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:1061 +msgid "Arithmetical operation with strings is not allowed" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:1083 +msgid "Comparison between string and number is not allowed" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:1098 +#, c-format +msgid "Comparison '%s' between strings not allowed" +msgstr "" + +#: ../db/drivers/dbf/dbfexe.c:1112 +msgid "Match (~) between numbers not allowed" +msgstr "" + +#: ../db/drivers/dbf/cursor.c:47 +msgid "Unable to allocate new cursor" +msgstr "" + +#: ../db/drivers/dbf/cursor.c:59 +msgid "Unable to tokenize new cursor" +msgstr "" + +#: ../db/drivers/dbf/column.c:49 +#, c-format +msgid "Column '%s' already exists (duplicate name)" +msgstr "" + +#: ../db/drivers/dbf/column.c:99 +#, c-format +msgid "Column '%s' does not exist" +msgstr "" + +#: ../db/drivers/dbf/db.c:94 +#, c-format +msgid "Unable to create DBF database: %s" +msgstr "" + +#: ../db/drivers/dbf/db.c:102 +#, c-format +msgid "Cannot open DBF database directory: %s" +msgstr "" + +#: ../db/drivers/dbf/db.c:110 +#, c-format +msgid "Unable to open DBF database: %s" +msgstr "" + +#: ../db/drivers/dbf/describe.c:34 +#, c-format +msgid "Table '%s' doesn't exist" +msgstr "" + +#: ../db/drivers/dbf/execute.c:32 +msgid "Unable to execute statement." +msgstr "" + +#: ../db/drivers/dbf/create_table.c:22 +msgid "Unable to create table" +msgstr "" + +#: ../db/drivers/dbf/table.c:117 ../db/drivers/dbf/table.c:170 +msgid "Unable to open DBF file." +msgstr "Nelze otevřít soubor DBF." + +#: ../db/drivers/dbf/table.c:312 +#, c-format +msgid "Unable to move '%s' to '%s'." +msgstr "" + +#: ../db/drivers/dbf/select.c:44 +msgid "Unable to open cursor." +msgstr "" + +#: ../db/drivers/ogr/listtab.c:49 ../db/drivers/sqlite/listtab.c:78 +msgid "Unable to db_alloc_string_array()" +msgstr "" + +#: ../db/drivers/ogr/cursor.c:74 +msgid "Unable to add new token" +msgstr "" + +#: ../db/drivers/ogr/db.c:56 +msgid "Had to open data source read-only" +msgstr "" + +#: ../db/drivers/ogr/db.c:60 +msgid "Unable to open OGR data source" +msgstr "" + +#: ../db/drivers/ogr/fetch.c:71 +msgid "DB_PREVIOUS not supported" +msgstr "" + +#: ../db/drivers/ogr/fetch.c:82 +msgid "DB_LAST not supported" +msgstr "" + +#: ../db/drivers/ogr/fetch.c:167 ../db/drivers/ogr/describe.c:212 +msgid "Unknown type" +msgstr "Neznámý typ" + +#: ../db/drivers/ogr/describe.c:55 +#, c-format +msgid "OGR layer <%s> does not exist\n" +msgstr "" + +#: ../db/drivers/ogr/describe.c:63 ../db/drivers/ogr/select.c:58 +msgid "Unable to describe table\n" +msgstr "" + +#: ../db/drivers/ogr/describe.c:116 +#, c-format +msgid "OGR driver: column '%s', OGR type %d is not supported" +msgstr "" + +#: ../db/drivers/ogr/execute.c:113 +#, c-format +msgid "\tOGR failed to write feature fid=%lld to layer <%s>" +msgstr "" + +#: ../db/drivers/ogr/select.c:50 +msgid "Unable to select: \n" +msgstr "" + +#: ../db/drivers/mysql/listtab.c:37 +msgid "Unable get list of tables:" +msgstr "" + +#: ../db/drivers/mysql/cursor.c:53 +msgid "Unable to add dnew token." +msgstr "" + +#: ../db/drivers/mysql/dbe.c:45 +msgid "Unable parse MySQL embedded database name" +msgstr "" + +#: ../db/drivers/mysql/dbe.c:61 +msgid "Cannot initialize MySQL embedded server" +msgstr "Nelze inicializovat připojený MySQL server" + +#: ../db/drivers/mysql/dbe.c:80 +msgid "Unable to connect to MySQL embedded server: " +msgstr "" + +#: ../db/drivers/mysql/fetch.c:52 +msgid "Cursor position is not supported by MySQL driver" +msgstr "Pozice kurzoru není podporována ovladačem MySQL" + +#: ../db/drivers/mysql/fetch.c:191 +msgid "Unable to scan timestamp: " +msgstr "Nelze skenovat časové razítko:" + +#: ../db/drivers/mysql/fetch.c:200 +msgid "Unknown timestamp format: " +msgstr "Neznámý formát časové značky: " + +#: ../db/drivers/mysql/fetch.c:215 +msgid "Unable to scan date: " +msgstr "" + +#: ../db/drivers/mysql/fetch.c:229 +msgid "Unable to scan time: " +msgstr "" + +#: ../db/drivers/mysql/fetch.c:245 +msgid "Unable to scan datetime:" +msgstr "" + +#: ../db/drivers/mysql/parse.c:62 +msgid "Wrong port number in MySQL database definition: " +msgstr "Špatný port v definici databáze MySQL: " + +#: ../db/drivers/mysql/parse.c:82 +msgid "Unknown option in database definition for MySQL: " +msgstr "" + +#: ../db/drivers/mysql/describe.c:32 ../db/drivers/sqlite/describe.c:92 +#: ../db/drivers/sqlite/select.c:95 +msgid "Unable to describe table:" +msgstr "" + +#: ../db/drivers/mysql/describe.c:121 +#, c-format +msgid "MySQL driver: column '%s', type %d is not supported" +msgstr "ovladač MySQL: sloupec '%s', typu %d není podporován" + +#: ../db/drivers/mysql/describe.c:127 +#, c-format +msgid "column '%s' : type BIGINT is stored as integer (4 bytes) some data may be damaged" +msgstr "sloupec '%s' : typ BITINT byl uložen jako integer některá data mohou být poškozena" + +#: ../db/drivers/mysql/execute.c:62 +msgid "Unable to start transaction:" +msgstr "" + +#: ../db/drivers/mysql/execute.c:77 +msgid "Unable to commit transaction:" +msgstr "" + +#: ../db/drivers/mysql/index.c:55 ../db/drivers/sqlite/index.c:77 +msgid "Unable to create index:" +msgstr "" + +#: ../db/drivers/mysql/select.c:42 +msgid "Unable to select data:" +msgstr "" + +#: ../db/drivers/sqlite/listtab.c:50 ../db/drivers/sqlite/listtab.c:66 +msgid "Unable to list tables:" +msgstr "Tabulky nelze zobrazit:" + +#: ../db/drivers/sqlite/cursor.c:47 +msgid "Unable to allocate cursor." +msgstr "" + +#: ../db/drivers/sqlite/main.c:47 +#, c-format +msgid "Busy SQLITE db, already waiting for %d seconds..." +msgstr "" + +#: ../db/drivers/sqlite/db.c:99 +#, c-format +msgid "Unable to create directory '%s' for sqlite database" +msgstr "" + +#: ../db/drivers/sqlite/db.c:107 +msgid "Unable to open database:" +msgstr "" + +#: ../db/drivers/sqlite/db.c:134 +msgid "SQLite database connection is still busy" +msgstr "" + +#: ../db/drivers/sqlite/db.c:155 +#, c-format +msgid "Database <%s> already exists" +msgstr "" + +#: ../db/drivers/sqlite/db.c:162 +msgid "Unable to create database:" +msgstr "Nelze vytvořit databázi:" + +#: ../db/drivers/sqlite/db.c:186 +#, c-format +msgid "Database <%s> not found" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:72 +msgid "Unable to fetch:" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:87 +msgid "DB_PREVIOUS is not supported" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:93 +msgid "DB_LAST is not supported" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:203 +msgid "Unable to scan timestamp:" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:218 +msgid "SQLite driver: parsing of interval values not implemented; assuming seconds" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:223 +msgid "Unable to scan interval:" +msgstr "" + +#: ../db/drivers/sqlite/fetch.c:286 +msgid "Unable to get number of rows:" +msgstr "" + +#: ../db/drivers/sqlite/describe.c:60 ../db/drivers/sqlite/execute.c:53 +#: ../db/drivers/sqlite/select.c:63 +msgid "Error in sqlite3_prepare():" +msgstr "" + +#: ../db/drivers/sqlite/describe.c:78 ../db/drivers/sqlite/describe.c:132 +#: ../db/drivers/sqlite/execute.c:69 ../db/drivers/sqlite/create_table.c:141 +#: ../db/drivers/sqlite/index.c:96 ../db/drivers/sqlite/select.c:80 +msgid "Error in sqlite3_step():" +msgstr "" + +#: ../db/drivers/sqlite/describe.c:194 +#, c-format +msgid "SQLite driver: column '%s', SQLite type %d is not supported" +msgstr "Ovladač SQLite: sloupec '%s', typ SQLite %d není podporován" + +#: ../db/drivers/sqlite/execute.c:83 +msgid "Error in sqlite3_finalize():" +msgstr "" + +#: ../db/drivers/sqlite/execute.c:111 +msgid "'BEGIN' transaction failed:" +msgstr "" + +#: ../db/drivers/sqlite/execute.c:139 +msgid "'COMMIT' transaction failed:" +msgstr "" + +#: ../db/drivers/sqlite/table.c:37 +msgid "Error in sqlite3_exec():" +msgstr "" + +#: ../db/drivers/sqlite/listdb.c:99 +#, c-format +msgid "Unable to open directory '%s'" +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) + +#: ../vector/v.info/print.c:301 +msgid "Name:" +msgstr "Název:" + +#: ../vector/v.info/print.c:303 +msgid "Mapset:" +msgstr "Mapset:" + +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Převádím..." -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "Zdroj dat OGR:" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "Typ prvku:" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "Tabulka DB:" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "Název DB:" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "úroveň" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "Počet ostrovů:" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "Ne" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -74805,28 +76549,56 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" +"Vypadá to, že kartografické zobrazení datasetu neodpovídá zobrazení aktuální " +"lokace \n" +"\n" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "Kartografické zobrazení vstupního datasetu a aktuální lokace souhlasí." + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "Konvertuje DWG/DXF na GRASS vektorovu mapu" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -74902,117 +76674,117 @@ msgstr "Nepročistit polygony (nedoporučuje se)" msgid "Force 2D output even if input is 3D" msgstr "Vynutit 2D výstup, i když je vstup 3D" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "Změnit názvy sloupců na malá písmena" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "Zápis sloupce <%s> s pevnou délkou %d znaků (může být zkrácen)" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " @@ -75021,157 +76793,157 @@ msgstr "" "Délka pro sloupec '%s' nastavena na 255 (nebyla specifikována OGR), některé " "řetězce mohou být zkráceny!" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "Zápis sloupce <%s> s pevnou délkou %d znaků (může být zkrácen)" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "%d vstupních polygonů" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -75180,51 +76952,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -75380,10 +77152,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "Skupina <%s> jako cíl pro lokaci [%s], mapset [%s]" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Cílová lokace <%s> nebyla nalezena" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "Prosím zpusťte i.target pro skupinu" @@ -75550,7 +77332,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -75560,7 +77342,7 @@ msgstr[2] "%d sloupců" msgstr[3] "%d sloupců" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -75568,7 +77350,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -76557,6 +78339,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "Použít geodetickou kalkulaci pro lokace zadané sférickými souřadnicemi" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -77137,6 +78923,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Nelze otevřít soubor <%s> pro psaní" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Nelze otevřít soubor <%s> pro psaní" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -77717,7 +79520,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -77956,22 +79759,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -87056,38 +88852,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -87167,11 +88963,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -87196,103 +88992,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -87304,336 +89100,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -87686,50 +89482,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -87757,7 +89553,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -87976,7 +89772,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -88033,85 +89829,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Použít mapové souřadnice namísto souřadnic xyz" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Vytváření dočasných souborů ..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Vytvářím nějaké dočasné soubory..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "Nelze získat informace o kartografickém zobrazení aktuální lokace" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -88157,28 +89954,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -88235,27 +90032,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Nelze otevřít OGR zdroj dat '%s'" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -88265,7 +90062,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -88275,14 +90071,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -88290,72 +90086,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -88582,7 +90378,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -88600,64 +90396,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -88797,79 +90594,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -88981,40 +90778,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -89050,7 +90847,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -89061,34 +90858,35 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." -msgstr "" +#: ../scripts/r.unpack/r.unpack.py:143 +#, fuzzy +msgid "Overriding projection check (using current project's CRS)." +msgstr "Přepsat kartografické zobrazení (použít zobrazení lokace)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -89180,34 +90978,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -89286,317 +91084,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Region <%s> nebyl nalezen" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -89604,60 +91402,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -89709,29 +91507,41 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Nelza otevřít soubor s pravidly <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Sloupec <%s> nebyl nalezen v tabulce <%s>" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Chyba atributů skenování" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" +msgstr "\"*\" pro všechny sloupce" + #: ../scripts/g.download.location/g.download.location.py:105 msgid "Location named <{}> already exists, download canceled" msgstr "" @@ -89775,16 +91585,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -89855,41 +91655,52 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Rastrová mapa <%s> nebyla v aktuálním mapsetu nalezena" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +#, fuzzy +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "Názvy a typy nových sloupců ('název typ [,název typ, ...]')" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +#, fuzzy +msgid "Adding column <{}> to the table" +msgstr "Nový atributový sloupec <%s> přidán do tabulky" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Chyba atributů skenování" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -89937,20 +91748,181 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "" +#~ "Vytiskne/nastaví připojení databáze pro vektorovou mapu k atributové " +#~ "tabulce" + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Název vektorové vrstvy" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Číslo vrstvy (to)" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Příliš mnoho názvů sloupců" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Počet sloupců v nové oblasti" + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "Formát výstupních souborů" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Typ uložení výsledné rastrové mapy" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "Název existující rastrové mapy obsahující výsledky klasifikace" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Název výstupní rastrové mapy" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "Vzdálenost odstupu fotoaparátu (v mapových jednotkách)" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Název výstupní rastrové mapy" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Název výstupní rastrové mapy" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Rozlišení VZ= %f; SJ=%f" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Vytiskni označení kategorií" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Vstupní formát" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Šířka linie textu" + +#, fuzzy +#~ msgid "density" +#~ msgstr "zhutnění" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Vektorové body" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Načítám vstupy..." + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Název číselného sloupce obsahujícího šířku linie" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Jméno sloupce obsahujícího souřadnici x" + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "Mezní hodnota musí být >= 0" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Formát vstupního souboru" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Výstupní mapa expozice (nebo fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Výstupní mapa expozice (nebo fy)" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Zóna(y) vzdáleností" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Přípona výstupních souborů" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Název výstupní tabulky" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Jméno výstupního vektoru pro zarovnané body bystřin" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Název sloupce atributu, který má být použit pro velikost bufferu" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Název výstupního souboru" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Název rastrové vrstvy, která bude zobrazena" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Formát" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Název rastrové vrstvy, která bude zobrazena" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Počet úrovní, které budou použity pro každou součást" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Obrácený výběr" + +#, fuzzy +#~ msgid "" +#~ "Number of k-fold cross-validation for grid search parameter optimization" +#~ msgstr "Provede proceduru křížové validace bez rastrové aproximace" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Přepiš parametry připojení pro danou vrstvu" + +#~ msgid "Location:" +#~ msgstr "Lokace:" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -92416,9 +94388,6 @@ msgstr "" #~ msgstr[0] "Interpoluji rastrovou mapu <%s> ... řádek %d ..." #~ msgstr[1] "Interpoluji rastrovou mapu <%s> ... řádek %d ..." -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "lat/long projekce není v současnosti podporována" - #~ msgid "Char string to represent no data cell" #~ msgstr "Znak pro označení buněk s hodnotou NULL" diff --git a/locale/po/grassmods_de.po b/locale/po/grassmods_de.po index 9ce130ee255..498eb0f1c68 100644 --- a/locale/po/grassmods_de.po +++ b/locale/po/grassmods_de.po @@ -10,13 +10,21 @@ msgstr "" "Project-Id-Version: grassmods_de\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD +======= +"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" ======= "POT-Creation-Date: 2021-02-17 23:13-0500\n" "PO-Revision-Date: 2022-05-23 10:50+0000\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28,6 +36,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -38,12 +51,15 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "X-Generator: Weblate 4.12.2\n" ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "X-Generator: Weblate 4.16.4\n" ======= "X-Generator: Weblate 4.12.2\n" @@ -52,6 +68,9 @@ msgstr "" "X-Generator: Weblate 4.12.2\n" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -124,7 +143,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -160,6 +179,7 @@ msgstr "Metadaten" #: ../temporal/t.connect/main.c:38 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -171,6 +191,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 "" @@ -180,32 +205,33 @@ msgid "Print current connection parameters and exit" msgstr "Gibt derzeitige Verbindungsparameter aus und beendet sich." #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -231,21 +257,21 @@ msgstr "Gibt derzeitige Verbindungsparameter aus und beendet sich." #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Drucke" @@ -322,7 +348,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -347,7 +373,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -358,7 +384,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -380,7 +406,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -537,6 +563,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -556,7 +583,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -575,7 +601,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -589,6 +614,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -622,7 +648,7 @@ msgstr "Mein erstes Rastermodul." #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -632,8 +658,8 @@ msgstr "Mein erstes Rastermodul." #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -648,21 +674,21 @@ msgstr "Mein erstes Rastermodul." #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Rasterkarte <%s> konnte nicht gefunden werden." @@ -671,7 +697,7 @@ msgstr "Rasterkarte <%s> konnte nicht gefunden werden." #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -706,7 +732,6 @@ msgstr "Rasterkarte <%s> konnte nicht gefunden werden." #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -719,7 +744,6 @@ msgstr "Rasterkarte <%s> konnte nicht gefunden werden." #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -758,6 +782,7 @@ msgstr "Rasterkarte <%s> konnte nicht gefunden werden." #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -779,7 +804,7 @@ msgstr "Rasterkarte <%s> konnte nicht gefunden werden." #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -845,7 +870,7 @@ msgstr "Rasterkarte <%s> konnte nicht gefunden werden." #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -859,7 +884,7 @@ msgstr "Mein erstes Vektormodul." #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -872,8 +897,8 @@ msgstr "Mein erstes Vektormodul." #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -888,16 +913,16 @@ msgstr "Kann das vorherbestimmte Vektoröffnungslevel nicht setzen." #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -943,7 +968,7 @@ msgstr "Kann das vorherbestimmte Vektoröffnungslevel nicht setzen." #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -955,17 +980,20 @@ msgstr "Kann das vorherbestimmte Vektoröffnungslevel nicht setzen." #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main msgid "Unable to open vector map <%s>" msgstr "Kann die Vektorkarte <%s> nicht öffnen." #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -974,7 +1002,7 @@ msgstr "Kann die Vektorkarte <%s> nicht öffnen." #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -1004,13 +1032,13 @@ msgstr "Kann die Vektorkarte <%s> nicht öffnen." #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -1039,7 +1067,7 @@ msgstr "Die Datenbankverbindung für den Layer<%d> ist nicht definiert." #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1051,6 +1079,9 @@ msgstr "Kann den Treiber <%s> nicht starten." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1068,6 +1099,7 @@ msgstr "" "durch." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1079,6 +1111,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -1086,8 +1123,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1121,10 +1158,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1132,7 +1169,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Kann Datenbank <%s> nicht mit dem Treiber <%s> öffnen." #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1162,23 +1199,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "Kann die Attributtabelle nicht in die Vektorkarte <%s> kopieren." #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "Erstelle Graustufen Farbtabelle für <%s> (8bit, full range)." -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "Erstelle Graustufen Farbtabelle für <%s> (16bit, image range)." -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1250,6 +1287,7 @@ msgstr "" "kalte Wolken zusammen." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1261,6 +1299,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -1284,13 +1327,14 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" msgstr " Standard-Region für die Location aktualisiert." -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "Region des aktuellen Mapsets aktualisiert." @@ -1343,6 +1387,7 @@ msgstr "Region des aktuellen Mapsets aktualisiert." #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1403,6 +1448,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1468,14 +1519,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1525,144 +1575,133 @@ msgstr "Titel der resultierenden Rasterkarte. " #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadaten" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Zeige unterstützte Formate an und Schluß." -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +#, fuzzy +msgid "Override projection check (use current project's CRS)" msgstr "Übersteuere die Projektionsprüfung (verwende Projektion der Location)." -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "Vergrößere die Ausdehnung der Region basierend auf neuem Datensatz." -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "Aktualisiere die Standard-Region auch wenn im Mapset PERMANENT." -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "%s= und %s= schließen sich gegenseitig aus." -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "Fahre mit dem Import fort..." -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "Bildgruppe <%s> existiert bereits und wird überschrieben." -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "Der ausgewählte Kanal (%d) existiert nicht." -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "Bildgruppe <%s> erzeugt." @@ -1679,37 +1718,36 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "Kann die Projektion der Eingabekarte nicht in das GRASS-Format konvertieren; " "erstelle daher keine neue Location." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Kann die Location <%s> nicht anlegen" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Location <%s> erstellt." -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1717,65 +1755,71 @@ msgstr "" msgid "Over-riding projection check" msgstr "Übersteuere Projektionsprüfung" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" "Die Projektion des Datensatzes scheint nicht mit der aktuellen Location " "übereinzustimmen.\n" "\n" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "Location PROJ_INFO:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "Datensatz PROJ_INFO:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 -#, c-format +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 +#, fuzzy, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" "\n" "Falls es keine signifikanten Unterschiede in den Projektionsdefinitionen " "gibt, Flag -o verwenden, um sie zu ignorieren und die aktuelle " "Standortdefinition zu verwenden.\n" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 +#, fuzzy msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" "Bedenken Sie, dass es besser sein könnte eine neue Location mit den Werten " "des zu importierenden Datensatzes mit Hilfe des 'location'-Parameters zu " "erzeugen.\n" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +#, fuzzy +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" "Die Projektionsinformationen des Eingabedatensatzes und der aktuellen " "Location scheinen übereinzustimmen." @@ -1857,12 +1901,10 @@ msgstr "Algebra" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1900,7 +1942,7 @@ msgstr "Anzahl der zu verwendenden Klassen" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1918,7 +1960,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1968,24 +2010,18 @@ msgstr "Name der Ausgabe-Neigungslängen-Rasterkarte" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Ausgaben" @@ -2109,7 +2145,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2119,7 +2155,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2240,7 +2275,7 @@ msgstr "Gebe Rasterhistorie anstelle der Info aus." msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2269,6 +2304,7 @@ msgstr "Kann keinen Speicher für Zeichenkette reservieren." #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2405,7 +2441,13 @@ msgstr "<%s=%s> Ungültige Anzahl von Punkten." msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2414,8 +2456,8 @@ msgid "The minimum number of input raster maps is two" msgstr "Die minimale Anzahl der Eingabe-Rasterkarten ist zwei." #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Prozent fertig..." @@ -2447,7 +2489,7 @@ msgstr "Aktualisiere die Statistik der Rasterkarte." msgid "Statistics for <%s> updated" msgstr "Die Statistiken für <%s> wurde aktualisiert." -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2503,7 +2545,6 @@ msgstr "Entweder \"-i\" oder \"value=\" muss angegeben werden." #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2548,7 +2589,7 @@ msgid "Unknown method <%s>" msgstr "Unbekannte Methode <%s>." #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2601,7 +2642,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -3027,7 +3068,7 @@ msgstr "Finde Kostenpfad..." msgid "Error, ct == pres_cell" msgstr "Fehler, ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -3115,14 +3156,16 @@ msgstr "Export" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3281,7 +3324,7 @@ msgid "List of cell values to be set to NULL" msgstr "Liste von Werten, die auf NULL gesetzt werden sollen." #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3613,6 +3656,15 @@ msgstr "Ausgabe-Rasterkarte des Einfallswinkels (nur Modus 1)." #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3701,17 +3753,15 @@ msgstr "Ausgabe-Rasterkarte des Einfallswinkels (nur Modus 1)." #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3732,7 +3782,7 @@ msgstr "Ausgabe-Rasterkarte des Einfallswinkels (nur Modus 1)." #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Ausgabe" @@ -3817,7 +3867,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "Schrittweite der Stichprobenabstände (0.5-1.5)" @@ -3852,57 +3902,57 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" "Sie müssen eine Rasterkarte mit Breitengraden angeben, wenn Sie zivile Zeit " "verwenden." -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "Fehler beim Lesen der Zeitzone." -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "Ungültiger Wert der Zeitzone." -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "insol_time und indcidout sind nicht kompatible Optionen." -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "Fehler beim Lesen der Zeitschrittgröße." -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "Ungültige Zeitschrittgröße." -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "Fehler beim Lesen der Horizont-Schrittgröße." -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "Die Horizont-Schrittgröße muss größer sein als 0." -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" "Wenn Sie die Option 'horizon' verwenden, müssen Sie auch den 'horizonstep'-" "Parameter angeben." -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "Time und insol_time sind nicht kompatible Optionen." -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" @@ -3910,61 +3960,57 @@ msgstr "" "Modus 1: momentaner Sonneneinfallswinkel & Strahlungsintensität bei " "bekannter lokaler Zeit" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "incidout benötigt den Zeit-Parameter." -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "Modus 2: integrierte tägliche Strahlung für einen Tag des Jahres" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" "Wenn sie -s und keine Horizont-Rasterkarte verwenden, muss numpartitions=1 " "sein." -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." @@ -3972,55 +4018,55 @@ msgstr "" "Wenn Sie Speicher sparen und Schatten verwenden wollen, müssen Sie einen " "vorher berechneten Horizont verwenden." -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "" "Kann die Projektionsinformation der aktuellen Location nicht ermitteln." -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "Kann die Projektionseinheit der aktuellen Location nicht ermitteln." -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "Kann die Projektionsinformationen der aktuellen Location nicht holen." -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +#, fuzzy +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" "Die Rasterkarten latin und longin haben kein Effekt in einer Lat/Lon " "Location." -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" "Entweder müssen die beiden Rasterkarten latin und longin oder keine von " "beiden angegeben werden." -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -4053,19 +4099,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Speicher ist zu Ende (Out-of-memory)." -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4136,9 +4182,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -4154,7 +4200,7 @@ msgstr "" "Für Horizont-Rasterkarten: Lese vom DGM einen extra Pufferbereich um die " "aktuelle Region herum ein." -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" @@ -4162,7 +4208,7 @@ msgstr "" "Für Horizont-Rasterkarten: Lese vom DGM einen extra Pufferbereich östlich " "der aktuellen Region ein." -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" @@ -4170,7 +4216,7 @@ msgstr "" "Für Horizont-Rasterkarten: Lese vom DGM einen extra Pufferbereich westlich " "der aktuellen Region ein." -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" @@ -4178,7 +4224,7 @@ msgstr "" "Für Horizont-Rasterkarten: Lese vom DGM einen extra Pufferbereich nördlich " "der aktuellen Region ein." -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" @@ -4186,14 +4232,14 @@ msgstr "" "Für Horizont-Rasterkarten: Lese vom DGM einen extra Pufferbereichsüdlich der " "aktuellen Region ein." -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" "Die maximale bei der Suche nach der Horizonthöhe zu berücksichtigende " "Distanz." -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4248,6 +4294,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4268,46 +4317,58 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +#, fuzzy +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "Koordinate, für die die Horizonthöhe berechnet werden soll." -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Ausgabeformat (printf-Stil)." + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Name der Ausgabedatei (verwende output=- für stdout)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Füge Kategorie-Label der Ausgabe bei." + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "Schreibe die Ausgabe in Grad (Standard: Bogenmaß)." -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4316,83 +4377,96 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Kann die Datei <%s> nicht öffnen." -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" "Sie haben keine Wert für die Richtung oder Schrittgröße angegeben. Breche ab." -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "Sie haben keine Horizont-Rasterkarte angegeben, Breche ab." -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "Sie haben kein Schrittgröße für den Winkel angegeben. Breche ab." -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "Konnte die Pufferzonengröße nicht lesen. Breche ab." -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "Konnte die %s Bufferzonengröße nicht lesen. Breche ab." -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "Osten" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "Westen" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "Süden" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "Norden" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "Konnte die maximale Distanz nicht lesen. Breche ab." -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "Der Distanzwert muss zwischen 0.5 und 1.5 sein. Abbruch." -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" +"Kann die Projektionsinformation der aktuellen Location nicht ermitteln." + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Kann die Projektionseinheit der aktuellen Location nicht ermitteln." + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "Kann die Projektionsinformationen der aktuellen Location nicht holen." + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "UPS: Die Zeilen haben sich von %d auf %d geändert." -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "OOPS: Spalten haben sich von %d auf %d verändert." -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -5226,7 +5300,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Attribute" @@ -5307,7 +5381,7 @@ msgstr "Kann den Index nicht erzeugen." #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Kann Rechte für die Tabelle <%s> nicht setzen." @@ -5438,7 +5512,7 @@ msgstr "Datei die Regeln zum Umkodieren enthält." #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5643,9 +5717,9 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" msgstr "GRASS LOCATION PROJ_INFO:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5660,8 +5734,9 @@ msgstr "Zu importierender Datensatz PROJ_INFO:\n" #: ../raster/r.in.pdal/projection.c:92 ../raster/r.in.lidar/projection.c:94 #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 +#, fuzzy msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" "Bedenken Sie, dass die Erzeugung einer neuen Location auf Grundlage der " @@ -5877,9 +5952,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5897,7 +5972,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5982,10 +6057,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -6026,30 +6101,30 @@ msgstr "Skalierungsfaktor für die z-Daten." msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "Projektion" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6180,128 +6255,128 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Gebe die Statistik im Shell-Skript-Stil aus." -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Ungültige Eingabe <%s=%s>." -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Lese Daten..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Ziel-Projektion; Standard ist die Projektion dieser Location." -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "Übersteuere die Projektionsprüfung (verwende Projektion der Location)." -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Lese Punkte..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "%lu Punkte in der Region gefunden." -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Rasterkarte <%s> erzeugt." @@ -6401,7 +6476,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6435,7 +6510,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6467,7 +6542,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6523,9 +6598,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Maximale Anzahl der Wiederholungen." -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6541,8 +6616,8 @@ msgstr "Maximale Anzahl der Wiederholungen." msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6552,24 +6627,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Mittelwert der Verteilung" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Standardabweichung" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6621,7 +6727,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6923,7 +7029,7 @@ msgstr "Fehler beim Lesen der Daten" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -7032,7 +7138,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -7123,7 +7228,8 @@ msgid "Inappropriate window size (too big or even)" msgstr "Ungeeignete Fenstergröße (zu groß oder gerade)." #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" msgstr "Lat/Long Location wird nicht unterstützt" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7746,7 +7852,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7755,7 +7861,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Rasterkarte nicht gefunden." @@ -7860,7 +7966,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7884,17 +7990,17 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" "Kann die Projektionsinformation der aktuellen Location nicht ermitteln." -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" "Kann die Einheiten der Projektion der aktuellen Location nicht ermitteln." -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" "Kann die Kennzahlen der Projektion der aktuellen Location nicht ermitteln." @@ -7968,7 +8074,7 @@ msgstr "Benutze die Kategorie-Werte, die von der Coverkarte bedeckt sind." #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -8018,17 +8124,14 @@ msgid "Output raster map required" msgstr "Ausgabe-Rasterkarte erforderlich." #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "Distanzwert (%d): %lf muss >= 0.0 sein." #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "Exponent (%lf) muss > 0.0 sein." #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "Flachwert (%lf) muss kleiner sein als der Distanzwert (%lf)." @@ -8086,6 +8189,7 @@ msgstr "Erzeuge Rasterkarte <%s> ..." #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -8232,7 +8336,7 @@ msgstr "SURFER (Golden Software) ASCII-Datei wird importiert." #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8319,7 +8423,7 @@ msgstr "" "Schalter verwenden." #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8379,7 +8483,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8441,7 +8545,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "Raster <%s> Typen passen nicht." @@ -8564,7 +8668,6 @@ msgid "Calculating flow directions..." msgstr "Berechne Flußrichtungen..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "Richtung gelesen: %lf, Nachbar gefunden: %i" @@ -8703,7 +8806,7 @@ msgstr "Filter nur auf NULL-Werte anwenden." msgid "<%d> is not valid number of threads." msgstr "<%s=%s> Ungültige Anzahl von Punkten." -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "Die Rasterkarte ist zu klein für die Größe des Filters." @@ -8796,8 +8899,8 @@ msgstr "Prozentteil der Karte, der im Speicher gehalten werden soll." msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8807,8 +8910,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "Im Lesemodus Ausgabe im Shell-Skript-Stil." @@ -8828,7 +8931,7 @@ msgstr "" "Bitte geben Sie eine angemessene Zahl von Zeilen an, die übersprungen werden " "sollen." -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "Ungültige z-Spanne." @@ -9216,9 +9319,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" "Lat/Long Location wird nicht unterstützt von %s. Bitte, projezieren Sie die " "Karte zuerst." @@ -9451,13 +9554,11 @@ msgstr "Beginne Kreuzvalidierung mit lambda_i=%.4f ... (%d of %d)" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "Mittelwert = %.5lf" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "Root Mean Square (RMS) = %.5lf" @@ -9472,7 +9573,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9717,31 +9817,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9757,12 +9857,12 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +#, fuzzy +msgid "create project" msgstr "erzeuge Location" #: ../raster/r.in.gdal/main.c:118 @@ -9777,18 +9877,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Name der Ziellocation für das Bild." #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9812,10 +9912,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Name der neu zu erstellenden Location." #: ../raster/r.in.gdal/main.c:195 @@ -9845,7 +9945,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9854,79 +9954,81 @@ msgstr "" msgid "Region" msgstr "Region" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "Passe Lat/Lon-Karten in geographische Koordinaten (90N,S; 180E,W) ein." -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Verwende die Nummern der Kanäle anstatt der Farbbezeichnungen." -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "Begrenze den Import auf die aktuelle Region." -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +#, fuzzy +msgid "You have to specify a target project different from output project" msgstr "" "Sie müssen eine Ziel-Location angeben, die verschieden ist von der Ausgabe-" "Location." -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +#, fuzzy +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "Der '-l'-Schalter funktioniert nur in einer Lat/Lon-Location." -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Die Rasterkarte <%s> existiert bereits und wird überschrieben" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "Die Rasterkarte <%s> existiert bereits." -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." @@ -9935,14 +10037,14 @@ msgstr "" "werden. Sie können 'gdalwarp' verwenden, um die Karte zu transformieren, so " "dass Norden oben ist." -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " @@ -9952,120 +10054,150 @@ msgstr "" "der Begrenzung und Auflösung mit r.info und eine Anpassung mit r.region " "dieser Parameter ist für die weitere Berechnung empfehlenswert." -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "Kopiere %d GCPs in eine Punktdatei für <%s>." -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "GCPs haben das folgende OpenGIS WKT Koordinatensystem:" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "Umprojezieren der GCP Tabelle:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "* Eingabe-Projektion der GCP-Tabelle: %s" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "* Ausgabe-Projektion der GCP-Tabelle: %s" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"Kann die Projektion der Eingabekarte nicht in das GRASS-Format konvertieren; " +"erstelle daher keine neue Location." + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "Kann die Kennzahlen der Projektion der Eingabe-GCPs nicht übersetzten." -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "Kann die Projektionsinformation der Ziel-Location nicht ermitteln." -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "Kann die Projektionseinheit der Ziel-Location nicht ermitteln." -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "Kann die Kennzahlen der Projektion der Ziel-Location nicht ermitteln." -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "Mapset <%s> in Ziel-Location <%s> - " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "Zugang verweigert." -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "nicht gefunden" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"Kann die Projektion der Eingabekarte nicht in das GRASS-Format konvertieren; " +"erstelle daher keine neue Location." + +#: ../raster/r.in.gdal/proj.c:323 +#, fuzzy +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" +"\n" +"Falls es keine signifikanten Unterschiede in den Projektionsdefinitionen " +"gibt, Flag -o verwenden, um sie zu ignorieren und die aktuelle " +"Standortdefinition zu verwenden.\n" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10747,7 +10879,6 @@ msgid "Number of intermediate images to produce" msgstr "Anzahl der zu produzierenden Zwischenschritte." #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "Fraktale Dimension von [%.2lf] muss zwischen 2 und 3 liegen." @@ -10862,6 +10993,18 @@ msgstr "Anzahl der Agenten." #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10893,26 +11036,6 @@ msgstr "Zeit-Intervall für die Erstellung von Ausgabekarten [Minuten]" msgid "Water diffusion constant" msgstr "Wasserdiffusionskoeffizienten" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10937,12 +11060,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10950,40 +11067,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "Es sollen mehr als 100 Dateien erstellt werden !!!!!" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "Standard nwalk=%d, rwalk=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "Verwende metrischen Umrechnungsfaktor %f, step=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "Sie produzieren weder Vektor- noch Rasterdaten." -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Eingabe fehlgeschlagen." -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "Kann Rasterkarten nicht schreiben." @@ -11146,7 +11263,7 @@ msgstr "Gewichtungsfaktor für den Geschwindigkeitsvektor des Wasserflusses." msgid "Time-series output" msgstr "Ausgabe der Zeitreihe" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "Sie produzieren keine Rasterkarten." @@ -11396,29 +11513,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "output= und method= müssen die selbe Anzahl von Werten haben." -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11473,73 +11590,38 @@ msgstr "Datei <%s> erstellt." msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Kleinster Zufallswert." -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Größter Zufallswert." -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "Erzeuge eine Integer-Rasterkarte." -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "Lese Eingabe-Rasterkarte <%s>..." - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" -"Auflösung der Expositionsdatei unterscheidet sich von der Auflösung der " -"aktuellen Region" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "Lese Eingabe-Dateien: Barrieren" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "Kann die Segmentdatei %s nicht erzeugen." - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "Kann die Segmentdatei %s nicht formatieren." - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "Kann die Segmentdatei %s nicht öffnen." - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11587,6 +11669,41 @@ msgstr "" "Auflösung ist zu unausgewogen (%f x %f); Bitte resamplen Sie die " "Eingabekarte." +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "Lese Eingabe-Rasterkarte <%s>..." + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" +"Auflösung der Expositionsdatei unterscheidet sich von der Auflösung der " +"aktuellen Region" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "Lese Eingabe-Dateien: Barrieren" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "Kann die Segmentdatei %s nicht erzeugen." + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "Kann die Segmentdatei %s nicht formatieren." + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "Kann die Segmentdatei %s nicht öffnen." + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -12311,7 +12428,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12325,12 +12442,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" +"Reprojiziert eine Vektorkarte von einer Location in die aktuelle Location." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "Location mit der Eingaberasterkarte" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12356,10 +12475,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "Name der Eingabe-Rasterkarte, die umprojeziert werden soll." -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Pfad zur GRASS-Datenbank der Eingabe-Location." #: ../raster/r.proj/main.c:174 @@ -12419,12 +12537,13 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "Eingabe und Ausgabe Location dürfen nicht identisch sein." #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +#, fuzzy +msgid "Input and output projects are the same" msgstr "Eingabe- und Ausgabe-Location sind identisch." #: ../raster/r.proj/main.c:268 @@ -12442,13 +12561,13 @@ msgstr "" "Kann die Kennzahlen der Projektion der Ausgabe-Rasterkarte nicht ermitteln." #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "Mapset <%s> in Eingabe-Location <%s> - %s" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Prüfe Location <%s> Mapset <%s>." #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12456,15 +12575,15 @@ msgstr "Prüfe Location <%s> Mapset <%s>." #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Benötigter Parameter <%s> wurde nicht angegeben" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "Rasterkarte <%s> in der Location <%s> im Mapset <%s> nicht gefunden." #: ../raster/r.proj/main.c:323 @@ -12480,12 +12599,13 @@ msgid "Unable to get projection key values of input map" msgstr "Kann die Kennzahlen der Projektion der Eingabekarte nicht ermitteln." #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "Kann nicht mit unprojezierten Daten arbeiten (xy location)." #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" msgstr "Eingabekarte <%s@%s> in Location <%s>:" #: ../raster/r.proj/main.c:524 @@ -12567,7 +12687,7 @@ msgid "Sorting events..." msgstr "Schreibe Kanten..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12831,8 +12951,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -13005,8 +13126,9 @@ msgstr "" "S_decode ==> Bitte berichtigen Sie den 'sky factor' des Schattenbandes: %f" #: ../raster/r.sunmask/g_solposition.c:67 +#, fuzzy msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" "Die Sonnenposition kann in unprojezierten Locations nicht berechnet werden. " @@ -13021,6 +13143,24 @@ msgstr "" "Angegebener Punkt %f, %f ist außerhalb der aktuellen Gebietsausdehnung, ist " "dies beabsichtigt? Trotzdem, die Einstellungen werden verwendet." +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "" +"Kann die Projektionsinformation der aktuellen Location nicht ermitteln." + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "" +"Kann die Einheiten der Projektion der aktuellen Location nicht ermitteln." + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "" +"Kann die Kennzahlen der Projektion der aktuellen Location nicht ermitteln." + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13646,18 +13786,21 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +#, fuzzy +msgid "Cannot get projection info of current project" msgstr "" "Kann die Projektionsinformation der aktuellen Location nicht ermitteln." #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +#, fuzzy +msgid "Cannot get projection units of current project" msgstr "" "Kann die Einheiten der Projektion der aktuellen Location nicht ermitteln." #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "Kann die Projektionsinformationen der aktuellen Location nicht holen." #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13735,7 +13878,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s=%s - muss eine nicht negative Zahl sein." @@ -13745,7 +13888,7 @@ msgstr "%s=%s - muss eine nicht negative Zahl sein." msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s=%s - muss eine positive Zahl sein." @@ -13834,7 +13977,7 @@ msgstr "Kann den fp Bereich der Rasterkarte <%s> nicht lesen." #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Kann Tabelle nicht erzeugen: '%s'" @@ -13843,7 +13986,7 @@ msgstr "Kann Tabelle nicht erzeugen: '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Kann keinen Index für die Tabelle <%s>, Schlüssel <%s> erzeugen." @@ -14158,7 +14301,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -14169,19 +14312,19 @@ msgstr "" msgid "position" msgstr "Position" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Rasterkarte(n) zum abfragen." -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Koordinaten für die Abfrage." -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14189,15 +14332,28 @@ msgstr "Koordinaten für die Abfrage." msgid "Query" msgstr "Abfrage" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "Größe des Punkt-Caches." -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14206,62 +14362,71 @@ msgstr "Größe des Punkt-Caches." msgid "Advanced" msgstr "Fortgeschritten" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "Ausgabe der Kopfzeile." -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "Zeige die Kategorielabel der Rasterzelle(n)." -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "Gebe Farbwerte als RRR:GGG:BBB aus." -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Gebe Integer Kategoriewerte aus, keine Zellwerte." -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "Benutze Cache-Reporting." -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "Kann die Vektorkarte <%s> nicht lesen." -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Interpretation von dp als Integer ist fehlgeschlagen." + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importiert eine binäre MAT-Datei (v4) als GRASS Rasterkarte." @@ -14431,9 +14596,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14786,21 +14948,21 @@ msgstr "" "Auflösung der Eingabekarte unterscheidet sich von der aktuellen " "Regionsauflösung!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "Verarbeitung aller selektierten Ausgabedateien erfordert " -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "%.2f GB Speicherplatz für temporäre Dateien." -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "%.2f MB Speicherplatz für temporäre Dateien." -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "%.2f KB Speicherplatz für temporäre Dateien." @@ -14991,83 +15153,83 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -"Sie müssen mindestens einen der Parameter wählen: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> oder <%s>" +"Sie müssen mindestens einen der Parameter wählen: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> oder <%s>" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Falscher Raster-Typ: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "Höhen-Ergebnisse für Mapset <%s> in <%s>." -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "Min berechnete Exposition%.4f, max berechnete Exposition %.4f." -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Expositions-Rasterkarte <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" "minimale berechnete Hangneigung %.4f, maximale berechnete Hangneigung %.4f." -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Neigungs-Rasterkarte <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "Rasterkarte mit vertikaler Wölbung <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Rasterkarte mit horizontaler Wölbung <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "O-W Neigungs-Rasterkarte <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "N-S Neigungs-Rasterkarte <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Dxx Rasterkarte <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Dyy Rasterkarte <%s> komplett." -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Dxy Rasterkarte <%s> komplett." @@ -16057,32 +16219,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "ABSCHNITT 4: Bestimme RUSLE LS und/oder den S Faktor." -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "ABSCHNITT 3: Akkumuliere Oberflächenabfluß mit SFD." -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "MFD: kumulierter Anteil der Fließrichtung ist nicht 1.0 aber %f " -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -16098,61 +16260,61 @@ msgstr "ABSCHNITT %d: Schließe Karten." msgid "SECTION %d: Watershed determination." msgstr "ABSCHNITT %d: Bestimme Wassereinzugsgebiet." -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -16176,7 +16338,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -17145,11 +17306,11 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -17157,36 +17318,36 @@ msgstr "" "Programm zur numerischen Berechnung von transienten, beschränkten und " "unbeschränkten Grundwasserfluss in zwei Dimensionen." -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "Bitte geben Sie river_head, river_leak und river_bed Karten an." -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "Bitte geben Sie drain_head und drain_leak Karten an." -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "Maximale Differenz zwischen diesem und dem letzten Schritt: %g" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Kann das lineare Gleichungssystem nicht erzeugen und lösen." @@ -17516,7 +17677,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17974,8 +18135,8 @@ msgstr "Ausgabe für RRR:GGG:BBB Farbwerte für jeden Profilpunkt." #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -18102,97 +18263,97 @@ msgstr "Foster (1981)" msgid "El-Swaify (1985)" msgstr "El-Swaify (1985)" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "zrange wird im Lesemodus nicht berücksichtigt." -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -18476,11 +18637,11 @@ msgstr "Kann die Datei <%s> nicht zum Schreiben der Beschriftungen öffnen." #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18683,32 +18844,32 @@ msgstr "Die Größe der Nachbarschaft muss positiv sein." msgid "Neighborhood size must be odd" msgstr "Die Größe der Nachbarschaft muss ungerade sein." -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18791,8 +18952,9 @@ msgid "Units" msgstr "Einheiten" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Standardeinstellung: Kartenmitte" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18814,8 +18976,9 @@ msgstr "Fläche:" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -19584,8 +19747,8 @@ msgid "Not enough points, %d are required" msgstr "Nicht genügend Punkte, %d werden benötigt." #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "Fehler bei Durchführung der Transformation (%d)" @@ -19595,28 +19758,28 @@ msgid "Poorly placed control points" msgstr "Schlecht platzierte Kontrollpunkte." #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "Ungenügend Speicher." #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "Parameterfehler" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "Keine aktiven Kontrollpunkte." #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "Ungültige Koordinaten [%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" "Berechnet eine Koordinatentransformation basierend auf Kontrollpunkten." @@ -19626,57 +19789,57 @@ msgid "Rectification polynomial order" msgstr "Polynomgrad der Entzerrung." #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "Zeige Zusammenfassung." #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" "Datei mit zu transformierenden Koordinaten (oder \"-\" um von stdin zu " @@ -19687,7 +19850,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "Lokale x,y-Koordinaten zu den Zielwerten für Ost und Nord." #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "Umgekehrte Transformation von Koordinatendatei oder Koeffizienten Dump" @@ -19696,7 +19859,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "Ziel Ost-,Nord-Koordinaten zu lokalen x,y." #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "Zeige Transformationsmatrix Koeffizienten." @@ -20205,6 +20368,10 @@ msgstr "Kann den Wertebereich der 3D-Rasterkarte <%s> nicht lesen." msgid "Error while reading history file" msgstr "Fehler beim Lesen der 'history'-Datei." +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "GRASS LOCATION PROJ_INFO:\n" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -20263,64 +20430,73 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "Übersteuere die Projektionsprüfung (verwende Projektion der Location)." + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "Kann die 3D-Rasterkarte <%s> nicht erzeugen." -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "Lese Punkte..." -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -20427,7 +20603,6 @@ msgstr "Erstelle explizit ein 3D NULL-Wert Bitmap Datei." #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -20440,10 +20615,8 @@ msgstr "Erstelle explizit ein 3D NULL-Wert Bitmap Datei." #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -20457,11 +20630,11 @@ msgstr "Erstelle explizit ein 3D NULL-Wert Bitmap Datei." #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "Darstellung" @@ -20955,10 +21128,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -21014,9 +21187,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Typ" @@ -21076,13 +21249,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "Starte <%s> GUI im Hintergrund. Bitte warten Sie ..." #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -21453,74 +21626,76 @@ msgstr "" "Speichere die Einstellungen der aktuellen Region in eine benannte Regions-" "Datei." -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Region <%s> nicht gefunden." -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "Kann den Header der 3D-Rasterkarte <%s@%s> nicht lesen." -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "Kann die Region <%s> einrichten." -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "Kann die derzeitige Region nicht aktualisieren." -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" "Kann die Standard-Region nicht ändern. Das aktuelle Mapset ist nicht " "." -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" "Sie sind bereits in Lat/Long. Verwenden Sie den Schalter -p statt dessen." -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 +#, fuzzy msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" "Sie befinden sich in einer einfachen XY-Location. Umprojezieren nach Lat/Lon " "ist nicht möglich.Verwenden Sie statt dessen den Schalter -p)." -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "WGS84 Ausgabe nicht möglich, da diese Location keine " "Datumstransformationsparameter enthält. Versuchen Sie g.setproj." -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "Kann lat/long Projektions Parameter nicht aktualisieren." -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "Lat/Long Berechnungen sind in einem einfachen XY-System nicht möglich." @@ -21764,8 +21939,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" "Der Parameter 'file' enthält einen Verweis auf das Mapset <%s>, aber der " "Parameter Mapset <%s> stimmt damit nicht überein." @@ -22040,119 +22215,120 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +#, fuzzy +msgid "Can also be used to create new GRASS projects." msgstr "Kann auch verwendet werden, um neue GRASS Locations zu erzeugen." -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "Ausgabe und Manipulation von GRASS Projektionsinformationsdateien." -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "Gebe die Projektionsinformationen im Standard-GRASS-Format aus" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "Gebe die Projektionsinformationen im Shellskript-Stil aus" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" "Überprüfe Datum-Informationen und gebe die Transformationsparameter aus." -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Gebe die Projektionsinformationen im PROJ.4-Format aus." -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "Ausgabe ohne Zeilenumbrüche (nur bei WKT- und PROJ.4-Ausgaben)" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 #, fuzzy msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "Ausgabe ohne Zeilenumbrüche (nur bei WKT- und PROJ.4-Ausgaben)" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "Gebe die Projektionsinformationen im WKT-Format aus." -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "Benutze ESRI-spezifisches Format (nur bei WKT-Ausgabe)." -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "Spezifikation" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" "Name der Datei georeferenzierten Daten, von der Projektionsinformationen " "gelesen werden sollen" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "Name der ASCII-Datei mit WKT-Projektionsinformationen" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "PROJ.4 Projektionsdefinition" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "EPSG Code" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "Datum" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "Datum (übersteuere Datumsangaben in der Eingabedatei)" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" "Akzeptiert Standard GRASS Datumcodes oder \"list\" zum Anzeigen der Liste " "und beenden" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "Index der Datumtransformations-Parameter" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" "\"0\" für nicht spezifiziert oder \"-1\" um alle aufzulisten und sich zu " "beenden" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" @@ -22160,48 +22336,50 @@ msgstr "" "Erzwinge das Übersteuern der Datumtransformationsinformation des Eingabe " "Koordinatensystems." -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +#, fuzzy +msgid "Modify current project's projection files" msgstr "Verändere die Projektion der aktuelle Location" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Erzeuge" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Name einer neu zu erstellenden Location" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Projektionsinformationen fehlen." -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" "Nur ein Schalter von -%c, -%c, -%c, -%c, -%c oder -%c kann angegeben werden" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" "Nur ein Schalter von -%c, -%c, -%c, -%c, -%c oder -%c kann angegeben werden" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" "Kein Ausgabeformat angegeben, verwende einen der Schalter -%c, -%c, -%c oder " "-%c" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -22294,8 +22472,8 @@ msgstr "" "benutzt." #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" msgstr "Kann die Location <%s>: %s nicht erstellen." #: ../general/g.proj/create.c:21 @@ -22304,14 +22482,14 @@ msgid "Unable to create projection files: %s" msgstr "Kann die Projektionsdateien %s nicht erzeugen." #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" +#, fuzzy, c-format +msgid "Unable to create project <%s>" msgstr "Kann die Location <%s> nicht anlegen" #: ../general/g.proj/create.c:27 -#, c-format +#, fuzzy, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" "Sie können wie folgt in die neue Location wechseln\n" @@ -22320,11 +22498,11 @@ msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " @@ -22334,75 +22512,75 @@ msgstr "" "aber mehrere Mapsets haben, sollten Sie `g.region -d` in jedem ausführen, " "um die Einstellungen von der Standardregion zu übernehmen." -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "Projektionsinformationen aktualisiert" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "Gibt eine Nachricht, Warnung oder fatalen Fehler im GRASS-Stil aus." -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" "Dieses Modul sollte in Skripten verwendet werden um Nachrichten an den " "Benutzer auszugeben." -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "Gebe Nachricht als Warnung aus." -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "Gebe Nachricht als fatalen Fehler aus." -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "Gebe Nachricht als Debug-Nachricht aus." -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "Gebe Nachricht als Fortschrittsinfo aus." -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "Level" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "Gebe Nachricht nur im gesprächigen Modus aus." -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Text der zu druckenden Nachricht." -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "Level für Debug-Nachrichten." -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "Wählen Sie nur ein Benachrichtigungs-Level." -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "Kann die Nachricht nicht parsen." @@ -22544,8 +22722,10 @@ msgid "Changes/reports current mapset." msgstr "" #: ../general/g.mapset/main.c:52 +#, fuzzy msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" "Erzeuge optional ein neues Mapset oder liste die verfügbaren Mapsets in der " "Location auf." @@ -22632,35 +22812,58 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "Aktuelles Mapset ist <%s>" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "Verfügbaren Mapsets:" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 +#, fuzzy msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" "Beeinflusst beeinflusst den Zugriff des Benutzers auf Daten in anderen " "Mapsets in der aktuellen Location." -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22669,69 +22872,75 @@ msgstr "" msgid "Operation to be performed" msgstr "Operation die ausgeführt werden soll." -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" -msgstr "" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" +msgstr "Ausgabeformat (printf-Stil)." -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "Liste alle verfügbare Mapsets in alphabetischer Reihe auf." -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "Gebe den aktuellen Mapset-Suchpfad aus." -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Geben Sie eine Regel in einem dieser Formate ein:" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "Mapset <%s> nicht gefunden." -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "Mapset <%s> zum Suchpfad hinzugefügt." -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "Mapset <%s> aus dem Suchpfad entfernt." -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22746,37 +22955,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -23138,7 +23344,7 @@ msgstr " Standardabweichung" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -24340,7 +24546,7 @@ msgstr "Transformation erfolgreich." #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -24435,17 +24641,19 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "Gruppe <%s> zielt auf Location [%s], Mapset [%s]." #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Name der Ziellocation für das Bild." #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -24477,35 +24685,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" msgstr "Ziel-Location [%s] nicht gefunden.\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 -#, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "Mapset <%s> in Ziel-Location <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "Zugriff verweigert.\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "nicht gefunden\n" @@ -24558,61 +24767,66 @@ msgstr "Ziel-Information für die Gruppe <%s> fehlt." #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" msgstr "Ziel-Location <%s> nicht gefunden." -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "Mapset <%s> in Ziel-Location <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "Keine Kamerareferenzdatei ausgewählt für die Gruppe <%s>." -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "Schlechtes Format in der Kamerareferenzdatei der Gruppe <%s>." -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "Schlechtes Format in der Anfangs-Kameraposition für die Gruppe <%s>." @@ -24622,30 +24836,32 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Name der Bildgruppe für Orthorektifikation." #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Kann auf den Font-Pfad %s: %s nicht zugreifen." -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "Die Projektionsinformationen werden nicht aktualisiert." -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" +msgstr "Gruppe <%s> zielt auf Location [%s], Mapset [%s]." #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -24759,15 +24975,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr " Führen Sie OPTION 5 von i.ortho.photo aus!" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 -#, c-format -msgid "Rectify <%s@%s> (location <%s>)" +#, fuzzy, c-format +msgid "Rectify <%s@%s> (project <%s>)" msgstr "Rektifiziere <%s@%s> (Location <%s>)." #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." msgstr "nach <%s@%s> (Location <%s>) ..." #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24810,103 +25024,102 @@ msgstr "Ziel-Auflösung (ignoriert, wenn -c verwendet wird)" msgid "Raster map with camera angle relative to ground surface" msgstr "Rasterkarte mit Kamerawinkel relativ zur Oberfläche" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" "Verwende die Einstellungen der aktuelle Region für die Ziellocation " "(Standard: Berechne den kleinsten Bereich)." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "Rektifiziere alle Rasterkarten der Gruppe." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "Gruppe <%s> nicht gefunden." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "Location: %s" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "erzeuge Location" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "Mapset: %s" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "Konnte REF-Datei der Gruppe <%s> nicht lesen." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "Gruppe <%s> enthält keine Dateien; führen Sie i.group aus." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "Erweiterung <%s> ist ungültig." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "Die folgende Rasterkarte existiert bereits in" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "Ziel-LOCATION %s, MAPSET %s:" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Gruppe <%s> zielt auf Location [%s], Mapset [%s]." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "Georeferenzierung abgebrochen." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "Ziel-Resolution muss > 0 sein, ignoriert" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "Verwende die Region: N=%f S=%f, O=%f W=%f" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "Kein Ziel-Höhenmodell ausgewählt für die Gruppe <%s>." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "Eingabe-Rasterkarte <%s> existiert nicht in der Gruppe <%s>." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "Versuche:" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "Ende!" @@ -25034,6 +25247,16 @@ msgstr "Region N=%f S=%f O=%f W=%f" msgid "Resolution EW=%f NS=%f" msgstr "Auflösung OW=%f NS=%f" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "Rektifiziere <%s@%s> (Location <%s>)." + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "nach <%s@%s> (Location <%s>) ..." + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -25052,6 +25275,13 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" +"Verwende die Einstellungen der aktuelle Region für die Ziellocation " +"(Standard: Berechne den kleinsten Bereich)." + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -25061,6 +25291,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "Ungültiger Grad (%d); Bitte geben Sie 1 bis %d ein." +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "Location: %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "Ziel-LOCATION %s, MAPSET %s:" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "Ziel-Location <%s> nicht gefunden." + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "Mapset <%s> in Ziel-Location <%s> - " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -25434,6 +25684,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Projektion" @@ -25578,6 +25829,7 @@ msgstr "" "'sequential maximum a posteriori (SMAP)' Ansatzes durch." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25589,6 +25841,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)..." @@ -25958,6 +26215,7 @@ msgstr "" #: ../imagery/i.vi/main.c:97 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25969,6 +26227,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -26110,6 +26373,7 @@ msgstr "" #: ../imagery/i.vi/main.c:210 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26121,6 +26385,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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])" @@ -26169,6 +26438,7 @@ msgstr "" #: ../imagery/i.vi/main.c:262 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26180,6 +26450,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -27176,6 +27451,7 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Segmentation processes stopped at %d due to reaching max iteration limit, " "more merges may be possible" @@ -27184,6 +27460,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Negative value %s for option '%s': disabling" ======= msgid "" @@ -27196,6 +27474,9 @@ msgid "" "more merges may be possible" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27521,6 +27802,7 @@ msgstr "" #: ../imagery/i.eb.netrad/main.c:85 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27532,6 +27814,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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]" @@ -27624,8 +27911,8 @@ msgid "For no rescaling use 0,0" msgstr "Um Neuskalierung zu vermeiden, 0,0 verwenden" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "Neuskalieren" @@ -27825,6 +28112,7 @@ msgstr "" #: ../imagery/i.aster.toar/main.c:105 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27836,6 +28124,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -28697,17 +28990,14 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "* Wüstenindex: %.2lf" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "* Schneebedeckung: %.2lf %%" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "* Wolkenbedeckung: %.2lf %%" @@ -28716,17 +29006,14 @@ msgid "* Temperature of clouds:" msgstr "* Temperatur der Wolken:" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "** Maximum: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "** Mittelwert (%s Wolke): %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "** Minimum: %.2lf K" @@ -28735,17 +29022,14 @@ msgid "Histogram cloud signature:" msgstr "Histogramm der Wolkensignatur:" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "* Mittlere Temperatur: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "* Standardabweichung: %.2lf" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "* Schiefe: %.2lf" @@ -28755,17 +29039,14 @@ msgid "* Histogram classes: %d" msgstr "* Histogrammklassen: %d" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "* 98.75 Perzentile: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "* 97.50 Perzentile: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "* 83.50 Perzentile: %.2lf K" @@ -28774,12 +29055,10 @@ msgid "Maximum temperature:" msgstr "Maximum Temperatur:" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "* Kalte Wolke: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "* Warme Wolke: %.2lf K" @@ -30767,6 +31046,9 @@ msgid "Apriori Phi (roll) standard deviation" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -32123,11 +32405,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -32180,7 +32466,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -32275,16 +32561,15 @@ msgid "OGR layer <%s> not found" msgstr "OGR Layer <%s> nicht gefunden" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Spalte <%s> in der Tabelle <%s>nicht gefunden." @@ -32865,6 +33150,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "Histogramm" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Attribut-Spalten, die Daten enthalten." + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Anzahl der zu verwendenden Klassen" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -32907,6 +33228,8 @@ msgstr "Eingaben" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -32957,6 +33280,7 @@ msgstr "" "zu berechnende Perzentile (erfordert den Schalter 'erweiterte Statistiken')." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32968,33 +33292,50 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 +msgid "Name of output raster cloud and shadow mask" +msgstr "Name der Ausgabe-Rasterkarte." + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Name für die Ausgabe-Vektorkarte" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Name der Ausgabe-Rasterkarte." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Name für die Ausgabe-Vektorkarte" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Name der Ausgabe-Rasterkarte." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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)" ======= #: ../locale/scriptstrings/t.rast.series_to_translate.c:1 @@ -33003,6 +33344,7 @@ msgid "" "of raster maps in a space time raster dataset." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33014,42 +33356,53 @@ 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:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 #, fuzzy msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "Name der Landsat Metadaten-Datei (.met oder MTL.txt)" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Name der Datenbank-Datei." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Neuskalieren" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Kann die temporäre Datei nicht schreiben." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "Basisname der Eingabe-Rasterkarten" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Koordinaten der Startpunkte" @@ -33131,6 +33484,7 @@ msgid "" "on the fly." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33142,6 +33496,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 @@ -33184,243 +33543,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "Eingabe" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" -"Gibt oder setzt Datenbankverbindung für eine Vektorkarte zu einer " -"Attributtabelle." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Name der Vektorkarte" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Layer-Nummer (to)." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "Layer-Nummer für Flächen-Karte" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -#, fuzzy -msgid "Numpy array with vector cats." -msgstr "Keine Flächen in Vektorkarte <%s>" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Zu viele Spaltennamen." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Anzahl der Spalten in der neuen Region." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "Format des Ausgabedateien" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Speichertyp der resultierenden Rasterkarte." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Name der Rasterkarte mit Klassifikationsergebnissen." - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -33631,6 +33761,537 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Erzeuge eine Integer-Rasterkarte." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Name der Ziellocation für das Bild." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Name der Hintergrund-Vektorkarte(n)." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "Spline-Spannung (Tension) Parameter" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Name der Ausgabekarte" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s: ungültiger Wert." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "Ausgabe-Vektorkarte, in die die Segmente geschrieben werden." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Erzeuge Vektorpunkte als 3D-Punkte." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Name der Eingabekarte." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Erzeuge Vektorpunkte als 3D-Punkte." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Name der Hintergrund-Vektorkarte(n)." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Name der anzuzeigenden Rasterkarte" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Schreibe transformierte Daten in die Datei..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +#, fuzzy +msgid "Multiply all automatic regularization parameters by this number." +msgstr "Multipliziere die resultierende Dichte mit dieser Zahl." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Glättet Ecken flächenhafter Objekte" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Selektiere Objekte..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Selektiere Objekte..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Selektiere Objekte..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "Nicht automatisch beim Starten selektieren." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "Generalisierung" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Location: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Prozentsatz der CPU der verwendet werden darf." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "erzeuge Location" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Anzahl der Level, welche für <%s> benutzt werden sollen." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Maximale Zahl der Iterationen." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Umrechnungsfaktor für MFD (1-10)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Grenzwert für Ausreißer" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Grenzwert für Ausreißer" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Grenzwert für Ausreißer" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Wie oft soll der Filter wiederholt werden?" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +#, fuzzy +msgid "Regularization parameter for treshold features" +msgstr "Regularisierungsgewicht für die Evaluation der Residuen" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +#, fuzzy +msgid "Regularization parameter for hinge features" +msgstr "Parameter für die Tykhonov Regularisierung (beinflußt Glättung)." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Entferne doppelte Zentroide" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Titel für die neue Rasterkarte." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Anzahl der zu verwendenden Klassen" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +#, fuzzy +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" +"Maximal zu verwendender Speicher in Verbindung mit dem Schalter -m (in MB)." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -33853,10 +34514,15 @@ msgstr "Tabellendatei, die importiert werden soll oder eine DB-Verbindung." msgid "Name for output vector map" msgstr "Name für die Ausgabe-Vektorkarte" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "Übersteuere die Projektionsprüfung (verwende Projektion der Location)." + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -35096,6 +35762,7 @@ msgstr "" #: ../locale/scriptstrings/r.in.nasadem_to_translate.c:18 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35107,6 +35774,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 " @@ -35322,6 +35994,14 @@ msgstr "Name der Eingabe-Paket-Datei" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -35447,6 +36127,7 @@ msgid "" "services (Zulian, 2014)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35458,6 +36139,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 @@ -35593,6 +36279,7 @@ msgid "" "resources" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35604,6 +36291,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 @@ -35693,6 +36385,7 @@ msgid "" "value." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35704,6 +36397,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 @@ -36005,6 +36703,7 @@ msgid "" "high recreational value" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36016,6 +36715,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 @@ -36084,6 +36788,7 @@ msgid "" "channels" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36095,6 +36800,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 @@ -36772,6 +37482,7 @@ msgid "" "eg.: absolute time \"1 months\" or relative time \"1\"" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36783,6 +37494,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 @@ -37221,6 +37937,7 @@ msgid "" "locations." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37232,6 +37949,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 @@ -38252,6 +38974,7 @@ msgid "" "raster map" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38263,6 +38986,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 @@ -38689,7 +39417,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -38736,11 +39464,6 @@ msgstr "" msgid "landscape" msgstr "Landsat" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -39858,7 +40581,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Ziel-Layernummer oder -name" @@ -39898,6 +40620,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Setze den Kartennamen auf <%s>." + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -40280,7 +41014,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -40478,7 +41211,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Eingabeformat" @@ -40514,6 +41247,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Pfad zur GRASS-Datenbank der Eingabe-Location." + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -41589,11 +42331,8 @@ msgstr "Konfigurationsdatei" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -41644,45 +42383,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Hintergrundfarbe" +msgid "Thin species and background points" +msgstr "Anzahl der Interpolationspunkte." -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Hintergrundfarbe" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Spaltenummer der Daten in der Eingabedatei." -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Startwert für den Zufallszahlengenerator." @@ -41881,6 +42634,7 @@ msgid "" "'qsub -v year=2011 ...'" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -41892,6 +42646,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 @@ -42452,6 +43211,7 @@ msgstr "" "Stunden]." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42463,6 +43223,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -42507,6 +43272,7 @@ msgstr "" "m-2.day-1] (Modus 2)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42518,6 +43284,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -42594,6 +43365,10 @@ msgstr "" "m-2.day-1] (Modus 2)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -42690,6 +43465,7 @@ msgid "" "specified time period" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -42701,6 +43477,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 @@ -42708,11 +43489,14 @@ msgstr "" #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Name of vector map with interesting segments of rivers" msgstr "Name existierender Vektorkarte mit Punkten" @@ -42722,6 +43506,9 @@ msgstr "Name existierender Vektorkarte mit Punkten" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42902,8 +43689,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -42914,6 +43710,7 @@ msgid "Group of raster layers to be classified" msgstr "Art der zu erstellenden Rasterkarte." #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -42955,11 +43752,13 @@ msgid "" msgstr "Name der numerischen Spalte für die Winkel der Symbolrotation." #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Ausgabekarte" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -43270,6 +44069,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -43281,6 +44081,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -43310,6 +44111,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Datei mit Beschriftungen." @@ -43689,67 +44491,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "Rasterkarte mit Informationen zu dem Fließgewässersystem." - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Name der Ausgabe-Rasterkarte." - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "Name der Ausgabe-Akkumulations-Rasterkarte." - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "Camera Entferung (in Karteneinheiten)." - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -43993,6 +44734,7 @@ msgid "" "using r.kappa." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -44004,6 +44746,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 @@ -44178,6 +44925,7 @@ msgid "" "bands)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -44189,6 +44937,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 @@ -44225,11 +44978,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Vergrößere die Location basierend auf dem neuen Datensatz." +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -44912,6 +45667,7 @@ msgstr "" "Ausgabe nach stdout)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -44923,6 +45679,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -45150,6 +45911,14 @@ msgid "" msgstr "" "Reprojiziert eine Vektorkarte von einer Location in die aktuelle Location." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "Location mit der Eingaberasterkarte" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Pfad zur GRASS-Datenbank der Eingabe-Location." + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -45281,12 +46050,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -45437,9 +46206,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -45482,19 +46250,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Vergrößere die Location basierend auf dem neuen Datensatz." + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -45503,7 +46282,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "Zeigt die vorhandenen Layer in der Datenquelle und beendet sich." @@ -45644,34 +46423,6 @@ msgstr "Eingabe-Datenbankname" msgid "Base name for output file" msgstr "Name der Ausgabedatei" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "Hydrologie" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Attribut-Spalten, die Daten enthalten." - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Anzahl der zu verwendenden Klassen" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -46365,6 +47116,10 @@ msgstr "Name für die SVG-Ausgabedatei" msgid "Queries projection information spatially." msgstr "Projektionsinformationen aktualisiert" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "erzeuge Location" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -46663,8 +47418,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Löst Grenzen zwischen benachbarten Flächen mit gleicher Kategorienummer oder " @@ -46697,8 +47453,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Name der Attributspalte mit den Höhen." #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -47431,9 +48188,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -47694,6 +48457,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47705,6 +48469,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -47715,17 +48484,23 @@ msgstr "Unbekannter EPSG-Code %s" #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Print projection info in Proj4 format" msgstr "Gebe die Projektionsinformationen im PROJ.4-Format aus." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47737,6 +48512,7 @@ msgstr "" "Attributtabelle." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47748,6 +48524,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -47859,6 +48640,7 @@ msgid "" "the table." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47870,6 +48652,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 @@ -47886,6 +48673,7 @@ msgid "" "Instead of creating a new vector map update the attribute table with value(s)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47897,6 +48685,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 @@ -47940,6 +48733,7 @@ msgid "" "an" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47951,6 +48745,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 @@ -47979,6 +48778,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -49023,8 +49830,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -49124,16 +49931,22 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Liste der zu importierenden Layer." + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -49155,33 +49968,52 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 msgid "(default: unlimited)" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 -msgid "Skip earlier feature IDs and start downloading at this one" +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 +msgid "Maximum number of features to download" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 +msgid "(default: unlimited)" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 -msgid "(default: start with the first feature)" +msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +msgid "(default: start with the first feature)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -49461,6 +50293,7 @@ msgstr "" "Name der Ausgabe-Vektorausgabekarte (auslassen für Ausgabe auf stdout)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49472,6 +50305,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -49610,6 +50448,7 @@ msgid "" "column." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49621,6 +50460,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 @@ -49651,6 +50495,7 @@ msgid "" "vector map" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49662,6 +50507,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 @@ -49681,6 +50531,7 @@ msgid "" "distance raster maps" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49692,6 +50543,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 @@ -50056,17 +50912,23 @@ msgstr "" #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Output vector points map of vertical deflections [m]" msgstr "Ausgabe-Vektorkarte, in die die Fehlern geschrieben werden." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -50077,6 +50939,7 @@ msgstr "" "Source WHERE Bedingungen des SQL-Ausdrucks ohne das Schlüsselwort 'where'" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -50088,6 +50951,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -50229,6 +51097,7 @@ msgid "" "datasets" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -50240,6 +51109,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 @@ -50912,6 +51786,7 @@ msgid "" "them" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -50923,6 +51798,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 @@ -51010,6 +51890,7 @@ msgid "" "data range." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -51021,6 +51902,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 @@ -52980,6 +53866,7 @@ msgstr "" "sein)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -52991,6 +53878,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -53024,6 +53916,7 @@ msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -53035,6 +53928,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 @@ -54464,8 +55362,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -54503,6 +55401,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -54933,6 +55832,13 @@ msgstr "Reklassifizieren" msgid "multiple" msgstr "multispektral" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -54989,6 +55895,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Vektorlinien" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Vektorlinien" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -55029,6 +55949,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Anzahl Zellen, die die Kacheln in alle Richtungen überlappen sollen." +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Art der zu erstellenden Rasterkarte." + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Wie oft soll der Filter wiederholt werden?" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -55471,8 +56423,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -56232,6 +57184,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Name der Ausgabe-Rasterkarte (Sättigung, saturation)." +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Name der neu zu erstellenden Location." + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -56532,6 +57488,10 @@ msgstr "Name der Eingabe-Paket-Datei" msgid "Offset factor for input" msgstr "Skalierungsfaktor für die Höhe." +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -56986,10 +57946,94 @@ msgstr "Vertikale Überhöhung." msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Datei mit Beschriftungen." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Name der Eingabekarte." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Name der zu editierenden Vektorkarte" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "ausschalten" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Resultierende 2D Cross-Sektions-Karte." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Name der Rasterkarte für <%s>." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parameter" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Gebe x und y aus (Spalte und Zeile)." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "Hydrologie" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Attribut-Spalten, die Daten enthalten." + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -57525,17 +58569,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -57615,24 +58649,21 @@ msgid "categorical map with zones" msgstr "Vektorpunkte" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Name der Ausgabedatei" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 #, fuzzy msgid "Plot dimensions (width,height)" msgstr "Stelle die Screen-Dimensionen dar (Breite, Höhe)." #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Größe (Breite, Höhe) des Ausgabe-Bildes." @@ -57644,9 +58675,8 @@ msgid "Default font size" msgstr "Standardeinheit ist Rasterzelle" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -57666,14 +58696,12 @@ msgid "Create a vector point layer of outliers" msgstr "Erzeuge Vektorpunkte als 3D-Punkte." #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "Grenzwert für Ausreißer" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -57684,14 +58712,12 @@ msgid "Draw notches" msgstr "Zeichen-Modus" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -57724,14 +58750,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -57743,27 +58761,23 @@ msgid "Plot format" msgstr "Eingabeformat" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Gebe Kategorielabel aus." #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -57812,15 +58826,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -57841,7 +58846,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "Farbe der Linien, welche die Farbflächen der Farbtabelle trennen." #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Breite der Grenze" @@ -57853,55 +58857,46 @@ msgid "The width of the boxplots (0,1])" msgstr "Linienbreite des Textes." #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Linienbreite" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 #, fuzzy msgid "The linewidth of the boxplots" msgstr "Linienbreite des Textes." #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Format des Ausgabedateien" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "Farbe für Text und Achsen." #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Farbe für die Y-Daten." #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 #, fuzzy msgid "Whisker and cap linewidth" msgstr "Gitterlinienbreite" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 #, fuzzy msgid "Flier marker" msgstr "Symbolmarker" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -57909,113 +58904,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "Schriftgröße" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "Bytes passen nicht zur Dateigröße" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Farbe der Randzone" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Bestimmt die Textfarbe." -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Name der Ausgabe-Rasterkarte(n)." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Name der Ausgabe-Rasterkarte(n)." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Auflösung" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Zeichen-Modus" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Schriftgröße" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Tabellenformat" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Linienbreite des Textes." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Text-Farbe" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -58082,6 +58991,7 @@ msgstr "" msgid "" <<<<<<< 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." ======= @@ -58089,6 +58999,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Export categories and corresponding colors as QGIS color file or csv file. " "Non-existing categories and their color definitions will be removed." ======= @@ -58100,6 +59012,9 @@ msgid "" "Non-existing categories and their colour definitions will be removed." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -58980,6 +59895,7 @@ msgid "" "distance raster maps)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -58991,6 +59907,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 @@ -59144,6 +60065,7 @@ msgid "" "can be file name of a file generated by Python viscm tool" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -59155,6 +60077,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 @@ -59267,6 +60194,7 @@ msgid "" "Traces a flow through an elevation model or cost surface on a raster map." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -59278,6 +60206,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 @@ -59391,6 +60324,7 @@ msgid "" "specified)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -59402,6 +60336,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 @@ -59737,6 +60676,7 @@ msgid "" "over time." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -59748,6 +60688,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 @@ -60422,6 +61367,7 @@ msgstr "" "Distanz." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -60433,6 +61379,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -60451,6 +61402,7 @@ msgid "" "respectively. The rest is computed using r.slope.aspect" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -60462,6 +61414,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)." @@ -60785,6 +61742,7 @@ msgid "" "in input map attribute table, it will be created." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -60796,6 +61754,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 @@ -60841,6 +61804,7 @@ msgid "" "used for classification except for class_column and cat column." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -60852,6 +61816,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 @@ -60993,6 +61962,14 @@ msgstr "Sortiere die Ergebnisse." msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -61022,6 +61999,7 @@ msgid "no-data" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61033,6 +62011,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -61040,6 +62023,21 @@ msgid "add grid lines" msgstr "Habe %d Linien beschriftet" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Text-Farbe" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" ======= @@ -61103,6 +62101,7 @@ msgid "" "account other flags)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61114,6 +62113,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 @@ -61132,6 +62136,7 @@ msgid "" "basic;Use basic regular expressions;extended;Use extended regular expressions" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61143,6 +62148,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 @@ -61216,310 +62226,310 @@ msgstr "" "Benennt eine Spalte einer Attributtabelle verbunden mit einer bestimmten " "Vektorkarte um." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Vektorlinien" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Anzahl der Spalten" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Spaltenname für z-Werte" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Topology Spalte:" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Spaltenname für z-Werte" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Art des Vektorobjekts" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Name der Ausgabe-Rasterkarte." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Name der Ausgabedatei (ohne Dateiendung)." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Skaliere den Wertebereich der Ausgabekarten" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Eingabe Optionen" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "Der Wert des Patch-Typs" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "Statistik" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 #, fuzzy msgid "Dot marker" msgstr "Symbolmarker" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "Flächengröße" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 #, fuzzy msgid "Set marker size" msgstr "Flächengröße" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Text-Farbe" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Farbe für die Y-Daten." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Spalte" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Rückwertiger Durchlauf fertig." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "Linie" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Eingabe Optionen" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Farben" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Farbe für Text und Achsen." +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Gitterlinienbreite" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Linienbreite des Textes." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Linien-Farbe" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "Farbe für Text und Achsen." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Ungültige Seitenbreite." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Liste der Perzentile" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Integer-Wertebereich: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Name der Rasterkarte, die angezeigt werden soll." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Integer-Wertebereich: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Name der Rasterkarte, die angezeigt werden soll." @@ -61886,6 +62896,7 @@ msgid "" "scales." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61897,6 +62908,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 @@ -61941,8 +62957,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -62547,6 +63563,8 @@ msgid "" "map of a space time vector dataset" msgstr "" +<<<<<<< HEAD +======= #: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 msgid "Create a dasymetric weighting layer with Random Forest" msgstr "" @@ -63771,6 +64789,7 @@ msgstr "" "soll (Punktmodus)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63782,6 +64801,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -63792,17 +64816,23 @@ msgstr "Name der Spalte mit den X-Koordinaten." #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Format: All values must be >0" msgstr "Der Schwellwert muss >=0 sein." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -63813,6 +64843,7 @@ msgstr "" "varchar(10)'" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63824,6 +64855,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -63896,6 +64932,7 @@ msgstr "" "eingelesen." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63907,6 +64944,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -63935,6 +64977,7 @@ msgstr "" "Importiere nur Punkte die sich innerhalb der aktuellen Region befinden." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63946,6 +64989,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -64017,6 +65065,7 @@ msgid "" "Python dictionary of customized tunegrid for sklearn RandomForestRegressor" msgstr "" +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -64185,6 +65234,7 @@ msgstr "" "werden soll." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64196,6 +65246,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)" @@ -64296,6 +65351,7 @@ msgstr "" "Koordinatensystems." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64307,16 +65363,24 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Area input vector maps" msgstr "Keine Eingabe-Vektorkarten!" @@ -64372,6 +65436,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -64406,6 +65473,7 @@ msgstr "" "Koordinatensystems." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64417,6 +65485,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -64566,6 +65639,7 @@ msgid "" "Jinjie; Zhao, Shaohua. 2015)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64577,6 +65651,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 @@ -64798,6 +65877,7 @@ msgid "" "Increase to reduce spatial discontinuation in the final LST" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64809,6 +65889,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 @@ -65138,11 +66223,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "Histogramm" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -65296,6 +66376,7 @@ msgid "" "defined by the user." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -65307,6 +66388,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 @@ -71734,6 +72820,49 @@ msgstr "Anzahl der Zentroide:" msgid "Path where move and copy the mapset" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Verwende die aktuelle Region." + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" +>>>>>>> osgeo-main #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." @@ -71761,6 +72890,7 @@ msgstr "" "Fügt eine oder mehrere Spalten zu der Attributtabelle einer Vektorkarte." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -71772,6 +72902,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -72312,8 +73447,8 @@ msgid "Unable to open file '%s': %s" msgstr "Kann Datei '%s' nicht öffnen: %s" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -76840,6 +77975,7 @@ msgid "" "layer for this categories is given by nlayer option" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -76851,6 +77987,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 @@ -76895,8 +78036,9 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +#, fuzzy +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "Verwende gedätische Berechnungen für Longitude-Latitude Locations." <<<<<<< HEAD @@ -78531,16 +79673,22 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to open file '%s' for writing" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -78563,6 +79711,7 @@ msgid "" "other options has been set." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -78574,6 +79723,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 @@ -78932,7 +80086,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format <<<<<<< HEAD @@ -79012,7 +80166,7 @@ msgid "No source features selected. Please check options '%s', '%s'." >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -79863,6 +81017,7 @@ msgstr "" #: ../vector/v.kernel/main.c:116 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -79874,6 +81029,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -79944,6 +81104,7 @@ msgstr "Kernel Funktion" #: ../vector/v.kernel/main.c:209 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -79955,6 +81116,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)" @@ -79970,6 +81136,7 @@ msgstr "" #: ../vector/v.kernel/main.c:219 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -79981,6 +81148,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -79996,6 +81168,7 @@ msgstr "" #: ../vector/v.kernel/main.c:238 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -80007,6 +81180,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -80026,6 +81204,7 @@ msgstr "Unbekannte Kernelfunktion" #: ../vector/v.kernel/main.c:281 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -80037,6 +81216,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'." @@ -80184,7 +81368,7 @@ msgstr "Typ der Komponenten" msgid "Add points on nodes" msgstr "Fügt Punkte zu Knoten hinzu" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -80484,7 +81668,7 @@ msgstr "" "Ausgabe-Vektorkarte, Tabelle <%s> (Treiber: <%s>, Datenbank: <%s>) existiert " "bereits." -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "Datentyp der Schlüssel-Spalte (key column) muss ein integer sein." @@ -80579,43 +81763,39 @@ msgstr "" "beendet sich. " #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Überschreibe die Verbindungsparameter für den angegebenen Layer." - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Lösche die Verbindung zur Tabelle (nicht aber die Tabelle)." -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Bitte nur einen Druck-Stil auswählen." -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "Nicht in der Lage Vektorkarte in anderem Mapset zu ändern." -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Datenbankverbindung nicht definiert." -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" @@ -80623,7 +81803,7 @@ msgstr "" "Layer <%d> Tabelle <%s> in der Datenbank <%s> mit dem Treiber <%s> und der " "Schlüsselspalte <%s>\n" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -80633,19 +81813,19 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" "Verwenden Sie -o, um den existierenden Link für den Layer <%d> zu " "überschreiben." -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "Die Tabelle <%s> existiert nicht in der Datenbank <%s>." -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -80654,16 +81834,16 @@ msgstr "" "Die Tabelle <%s> ist jetzt Teil der Vektorkarte <%s> und kann mit GRASS " "Modulen gelöscht und überschrieben werden." -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Kann Privilegien für die Tabelle '%s' nicht zuweisen." -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Select-Privilegien wurden für die Tabelle gewährt." -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -80702,7 +81882,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -80779,180 +81959,180 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" "Wählen Sie entweder den Schalter \"aktuelle Region\" oder die Option " "'spatial' aber nicht beide." -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "4 Werte sind für den Parameter 'spatial' nötig." -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "Die Vektorkarte <%s> existiert bereits und wird überschrieben." -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "Vektorkarte <%s> existiert bereits." -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -81358,6 +82538,7 @@ msgid "" "No input profile map name provided, but WHERE conditions for it have been set" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81369,6 +82550,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." @@ -81424,6 +82610,7 @@ msgid "" "it's not supported. Enhance WHERE conditions to get only one line." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81435,6 +82622,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." @@ -81537,7 +82729,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -81831,6 +83023,7 @@ msgid "" "Name for output vector map where erroneous vector features are written to" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81842,17 +83035,22 @@ 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 msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -81879,21 +83077,27 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Layer <%s> not available" msgstr "Layer <%s> ist nicht vorhanden." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -81907,7 +83111,7 @@ msgstr "" msgid "No layer defined" msgstr "Kein Layer definiert" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "Kann die Datenquelle <%s> nicht öffnen." @@ -81927,7 +83131,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -81963,12 +83167,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Reprojiziert eine Vektorkarte von einer Location in die aktuelle Location." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "Location, die die Eingabe-Vektorkarte enthält." #: ../vector/v.proj/main.c:88 @@ -82003,13 +83209,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Eingabe und Ausgabe Location dürfen nicht identisch sein." + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "Vektorkarte <%s> in der Location <%s> im Mapset <%s> nicht gefunden." #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -82023,13 +83234,13 @@ msgid "Input vector map <%s> is empty" msgstr "" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "Mapset <%s> in Eingabe-Location <%s> - Zugriff verweigert." #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "Mapset <%s> in Eingabe-Location <%s> nicht gefunden." #: ../vector/v.proj/main.c:517 @@ -82568,7 +83779,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -83223,7 +84434,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "Import fehlgeschlagen" @@ -83533,12 +84744,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "Entferne Überstände (dangles)..." #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "Entferne Brücken..." @@ -83749,19 +84960,19 @@ msgid "Snapping boundaries..." msgstr "Fange Grenzen..." #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "Teile Polygone..." #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Entferne Duplikate ..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "Breche Grenzen auf..." @@ -83898,6 +85109,7 @@ msgstr "" "aus." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -83909,6 +85121,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)" @@ -84007,7 +85224,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "Layer <%s> nicht gefunden" @@ -84165,10 +85382,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -84209,6 +85426,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -84310,9 +85531,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -84326,7 +85547,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "Vektor ist nicht 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -84414,7 +85635,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -84442,8 +85662,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" "%d Punkte, die (nach Ausdünnung) zur Verfügung stehen, sind weniger als die " "angegebenen NPMIN=%d." @@ -85112,7 +86332,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "Kann den Zentroid der Fläche nicht berechnen." @@ -85344,6 +86564,7 @@ msgid "Creation" msgstr "Erzeugung" #: ../vector/v.out.postgis/args.c:44 +<<<<<<< HEAD msgid "" "Name for output vector map defined as a link to the PostGIS feature table" msgstr "" @@ -85356,9 +86577,23 @@ msgstr "" #: ../vector/v.out.postgis/args.c:53 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Name for output vector map defined as a link to the PostGIS feature table" +msgstr "" + +#: ../vector/v.out.postgis/args.c:46 +msgid "" +"If not specified, the vector link is not created. The link can be also " +"manually created by 'v.external' module." +msgstr "" + +#: ../vector/v.out.postgis/args.c:53 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +msgid "" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -86511,17 +87746,23 @@ msgstr "Kann die Layer-Informationen für die Punkte nicht erhalten." #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to drop table: %s" msgstr "Kann die Tabelle <%s> nicht löschen." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -86535,17 +87776,23 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to select line id values from %s.%s." msgstr "Kann die Linien IDs nicht selektieren von %s.%s." ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -86892,6 +88139,7 @@ msgstr "" "Datei." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86903,6 +88151,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -87619,6 +88872,7 @@ msgid "" "used" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -87630,6 +88884,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 @@ -87654,10 +88913,13 @@ msgid "" "Generate n points for each individual area (requires restrict parameter)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" "Hänge Dateien an eine existierende Datei an. Das Überschreiben von " @@ -87669,6 +88931,9 @@ msgid "Missing attribute table for vector map <%s>" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -87705,6 +88970,7 @@ msgid "" "Selected areas in input vector <%s> do not overlap with the current region" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -87716,6 +88982,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 @@ -87762,17 +89033,17 @@ msgstr "" "Fehler beim Lesen der Vektorkarte <%s> - Einige Daten könnten nicht korrekt " "sein" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "Fange Grenzen (Schwellwert = %.3e):" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "Säubere Grenzen an den Knoten..." -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "Vereinige Grenzen..." @@ -87953,13 +89224,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -88214,42 +89485,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Punkt-Layer" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "Gebe nur SQL-Statement aus." -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Diese Option benötigt eine Spalte." -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Diese Option benötigt zwei Spalten." -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Diese Option benötigt mindestens zwei Spalten." -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "Für 'option=query' muss der Parameter 'qcolumn' spezifiziert sein." -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "Die 'sides'-Option macht nur Sinn für Grenzen." -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "Die 'sinuous' -Option macht nur Sinn für Grenzen." -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "Die 'azimuth' -Option macht nur Sinn für Linien." @@ -89244,16 +90520,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Gebe Vektorattribute aus." @@ -89852,6 +91118,7 @@ msgstr "Name der Hintergrund-Vektorkarte(n)." #: ../vector/v.edit/args.c:182 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -89863,6 +91130,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" @@ -90894,6 +92166,7 @@ msgstr "" #: ../vector/v.neighbors/main.c:134 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -90905,6 +92178,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 " @@ -90917,6 +92195,7 @@ msgstr "" #: ../vector/v.neighbors/main.c:160 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -90928,6 +92207,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -91661,6 +92945,7 @@ msgstr "Art des Vektorobjekts" #: ../vector/v.out.ogr/args.c:20 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91672,6 +92957,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." @@ -91736,6 +93026,7 @@ msgstr "Überspringe den Export der GRASS-Kategorie-ID ('cat')-Spalte" #: ../vector/v.out.ogr/args.c:100 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91747,6 +93038,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." @@ -91771,6 +93067,7 @@ msgstr "" #: ../vector/v.out.ogr/args.c:126 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91782,6 +93079,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -91859,6 +93161,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:371 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91870,6 +93173,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -91912,11 +93220,14 @@ msgstr[1] "" msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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' " @@ -91951,6 +93262,9 @@ msgid_plural "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -91960,6 +93274,7 @@ msgid_plural "" "parameter." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91971,6 +93286,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] "" @@ -91979,11 +93299,14 @@ msgstr[1] "" msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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." @@ -91995,6 +93318,9 @@ msgstr[1] "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -92035,6 +93361,7 @@ msgstr[1] "" #: ../vector/v.out.ogr/main.c:437 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92046,6 +93373,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 "" @@ -92056,6 +93388,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:446 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92067,6 +93400,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -92077,6 +93415,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:456 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92088,6 +93427,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -92099,6 +93443,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:465 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92110,6 +93455,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -92120,6 +93470,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:475 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92131,6 +93482,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -92142,6 +93498,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:484 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92153,6 +93510,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -92163,6 +93525,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:493 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92174,6 +93537,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -92184,6 +93552,7 @@ msgstr "" #: ../vector/v.out.ogr/main.c:502 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92195,6 +93564,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -92234,12 +93608,15 @@ msgid "" "Vector map <%s> is 3D. Use format specific layer creation options SHPT " <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)" ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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)" @@ -92248,6 +93625,9 @@ msgid "" "(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -92787,6 +94167,13 @@ msgid "" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -92825,16 +94212,20 @@ msgstr "Ändere Spaltenname zu Kleinbuchstaben" #: ../vector/v.in.ogr/main.c:589 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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." -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" "Sie haben weder die Ausgabe von Vektor- noch von Rasterkarten veranlasst." -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" @@ -92842,7 +94233,7 @@ msgstr "" "Beide Kreuzvalidierungsoptionen (Schalter '-c' und die 'cvdev'-Vektorkarte) " "müssen angegeben werden." -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" @@ -92850,47 +94241,47 @@ msgstr "" "Die Kreuzvalidierung kann nicht gleichzeitig mit Ausgabe-Rasterkarten oder " "der 'devi'-Datei berechnet werden." -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" "Benutze Anisotropie - beide Parameter theta und scalex müssen angegeben " "werden." -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "Beide Parameter smatt und smooth angegeben - verwende Konstanten." -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" "Die Berechnung dauert zu lange - es wird vorgeschlagen, npmin zu reduzieren." -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "%d Bytes Speicherplatz für temporäre Dateien." -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "Interp_segments fehlgeschlagen." -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -92932,6 +94323,7 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." ======= @@ -92939,6 +94331,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "No features for %s selected. Please check options '%s', '%s'." ======= msgid "" @@ -92949,6 +94343,9 @@ msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -92959,6 +94356,7 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Option <%s> will be ignored. Multiple geometry fields are supported by GDAL " ">= 1.11" @@ -92967,6 +94365,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "%s is empty" msgstr "%s ist leer" @@ -92985,6 +94385,9 @@ msgid "" ">= 1.11" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -93051,6 +94454,7 @@ msgid "" "imported separately." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -93062,6 +94466,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 @@ -93130,6 +94539,7 @@ msgid "" "filter, disabling" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -93141,6 +94551,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 @@ -93558,7 +94973,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "Frage Vektorkarte <%s> ab..." -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Schreibe Zentroide..." @@ -94367,6 +95782,7 @@ msgstr "" #: ../vector/v.net/args.c:42 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94378,6 +95794,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -94392,6 +95813,7 @@ msgstr "" #: ../vector/v.net/args.c:46 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94403,6 +95825,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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}" @@ -94414,6 +95841,7 @@ msgstr "" #: ../vector/v.net/args.c:48 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94425,6 +95853,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -94465,6 +95898,7 @@ msgstr "" #: ../vector/v.net/args.c:99 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94476,6 +95910,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -94491,6 +95930,7 @@ msgstr "" #: ../vector/v.net/args.c:106 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94502,6 +95942,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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'." @@ -94513,6 +95958,7 @@ msgstr "" #: ../vector/v.net/args.c:117 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94524,6 +95970,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 " @@ -94785,6 +96236,7 @@ msgstr "" "die Kategorien bei 1." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94796,99 +96248,112 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 msgid "Unable to open driver <%s>" msgstr "Kann den Treiber <%s> nicht öffnen." -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "Name:" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "Mapset:" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "Location:" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Projektion" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "Datenbank:" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "Titel:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "Maßstab:" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "Name des Erzeugers:" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "Organisation:" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "Quelldatum:" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "Kartenformat:" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "OGR-Layer:" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "OGR-Datenquelle:" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "Objekttyp:" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "DB Tablle:" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "DB Name:" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "Geometriespalte:" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "Topology:" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "Topology Spalte:" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Kartenart:" ======= @@ -94899,6 +96364,7 @@ msgstr "" "Punkte zu speichern. " <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94910,76 +96376,81 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "Anzahl der Punkte:" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "Anzahl der Zentroide:" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "Anzahl der Linien:" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "Anzahl der Grenzen:" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "Anzahl der Flächen:" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "Anzahl der Inseln:" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "Anzahl der Oberflächen:" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "Anzahl der Kernels:" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "Anzahl der Volumen:" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "Anzahl der Löcher:" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "Anzahl der dblinks:" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "Zone" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "Digitalisierungs-Schwellwert" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "Kommentar" @@ -95434,6 +96905,7 @@ msgstr "" #: ../vector/v.out.ascii/main.c:53 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -95445,6 +96917,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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'." @@ -95506,24 +96983,61 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" +"Die Projektion des Datensatzes scheint nicht mit der aktuellen Location " +"übereinzustimmen.\n" +"\n" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" +"Die Projektionsinformationen des Eingabedatensatzes und der aktuellen " +"Location scheinen übereinzustimmen." + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "Konvertiert DWG/DXF in GRASS Vektorkarten." -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" @@ -95534,6 +97048,7 @@ msgstr "" "Invertiere die Selektion der Layer (importiere nicht die angegebenen Layer)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -95545,8 +97060,13 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -95622,72 +97142,75 @@ msgstr "Polygone nicht säubern (clean) (nicht empfehlenswert)." msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "Ändere Spaltenname zu Kleinbuchstaben" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format <<<<<<< HEAD msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" +<<<<<<< HEAD +#: ../vector/v.in.ogr/main.c:804 +======= #: ../vector/v.in.ogr/main.c:803 ======= msgid "Unable to add database link for vector map <%s>" @@ -95696,6 +97219,7 @@ msgstr "Kann den Link zur Datenbank der Vektorkarte <%s> nicht hinzufügen." #: ../vector/v.extrude/main.c:72 msgid "" "Extrudes flat vector features to 3D vector features with defined height." +<<<<<<< HEAD msgstr "" #: ../vector/v.extrude/main.c:74 @@ -95733,11 +97257,47 @@ msgid "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +msgstr "" + +#: ../vector/v.extrude/main.c:74 +msgid "" +"Optionally the height can be derived from sampling of elevation raster map." +msgstr "" + +#: ../vector/v.extrude/main.c:78 +msgid "Trace elevation" +msgstr "Zeichne die Höhen nach" + +#: ../vector/v.extrude/main.c:118 +msgid "Name of attribute column with feature height" +msgstr "" + +#: ../vector/v.extrude/main.c:151 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +#, c-format +<<<<<<< HEAD +<<<<<<< HEAD +======= +msgid "Check if OGR layer <%s> contains polygons..." +======= +msgid "One of '%s' or '%s' parameters must be set" +msgstr "Einer der beiden Parameter '%s' oder '%s' muss angegeben werden." + +#: ../vector/v.extrude/main.c:202 +#, c-format +msgid "" +"Invalid layer number (%d). Parameter '%s', '%s' or '%s' specified, assuming " +"layer '1'." +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format <<<<<<< HEAD +>>>>>>> osgeo-main msgid "Boundary splitting distance in map units: %G" msgstr "Distanz der Grenz-Aufteilung in Karteneinheiten: %G" ======= @@ -95747,38 +97307,44 @@ msgid "" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "Verwende die temporäre Vektorkarte <%s>" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Unable to fetch height from DB for area %d. Using default fixed height %f." ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main msgid "Key column '%s' in input layer <%s> is not integer" ======= msgid "" "Unable to fetch height from DB for area %d. Using default fixed height %f." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format <<<<<<< HEAD msgid "Creating attribute table for layer <%s>..." @@ -95788,28 +97354,34 @@ msgid "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Unable to fetch height from DB for line %d. Using default fixed height %f." ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main msgid "Column name <%s> renamed to <%s>" ======= msgid "" "Unable to fetch height from DB for line %d. Using default fixed height %f." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format <<<<<<< HEAD msgid "Writing column <%s> with integer 64 as integer 32" @@ -95819,7 +97391,7 @@ msgid "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" @@ -95827,6 +97399,12 @@ msgstr "" "abgeschnitten worden sein). " <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../vector/v.in.ogr/main.c:1085 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1084 ======= #: ../vector/v.in.region/main.c:43 @@ -95860,6 +97438,10 @@ msgstr "" #: ../vector/v.univar/main.c:192 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " @@ -95869,6 +97451,12 @@ msgstr "" "bestimmt). Einige Texte können abgeschnitten worden sein!" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../vector/v.in.ogr/main.c:1103 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1102 ======= #: ../vector/v.univar/main.c:195 @@ -95891,18 +97479,22 @@ msgstr "" #: ../vector/v.univar/main.c:242 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" "Schreibe Spalte %s mit einer festen Länge von %d Zeichen (Es könnte etwas " "abgeschnitten worden sein). " -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format <<<<<<< HEAD msgid "Column name <%s> renamed to <%s_%d>" @@ -95927,12 +97519,18 @@ msgid "Name of input 3D vector points map" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../vector/v.in.ogr/main.c:1353 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1352 ======= #: ../vector/v.vol.rst/main.c:482 @@ -95947,20 +97545,30 @@ msgstr "" #: ../vector/v.vol.rst/main.c:557 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../vector/v.in.ogr/main.c:1393 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1392 ======= #: ../vector/v.vol.rst/main.c:642 @@ -95975,28 +97583,38 @@ msgstr "" #: ../vector/v.vol.rst/main.c:855 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format msgid "Unable to drop table: '%s'" msgstr "Kann Tabelle <%s> nicht löschen." -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "Säubere Polygone..." -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../vector/v.in.ogr/main.c:1593 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1592 ======= #: ../vector/v.vol.rst/main.c:911 @@ -96049,10 +97667,15 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:223 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" +<<<<<<< HEAD #: ../vector/v.in.ogr/main.c:1669 #, c-format <<<<<<< HEAD @@ -96077,14 +97700,33 @@ msgid "" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1670 #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +msgid "%d input polygons\n" +msgstr "%d Eingabepolygone\n" +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgid "" +"There are points outside specified 2D/3D region--ignored %d points (total " +"points: %d)" +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) + +#: ../vector/v.in.ogr/main.c:1671 +#, c-format +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD msgid "%d input polygons" msgstr "%d Eingabepolygone" @@ -96092,6 +97734,9 @@ msgstr "%d Eingabepolygone" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96099,6 +97744,7 @@ msgid "" "Points are more dense than specified 'DMIN'--ignored %d points (remain %d)" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD #: ../vector/v.in.ogr/main.c:1673 #, c-format @@ -96137,15 +97783,39 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../vector/v.in.ogr/main.c:1674 #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +msgid "Total area: %G (%d areas)\n" +msgstr "Gesamtfläche: %G (%d Flächen)\n" +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgid "" +"%d points given for interpolation (after thinning) is less than given NPMIN=" +"%d" +msgstr "" +"%d Punkte, die (nach Ausdünnung) zur Verfügung stehen, sind weniger als die " +"angegebenen NPMIN=%d." +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) + +#: ../vector/v.in.ogr/main.c:1675 +#, c-format +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD msgid "Total area: %G (%d areas)" msgstr "Gesamtfläche: %G (%d Flächen)" @@ -96153,6 +97823,9 @@ msgstr "Gesamtfläche: %G (%d Flächen)" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96162,57 +97835,57 @@ msgid "" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "Überlappende Fläche: %G (%d Flächen)\n" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "Überlappende Fläche: %G (%d Flächen)" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "Fläche ohne Kategorie: %G (%d Flächen)\n" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "Fläche ohne Kategorie: %G (%d Flächen)" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format <<<<<<< HEAD msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" ======= @@ -96223,6 +97896,7 @@ msgstr "Lade Kategorien aus Tabelle <%s> ..." msgid "" "Topology level required for extracting areas for OGR layers. Areas will be " "not processed." +<<<<<<< HEAD msgstr "" #: ../vector/v.extract/main.c:84 @@ -96298,25 +97972,93 @@ msgid "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.extract/main.c:84 +msgid "" +"Selects vector features from an existing vector map and creates a new vector " +"map containing only the selected features." +msgstr "" + +#: ../vector/v.extract/main.c:89 +msgid "Dissolve common boundaries (default is no)" +msgstr "Löse gemeinsame Grenzen auf (Standrad: nein)." + +#: ../vector/v.extract/main.c:93 +msgid "Do not copy attributes (see also 'new' parameter)" +msgstr "" + +#: ../vector/v.extract/main.c:110 +msgid "Types to be extracted" +msgstr "Typen die extrahiert werden." + +#: ../vector/v.extract/main.c:125 +msgid "Input text file with category numbers/number ranges to be extracted" +msgstr "" +"Eingabe-Textdatei mit Kategorienummern/-wertebereichen, die extrahiert " +"werden sollen." + +#: ../vector/v.extract/main.c:126 +msgid "If '-' given reads from standard input" +msgstr "Wenn '-' angegeben wird von Standardeingabe gelesen." + +#: ../vector/v.extract/main.c:134 +msgid "Number of random categories matching vector objects to extract" +msgstr "" +"Zahl der zu zufälligen Kategorien passenden Vektorobjekten, die extrahiert " +"werden." + +#: ../vector/v.extract/main.c:136 +msgid "Number must be smaller than unique cat count in layer" +msgstr "" +"Zahl muss kleiner sein als die Anzahl der eindeutigen cat in dem Layer." + +#: ../vector/v.extract/main.c:144 +msgid "Desired new category value (enter -1 to keep original categories)" +msgstr "" + +#: ../vector/v.extract/main.c:146 +msgid "If new >= 0, attributes is not copied" +msgstr "" + +#: ../vector/v.extract/main.c:151 +msgid "Name of attribute column for dissolving areas" +msgstr "" + +#: ../vector/v.extract/main.c:152 +msgid "Preserves category values" +msgstr "" + +#: ../vector/v.extract/main.c:169 +#, c-format +msgid "" +"Options <%s>, <%s>, <%s> and <%s> options are exclusive. Please specify only " +"one of them." +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" + +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "Versuchen Sie den Import nochmals, Fangtoleranz %g: 'snap=%g'" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" "Versuchen Sie den Import nochmals, Fangtoleranz mindestens %g: 'snap=%g'" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -96329,29 +98071,29 @@ msgstr "" "mit mehr als 1 Zeile in der Attributtabelle verknüpft. Die Anzahl der " "Merkmale für diese Gebiete wird als Kategorie im Layer %d" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "%d zusätzliche Bereiche wurden beim Import angelegt." -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format <<<<<<< HEAD msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." ======= msgid "Ignored text entry: %s" @@ -96395,6 +98137,7 @@ msgstr "" msgid "" "Random category count is larger or equal to uniq <%s> feature category count " "%d" +<<<<<<< HEAD msgstr "" #: ../vector/v.extract/main.c:414 @@ -96460,15 +98203,82 @@ msgstr "Ersetze den Kommentar statt ihn zu erweitern" #: ../vector/v.support/main.c:126 msgid "Replace command line instead of appending it" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.extract/main.c:414 +msgid "Extracting features..." +msgstr "Extrahiere Objekte..." + +#: ../vector/v.extract/main.c:438 +msgid "Removing duplicate centroids..." +msgstr "Lösche doppelte Zentroide..." + +#: ../vector/v.support/main.c:41 +msgid "Updates vector map metadata." +msgstr "Aktualisiere die Metadaten einer Vektorkarte" + +#: ../vector/v.support/main.c:52 +msgid "Organization where vector map was created" +msgstr "Organisation in der die Vektorkarte erzeugt wurde" + +#: ../vector/v.support/main.c:61 +msgid "Date of vector map digitization (e.g., \"15 Mar 2007\")" +msgstr "" +"Datum, an dem die Vektorkarte digitalisiert wurde (z.B., \"15 Mar 2007\")." + +#: ../vector/v.support/main.c:68 +msgid "Person who created vector map" +msgstr "Person, die die Vektorkarte erstellt hat" + +#: ../vector/v.support/main.c:75 +msgid "Vector map title" +msgstr "Titel der Vektorkarte" + +#: ../vector/v.support/main.c:83 +msgid "Date when the source map was originally produced" +msgstr "Datum, an dem die Quelle der Vektorkarte ursprünglich erzeugt wurde" + +#: ../vector/v.support/main.c:89 +msgid "Vector map scale number (e.g., 24000)" +msgstr "Maßstabszahl der Vektorkarte (z.B., 24000)" + +#: ../vector/v.support/main.c:95 +msgid "Vector map projection zone" +msgstr "Projektionzone der Vektorkarte" + +#: ../vector/v.support/main.c:102 +msgid "Vector map digitizing threshold number (e.g., 0.5)" +msgstr "Schwellwert der Digitalisierung der Vektorkarte (z.B., 0.5)" + +#: ../vector/v.support/main.c:110 +msgid "Text to append to the comment line of the map's metadata file" +msgstr "Text, der an den Kommentar Metadatendatei der Karte angehängt wird" + +#: ../vector/v.support/main.c:118 +msgid "" +"Command line to store into vector map history file (used for vector scripts)" +msgstr "" +"Kommentarzeile die in der History-Datei der Vektorkarte gespeichert wird " +"(verwendet für Vektor-Skripts)" + +#: ../vector/v.support/main.c:122 +msgid "Replace comment instead of appending it" +msgstr "Ersetze den Kommentar statt ihn zu erweitern" + +#: ../vector/v.support/main.c:126 +msgid "Replace command line instead of appending it" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" + +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format <<<<<<< HEAD msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" @@ -96482,6 +98292,7 @@ msgid "" "in the vector based on the control points." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -96493,17 +98304,22 @@ 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:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -96659,10 +98475,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "Gruppe <%s> zielt auf Location [%s], Mapset [%s]." + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Ziel-Location <%s> nicht gefunden." + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "Bitte führen Sie i.target für die Gruppe aus." @@ -97888,6 +99714,7 @@ msgstr "Operator bestimmt das erforderte Verhältnis zwischen den Objekten" #: ../vector/v.select/args.c:51 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -97899,6 +99726,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 " @@ -97950,6 +99782,7 @@ msgstr "" #: ../vector/v.select/args.c:84 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -97961,6 +99794,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)" @@ -98700,11 +100538,14 @@ msgstr "" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to copy table for layer %d" msgstr "" @@ -98718,6 +100559,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -103312,7 +105156,7 @@ msgstr "Pfad zur Font-Datei." msgid "Text encoding (only applicable to TrueType fonts)" msgstr "Text Encoding (nur für TrueType Fonts)." -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format <<<<<<< HEAD msgid "%d col" @@ -103323,6 +105167,7 @@ msgid_plural "" "MFD: A * path already processed when distributing flow: %d of %d cells" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -103334,11 +105179,16 @@ 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] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" <<<<<<< HEAD @@ -103370,7 +105220,7 @@ msgid "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" "Abbruch (Region größer als 200 Zeilen x 200 Spalten sind nicht erlaubt)" @@ -103573,6 +105423,7 @@ msgstr "" "notwendige Fläche für " <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -103584,6 +105435,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -110749,11 +112605,14 @@ msgstr "Maximale Differenz zwischen diesem und dem letzten Schritt: %g" #, c-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Label file <%s> not found" msgstr "Label-Datei <%s> nicht gefunden." @@ -110763,6 +112622,9 @@ msgid "Region size is lower than minreg, nothing displayed." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -110882,6 +112744,7 @@ msgid "" "category values represent cost." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -110893,6 +112756,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." @@ -110966,6 +112834,7 @@ msgstr "" "ignoriert." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -110977,6 +112846,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -112192,6 +114066,7 @@ msgid "" "maps must be specified. This option is mutual exclusive to the map option." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -112203,6 +114078,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 @@ -112210,6 +114090,7 @@ msgstr "" msgid "Title" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../raster/r.colors/edit_colors.c:138 @@ -112218,6 +114099,8 @@ msgid "Offset for color rule values" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../display/d.legend/main.c:105 ../display/d.legend.vect/main.c:135 msgid "Title font size" msgstr "" @@ -112380,6 +114263,9 @@ msgid "Offset for color rule values" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -112414,6 +114300,9 @@ msgid "Scale for color rule values" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -112518,11 +114407,14 @@ msgid "" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "\n" "Bitte geben Sie Anweisungen ein. Um dies zu beenden geben Sie in der " "letzten Zeile EOF (Strg-d) ein.\n" @@ -112977,6 +114869,10 @@ msgstr "Rendering" msgid "Highlight color" msgstr "Farbe zum Hervorheben" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "Verwende gedätische Berechnungen für Longitude-Latitude Locations." + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "Render dicke Linien." @@ -113575,6 +115471,23 @@ msgstr "" "Stellt drei Rasterkarten als rot, grün und blau Überlagerung im aktuellen " "Kartenfenster dar." +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Kann die Datei '%s' nicht zum Lesen öffnen." + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Kann Datei <%s> nicht zum Schreiben öffnen." + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -113594,6 +115507,9 @@ msgstr "Kann Farbe nicht lesen." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -113606,6 +115522,7 @@ msgid "Unable to open color rule" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -113617,6 +115534,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -114234,7 +116156,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "Kann Datei '%s' nicht öffnen" @@ -114473,22 +116395,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -114857,6 +116772,7 @@ msgid "" "separators. Invalid line is:\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -114868,6 +116784,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 "" @@ -117660,6 +119581,7 @@ msgid "" "column prefixes ({1})" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -117671,6 +119593,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 @@ -117678,6 +119605,7 @@ msgstr "" msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." ======= @@ -117685,6 +119613,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "The number of result columns ({result_columns}) needs to be the same as the " "number of aggregation methods ({methods})" ======= @@ -117696,6 +119626,9 @@ msgid "" "table of vector map <{vector}>." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -117706,6 +119639,7 @@ msgstr "" msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "Not all vector categories converted to raster. " "Converted {0} of {1}." ======= @@ -117713,6 +119647,8 @@ msgid "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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}'" @@ -117725,31 +119661,81 @@ msgid "" "Converted {0} of {1}." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 +#, python-format +msgid "" +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." +msgstr "" + +#: ../scripts/v.dissolve/v.dissolve.py:606 +#, python-format +msgid "" +"Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." +msgstr "" + +<<<<<<< HEAD +#: ../scripts/v.dissolve/v.dissolve.py:618 +======= +<<<<<<< HEAD +#: ../scripts/v.dissolve/v.dissolve.py:616 +======= +#: ../scripts/v.rast.stats/v.rast.stats.py:369 +msgid "Adding columns failed. Exiting." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:86 +msgid "JOIN is not supported for tables stored in DBF format" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:89 +msgid "There is no table connected to this map. Unable to join any column." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:154 +#, python-format +msgid "Error creating column <%s>" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:161 +#, python-format +msgid "Updating column <%s> of vector map <%s>..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:167 +#, python-format +msgid "Error filling column <%s>" +msgstr "" + +#: ../scripts/v.dissolve/v.dissolve.py:68 #, python-format msgid "" "No '%s' option specified. Dissolving based on category values from layer <" "%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:74 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: ../scripts/v.dissolve/v.dissolve.py:616 ======= @@ -117795,17 +119781,22 @@ msgstr "" #: ../scripts/v.dissolve/v.dissolve.py:84 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../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 "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -117861,17 +119852,23 @@ msgstr "" msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "It is not possible to set 'maxcols=%s' and 'overlap=%s'. Please set " "maxcols>overlap" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -117886,11 +119883,14 @@ msgstr "" msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "It is not possible to set 'maxrows=%s' and 'overlap=%s'. Please set " "maxrows>overlap" msgstr "" @@ -117900,6 +119900,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -118032,6 +120035,7 @@ msgstr "" #: ../scripts/r.tileset/r.tileset.py:306 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -118043,16 +120047,21 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -118077,103 +120086,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -118185,336 +120194,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -118567,50 +120576,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -118638,6 +120647,7 @@ msgstr "" #: ../scripts/v.in.geonames/v.in.geonames.py:63 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -118649,12 +120659,17 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -118874,7 +120889,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -118931,85 +120946,87 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Benutze Kartenkoordinaten anstatt xyz-Koordniaten." -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Verwende die temporäre Vektorkarte <%s>" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Erzeuge einige temporäre Dateien..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" msgstr "" +"Kann die Projektionsinformation der aktuellen Location nicht ermitteln." -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -119055,28 +121072,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -119133,27 +121150,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Kann die OGR-Datenquelle '%s' nicht öffnen." -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -119163,7 +121180,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -119173,14 +121189,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -119188,72 +121204,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -119315,6 +121331,7 @@ msgid "" "this." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -119326,6 +121343,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 @@ -119508,7 +121530,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -119526,64 +121548,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -119723,79 +121746,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -119907,40 +121930,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -119976,7 +121999,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -119987,35 +122010,41 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." -msgstr "" +#: ../scripts/r.unpack/r.unpack.py:143 +#, fuzzy +msgid "Overriding projection check (using current project's CRS)." +msgstr "Übersteuere die Projektionsprüfung (verwende Projektion der Location)." -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" +"\n" +"Falls es keine signifikanten Unterschiede in den Projektionsdefinitionen " +"gibt, Flag -o verwenden, um sie zu ignorieren und die aktuelle " +"Standortdefinition zu verwenden.\n" #: ../scripts/r.unpack/r.unpack.py:249 #, python-brace-format @@ -120106,34 +122135,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -120212,317 +122241,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "$GISBASE nicht definiert" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Region <%s> nicht gefunden." -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -120530,60 +122559,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -120635,29 +122664,41 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Kann die Regel-Datei <%s> nicht öffnen." + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Spalte <%s> in der Tabelle <%s>nicht gefunden." -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Fehler beim Interpretieren der Farbe %s." -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" +msgstr "\"*\" für alle Spalten" + #: ../scripts/g.download.location/g.download.location.py:105 msgid "Location named <{}> already exists, download canceled" msgstr "" @@ -120701,16 +122742,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -120781,41 +122812,51 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Karte <{}> nicht im aktuellen Mapset <%s> gefunden." + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +#, fuzzy +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "Name and Typ der neuen Spalten ('name type [,name type, ...]')" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Fehler beim Scannen der Argumente." + #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -120863,20 +122904,197 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "" +#~ "Gibt oder setzt Datenbankverbindung für eine Vektorkarte zu einer " +#~ "Attributtabelle." + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Name der Vektorkarte" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Layer-Nummer (to)." + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "Layer-Nummer für Flächen-Karte" + +#, fuzzy +#~ msgid "Numpy array with vector cats." +#~ msgstr "Keine Flächen in Vektorkarte <%s>" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Zu viele Spaltennamen." + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Anzahl der Spalten in der neuen Region." + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "Format des Ausgabedateien" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Speichertyp der resultierenden Rasterkarte." + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "Name der Rasterkarte mit Klassifikationsergebnissen." + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "Rasterkarte mit Informationen zu dem Fließgewässersystem." + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Name der Ausgabe-Rasterkarte." + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "Name der Ausgabe-Akkumulations-Rasterkarte." + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "Camera Entferung (in Karteneinheiten)." + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Name der Ausgabe-Rasterkarte(n)." + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Name der Ausgabe-Rasterkarte(n)." + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Auflösung" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Zeichen-Modus" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Schriftgröße" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Tabellenformat" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Linienbreite des Textes." + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Vektorpunkte" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Benötigt" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Name der Spalte, die numerische Werte enthält." + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Name der Spalte mit den X-Koordinaten." + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "Der Schwellwert muss >=0 sein." + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Format der Inputdatei" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Ausgabe-Expositionskarte (oder fy)." + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Name des Ausgabe-QC-Typ-Klassifikationslayers" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Distanzzone(n)" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Skaliere den Wertebereich der Ausgabekarten" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Ausgabe-Tabellenname" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Name der Vektorausgabekarte mit den angepassten Punkten im Fluss." + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Name der Spalte mit den Pufferdistanzen" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Name der Ausgabedatei oder des GPS Gerätes." + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Name der Rasterkarte, die angezeigt werden soll." + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Format" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Name der Rasterkarte, die angezeigt werden soll." + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Anzahl der Level, welche für jeden Komponent benutzt werden sollen." + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Kehre die Auswahl um" + +#, fuzzy +#~ msgid "" +#~ "Number of k-fold cross-validation for grid search parameter optimization" +#~ msgstr "Benutze Vergleichsprüfung ohne Rasterannährung." + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Überschreibe die Verbindungsparameter für den angegebenen Layer." + +#~ msgid "Location:" +#~ msgstr "Location:" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -122642,6 +124860,9 @@ msgid "" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -122763,6 +124984,9 @@ msgid "Maximum memory to be used with -m flag (in MB)" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -122822,12 +125046,15 @@ msgstr "" #~ msgid "The number of points to allocate" #~ msgstr "Die Zahl der Punkte, die verteilt werden sollen." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Generate points also for NULL category" #~ msgstr "Erzeuge Punkte auch für die NULL-Kategorie." @@ -122843,6 +125070,9 @@ msgstr "" #~ msgstr "Distanz muss >= 0.0 sein." ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -122854,6 +125084,10 @@ msgstr "" "konvertieren, zwecks Überprüfung." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -122873,11 +125107,6 @@ msgstr "" #~ msgid "Name of vector map to import in actinia" #~ msgstr "Name der zu editierenden Vektorkarte" -#~ msgid "Maximum memory to be used with -m flag (in MB)" -#~ msgstr "" -#~ "Maximal zu verwendender Speicher in Verbindung mit dem Schalter -m (in " -#~ "MB)." - #~ msgid "Sorry, you must choose an output map." #~ msgstr "Entschuldigung, Sie müssen eine Ausgabe-Karte wählen." @@ -122921,6 +125150,7 @@ msgstr "" "Name der Tabelle, erzeugt wenn der Schalter 'Distanz zu Allen' gesetzt wurde." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -122932,6 +125162,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -122980,6 +125215,7 @@ msgstr "" "Nicht genügend Zentren für den gewählten nlayer. Nichts wird zugewiesen." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -122991,6 +125227,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123069,11 +125310,14 @@ msgstr "" #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Number of vertical pieces must be at least 1. Default value will be " #~ "used..." @@ -123082,6 +125326,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123155,6 +125402,9 @@ msgid "File in which to save d.graph instructions for legend display" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -123183,6 +125433,7 @@ msgstr "" #~ msgid "Name and type of the new column(s)" #~ msgstr "Name and Typ der neuen Spalten ('name type [,name type, ...]')" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "" @@ -123198,6 +125449,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Data types depend on database backend, but all support VARCHAR(), INT, " #~ "DOUBLE PRECISION and DATE" @@ -123207,6 +125460,9 @@ msgstr "" ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123272,6 +125528,7 @@ msgstr "" "%d Linien/Grenzen wurden nicht geändert wegen übertriebener Vereinfachung." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123283,6 +125540,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -123417,6 +125679,7 @@ msgstr "" "und die Einstellungen der Location für diesen Datensatz zu verwenden.\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123428,6 +125691,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -123492,6 +125760,7 @@ msgstr "" #~ msgid "Unable to read REF file for group <%s>" #~ msgstr "Konnte REF-Datei der Gruppe <%s> nicht lesen." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -123499,6 +125768,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Correction of the v.lidar.growing output. It is the last of the three " #~ "algorithms for LIDAR filtering." @@ -123509,6 +125780,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123520,6 +125794,7 @@ msgstr "" "um LIDAR zu filtern." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123531,6 +125806,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123552,6 +125832,7 @@ msgstr "" #~ msgid "Update color values to GRASSRGB column in attribute table" #~ msgstr "Aktualisiere Farbwerte mit der GRASSRGB Spalte der Attributtabelle." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -123559,6 +125840,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Displays a thematic vector area map in the active frame on the graphics " #~ "monitor." @@ -123567,6 +125850,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123590,11 +125876,14 @@ msgstr "Stellt eine thematische Vektorkarte im aktiven Grafikfenster dar." #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Allows creation and/or modification of raster3d map layer support files." #~ msgstr "" @@ -123604,6 +125893,9 @@ msgstr "Stellt eine thematische Vektorkarte im aktiven Grafikfenster dar." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123614,6 +125906,7 @@ msgstr "" "Dateien." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123625,6 +125918,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123650,6 +125948,7 @@ msgstr "" "fehlgeschlagen." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123661,6 +125960,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123684,6 +125988,7 @@ msgstr "" "Keine Kategoriebeschriftungen (dig_cats) gefunden; keine Tabelle erstellt." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123695,6 +126000,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123708,6 +126018,7 @@ msgstr "" #~ msgid "Input file is version 4." #~ msgstr "Eingabedatei ist Version 4." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -123715,6 +126026,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Input file is not portable. We will attempt to convert anyway but " #~ "conversion may fail. Please read manual for detail information." @@ -123726,6 +126039,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123738,6 +126054,7 @@ msgstr "" "Informationen." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123749,6 +126066,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123772,6 +126094,7 @@ msgstr "" "[%d] Grenzen (boundaries) wurden gelesen und in die Ausgabe geschrieben" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123783,6 +126106,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -123851,6 +126179,7 @@ msgstr "" "\"rules\" muss angegeben werden!" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123862,6 +126191,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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]." @@ -123878,11 +126212,14 @@ msgstr "" #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Computes anisotropic cumulative cost of moving between different " #~ "geographic locations on an input elevation raster map whose cell category " @@ -123905,6 +126242,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123928,6 +126268,7 @@ msgstr "" "Name der Karte, die für die Sättigung (SATURATION) verwendet werden soll" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123939,6 +126280,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -123949,6 +126295,7 @@ msgstr "" #~ msgid "Surface generation program." #~ msgstr "Programm zur Erzeugung von Oberflächen." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -123956,6 +126303,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!" #~ msgstr "" @@ -123965,6 +126314,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -123975,6 +126327,7 @@ msgstr "" "stattdessen r.surf.idw." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123986,6 +126339,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -124060,6 +126418,7 @@ msgstr "" #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD #~ msgid "Color in GRASS format for drawing grid or \"none\" not drawing" @@ -124071,6 +126430,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." @@ -124097,22 +126461,28 @@ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts." #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Color for showing unknown information or \"none\"" #~ msgstr "Farbe für unbekannte Information." #, fuzzy <<<<<<< HEAD #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts." ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -124128,6 +126498,10 @@ msgstr "Farbe für unbekannte Information." #, fuzzy <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -124302,6 +126676,7 @@ msgstr "" "Kategorien." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -124313,6 +126688,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -124673,6 +127053,10 @@ msgstr "Start des 1. MP >= Ende des 2. MP für Punkte der cats %[d], [%d]." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main diff --git a/locale/po/grassmods_el.po b/locale/po/grassmods_el.po index 1a956830b03..6abde7419dc 100644 --- a/locale/po/grassmods_el.po +++ b/locale/po/grassmods_el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2009-02-19 10:29+0200\n" "Last-Translator: Vasilios Antoniou \n" "Language-Team: Greek \n" @@ -88,7 +88,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -128,32 +128,33 @@ msgid "Print current connection parameters and exit" msgstr "Εκτυπώνει τις τρέχουσες παραμέτρους σύνδεσης και κλείνει" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -179,21 +180,21 @@ msgstr "Εκτυπώνει τις τρέχουσες παραμέτρους σύ #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -270,7 +271,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -295,7 +296,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -306,7 +307,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -328,7 +329,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -485,6 +486,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -504,7 +506,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -523,7 +524,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -537,6 +537,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -570,7 +571,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -580,8 +581,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -596,21 +597,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." @@ -619,7 +620,7 @@ msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -654,7 +655,6 @@ msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -667,7 +667,6 @@ msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -706,6 +705,7 @@ msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -727,7 +727,7 @@ msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -793,7 +793,7 @@ msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -807,7 +807,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -820,8 +820,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -836,16 +836,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -891,7 +891,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -907,7 +907,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -916,7 +916,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -946,13 +946,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -980,7 +980,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -995,8 +995,8 @@ msgstr "Αδυναμία εκκίνησης του οδηγού <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1030,10 +1030,10 @@ msgstr "Αδυναμία εκκίνησης του οδηγού <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1041,7 +1041,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1071,23 +1071,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1169,13 +1169,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1228,6 +1228,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1288,6 +1289,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1353,14 +1360,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1410,144 +1416,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1564,35 +1558,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Αδυναμία δημιουργίας raster χάρτη <%s>." -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1600,55 +1592,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1728,12 +1722,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1771,7 +1763,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1787,7 +1779,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1837,24 +1829,18 @@ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1975,7 +1961,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1985,7 +1971,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2105,7 +2090,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2134,6 +2119,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2267,7 +2253,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2276,8 +2268,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2309,7 +2301,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2365,7 +2357,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2410,7 +2401,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2463,7 +2454,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2875,7 +2866,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2963,14 +2954,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3129,7 +3122,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3437,6 +3430,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3525,17 +3527,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3556,7 +3556,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3628,7 +3628,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3661,160 +3661,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3847,19 +3839,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Εκτός μνήμης" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3929,9 +3921,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3945,36 +3937,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4029,6 +4021,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4049,46 +4044,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4097,82 +4101,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4972,7 +4988,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5051,7 +5067,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5180,7 +5196,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5379,9 +5395,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5397,7 +5412,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5606,9 +5621,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5626,7 +5641,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5711,10 +5726,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5754,30 +5769,30 @@ msgstr "Όνομα αρχείου εξαγωγής" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5901,123 +5916,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." @@ -6117,7 +6132,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6151,7 +6166,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6183,7 +6198,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6237,9 +6252,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6255,8 +6270,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6266,24 +6281,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6335,7 +6381,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6635,7 +6681,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6741,7 +6787,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6827,7 +6872,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7446,7 +7491,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7455,7 +7500,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7560,7 +7605,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7584,15 +7629,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7665,7 +7710,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7715,17 +7760,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7783,6 +7825,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7921,7 +7964,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8004,7 +8047,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8063,7 +8106,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8124,7 +8167,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8247,7 +8290,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8386,7 +8428,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8478,8 +8520,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8488,8 +8530,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8507,7 +8549,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8887,9 +8929,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9114,13 +9156,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9133,7 +9173,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9375,31 +9414,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9415,12 +9454,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9435,18 +9473,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη (saturation)" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9470,10 +9508,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9503,7 +9540,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9512,210 +9549,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "Δεν επιτρέπεται η πρόσβαση" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "δεν βρέθηκε" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10382,7 +10435,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10495,6 +10547,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10526,26 +10590,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10570,12 +10614,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10583,40 +10621,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10767,7 +10805,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11011,29 +11049,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11088,71 +11126,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11195,6 +11200,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11898,7 +11936,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11912,13 +11950,13 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη " #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11943,10 +11981,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -12002,12 +12038,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12024,12 +12060,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12037,16 +12073,16 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Οι απαιτούμενες παράμετροι <%s> δεν έχουν δοθεί" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" +msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." #: ../raster/r.proj/main.c:323 msgid "Unable to get projection info of input map" @@ -12061,12 +12097,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12145,7 +12181,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12400,8 +12436,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12567,7 +12604,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12578,6 +12615,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13189,15 +13238,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13276,7 +13325,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13286,7 +13335,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13374,7 +13423,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13383,7 +13432,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13695,7 +13744,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13706,19 +13755,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13726,15 +13775,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13743,62 +13805,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13968,9 +14038,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14310,21 +14377,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14509,80 +14576,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15457,32 +15524,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15498,61 +15565,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15576,7 +15643,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16516,46 +16582,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Αδυναμία δημιουργίας και λύσης του γραμμικού συστήματος" @@ -16880,7 +16946,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17334,8 +17400,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17462,97 +17528,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17815,11 +17881,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18018,32 +18084,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18126,7 +18192,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18149,8 +18215,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18904,8 +18971,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18915,28 +18982,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18945,57 +19012,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19004,7 +19071,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19013,7 +19080,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19509,6 +19576,10 @@ msgstr "" msgid "Error while reading history file" msgstr "Σφάλμα κατά την ανάγνωση του αρχείου ιστορικού" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19567,64 +19638,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19730,7 +19809,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19743,10 +19821,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19760,11 +19836,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20259,10 +20335,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20318,9 +20394,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20380,13 +20456,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20747,67 +20823,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21051,8 +21127,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21318,154 +21394,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη " -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21553,9 +21630,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Αδυναμία δημιουργίας raster χάρτη <%s>." #: ../general/g.proj/create.c:21 #, c-format @@ -21563,98 +21640,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Αδυναμία δημιουργίας raster χάρτη <%s>." #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21797,7 +21874,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21880,33 +21958,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21915,69 +22015,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21992,37 +22096,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22375,7 +22476,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23562,7 +23663,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23658,7 +23759,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23666,8 +23768,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη (saturation)" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23699,35 +23802,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23780,61 +23884,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 #, c-format -msgid "Target location <%s> not found" +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23844,7 +23953,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23852,21 +23961,21 @@ msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Αδυναμία δημιουργίας raster χάρτη <%s>." -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23981,15 +24090,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24029,101 +24136,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24247,6 +24352,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24263,6 +24378,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24272,6 +24392,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24638,6 +24778,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Όνομα τοποθεσία" @@ -26209,8 +26350,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26534,17 +26675,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26553,17 +26691,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26572,17 +26707,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26592,17 +26724,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26611,12 +26740,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27405,11 +27532,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27459,7 +27590,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27554,16 +27685,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28139,6 +28269,41 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Όνομα αρχείου εξαγωγής" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28181,6 +28346,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28217,61 +28384,72 @@ msgstr "Εισαγωγή όνομα βάσης δεδομένων" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "Όνομα εξαγόμενου ράστερ χάρτη" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "Όνομα εξαγόμενου ράστερ χάρτη" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "Όνομα εξαγόμενου ράστερ χάρτη" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "Όνομα εξαγόμενου ράστερ χάρτη" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#, fuzzy +msgid "Name of output raster shadow mask" +msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Λάθος συντεταγμένες" @@ -28351,233 +28529,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Όνομα χάρτη ράστερ γωνίας" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Νούμερο επιπέδου" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28780,6 +28739,512 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "<%s> είναι μη επιτρεπτό όνομα αρχείου" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη (saturation)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Όνομα πίνακα εξαγωγής" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Όνομα χάρτη ράστερ γωνίας" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Όνομα τοποθεσία" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Σφάλμα κατά το άνοιμα 3Δ ράστερ χάρτη" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Όνομα του δεύτερου ράστερ χάρτη για blending" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28972,10 +29437,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29205,6 +29675,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30395,7 +30873,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30439,11 +30917,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31526,7 +31999,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Νούμερο επιπέδου" @@ -31563,6 +32035,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31920,7 +32403,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32113,7 +32595,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -32147,6 +32629,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33184,11 +33674,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33234,44 +33721,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -34056,8 +34556,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34067,6 +34576,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34105,11 +34615,13 @@ msgid "" msgstr "Όνομα αρχείου εξαγωγής" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Αποτέλεσμα:" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34402,6 +34914,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34413,6 +34926,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34442,6 +34956,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34810,64 +35325,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35214,11 +35671,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36066,6 +36525,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36194,12 +36661,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36338,9 +36805,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36383,19 +36849,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36404,7 +36880,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36533,32 +37009,6 @@ msgstr "Εισαγωγή όνομα βάσης δεδομένων" msgid "Base name for output file" msgstr "Όνομα του ASCII εξαγώμενου αρχείου" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Όνομα αρχείου εξαγωγής" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37197,6 +37647,10 @@ msgstr "Όνομα του ASCII εξαγώμενου αρχείου" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37484,7 +37938,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37515,8 +37969,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Όνομα αρχείου εξαγωγής" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38211,9 +38666,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38466,6 +38927,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39480,8 +39949,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39575,39 +40044,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη " + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42825,8 +43303,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42864,6 +43342,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43268,6 +43747,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43321,6 +43807,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Όνομα αρχείου εξαγωγής" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Όνομα αρχείου εξαγωγής" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -43357,6 +43857,37 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43772,8 +44303,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44501,6 +45032,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Όνομα εξαγόμενου ράστερ χάρτη (saturation)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44784,6 +45319,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -45209,10 +45748,90 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη " + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Το αποτέλεσμα τομής 2Δ ράστερ χάρτη" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη (intensity)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Λάθος παράμετροι" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Όνομα αρχείου εξαγωγής" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45705,17 +46324,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45741,23 +46350,20 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Όνομα πίνακα εξαγωγής" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45768,9 +46374,8 @@ msgid "Default font size" msgstr "Ο προεπιλεγμένος οδηγός δεν έχει καθοριστεί" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45789,13 +46394,11 @@ msgid "Create a vector point layer of outliers" msgstr "Αριθμός γραμμών που θα εμφανίζονται στο υπόμνημα." #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45805,14 +46408,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45845,14 +46446,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45863,26 +46456,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45927,15 +46516,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45954,7 +46534,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45964,50 +46543,41 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Όνομα του ASCII εξαγώμενου αρχείου" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Χρώμα για δεδομένα Υ" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -46015,105 +46585,24 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Χρώμα" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -47311,6 +47800,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -47334,6 +47831,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -47424,289 +47929,289 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Όνομα αρχείου εξαγωγής" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Όνομα πίνακα εξαγωγής" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Όνομα πίνακα εξαγωγής" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Όνομα πίνακα εξαγωγής" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Όνομα πίνακα εξαγωγής" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Όνομα εξαγόμενου ράστερ χάρτη (saturation)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Όνομα αρχείου εξαγωγής (ΜΗΝ προσθέσετε επέκταση αρχείου)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Όνομα εξαγόμενου ράστερ χάρτη" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Χρώμα" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Χρώμα για δεδομένα Υ" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Χρώμα" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -48046,8 +48551,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -48127,180 +48632,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Όνομα αρχείου εξαγωγής" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Όνομα αρχείου εξαγωγής" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Όνομα αρχείου εξαγωγής" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Όνομα εισαγώμενου ράστερ χάρτη (saturation)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Το αποτέλεσμα τομής 2Δ ράστερ χάρτη" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Εξαγωγή ονόματος πίνακα" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη (intensity)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Όνομα εξαγόμενου ράστερ χάρτη" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Όνομα αρχείου εξαγωγής" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Όνομα εισαγώμενου ράστερ χάρτη (blue)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Διαμόρφωση" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Όνομα εισαγώμενου ράστερ χάρτη (blue)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Όνομα του δεύτερου ράστερ χάρτη για blending" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -49100,11 +49431,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -53948,6 +54274,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Όνομα εισαγώμενου ράστερ χάρτη " + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -54483,8 +54849,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54785,8 +55151,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54966,7 +55332,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54980,7 +55346,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -55510,7 +55876,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55800,7 +56166,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55890,49 +56256,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55942,33 +56304,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -56005,7 +56367,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -56082,56 +56444,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -56396,127 +56765,131 @@ msgstr[1] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56993,7 +57366,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -57231,11 +57604,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -57262,7 +57635,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -57271,7 +57644,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -57291,7 +57664,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -57327,12 +57700,13 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Όνομα χάρτη ράστερ γωνίας" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -57366,13 +57740,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -57387,12 +57765,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -58986,7 +59364,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -59609,7 +59987,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -59916,12 +60294,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -60121,19 +60499,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -60342,7 +60720,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -60500,10 +60878,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -60542,6 +60920,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -60642,9 +61024,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -60658,7 +61040,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -60743,7 +61125,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -60771,8 +61152,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -61393,7 +61774,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -61527,8 +61908,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -63306,17 +63687,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -63492,13 +63873,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -63744,42 +64125,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Τυπώνει τον πίνακα και κλεινει (έξοδος)" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -64761,16 +65147,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -66196,66 +66572,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -66544,7 +66920,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -67002,164 +67378,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -67336,27 +67712,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -67423,274 +67822,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -67699,51 +68098,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -67899,10 +68298,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -68066,7 +68475,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -68074,7 +68483,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -68082,7 +68491,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -69068,6 +69477,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -69636,6 +70049,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Αδυναμία ανάγνωσης αρχείου υπογραφής <%s>" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Αδυναμία ανάγνωσης αρχείου υπογραφής <%s>" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -70207,7 +70637,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -70446,22 +70876,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -72490,38 +72913,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -72601,11 +73024,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -72630,103 +73053,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -72738,336 +73161,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -73120,50 +73543,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -73191,7 +73614,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -73409,7 +73832,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -73466,85 +73889,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Χρησιμοποιήστε συντεταγμένες χάρτη αντί χψζ συντεταγμένες" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -73590,28 +74013,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -73668,27 +74091,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Αδυναμία δημιουργίας raster χάρτη <%s>." -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -73698,7 +74121,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -73708,14 +74130,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -73723,72 +74145,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -74015,7 +74437,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -74033,64 +74455,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -74230,79 +74653,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -74414,40 +74837,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -74483,7 +74906,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -74494,34 +74917,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -74613,34 +75036,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -74719,317 +75142,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Ο χάρτης raster <%s> δεν βρέθηκε." -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -75037,60 +75460,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -75142,27 +75565,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Αδυναμία ανάγνωσης αρχείου υπογραφής <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -75208,16 +75641,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -75288,41 +75711,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -75370,20 +75800,99 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Νούμερο επιπέδου" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Όνομα αρχείου εξαγωγής" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Όνομα αρχείου εξαγωγής" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Όνομα αρχείου εξαγωγής" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Όνομα εισαγώμενου ράστερ χάρτη (saturation)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Το αποτέλεσμα τομής 2Δ ράστερ χάρτη" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Εξαγωγή ονόματος πίνακα" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη (intensity)" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Όνομα εξαγόμενου ράστερ χάρτη" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Όνομα αρχείου εξαγωγής" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Όνομα εισαγώμενου ράστερ χάρτη (blue)" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Διαμόρφωση" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Όνομα εισαγώμενου ράστερ χάρτη (blue)" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Όνομα του δεύτερου ράστερ χάρτη για blending" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "Name of input raster map(s) used by GRASS script" #~ msgstr "Όνομα εισαγώμενου ράστερ χάρτη " @@ -77230,8 +77739,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Χρώμα κανένα" #, fuzzy diff --git a/locale/po/grassmods_es.po b/locale/po/grassmods_es.po index 866a118cf3b..752237a4050 100644 --- a/locale/po/grassmods_es.po +++ b/locale/po/grassmods_es.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2016-07-18 12:34-0500\n" "Last-Translator: \n" "Language-Team: Español \n" @@ -94,7 +94,7 @@ msgstr "temporal" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "configuraciones" @@ -136,32 +136,33 @@ msgid "Print current connection parameters and exit" msgstr "Imprimir los parámetros de la conexión actual y salir" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -187,21 +188,21 @@ msgstr "Imprimir los parámetros de la conexión actual y salir" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Imprimir" @@ -283,7 +284,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -308,7 +309,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -319,7 +320,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -341,7 +342,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -498,6 +499,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -517,7 +519,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -536,7 +537,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -550,6 +550,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -583,7 +584,7 @@ msgstr "Mi primer módulo ráster" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -593,8 +594,8 @@ msgstr "Mi primer módulo ráster" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -609,21 +610,21 @@ msgstr "Mi primer módulo ráster" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Mapa ráster <%s> no encontrado" @@ -632,7 +633,7 @@ msgstr "Mapa ráster <%s> no encontrado" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -667,7 +668,6 @@ msgstr "Mapa ráster <%s> no encontrado" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -680,7 +680,6 @@ msgstr "Mapa ráster <%s> no encontrado" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -719,6 +718,7 @@ msgstr "Mapa ráster <%s> no encontrado" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -740,7 +740,7 @@ msgstr "Mapa ráster <%s> no encontrado" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -806,7 +806,7 @@ msgstr "Mapa ráster <%s> no encontrado" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -820,7 +820,7 @@ msgstr "Mi primer módulo vectorial" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -833,8 +833,8 @@ msgstr "Mi primer módulo vectorial" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -850,16 +850,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -905,7 +905,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -921,7 +921,7 @@ msgstr "No se puede abrir el mapa vectorial <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -930,7 +930,7 @@ msgstr "No se puede abrir el mapa vectorial <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -960,13 +960,13 @@ msgstr "No se puede abrir el mapa vectorial <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -994,7 +994,7 @@ msgstr "La conexión a la base de datos no ha sido definida para la capa %d" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1009,8 +1009,8 @@ msgstr "No se puede iniciar el controlador <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1044,10 +1044,10 @@ msgstr "No se puede iniciar el controlador <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1055,7 +1055,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "No se puede abrir la base de datos <%s> por el controlador <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1085,23 +1085,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "No es posible copiar tabla de atributos al mapa vectorial <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "Rega de colores inconsistente en RAT" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "Creando tabla de grises para <%s> (8bit, periodo completo)" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "Creando tabla de grises para <%s> (16bit,rango de imagen)" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "Formatos soportados:" @@ -1185,13 +1185,14 @@ msgstr "Aplicando rotación horizontal" msgid "Applying vertical flip" msgstr "Aplicando rotación vertical" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" msgstr "Se actualizó la región predeterminada para esta Localización" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "Actualizada la región para el directorio de mapas actual" @@ -1244,6 +1245,7 @@ msgstr "Actualizada la región para el directorio de mapas actual" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1304,6 +1306,12 @@ msgstr "Nombre de archivo ráster que será enlazado" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1369,14 +1377,13 @@ msgstr "Nombre de archivo ráster que será enlazado" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1426,152 +1433,142 @@ msgstr "Título para el mapa ráster resultante" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadatos" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Listar los formatos soportados y salir" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +#, fuzzy +msgid "Override projection check (use current project's CRS)" msgstr "" "Invalida verificación de la proyección (usar la proyección de la " "localización actual)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" "Asumir que el conjunto de datos tiene la misma proyección de la Localización " "actual" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "Solamente realizar revisión de proyección y salir" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "Extender extensión de región basado en nuevo conjunto de datos" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" "También actualiza la región predeterminada si está en el directorio de mapas " "PERMANENT" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "Rotar horizontalmente" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "Rotar verticalmente" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" "Enlistar bandas disponibles incluyendo tipo de banda en conjunto de datos y " "salir" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "Formato: número de banda,tipo,revisión de proyección" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "%s= o %s= deben ser dados" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "%s= y %s son mutuamente excluyentes" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "No se puede obtener el directorio de trabajo actual" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "Procediendo con la importación..." -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "El grupo de imaginería <%s> ya existe y será sobrescrito." -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "Leyendo banda %d de %d" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "La banda seleccionada (%d) no existe" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "Grupo de imaginería <%s> creado" @@ -1588,39 +1585,38 @@ msgstr "" msgid "No projection information available" msgstr "No se encuentra información disponible sobre la proyección" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "No se puede convertir la proyección del mapa de entrada a formato GRASS; no " "se puede crear la nueva localización." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "No se puede crear nueva Localización <%s>" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "No ha sido posible crear nuevo Directorio de mapas <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Localización <%s> creada" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" "No se puede convertir la información de la proyección del mapa de entrada a " "formato GRASS." -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1628,64 +1624,70 @@ msgstr "" msgid "Over-riding projection check" msgstr "Ignorando comprobación de proyección" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" "La proyección del conjunto de datos parece no corresponder con la " "localización actual.\n" "\n" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "La PROJ_INFO de la localización es:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "La PROJ_INFO del conjunto de datos es:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 -#, c-format +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 +#, fuzzy, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" "\n" "En caso de que no haya diferencias significativas en las definiciones de " "proyección, use la bandera -o para ignorarlas y use la definición de la " "Localización actual.\n" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 +#, fuzzy msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" "Considere generar una nueva localización a partir del conjunto de datos de " "entrada usando el parámetro 'localización'.\n" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +#, fuzzy +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" "Las proyecciones del conjunto de datos de entrada y de la localización " "actual parecen coincidir" @@ -1767,12 +1769,10 @@ msgstr "álgebra" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1810,7 +1810,7 @@ msgstr "Número de bins a usar" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1828,7 +1828,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1878,24 +1878,18 @@ msgstr "Nombre para mapa ráster de salida de elevación" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Salidas" @@ -2019,7 +2013,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2029,7 +2023,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2154,7 +2147,7 @@ msgstr "Imprimir histórico del ráster en vez de información" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "Las baderas -%c y -%c/%c/%c son mutuamente excluyentes" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2183,6 +2176,7 @@ msgstr "No se puede asignar memoria para la cadena" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2321,7 +2315,13 @@ msgstr "<%s=%s> número de puntos no válido" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "GRASS no está compilado con soporte OGR" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2330,8 +2330,8 @@ msgid "The minimum number of input raster maps is two" msgstr "El número mínimo de mapas ráster de entrada es dos" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Porcentaje completo..." @@ -2363,7 +2363,7 @@ msgstr "Actualizar estadísticas del mapa ráster" msgid "Statistics for <%s> updated" msgstr "Estadísticas para <%s> actualizadas" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2419,7 +2419,6 @@ msgstr "Se debe dar \"-i\" o \"valor=\"" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "remuestrear" @@ -2466,7 +2465,7 @@ msgid "Unknown method <%s>" msgstr "Método <%s> desconocido" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2521,7 +2520,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "Por favor especifique %s= o %s=" @@ -2952,7 +2951,7 @@ msgstr "Encontrando ruta de coste..." msgid "Error, ct == pres_cell" msgstr "Error, ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -3040,14 +3039,16 @@ msgstr "exportar" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3206,7 +3207,7 @@ msgid "List of cell values to be set to NULL" msgstr "Lista de valores de celda para establecer a NULO" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3537,6 +3538,15 @@ msgstr "Mapa ráster de ángulo de incidencia de salida (modo 1 solamente)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3625,17 +3635,15 @@ msgstr "Mapa ráster de ángulo de incidencia de salida (modo 1 solamente)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3656,7 +3664,7 @@ msgstr "Mapa ráster de ángulo de incidencia de salida (modo 1 solamente)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Salida" @@ -3739,7 +3747,7 @@ msgstr "Hora local (solar) (a establecer sólo para modo 1) [horas decimales]" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "Coeficiente de paso de distancia muestral (0.5-1.5)" @@ -3774,54 +3782,54 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "Debes utilizar la longitud raster si utilizas la hora local" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "Error al leer valor de zona de tiempo civil" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "Valor de zona de tiempo civil no válido" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "insol_time e incidout son opciones incompatibles" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "Error al leer tamaño de paso de tiempo" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "Tamaño de paso de tiempo no válido" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "Error leyendo el tamaño de paso del horizonte" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "El tamaño de paso del horizonte tiene que ser mayor que 0." -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" "Si usa la opción horizonte debe definir también el parámetro 'horizonstep'." -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "El timpo e insol_tiempo son opciones incompatibles" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" @@ -3829,61 +3837,57 @@ msgstr "" "Modo 1: ángulo de incidencia solar instantáneo e irradiancia utilizando una " "hora local establecida" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "incidout requiere que se establezca el parámetro hora local (time)" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "Modo 2: irradiación diaria integrada para un día determinado del año" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "Usando el mapa de albedo <%s>" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "Usando el mapa de pendiente <%s>" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "Usando el mapa de aspecto <%s>" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" "Si se utiliza -s y no se usan horizontes raster, les particiones numéricas " "deben ser = 1" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." @@ -3891,56 +3895,56 @@ msgstr "" "Si quieres guardar memoria y usar sombras, tienes que utilizar horizontes " "pre-calculados." -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "" "No se puede obtener información de la proyección de la localización actual" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "" "No se pueden obtener unidades de la proyección de la localización actual" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "" "No se pueden obtener los valores clave de la proyección de la localización " "actual" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +#, fuzzy +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" "mapas ráster latin y longin no tienen efecto cuando se está en una " "Localización Lat/Lon" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "Se deben dar ambos mapas ráster latin y longin, o ninguno" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3973,19 +3977,19 @@ msgstr "Se deben dar ambos mapas ráster latin y longin, o ninguno" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Sin memoria" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4065,9 +4069,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "Ángulo de inicio para horizonte multidireccional [degrees]" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "Modo ráster" @@ -4083,7 +4087,7 @@ msgstr "" "Para horizontes raster, leer del MDE un buffer adicional alrededor de la " "región actual" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" @@ -4091,7 +4095,7 @@ msgstr "" "Para horizontes raster, leer del MDE un buffer extra hacia el este de la " "región actual" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" @@ -4099,7 +4103,7 @@ msgstr "" "Para horizontes raster, leer del MDE un buffer extra hacia el oeste de la " "región actual" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" @@ -4107,7 +4111,7 @@ msgstr "" "Para horizontes raster, leer del MDE un buffer extra hacia el norte de la " "región actual" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" @@ -4115,13 +4119,13 @@ msgstr "" "Para horizontes raster, leer del MDE un buffer extra hacia el sud de la " "región actual" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" "Distancia máxima a considerar cuando se encuentra la altura del horizonte" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4176,6 +4180,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4196,49 +4203,61 @@ msgstr "" msgid "Optional" msgstr "Opcional" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +#, fuzzy +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "Coordenada para la cual se quiere calcular el horizonte" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "Modo punto" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Formato de salida (printf -style)" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Nombre de archivo para la salida (usar salida=- para stdout)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Incluir etiquetas de categoría en la salida" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "Escribir salida en grados (por defecto son radianes)" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" "Escribir salida en orientación de brújula (el predeterminado es CCW, Este=0)" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" "Nota: en sistema de coordenadas latitud-longitud especifique el buffer en " "unidad de grado" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "No puede leer las coordenadas de la opción \"coordinate\"." -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4247,83 +4266,99 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "No se puede abrir el archivo <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "No se especificó un valor de dirección o de tamaño de paso. Abortando." -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "No se especificó un nombre de horizonte raster. Abortando." -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" "Los valores negativos del ángulo de inicio no están permitidos. Abortando." -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "Ángulo final no está entre 0 y 360. Abortando." -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "Debe especificar un inicial mayor que el ángulo final. Abortando." -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "No se especificó un ángulo de tamaño de paso. Abortando." -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "No se pudo leer el tamaño de la zona buffer. Abortando." -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "No se podía leer tamaño de bufferzone %s. Abortando." -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "este" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "oeste" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "sur" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "norte" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "No se pudo leer una distancia máxima. Cancelando." -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "Los valores de distancia deben ser 0.5-1.5. Abortando." -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" +"No se puede obtener información de la proyección de la localización actual" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" +"No se pueden obtener unidades de la proyección de la localización actual" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" +"No se pueden obtener los valores clave de la proyección de la localización " +"actual" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "OOPS: cambiadas filas desde %d hasta %d" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "OOPS: cambiadas columnas desde %d hasta %d" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "Calculando mapa %01d de %01d (ángulo %.2f, mapa ráster <%s>)" @@ -5017,8 +5052,8 @@ msgid "" "The default nodata value is present in rasterband <%s> and would lead to " "data loss. Please specify a custom nodata value with the %s parameter." msgstr "" -"El valor predeterminado de sindato (nodata) está presente en banda ráster <" -"%s> y provocará pérdida de datos. Por favor especifique el valor sindato " +"El valor predeterminado de sindato (nodata) está presente en banda ráster " +"<%s> y provocará pérdida de datos. Por favor especifique el valor sindato " "(nodata) con el parámetro %s." #: ../raster/r.out.gdal/export_band.c:200 @@ -5173,7 +5208,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Atributos" @@ -5258,7 +5293,7 @@ msgstr "No se puede crear el índice" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "No se pueden otorgar privilegios sobre la tabla <%s>" @@ -5389,7 +5424,7 @@ msgstr "Archivo que contiene reglas de recodificación" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5594,9 +5629,9 @@ msgid "Cannot open file %s for reading" msgstr "No se puede abrir el archivo %s para lectura" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" msgstr "La información de proyección (PROJ_INFO) de la localización es:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5613,8 +5648,9 @@ msgstr "" #: ../raster/r.in.pdal/projection.c:92 ../raster/r.in.lidar/projection.c:94 #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 +#, fuzzy msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" "Considere generar una nueva Localización con el parámetro 'location' del " @@ -5835,9 +5871,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "Transformar" @@ -5855,7 +5891,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5940,10 +5976,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5984,30 +6020,30 @@ msgstr "Escala a aplicar a los datos Z" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "Proyección" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6142,136 +6178,136 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" "Usar la resolución del ráster base en lugar de la región computacional " -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "Mostrar archivo de información LAS y salir" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "" "Mostrar todos los parámetros de conexión del mapa en estilo de script de " "consola y salir" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "Archivo <%s> no existe" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "Archivo de entrada <%s> no existe" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 #, fuzzy msgid "Output map type set to CELL" msgstr "Mapa de salida %s X %s" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Entrada no válida <%s=%s>" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "Opción '%s debe ser > 0.0" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Leyendo datos..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Proyección de destino, por omisión la proyección de esta localización" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" "Invalida verificación de la proyección (usar la proyección de la " "localización actual)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 #, fuzzy msgid "The input dataset has undefined projection" msgstr "Mapas ráster de entrada no definidos" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 #, fuzzy msgid "Running PDAL algorithms..." msgstr "Algoritmo Reumann-Witkam" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Explorando %d puntos..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "Escribiendo mapa ráster de salida..." -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "%lu puntos encontrados en el archivo de entrada" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Mapa raster <%s> creado." @@ -6371,7 +6407,7 @@ msgstr "Se deben dar -%c o -%s=" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "-%c and %s= son mutuamete excluyentes" @@ -6406,7 +6442,7 @@ msgstr "Mapa ráster de entrada debe ser de tipo CELL." #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6438,7 +6474,7 @@ msgstr "No ha sido posible crear archivo temporal <%s> --errno = %d" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "Error al escribir archivo temporal <%s>" @@ -6496,9 +6532,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Número máximo de iteraciones" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6514,8 +6550,8 @@ msgstr "Número máximo de iteraciones" msgid "surface" msgstr "superficie" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6525,24 +6561,55 @@ msgstr "superficie" msgid "random" msgstr "aleatorio" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Media de distribución" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Desviación estándar" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, fuzzy, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "Generar semillas aleatoriass" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6597,7 +6664,7 @@ msgstr "No hay tal color <%s>" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6829,8 +6896,8 @@ msgid "" "shown." msgstr "" "Nombre de un mapa raster existente en la ruta de búsqueda del directorio de " -"mapas del usuario que será usado como fondo en el cual el movimiento \"live" -"\" será mostrado." +"mapas del usuario que será usado como fondo en el cual el movimiento " +"\"live\" será mostrado." #: ../raster/r.spread/main.c:288 msgid "Raster map to contain output spread time (min)" @@ -6970,7 +7037,7 @@ msgstr "Error leyendo datos" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -7077,7 +7144,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "goemorfología" @@ -7165,7 +7231,8 @@ msgid "Inappropriate window size (too big or even)" msgstr "Tamaño de ventana inapropiado (demasiado grande o par)" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" msgstr "Localizaciones Lat/Long no están soportadas por este módulo" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7305,15 +7372,15 @@ msgstr "El mapa ráster <%s> no se encuentra en el Directorio de mapas actual" #, c-format msgid "<%s> is a reclass file of map <%s> in mapset <%s> - can't uncompress" msgstr "" -"<%s> es un archivo de reclasificación de mapa <%s> en Directorio de mapas <" -"%s> - no se puede descomprimir" +"<%s> es un archivo de reclasificación de mapa <%s> en Directorio de mapas " +"<%s> - no se puede descomprimir" #: ../raster/r.compress/main.c:134 #, c-format msgid "<%s> is a reclass file of map <%s> in mapset <%s> - can't compress" msgstr "" -"<%s> es un archivo de reclasificación de mapa <%s> en Directorio de mapas <" -"%s> - no se puede comprimir" +"<%s> es un archivo de reclasificación de mapa <%s> en Directorio de mapas " +"<%s> - no se puede comprimir" #: ../raster/r.compress/main.c:140 #, c-format @@ -7383,8 +7450,8 @@ msgstr "" #, c-format msgid "<%s> is a reclass file of map <%s> in mapset <%s>" msgstr "" -"<%s> es un archivo de reclasificación de mapa <%s> en Directorio de mapas <" -"%s> " +"<%s> es un archivo de reclasificación de mapa <%s> en Directorio de mapas " +"<%s> " #: ../raster/r.compress/main.c:355 #, c-format @@ -7796,7 +7863,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "No se encontró nombre del mapa raster en el archivo de entrada" @@ -7805,7 +7872,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Mapa ráster no encontrado" @@ -7919,7 +7986,7 @@ msgid "longitude" msgstr "longitud" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7943,17 +8010,17 @@ msgstr "Nombre para mapa ráster de salida de latitud o longitud" msgid "Longitude output" msgstr "Salida de Longitud" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" "No se puede obtener información de la proyección de la localización actual" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" "No se pueden obtener las unidades de la proyección de la localización actual" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" "No se pueden obtener los valores clave de la proyección de la localización " @@ -8034,7 +8101,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -8084,17 +8151,14 @@ msgid "Output raster map required" msgstr "Se requiere mapa raster de salida" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "El valor distancia (%d): %lf tiene que ser >= 0.0" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "El valor del exponente (%lf) debe ser > 0.0" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "Valor fijo (%lf) debe ser menor que valor de distancia (%lf)" @@ -8152,6 +8216,7 @@ msgstr "Generando mapa raster <%s>..." #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "regresión" @@ -8302,7 +8367,7 @@ msgstr "Se importará archivo ASCII SURFER (Golden Software)" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8389,7 +8454,7 @@ msgstr "" "binario" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8453,7 +8518,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8518,7 +8583,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "la opción zonas y la bandera región -r son mutuamente excluyentes" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "Tipo de raster <%s> que no encaja" @@ -8650,7 +8715,6 @@ msgid "Calculating flow directions..." msgstr "Calculando direcciones de flujo..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8789,7 +8853,7 @@ msgstr "Aplicar filtro sólo a valores de datos nulos" msgid "<%d> is not valid number of threads." msgstr "<%s=%s> número de puntos no válido" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "El mapa ráster es demasiado pequeño para el tamaño del filtro" @@ -8890,8 +8954,8 @@ msgstr "Porcentaje de mapa a mantener en memoria" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "Explorar archivo de datos para la extensión y luego salir" @@ -8900,8 +8964,8 @@ msgstr "Explorar archivo de datos para la extensión y luego salir" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "En modo de escaneo, imprimir usando estilo de script de consola" @@ -8919,7 +8983,7 @@ msgstr "Por favor, especifique un número de columna razonable." msgid "Please specify reasonable number of lines to skip" msgstr "Por favor, especifique un número razonable de líneas a saltar" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "rangoz no válido" @@ -9329,9 +9393,9 @@ msgstr "" "transitorios, confinados y no confinados en dos dimensiones" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" "Las localizaciones Latitud/Longitud no están soportadas por %s. Por favor " "reproyecte el mapa primero." @@ -9569,13 +9633,11 @@ msgstr "Iniciando validación cruzada con lambda_i=%.4f...(%d o %d)" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "Media = %.5lf" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "Raíz Media Cuadrada (RMS) = %.5lf" @@ -9590,7 +9652,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9843,31 +9904,31 @@ msgstr "Radio de filtro (horizontal)" msgid "Filter radius (vertical)" msgstr "Radio de filtro (vertical)" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "%s= y %s=/%s= son mutuamente excluyentes" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "Se requiere ya sea %s= o %s=/%s" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "Se necesitan ambas opciones %s= y %s=" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "Número diferente de valores para filter= y [xy_]radius=" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "Demasiados filtros (máx: %d)" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "Al menos un filtro debe ser finito" @@ -9885,12 +9946,12 @@ msgstr "" "Entrada parece ser datos NOAA/AVHRR que necesitan ser georeferenciados con " "transformación spline de capa fina (%s o %s)." -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +#, fuzzy +msgid "create project" msgstr "crear localización" #: ../raster/r.in.gdal/main.c:118 @@ -9905,18 +9966,19 @@ msgstr "Nombre de archivo ráster que será importado" msgid "Band(s) to select (default is all bands)" msgstr "Banda(s) a seleccionar (de manera predeterminada son todas las bandas)" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "Bandas" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +#, fuzzy +msgid "Name of GCPs target project (location)" msgstr "Nombre de ubicación objetivo de puntos de cotrol en tierra (GCPs)" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +#, fuzzy +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" "Nombre de Localización a crear o desde la cual leer proyección para " "transformación de puntos de control en tierra (GCPs)" @@ -9942,10 +10004,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Nombre de la nueva localización a crear" #: ../raster/r.in.gdal/main.c:195 @@ -9975,7 +10037,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9984,83 +10046,88 @@ msgstr "" msgid "Region" msgstr "Región" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" "Forzar los mpas Lat/Lon a encajar en coordenadas geogPosición de pantalla en " "coordenadas geográficas (90N,S; 180E,W)" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Mantener números de banda en vez de usar nombre de color de banda" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" "Crear la Localización especificada por parámetro \"location\" y salir. No " "importar archivo ráster." -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "Limitar importación a la región actual" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "Mostrar número de bandas y salir" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +#, fuzzy +msgid "You have to specify a target project different from output project" msgstr "" "Debe especificar una localización de destino distinta de la localización de " "salida" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +#, fuzzy +msgid "You need to specify valid project name." msgstr "Debe especificar un nombre de Localización válido." -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +#, fuzzy +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "La '-l' flag sólo funciona en localizaciones Lat/Lon" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +#, fuzzy +msgid "Disabling '-r' flag for new project" msgstr "Deshabilitando el flag '-r' para la nueva localización" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "El mapa ráster <%s> ya existe y será sobrescrito" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "El mapa ráster <%s> ya existe" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." @@ -10068,14 +10135,14 @@ msgstr "" "Mapa ráster de entrada está volteado o rotado - no se puede importar. Debe " "usar 'gdalwrap' para transformar el mapa para que el norte quede arriba." -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " @@ -10085,130 +10152,160 @@ msgstr "" "Seguramente querrás revisar los bordes del mapa y la resolución con r.info y " "reiniciarlos con r.region antes de continuar avanzando." -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "Importando %d bandas ráster... " -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "No ha sido posible obtener número %d de bandas ráster" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "Copiando %d GCP en archivo de puntos para <%s>" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "Los GCP tiene el siguiente sistema de coordenadas WKT de OpenGIS" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "Reproyectado la tabla de los GCP:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "* Proyección de entrada para la tabla de GCP: %s" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "* Proyección de salida para la tabla de GCP: %s" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 -#, c-format +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"No se puede convertir la proyección del mapa de entrada a formato GRASS; no " +"se puede crear la nueva localización." + +#: ../raster/r.in.gdal/main.c:1044 +#, fuzzy, c-format +msgid "" +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" "El objetivo para el grupo de salida <%s> ha sido definido en la Localización " "<%s>, Directorio de mapas ." -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" "No se pueden traducir los valores clave de la proyección de los GCP de " "entrada" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "" "No se puede obtener información de la proyección de la localización de " "destino" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "" "No se pueden obtener las unidades de la proyección de la localización de " "destino" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "" "No se pueden obtener los valores clave de la proyección de la localización " "de destino" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "Directorio de mapas <%s> en la localización de destino <%s> - " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "permiso denegado" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "no encontrado" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "Importando mapa ráster <%s>..." -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "Fila inválida" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "No ha sido posible abrir archivo <%s>: %s." +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"No se puede convertir la proyección del mapa de entrada a formato GRASS; no " +"se puede crear la nueva localización." + +#: ../raster/r.in.gdal/proj.c:323 +#, fuzzy +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" +"\n" +"En caso de que no haya diferencias significativas en las definiciones de " +"proyección, use la bandera -o para ignorarlas y use la definición de la " +"Localización actual.\n" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10900,7 +10997,6 @@ msgid "Number of intermediate images to produce" msgstr "Número de imágenes intermedias a producir" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "La dimensión fractal de %.2lf debe ser ebtre 2 y 3." @@ -11021,6 +11117,18 @@ msgstr "Número de walkers" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -11052,26 +11160,6 @@ msgstr "Intervalo de tiempo para crear mapas de salida [minutos]" msgid "Water diffusion constant" msgstr "Constante de difusión del agua" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -11098,12 +11186,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -11111,40 +11193,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "Se crearán más de 100 archivos!!!!!" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "nwalk por defecto=%d, rwalk=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "Usando factor de conversión métrico %f, paso=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "No está produciendo ningún archivo site o raster" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Falló la entrada" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "No se pueden escribir mapas ráster" @@ -11307,7 +11389,7 @@ msgstr "Factor de peso para vectorial de velocidad de flujo de agua" msgid "Time-series output" msgstr "Salida de series de tiempo" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "No se está produciendo ningún mapa raster" @@ -11561,29 +11643,29 @@ msgstr "" "Factor de ponderación para cada mapa de entrada, el valor predeterminado es " "1.0 para cada mapa de entrada" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "Los pesos deben ser positivos" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "Leyendo mapa ráster <%s> usando peso %f..." -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "input= y weights= deben tener el mismo número de valores" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "salida= y método= tienen que tener el mismo número de valores" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11639,77 +11721,40 @@ msgstr "Archivo %s creado" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" "Genera un mapa ráster de superficie de desviaciones aleatorias uniformes con " "rango definido." -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Valor aleatorio mínimo" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Valor aleatorio máximo" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "Crear un mapa raster integer" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" -"La resolución del mapa ráster de elevación difiere de la resolución de la " -"región actual" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "Leyendo mapa ráster de entrada <%s>..." - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" -"La resolución del archivo de orientación es distinta que la de la región " -"actual" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "Leyendo archivos de entrada: barrera" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "No se puede crear el archivo de segmentos %s" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "No se puede formatear el archivo de segmentos %s" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "No se puede abrir el archivo de segmentos %s" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11757,6 +11802,43 @@ msgstr "" "Resolución demasiado desequilibrada (%f x %f); por favor vuelva a muestrear " "el mapa de entrada" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" +"La resolución del mapa ráster de elevación difiere de la resolución de la " +"región actual" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "Leyendo mapa ráster de entrada <%s>..." + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" +"La resolución del archivo de orientación es distinta que la de la región " +"actual" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "Leyendo archivos de entrada: barrera" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "No se puede crear el archivo de segmentos %s" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "No se puede formatear el archivo de segmentos %s" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "No se puede abrir el archivo de segmentos %s" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -12490,7 +12572,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12504,13 +12586,14 @@ msgid "transformation" msgstr "transformación" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" "Reproyecta un mapa ráster de una Localización dada a la Localización actual." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "Localización que contiene el mapa raster de entrada" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12536,10 +12619,9 @@ msgstr "Predeterminado: nombre del directorio de mapas actual" msgid "Name of input raster map to re-project" msgstr "Nombre del mapa ráster a reproyectar" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Ruta a la base de datos de GRASS de la localización de entrada" #: ../raster/r.proj/main.c:174 @@ -12600,12 +12682,13 @@ msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" "opción <%s>: <%s> existe. Para sobreescribir, use la bandera --overwrite" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "Las localizaciones de entrada y salida no pueden ser la misma" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +#, fuzzy +msgid "Input and output projects are the same" msgstr "Las localizaciones de entrada y salida son las mismas" #: ../raster/r.proj/main.c:268 @@ -12625,13 +12708,13 @@ msgstr "" "salida" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "Directorio de mapas <%s> en localización de entrada <%s> - %s" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Comprobando localización <%s> directorio de mapas <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12639,15 +12722,15 @@ msgstr "Comprobando localización <%s> directorio de mapas <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Parámetro <%s> requerido no establecido" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" "No se encuentra el mapa ráster <%s> en la localización <%s> en el directorio " "de mapas <%s>" @@ -12666,12 +12749,13 @@ msgstr "" "No se pueden obtener los valores clave de la proyección del mapa de entrada" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "No se puede trabajar con datos no proyectados (localización XY)" #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" msgstr "Mapa de entrada <%s@%s> en localización <%s>:" #: ../raster/r.proj/main.c:524 @@ -12753,7 +12837,7 @@ msgid "Sorting events..." msgstr "Escribiendo bordes..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -13019,8 +13103,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -13192,8 +13277,9 @@ msgid "S_decode ==> Please fix the shadowband sky factor: %f" msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 +#, fuzzy msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" "No se puede calcular la posición del sol en localizaciones no proyectadas. " @@ -13208,6 +13294,25 @@ msgstr "" "El punto especificado %f, %f está fuera de la actual región, es " "intencionado? De todas formas, el punto será utilizado." +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "" +"No se puede obtener información de la proyección de la localización actual" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "" +"No se pueden obtener las unidades de la proyección de la localización actual" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "" +"No se pueden obtener los valores clave de la proyección de la localización " +"actual" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13884,17 +13989,20 @@ msgid "Current projection is x,y (undefined)." msgstr "La proyección actual es x,y (indefinida)." #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +#, fuzzy +msgid "Cannot get projection info of current project" msgstr "" "No se puede obtener información de la proyección de la Localización actual" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +#, fuzzy +msgid "Cannot get projection units of current project" msgstr "" "No se pueden obtener unidades de la proyección de la Localización actual" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +#, fuzzy +msgid "Cannot get projection key values of current project" msgstr "No se pueden obtener valores clave de la Localización actual" #: ../raster/r.sunhours/main.c:367 @@ -13976,7 +14084,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s = %s -- debe ser mayor que no sea negativoo" @@ -13986,7 +14094,7 @@ msgstr "%s = %s -- debe ser mayor que no sea negativoo" msgid "%s=%s - must not be zero" msgstr "%s=%s - no debe ser cero" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s = %s -- de ser un número posiivollll" @@ -14076,7 +14184,7 @@ msgstr "No se puede leer el intervalo fp del mapa raster <%s>" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "No se puede crear la tabla: '%s'" @@ -14085,7 +14193,7 @@ msgstr "No se puede crear la tabla: '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "No se puede crear el índice para la tabla <%s>, clave <%s>" @@ -14402,7 +14510,7 @@ msgstr "Nombre de mapa ráster de salida de índice topográfico" msgid "Number of sinks or boundaries: %d" msgstr "Número de sumideros o contornos: %d" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -14413,20 +14521,20 @@ msgstr "Número de sumideros o contornos: %d" msgid "position" msgstr "posición" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" "Consulta mapa ráster en sus valores de categoría y etiquetas de categoría." -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Nombre de mapa(s) ráster existente a consultar" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Coordenadas para consulta" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14434,15 +14542,28 @@ msgstr "Coordenadas para consulta" msgid "Query" msgstr "Consulta" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "Nombre de mapa vectorial de puntos a consultar" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "Tamaño del caché de punto" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14451,62 +14572,72 @@ msgstr "Tamaño del caché de punto" msgid "Advanced" msgstr "Avanzado" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "Cabecera de fila de salida" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "Mostrar las etiquetas de categoría de la celda(s) de cuadrícula" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "Producir valores de color como RRR:GGG:BBB" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Producir valores de categoría enteros, no valores de celda" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "Activar informe de caché" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "La bandera 'v' requiere la opción 'points'" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "Solo es posible hacer hasta %d mapas ráster (se dieron más de %d)" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "No ha sido posible leer archivo de categorías para <%s>" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +#, fuzzy +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "Falla al inicializar superficie de salida" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "No ha sido posible leer mapa vectorial <%s>" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "La línea %d no es un punto o centroide, fue omitido" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "%s %s está fuera de su región actual" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Falla al inicializar superficie de salida" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importa un archivo binario MAT(v4) a un ráster de GRASS." @@ -14676,9 +14807,6 @@ msgstr "Mostrar total de área en metros cuadrados" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -15034,21 +15162,21 @@ msgid "Input map resolution differs from current region resolution!" msgstr "" "¡La resolución del mapa de entrada es distinta de la de la región actual!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "Procesar todos los archivos de salida requerirá" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "%.2f GB de espacio en disco para archivos temporales." -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "%.2f MB de espacio en disco para archivos temporales." -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "%.2f KB de espacio en disco para archivos temporales." @@ -15249,21 +15377,21 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -"Tienes que especificar como mínimo uno de los parámetros:<%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s>, <%s> o <%s>" +"Tienes que especificar como mínimo uno de los parámetros:<%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s>, <%s> o <%s>" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Tipo de raster incorrecto: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." @@ -15271,62 +15399,62 @@ msgstr "" "r.slope.aspect no convierte unidades horizontales a metros en esta versión, " "ver página del manual." -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "Productos de elevación para el directorio de mapas <%s> en <%s>" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "Orientación mínima procesada %.4f orientación máxima procesada %.4f" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Orientación del mapa raster <%s> terminada" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "Pendiente mínima procesada %.4f pendiente máxima procesada %.4f" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Mapa raster de pendientes <%s> terminado" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "Perfil del mapa raster de curvas <%s> terminado" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Curva tangencial del mapa raster <%s> terminada" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "Pendiente este-oeste (E-W) del mapa ráster <%s> terminada" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "Pendiente N-S del mapa raster <%s> terminada" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Mapa ráster Dxx <%s> terminado" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Mapa ráster Dyy <%s> terminado" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Mapa ráster Dxy <%s>terminado" @@ -16315,17 +16443,17 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "SECCIÓN 4: RUSLE LS y/o factor de determinación S." -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "SECCIÓN 3: Acumulando Flujo de Superficie con SFD." -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "SECCIÓN 3: acumulando flujo superficial con MFD." -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format @@ -16333,15 +16461,15 @@ msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" "MFD: la proporción acumulativa de la distribución de flujo no es 1.0 sino %f" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "SECCIÓN 3b: Ajustando direcciónes de drenaje." @@ -16357,61 +16485,61 @@ msgstr "SECCIÓN %d: cerrando mapas." msgid "SECTION %d: Watershed determination." msgstr "SECCIÓN %d: determinación de cuenca hidrográfica." -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -16435,7 +16563,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -17430,11 +17557,11 @@ msgstr "" "Asignar un sistema de ecuaciones lineales cuadrático completo, el " "predeterminado " -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "Flujo hídrico subterraneo" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -17442,36 +17569,36 @@ msgstr "" "Programa de cálculo numérico para flujos transientes de aguas subterráneas " "no confinadas en dos dimensiones." -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "Por favor, proporcione los mapas river_head, river_leak y river_bed" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "Por favor, proporcione los mapas drain_head y drain_leak" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "Tiempo de cálculo: %g" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "Cálculo del flujo de agua superficial no confinada bucle %i" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "Diferencia máxima entre este y el último incremento: %g" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "No se puede crear y resolver el sistema de ecuaciones lineal" @@ -17802,7 +17929,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "No ha sido posible crear mapa vectorial temporal" @@ -18272,9 +18399,10 @@ msgid "Output RRR:GGG:BBB color values for each profile point" msgstr "Dar los valores de color RRR GGG BBB para cada punto del perfil" #: ../raster/r.profile/main.c:102 +#, fuzzy msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" "Si no se especifican las unidades, se usarán uidades de Localización. De " "manera predeterminada se usarán metros en Localizaciones geográficas " @@ -18406,98 +18534,98 @@ msgstr "Foster (1981)" msgid "El-Swaify (1985)" msgstr "El-Swaify (1985)" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "Usar solamente puntos válidos" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "el rango z no se tendrá en cuenta durante el escaneo" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "Opción de filtro no conocida <%s>" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "No válido %s" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "Paso #%d (de %d)..." -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" "Mapa ráster <%s> creado. %lu puntos de %d archivos encontrados en la región." -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "Mapa ráster <%s> creado. %lu puntos encontrados en la región." @@ -18780,11 +18908,11 @@ msgstr "No se puede abrir el archivo <%s> para escribir la etiqueta" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18993,26 +19121,26 @@ msgstr "El tamaño del vecindario debe ser positivo" msgid "Neighborhood size must be odd" msgstr "El tamaño del vecindario debe ser impar" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "%s= y %s= deben tener el mismo número de valores" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" @@ -19020,7 +19148,7 @@ msgstr "" "Método %s no compatible con ventana ponderada, usando en su lugar máscara de " "pesos" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "Abriendo mapa de selección <%s>" @@ -19103,7 +19231,8 @@ msgid "Units" msgstr "Unidades" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +#, fuzzy +msgid "Default: project map units" msgstr "Predeterminado: unidades de mapa Localización" #: ../misc/m.measure/main.c:60 @@ -19126,8 +19255,9 @@ msgstr "Área:" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "gráficas" @@ -19893,8 +20023,8 @@ msgid "Not enough points, %d are required" msgstr "No hay suficientes puntos, se requieren %d" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "Error realizando la transformación (%d)" @@ -19904,28 +20034,28 @@ msgid "Poorly placed control points" msgstr "Los puntos de control están mal colocados" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "Memoria insuficiente" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "Error de parámetro" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "No hay puntos de control activos" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "Coordenadas no válidas: [%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" "Procesa una transformación de coordenadas basada en los puntos de control." @@ -19935,57 +20065,57 @@ msgid "Rectification polynomial order" msgstr "Orden polinómica de rectificación" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "índice puntual" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "coordenadas de fuente" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "coordenadas de destino" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "Mostrar información de resumen" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "Archivo que contiene coordenadas a transformar (\"-\" a leer de stdin)" @@ -19994,7 +20124,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "Coordenadas x,y locales hacia este,norte de destino" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "Transformación inversa del archivo coords o del coef. dump" @@ -20003,7 +20133,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "Coordenadas de destino este,norte para locales x,y" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "Mostrar coeficientes de matriz de transformación" @@ -20531,6 +20661,10 @@ msgstr "No ha sido posible leer el rango del mapa ráster 3D <%s>" msgid "Error while reading history file" msgstr "Error mientras se leía archivo de historia" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "La información de proyección (PROJ_INFO) de la localización es:\n" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -20591,64 +20725,75 @@ msgstr "" "Usar resolución de ráster base actual en vez de la resolución de la región " "computacional" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "" +"Invalida verificación de la proyección (usar la proyección de la " +"localización actual)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "No ha sido posible crear mapa ráster 3D <%s>" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "Leyendo puntos..." -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -20758,7 +20903,6 @@ msgstr "Crear explícitamente el archivo de mapa de bits de valor nulo 3D" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -20771,10 +20915,8 @@ msgstr "Crear explícitamente el archivo de mapa de bits de valor nulo 3D" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -20788,11 +20930,11 @@ msgstr "Crear explícitamente el archivo de mapa de bits de valor nulo 3D" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "mostrar" @@ -21316,10 +21458,10 @@ msgstr "Error al cerrar archivo de script" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -21375,9 +21517,9 @@ msgstr "solamente interfaz de línea de comandos" msgid "command line interface with GUI startup screen" msgstr "interfaz de línea de comando con pantalla GUI de arranque" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Tipo" @@ -21441,13 +21583,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "Lanzando GUI <%s> en el fondo, por favor espere..." #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "soportar" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "scripts" @@ -21824,73 +21966,75 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "Establecer la región actual a partir de la región nombrada" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Región <%s> no encontrada" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "No se puede leer la cabecera del mapa ráster 3D <%s@%s>" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "No se puede establacer la región <%s>" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "No se puede actualizar la región actual" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" "No se puede cambiar la región predeterminada. El directorio de mapas actual " "no es ." -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "Ya está en Lat/Long. Usar la opción -p en su lugar." -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 +#, fuzzy msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" "Está en una localización XY, proyectar a Lat/Lon no es posible. Use la " "bandera -p en su lugar." -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "Salida WGS84 imposible, ya que esta localización no contiene parámetros de " "transformación del datum. Pruebe a ejecutar g.setproj." -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "No se pueden actualizar los parámetro de proyección latitud/longitud" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "Los cálculos Lat/Long no pueden realizarse desde un sistema simple XY" @@ -21903,8 +22047,8 @@ msgstr "Mapa raster <%s@%s> es un mapa base para <%s>. Eliminación forzada." #, c-format msgid "Raster map <%s@%s> is a base map. Remove reclassed map <%s> first." msgstr "" -"Mapa raster <%s@%s> es un mapa base. Remueva primero el mapa reclasificado <" -"%s>." +"Mapa raster <%s@%s> es un mapa base. Remueva primero el mapa reclasificado " +"<%s>." #: ../general/g.remove/check_reclass.c:43 #: ../general/g.remove/check_reclass.c:57 @@ -22147,8 +22291,8 @@ msgstr "Enlistar elementos disponibles y salir" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" "El parámetro 'archivo' contiene referencias al directorio de mapas <%s>, " "pero el parámetro <%s> del directorio de mapas no corresponde" @@ -22437,7 +22581,7 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." @@ -22445,117 +22589,118 @@ msgstr "" "Muestra o modifica archivos de información de proyección de GRASS (en varias " "descripciones de sistema de coordenadas)." -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +#, fuzzy +msgid "Can also be used to create new GRASS projects." msgstr "También puede ser utilizado para crear nuevas localizaciones GRASS." -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "Muestra y manipula archivos de información de proyección de GRASS." -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "Mostrar información de proyección en formato convencional de GRASS" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "Muestra información de proyección en formato de script de la consola" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" "Verificar información del datum e imprimir parámetros de transformación" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Imprimir información de proyección en formato PROJ.4" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" "Imprimir salida 'lisa' sin saltos de página (aplicable a salidas WKT y " "PROJ.4)" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 #, fuzzy msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" "Imprimir salida 'lisa' sin saltos de página (aplicable a salidas WKT y " "PROJ.4)" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "Imprimir información de proyección en formato WKT" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "Usar formato tipo ESRI (sólo aplicable a salida WKT)" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "Especificación" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" "Nombre del archivo georreferenciado del cual leer la información de " "proyección" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" "Nombre del archivo ASCII que contiene una descripción de proyección WKT" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "Descripción de proyección PROJ.4" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "Código de proyección EPSG" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "Datum" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" "Datum (anula cualquier datum especificado en sistema de coordenadas de " "entrada)" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" "Acepta códigos estándar de datum GRASS, o \"list\" para enlistar y salir" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "Número de índice de los parámetros de transformación del Datum" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr " \"0\" para sin especificar o \"-1\" para listar y salir" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" @@ -22563,48 +22708,50 @@ msgstr "" "Forzar a ignorar la información de transformación del datum en el sistema de " "coordenadas de entrada" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +#, fuzzy +msgid "Modify current project's projection files" msgstr "Modificar archivos de proyección de la localización actual" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Crear" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Nombre de la nueva localización a crear" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Faltan los archivos de proyección" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" "Sólo se puede especificar una de las opciones -%c, -%c, -%c, -%c, -%c o -%c" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" "Sólo se puede especificar una de las opciones -%c, -%c, -%c, -%c, -%c o -%c" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" "No se especificó el formato de salida, defina una de las opciones -%c, -%c, -" "%c, o -%c" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -22697,8 +22844,8 @@ msgstr "" "proyección. Se usará 'XY (sin proyectar)'" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" msgstr "No se puede crear la localización <%s>: %s" #: ../general/g.proj/create.c:21 @@ -22707,29 +22854,29 @@ msgid "Unable to create projection files: %s" msgstr "No se pueden crear los archivos de proyección: %s" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" +#, fuzzy, c-format +msgid "Unable to create project <%s>" msgstr "No se puede crear la localización <%s>" #: ../general/g.proj/create.c:27 -#, c-format +#, fuzzy, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" "Puedes cambiar a la nueva localización con\n" "`%s=%s`" #: ../general/g.proj/create.c:38 -#, c-format +#, fuzzy, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" "Debe seleccionar el Directorio de mapas PERMANENT antes de actualizar la " "proyección de la Localización actual (Directorio de mapas actual es <%s>)" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " @@ -22739,76 +22886,76 @@ msgstr "" "usted tiene múltiples Directorios de mapas debe correr 'g.region -d' en cada " "uno para actualizar la región a partir de la predeterminada" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "Información de la proyección actualizada" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" "Imprime un mensaje, advertencia, información de progresso, o error fatal al " "modo de GRASS." -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" "Este módulo debería usarse en scripts para los mensajes mostrados al usuario." -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "Imprimir mensaje como advertencia" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "Imprimir mensaje como error fatal " -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "Imprimir mensaje como mensaje de depuración " -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "Imprimir mensaje como información de progreso" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "Nivel" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "Mostrar mensaje en todos los moddos excepto en el modo \"silencioso\"" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "El mensaje es mostrado en GRASS_VERBOSE>=1" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "Imprimir mensaje sólo en modo verboso" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "El mensaje es mostrado solo en GRASS_VERBOSE>=3" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Texto del mensaje a imprimir" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "El mensaje es mostrado en GRASS_VERBOSE>=2" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "Nivel a usar para mensajes de depuración" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "Seleccionar sólo un nivel de mensajes" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "No se puede parsear el mensaje de entrada" @@ -22953,8 +23100,10 @@ msgid "Changes/reports current mapset." msgstr "Cambios/reportes del Directorio de mapas actual." #: ../general/g.mapset/main.c:52 +#, fuzzy msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" "Opcionalmente crear nuevo directorio de mapas o lista disponible de " "directorios de mapas en una posición dada." @@ -23046,39 +23195,64 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "El actual directorio de mapas es <%s>" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +#, fuzzy +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "Falla al inicializar superficie de salida" + +#: ../general/g.mapsets/list.c:22 +#, fuzzy +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "Falla al inicializar superficie de salida" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "Directorios de mapas disponibles:" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "Directorios de mapas a los que se puede acceder:" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "ruta de búsqueda" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" "Modifica/muestra la actual ruta de búsqueda del directorio de mapas actual " "del usuario." -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 +#, fuzzy msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" "Afecta al acceso del usuario a datos existentes bajo otros directorios de " "mapas en la localización actual." -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" "Nombre(s) de los Directorio(s) de mapas existentes a añadir/eliminar o " "definir" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -23087,71 +23261,77 @@ msgstr "" msgid "Operation to be performed" msgstr "Operación a realizar" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" msgstr "Separador de campos para mostrar (banderas -l y -p)" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "Listar todos los directorios de mapas disponibles en orden alfabético" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "Imprimir la ruta de búsqueda del directorio de mapas actual" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "Lanzar cuadro de diálogo GUI de selección de Directorio de mapas" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "Operación '%s' desconocida" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Introduzca una regla en uno de estos formatos:" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "Opción -%c ignorada" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "Opción <%s> ignorada" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "Directorio de mapas <%s> no encontrado" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" "Directorio de mapas actual (<%s>) debe ser siempre incluido en la ruta de " "búsqueda" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "Directorio de mapas <%s> ya está en la ruta de búsqueda" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "Directorio de mapas <%s> añadido a la ruta de búsqueda" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "Directorio de mapas <%s> eliminado de la ruta de búsqueda" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "Ruta de búsqueda no modificada" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "No ha sido posible abrir SEARCH_PATH para escritura" @@ -23168,21 +23348,17 @@ msgstr "" "para fuentes." #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "Sobreescribir archivo de configuración de fuente si ya existe" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" "Escribir archivo de configuración de fuente en salida estándar en vez de " "$GISBASE/etc" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "Lista directorios extras que serán explorados" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" @@ -23191,13 +23367,16 @@ msgstr "" "fuentes Freetype-compatible así como para las predeterminadas (ver " "documentación)" -#: ../general/g.mkfontcap/main.c:104 -#, c-format +#: ../general/g.mkfontcap/main.c:98 +#, fuzzy, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" +"Nombre de archivo de mapa ráster %d: %s ya existe. Usar la bandear --o para " +"sobreescribir." -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" @@ -23205,7 +23384,7 @@ msgstr "" "Esta instalación de GRASS fue compilada sin soporte de Freetype, parámetro " "extradirs ignorado" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "No se puede abrir %s para escritura: %s" @@ -23572,7 +23751,7 @@ msgstr " desviación estándar" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -24779,7 +24958,7 @@ msgstr "Transformación con éxito" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -24883,8 +25062,9 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" "El group [%s] de la localización [%s] del directorio de mapas [%s] ahora usa " "el archivo de cámara [%s]" @@ -24894,8 +25074,9 @@ msgid "Select or modify the target elevation model." msgstr "Seleccionar o modificar " #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Nombre de ubicación objetivo de puntos de cotrol en tierra (GCPs)" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -24927,35 +25108,38 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" msgstr "Localización de salida [%s] no encontrada\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "Falta nobre de mapa de elevación. Por favor defina la opción '%s'" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" +"El group [%s] de la localización [%s] del directorio de mapas [%s] ahora usa " +"el archivo de cámara [%s]" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 -#, c-format -msgid "Mapset [%s] in target location [%s] - %s " +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "Directorio de mapas [%s] en la Localización objetivo [%s] - %s" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "permiso denegado\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "no encontrado\n" @@ -25008,62 +25192,67 @@ msgstr "Falta Información de destino para el grupo <%s> " #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" msgstr "Localización de destino <%s> no encontrada" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "Directorio de mapas <%s> en la localización de destino <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "GCP" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "No se puede leer puntos de referencia para el grupo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" "No se ha seleccionado archivo de referencia de cámara para el grupo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "Mal formato en archivo cámara para grupo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "Formato erroneo en archivo de exposición de estación para grupo <%s>" @@ -25073,30 +25262,33 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Nombre del grupo de imágenes para ortorrectificación" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "No se puede acceder a la ruta fuente %s: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "La información de la proyección no se actualizará" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" +"El grupo <%s> se destinó a la localización [%s], conjunto de mapas [%s]" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -25210,15 +25402,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 -#, c-format -msgid "Rectify <%s@%s> (location <%s>)" +#, fuzzy, c-format +msgid "Rectify <%s@%s> (project <%s>)" msgstr "Rectificar <%s@%s> (localización <%s>)" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." msgstr "en <%s@%s> (localización <%s>) ..." #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -25262,103 +25452,103 @@ msgid "Raster map with camera angle relative to ground surface" msgstr "" "Mapa raster con el ángulo de cámara en relación con la superficie del suelo" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" "Utilizar los ajustes de la región actual en la localización de destino (def. " "= se calcula el área más pequeña)" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "Rectificar todos los mapas raster del grupo" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "Grupo <%s> no encontrado" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "Localización: %s" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "crear localización" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "Directorio de mapas: %s" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "No fue posible leer archivo REF para el grupo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "El grupo <%s> no contiene mapas raster; ejecutar i.group" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "La extensión <%s> no se admite" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "El siguiente mapa raster ya existe en" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "LOCALIZACIÓN destino %s, DIRECTORIO DE MAPAS %s:" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "" +"El grupo <%s> se destinó a la localización [%s], conjunto de mapas [%s]" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "Ortorectificación cancelada." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "La resolución de salida tiene que ser > 0, ignorado" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "Usando la región: N=%f S=%f, E=%f O=%f" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "No hay modelo de elevación destino seleccionado para el grupo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "El mapa ráste de entradar <%s> no existe en el grupo <%s>." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "Intenta:" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "Salir!" @@ -25487,6 +25677,16 @@ msgstr "Región: N=%f S=%f E=%f O=%f" msgid "Resolution EW=%f NS=%f" msgstr "Resolución EO=%f NS= %f" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "Rectificar <%s@%s> (localización <%s>)" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "en <%s@%s> (localización <%s>) ..." + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -25505,6 +25705,13 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "Orden de polinomio de rectificación (1-3)" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" +"Utilizar los ajustes de la región actual en la localización de destino (def. " +"= se calcula el área más pequeña)" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "Use spline de capa fina" @@ -25514,6 +25721,26 @@ msgstr "Use spline de capa fina" msgid "Invalid order (%d); please enter 1 to %d" msgstr "Orden no válida (%d); por favor introduzca 1 a %d" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "Localización: %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "LOCALIZACIÓN destino %s, DIRECTORIO DE MAPAS %s:" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "Localización de destino <%s> no encontrada" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "Directorio de mapas <%s> en la localización de destino <%s> - " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -25897,6 +26124,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "proyección" @@ -27522,8 +27750,8 @@ msgid "For no rescaling use 0,0" msgstr "Para no rescalar utilizar 0,0" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "Rescalar" @@ -27990,17 +28218,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "* Cobertura de la nieve: %.2lf %%" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "* Covertura de nubes: %.2lf %%" @@ -28009,17 +28234,14 @@ msgid "* Temperature of clouds:" msgstr "* Temperatura de las nubes:" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "** Máximo: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "** Media (nube %s): %.2lf K " #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "** Mínimo: %.2lf K" @@ -28028,17 +28250,14 @@ msgid "Histogram cloud signature:" msgstr "Histograma de firma de nube:" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "* Temperatura media: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "*Desviación estándar: %.2lf" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "* Asimetría: %.2lf" @@ -28048,17 +28267,14 @@ msgid "* Histogram classes: %d" msgstr "* Clases de histograma: %d" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "* Percentil 98.75: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "* Percentil 97.50: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "* Percentil 83.50: %.2lf K" @@ -28067,12 +28283,10 @@ msgid "Maximum temperature:" msgstr "Temperatura máxima:" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "* Nube fría: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "* Nube cálida: %.2lf K" @@ -28381,6 +28595,9 @@ msgstr "" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -30035,11 +30252,15 @@ msgstr "No se puede seleccionar datos:" msgid "Unable to describe table." msgstr "No se puede describir la tabla." -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "Falló la conexión." +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -30093,7 +30314,7 @@ msgstr "No se ha podido iniciar transacción:" msgid "Unable to commit transaction:" msgstr "No ha sido posible realizar transacción:" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -30188,16 +30409,15 @@ msgid "OGR layer <%s> not found" msgstr "Capa OGR <%s> no encontrada" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Columna <%s> no encontrada en la tabla <%s>" @@ -30792,6 +31012,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "histograma" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Nueva columna de atributos <%s> añadida a la tabla" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Número de bins a usar" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -30836,6 +31092,8 @@ msgstr "entradas" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -30873,68 +31131,82 @@ msgstr "Mapas de entrada" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Nombre para el mapa ráster de salida" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Nombre para el mapa vectorial de salida" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Nombre para el mapa ráster de salida" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Nombre para el mapa vectorial de salida" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Nombre para el mapa ráster de salida" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#, fuzzy +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" +"Valor de pendiente mínimo (en porcentaje) para el que se calcula la " +"orientación" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 #, fuzzy msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "Nombre del archivo metafile de Landsat (.met o MTL.txt)" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Nombre de un archivo de base de datos" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Rescalar" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 #, fuzzy msgid "Set computational region to maximum image extent" msgstr "" "Establecer la región computacional para que coincida con el nuevo mapa ráster" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "No se puede crear archivo temporal" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "Cargando bandas de entrada..." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Coordenadas de puntos seed" @@ -31021,245 +31293,14 @@ msgstr "Nombre de un conjunto de datos espacio temporales existente" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "entrada" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" -"Imprime/establece la conexión a la base de datos para un mapa vectorial a la " -"tabla de atributos." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Nombre de mapa vectorial" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Número o nombre de la capa (vectorial)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "Número de capa o nombre para mapeo temático" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -#, fuzzy -msgid "layer number/name for the ML results" -msgstr "Número o nombre de capa (write to)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -#, fuzzy -msgid "Numpy array with vector cats." -msgstr "No hay áreas en mapa vectorial <%s>" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Demasiados nombres de columna" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Número de columnas en la nueva región" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "Formato de archivos de salida" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Tipo de almacenamiento para el mapa ráster resultante" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "clasificación supervisada" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Nombre del mapa ráster que contiene el resultado de la reclasificación" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 #, fuzzy msgid "Delete segments where there is an existing plant" @@ -31474,6 +31515,541 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Crear un mapa raster integer" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +#, fuzzy +msgid "modeling" +msgstr "modelo" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Nombre del mapa vectorial de entrada con puntos esparcidos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Nombre del mapa(s) vectorial de fondo " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "Parámetro de tensión spline" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Nombre de una capa de salida" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Incluir valores sin dato" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "Mapa vectorial de salida en el que se escribirán los segmentos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Nombre de mapa vectorial de puntos a consultar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Nombre de la capa de salida de la radiación neta" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Nombre de mapa vectorial de puntos a consultar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nombre del mapa(s) vectorial de fondo " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Nombre del mapa raster a visualizar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Escribiendo los datos transformados a archivo..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +#, fuzzy +msgid "Multiply all automatic regularization parameters by this number." +msgstr "Multiplicar el resultado de densidad por este número" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +#, fuzzy +msgid "Do not apply clamping" +msgstr "No aplicar ensamblado" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Mostrar la dirección de los elementos lineales" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +#, fuzzy +msgid "Disable quadratic features" +msgstr "Mostrar vértices de los elementos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Distancias a elementos 'to'..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "No hay elementos 'to'" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Seleccionando elementos..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "No seleccionar automáticamente al empezar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "asignación de costo" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Elevación" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Porcentaje de tiempo de CPU a usar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "Nombre del mapa vectorial de entrada con puntos esparcidos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Nombre de la capa a usar para saturación" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Error mínimo de integración" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Factor de convergencia para MFD (1-10)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Umbral para los valores atípicos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Umbral para los valores atípicos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Umbral para los valores atípicos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Número de veces a repetir el filtro" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +#, fuzzy +msgid "Regularization parameter for treshold features" +msgstr "Regularización del peso en la evaluación residual" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +#, fuzzy +msgid "Regularization parameter for categorical features" +msgstr "Parámetro(s) de configuración no admitido" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +#, fuzzy +msgid "Regularization parameter for hinge features" +msgstr "Parámetro de regularización Tykhonov (affecta el smooting)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Eliminar centroides de área duplicados" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Generar semillas aleatoriass" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Número de bins a usar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +#, fuzzy +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "Memoria máxima a utilizar (en MB)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +#, fuzzy +msgid "Show the Maxent user interface" +msgstr "interfaz de usuario" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "Importa archivo SRTM HGT a un mapa ráster." @@ -31702,10 +32278,17 @@ msgstr "Archivo de tabla a importar o cadena de conexión a base de datos" msgid "Name for output vector map" msgstr "Nombre para el mapa vectorial de salida" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" +"Invalida verificación de la proyección (usar la proyección de la " +"localización actual)" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -31956,6 +32539,17 @@ msgstr "Nombre de archivo pack de entrada" msgid "Default: taken from input file internals" msgstr "Predeterminado: tomado de los archivos internos de entrada" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" +"Asumir que el conjunto de datos tiene la misma proyección de la Localización " +"actual" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -33239,7 +33833,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -33287,12 +33881,6 @@ msgstr "" msgid "landscape" msgstr "Landsat" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -#, fuzzy -msgid "modeling" -msgstr "modelo" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -34425,7 +35013,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Número o nombre de la capa." @@ -34466,6 +35053,18 @@ msgstr "Hasta condiciones WHERE de sentencia SQL sin palabra clave 'where'" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Estableciendo nombre de mapa a <%s>" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -34860,7 +35459,6 @@ msgstr "Realiza extracción de red de arroyos." #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -35065,7 +35663,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Mapas de entrada" @@ -35101,6 +35699,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Ruta a la base de datos de GRASS de la localización de entrada" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -36213,11 +36820,8 @@ msgstr "Archivo de configuración" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -36271,50 +36875,64 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Fondo" +msgid "Thin species and background points" +msgstr "Número de puntos de interpolación" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Fondo" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 #, fuzzy msgid "CSV file with alias and map names" msgstr "Archivo de entrada con un nombre de mapa por línea" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 #, fuzzy msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" "Formato de datos ráster a escribir (sensible a mayúsculas y minísculas, ver " "tambien la bandera -l)" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 #, fuzzy msgid "Automatically adapt resolution" msgstr "Se ajusta automáticamente si no se define" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Número de columna de los valores de datos en el archivo de entrada" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "segmentación" @@ -37153,8 +37771,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -37165,6 +37792,7 @@ msgid "Group of raster layers to be classified" msgstr "Nombre de mapa ráster a reclasificar" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -37207,11 +37835,13 @@ msgid "" msgstr "Nombre de columa de atributos en la cual guardar valor" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Mapa de salida" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -37525,6 +38155,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -37536,6 +38167,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -37565,6 +38197,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Archivo de etiquetas" @@ -37955,71 +38588,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "Nombre de mapa ráster de entrada de red codificada de arroyos" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Nombre para el mapa ráster de salida" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "Cerrando mapa de acumulación" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -#, fuzzy -msgid "Flow accumulation units" -msgstr "acumulación" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -#, fuzzy -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" -"Factor de multiplicación para convertir unidades de elevación a unidades " -"horizontales" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "longitud en unidades de mapa" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -38386,12 +38954,16 @@ msgid "" msgstr "Enlazar el archivo ráster usando r.external" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" "Ampliar la extensión de la localización en base a nuevo conjunto de datos" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" +"Asumir que el conjunto de datos tiene la misma proyección de la Localización " +"actual" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -39320,6 +39892,14 @@ msgid "" msgstr "" "Reproyecta un mapa ráster de una Localización dada a la Localización actual." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "Localización que contiene el mapa raster de entrada" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Ruta a la base de datos de GRASS de la localización de entrada" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -39459,12 +40039,12 @@ msgid "WFS standard" msgstr "Versión estándar WMS" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "Número máximo de elementos a descargar" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "(predeterminado: ilimitado)" @@ -39619,9 +40199,8 @@ msgstr "Configuraciones de la fuente" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -39664,10 +40243,10 @@ msgid "Path to the extraction directory" msgstr "Ruta al directorio de extracción" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +#, fuzzy msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" "Crear una nueva Localización e importar los datos a ella. No correr este " "módilo en paralelo o interrumpirlo cuado una nueva Localización deba ser " @@ -39677,9 +40256,26 @@ msgstr "" msgid "Set the current region from the last map that was imported" msgstr "Establecer la región actual desde el último mapa que fue importado" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "" +"Ampliar la extensión de la localización en base a nuevo conjunto de datos" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" +"Asumir que el conjunto de datos tiene la misma proyección de la Localización " +"actual" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" "Crear la Localización especificada por el parámetro \"location\" y salir. No " @@ -39691,7 +40287,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "Enlistar las capas OGR disponibles en la fuente de datos y salir" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "Listar las capas disponibles en la fuente de datos y salir" @@ -39833,34 +40429,6 @@ msgstr "Nombre de la base de datos de entrada" msgid "Base name for output file" msgstr "Nombre para el archivo de salida" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "goemorfología" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Columnas de atributos que contienen datos" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Número de bins a usar" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -40561,6 +41129,10 @@ msgstr "Nombre para el archivo SVG de salida" msgid "Queries projection information spatially." msgstr "No se encuentra información disponible sobre la proyección" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "crear localización" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -40865,8 +41437,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Disuelve contornos entre áreas adyacentes que comparten un número de " @@ -40900,7 +41473,8 @@ msgid "Layer number or name." msgstr "Número o nombre de la capa." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +#, fuzzy +msgid "Name of attribute column used to dissolve features" msgstr "Nombre de la columna de atributo usada para disolver contornos comunes" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -41659,9 +42233,20 @@ msgstr "" "Importa un conjunto de daos vectoriales espacio temporales a partir de un " "archivo de almacenamiento específico para GRASS." +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +#, fuzzy +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" +"Crear una nueva Localización e importar los datos a ella. No correr este " +"módilo en paralelo o interrumpirlo cuado una nueva Localización deba ser " +"creada" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" "Crear la Localización especificada por el parámetro \"location\" y salir. No " @@ -41873,6 +42458,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -41884,6 +42470,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -41954,6 +42545,17 @@ msgstr "Resolución de mapa ráster (usar con opción resolution=valor)" msgid "Estimate resolution only" msgstr "Estimar solamente resolución" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" +"Asumir que el conjunto de datos tiene la misma proyección de la Localización " +"actual" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -43029,8 +43631,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -43128,35 +43730,44 @@ msgid "Comma separated names of data layers to download" msgstr "Nombres separados por comas de las capas a descargar" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Lista de capas a importar" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "Especificar sistema de referencia alternativo (ejemplo: EPSG:4326)" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" "El código dado debe estar soportado por el servidor, consulte el archivo de " "funciones" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "Omitir IDs de elementos previas y empezar descargando ésta" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "(predeterminado: iniciar con el primer elemento)" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" @@ -43164,7 +43775,7 @@ msgstr "" "Descargar funciones de servidor a 'wms_capabilities.xml' en el directorio " "actual y salir" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -46612,8 +47223,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "monitores" @@ -46651,6 +47262,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "Aplica solamente cuando se usan las banderas -c o --overwrite" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "Redibuja el contenido del monitor actualmente seleccionado." @@ -47099,6 +47711,13 @@ msgstr "reclasificar" msgid "multiple" msgstr "multiespectral" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -47159,6 +47778,20 @@ msgstr "" msgid "Register empty maps" msgstr "Registrado mapas vacíos" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Líneas vectoriales" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Líneas vectoriales" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -47200,6 +47833,38 @@ msgstr "haciendo mosaico" msgid "Number of tiles in y direction" msgstr "El número de teselas de celda debería solapas en cada dirección" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Nombre de mapa ráster a reclasificar" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Número de veces a repetir el filtro" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -47657,8 +48322,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -48446,6 +49111,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Nombre para mapa ráster de salida (predeterminado: el de entrada)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Nombre de la nueva localización a crear" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -48748,6 +49417,10 @@ msgstr "Nombre de archivo SPOT VGT NDVI HDF de entrada" msgid "Offset factor for input" msgstr "Factor de escalamiento para entrada" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 #, fuzzy msgid "Adjacent downstream segment category" @@ -49209,10 +49882,95 @@ msgstr "Exageración vertical" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Archivo de etiquetas" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Nombre de una capa de entrada" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Nombre del mapa vectorial a utilizar como máscara" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "variables" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +#, fuzzy +msgid "csv file with variable and layer names" +msgstr "Archivo de entrada con un nombre de mapa por línea" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Nombre de mapa ráster de entrada de depresiones" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Nombre de mapa ráster de entrada con depresiones reales" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parámetros" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Imprimir X e Y (columna y fila)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "goemorfología" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Columnas de atributos que contienen datos" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -49774,17 +50532,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -49812,24 +50560,21 @@ msgid "categorical map with zones" msgstr "Puntos vectoriales" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nombre de archivo de imagen de entrada" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 #, fuzzy msgid "Plot dimensions (width,height)" msgstr "Mostrar dimensiones de marco (anchura, altura)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Tamaño (anchura, altura) de la imagen de salida" @@ -49841,9 +50586,8 @@ msgid "Default font size" msgstr "Predeterminado: mismo que el tamaño de fuente" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -49863,14 +50607,12 @@ msgid "Create a vector point layer of outliers" msgstr "Nombre de mapa vectorial de puntos a consultar" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "%d discrepantes (outliers) encontrados" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 #, fuzzy msgid "Draw boxplot(s) with outliers" @@ -49882,14 +50624,12 @@ msgid "Draw notches" msgstr "Modo dibujo" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -49923,14 +50663,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -49942,27 +50674,23 @@ msgid "Plot format" msgstr "Formato de entrada" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "mostrar etiquetas" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -50011,15 +50739,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -50040,7 +50759,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "Colores de línias separando los colores de la tabla de colores" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Anchura de borde" @@ -50052,55 +50770,46 @@ msgid "The width of the boxplots (0,1])" msgstr "Anchura de línea del texto" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Ancho de línea vectorial" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 #, fuzzy msgid "The linewidth of the boxplots" msgstr "Anchura de línea del texto" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Formato de archivos de salida" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "Color para el texto y los ejes" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Color para datos Y" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 #, fuzzy msgid "Whisker and cap linewidth" msgstr "Grosor de la cuadrícula" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 #, fuzzy msgid "Flier marker" msgstr "Marcador de iconos" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -50108,115 +50817,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "Tamaño de fuente" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "Tamaño de fuente para el subtítulo" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Color de la franja" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Establece el color de texto" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" -"Enlistar mapas registrados en un conjunto de datos ráster espacio temporales." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Exporta u conjunto de datos espacio temporales." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Resolución" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Modo dibujo" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Tamaño de fuente" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Formato de tabla" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -#, fuzzy -msgid "limit value axis" -msgstr "Invertir lista de valores" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Anchura de línea del texto" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Color de texto" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -51923,6 +52544,14 @@ msgstr "Estimar solamente resolución" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -51948,6 +52577,15 @@ msgstr "isolíneas" msgid "add grid lines" msgstr "Etiquetadas %d líneas." +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Color de texto" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -52056,186 +52694,193 @@ msgstr "" "Cambia el nombre de una columna en la tabla de atributos conectada a un mapa " "vectorial dado." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Líneas vectoriales" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Número de columnas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Nombre de columa de atributos en la cual guardar valor" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Nombre de la columna de geometría" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Nombre de columa de atributos en la cual guardar valor" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Tipo de elemento" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Nombre para imagen de salida (o archivo de texto para -t)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Nombre para el archivo imagen de salida (sin extensión)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Resolución de mapa ráster de salida" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Opciones de entrada" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "El valor del tipo de parche" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "estadísticas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 #, fuzzy msgid "Dot marker" msgstr "Marcador de iconos" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "tamaño de área" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 #, fuzzy msgid "Set marker size" msgstr "tamaño de área" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Color de fuente" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Color para datos Y" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "columna" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 #, fuzzy msgid "Density" msgstr "densidad de puntos" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "Nombre de mapa de colores de entrada" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Barrido hacia atrás completo" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "línea" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Opciones de entrada" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "tabla de colores" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 msgid "Color of the trendline" msgstr "Color para el texto y los ejes" @@ -52247,6 +52892,7 @@ msgstr "Color para el texto y los ejes" #: ../raster/r.null/main.c:62 msgid "null data" msgstr "dato nulo" +<<<<<<< HEAD #: ../locale/scriptstrings/r.null.all_to_translate.c:5 #: ../locale/scriptstrings/r.mask_to_translate.c:5 @@ -52267,134 +52913,147 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../locale/scriptstrings/r.null.all_to_translate.c:5 +#: ../locale/scriptstrings/r.mask_to_translate.c:5 +#: ../raster3d/r3.mask/main.c:136 ../raster3d/r3.null/main.c:183 +#: ../raster/r.null/main.c:63 +msgid "no-data" +msgstr "" +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) + +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 #, fuzzy msgid "Line style trendline" msgstr "Estilo de línea" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Grosor de la cuadrícula" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Anchura de línea del texto" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "desviación estándar" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Color de línea" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "Color para el texto y los ejes" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 #, fuzzy msgid "Ellipse edge style" msgstr "Estilo sólido" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Anchura de página no admitida" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Anchura de mosaicos (columnas)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 #, fuzzy msgid "Column grouping the features in categories" msgstr "Conviritiendo reglas de color en categorías..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 #, fuzzy msgid "RGB column for ellipse categories" msgstr "Nombre de la columna para categorías" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Definir rango de manera maual (se refiere a la opción 'column')" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Nombre del mapa ráster a visualizar" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Definir rango de manera maual (se refiere a la opción 'column')" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Nombre del mapa ráster a visualizar" @@ -52754,8 +53413,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -52841,187 +53500,6 @@ msgstr "" "Calcula estadísticas univariadas para cada atributo para cada mapa vectorial " "registrado en un conjunto de datos espacio temporal" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -#, fuzzy -msgid "density" -msgstr "densidad de puntos" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Puntos vectoriales" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Requerido" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Nombre de la columna que contiene los datos numéricos" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Nombre de la columna que contiene las coordenadas X" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -#, fuzzy -msgid "Format: All values must be >0" -msgstr "El valor umbral debe ser >=0" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Formato del archivo de entrada" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Producir mapa de orientación (o fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "Entradas opcionales" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "clasificación supervisada" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Distancias a elementos 'to'..." - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Resolución de mapa ráster de salida" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Nombre de tabla de salida" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Nombre del mapa vectorial de salida para puntos de corriente ajustados" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Nombre para archivo de salida que contendrá el reporte" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Nombre para archivo de salida que contendrá el reporte" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Nombre de mapa ráster a muestrear" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Formato" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Nombre de mapa ráster a muestrear" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Número de niveles a usar para cada componente" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Invertir selección" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -#, fuzzy -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "Realiza un procedimiento de validación cruzada sin aproximación ráster" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -53888,11 +54366,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "histograma" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -59117,6 +59590,47 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "Salida de v.select" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +#, fuzzy +msgid "Download whole tiles" +msgstr "No mantener archivos abiertos" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "región computacional" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -59688,8 +60202,8 @@ msgid "Unable to open file '%s': %s" msgstr "No ha sido posible abrir archivo '%s': %s" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -60000,8 +60514,9 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +#, fuzzy +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "Usar cálculos geodésicos para localizaciones latitud-longitud" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -60844,7 +61359,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -60858,7 +61373,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -61414,7 +61929,7 @@ msgstr "Tipo de componentes" msgid "Add points on nodes" msgstr "Añadir puntos a los nodos" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -61704,8 +62219,8 @@ msgid "" "Vector map <%s> cannot be overwritten because input table <%s> is linked to " "this map." msgstr "" -"Mapa vectorial <%s> no puede ser sobreescrito debido a que tabla de entrada <" -"%s> está enlazada a este mapa." +"Mapa vectorial <%s> no puede ser sobreescrito debido a que tabla de entrada " +"<%s> está enlazada a este mapa." #: ../vector/v.in.db/main.c:176 #, c-format @@ -61715,7 +62230,7 @@ msgstr "" "La tabla del mapa vectorial de salida <%s> (controlador: <%s>, base de " "datos: <%s>) ya existe" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "El tipo de datos de la columna clave debe ser entero" @@ -63561,46 +64076,42 @@ msgstr "" "salir" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Sobrescribir los parámetros de conexión para cierta capa" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Borrar conexión para cierta capa (no la tabla)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Por favor, elija sólo un estilo de impresión" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" "No se pueden editar mapas vectoriales guardados en otro directorio de mapas" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "Mapa <%s> no está conectado a base de datos" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "El mapa vectorial <%s> está conectado por:\n" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Conexión a la base de datos no definida" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -"capa <%d/%s> tabla <%s> en la base de datos <%s> a través del controlador <" -"%s> con clave <%s>\n" +"capa <%d/%s> tabla <%s> en la base de datos <%s> a través del controlador " +"<%s> con clave <%s>\n" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" @@ -63608,7 +64119,7 @@ msgstr "" "capa <%d> tabla <%s> en la base de datos <%s> a través del controlador <%s> " "con clave <%s>\n" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -63618,17 +64129,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "La conexión a la base de datos no ha sido definida para la capa <%s>" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "Usar -o para sobrescribir el enlace existente para la capa <%d>" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "La tabla <%s> no existe en la base de datos <%s>" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -63637,16 +64148,16 @@ msgstr "" "La tabla <%s> ahora es parte del mapa vectorial <%s> y se puede borrar o " "sobrescribir por los módulos de GRASS" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "No se pueden otorgar privilegios sobre la tabla %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Los privilegios seleccionados fueron asignados sobre la tabla" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -63687,7 +64198,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "Categorías" @@ -63769,182 +64280,183 @@ msgstr "Importa solamente el número de puntos dado" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" "Crear la Localización especificada por el parámetro \"location\" y salir. No " "importa datos vectoriales." -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "Seleccionar la opción región actual o la opción espacial, no ambas" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr " Se requieren 4.parámetros para el parámetro 'espacial'" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "El vectorial <%s> ya existe y será sobrescrito" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "El mapa vectorial <%s> ya existe" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "Escaneando %llu puntos" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "Escaneando %lu puntos..." -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "%llu puntos importados (el límite era %llu)" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "%llu puntos importados" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "%llu puntos de entrada no fueron válidos y fueron dejados fuera" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "%llu puntos de entrada estuvieron fuera del área seleccionada" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" "%llu puntos de entrada estuvieron fuera del área especificada por la máscara" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "%lu puntos importados (el límite era %d)" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "%lu puntos importados" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "%lu puntos de entrada estuvieron fuera del área seleccionada" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" "%lu puntos de entrada estuvieron fuera del área especificada por la máscara" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "El resto de los puntos fue ignorado" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -64449,7 +64961,7 @@ msgstr "No se especificó la columna de etiquetas, no se escribirán etiquetas" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -64706,13 +65218,13 @@ msgid "Name for output GRASS vector map (default: input layer)" msgstr "" "Nombre para el mapa vectorial GRASS de salida (predeterminado: el de entrada)" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" "Enlistar capas disponibles en la fuente de datos incluyendo tipo de elemento " "y salir" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "Formato: nombre de capa,tipo,revisión de proyección,geometría" @@ -64745,7 +65257,7 @@ msgstr "" "GRASS no está compilado con soporte PostgreSQL. Usando controlador OGR-" "PostgreSQL en vez del controlador de datos nativo GRASS-PostGIS." -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "Capa <%s> no disponible" @@ -64754,7 +65266,7 @@ msgstr "Capa <%s> no disponible" msgid "No layer defined" msgstr "No hay capas definidas" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "No se puede abrir el origen de datos <%s>" @@ -64774,7 +65286,7 @@ msgstr "No se puede crear el archivo '%s/%s'" msgid "Link to vector map <%s> created." msgstr "Liga al mapa vectorial <%s> creada." -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -64810,12 +65322,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Reproyecta un mapa vectorial desde una localización a la localización actual." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "Localización que contiene el mapa vectorial de entrada" #: ../vector/v.proj/main.c:88 @@ -64850,13 +65364,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Las localizaciones de entrada y salida no pueden ser la misma" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "No se encontraron mapas vectoriales" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" "No se encuentra el mapa vectorial <%s> en la localización <%s> en el " "directorio de mapas <%s>" @@ -64872,15 +65391,15 @@ msgid "Input vector map <%s> is empty" msgstr "Mapa vectorial de entrada <%s> está vacío" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" "Directorio de mapas <%s> en la localización de entrada <%s> - permiso " "denegado" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "" "Directorio de mapas <%s> en la localización de entrada <%s> no encontrado" @@ -66170,8 +66689,8 @@ msgid "Invalid option skipped: %s" msgstr "Opción no válida omitida: %s" #: ../vector/v.out.postgis/create.c:78 -#, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +#, fuzzy, c-format +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" "Código EPSG definido para la localización actual (%s) es anulado por %s " @@ -66830,7 +67349,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "Falló importación." @@ -67149,12 +67668,12 @@ msgid "Cleaning output topology" msgstr "Limiando topología" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "Eliminando puentes..." @@ -67368,19 +67887,19 @@ msgid "Snapping boundaries..." msgstr "Ensamblando contornos..." #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "Rompiendo polígonos..." #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Eliminando duplicados..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "Rompiendo los bordes..." @@ -67602,7 +68121,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "Capa <%s> no encontrada" @@ -67761,10 +68280,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "Memoria insuficiente para %s" @@ -67805,6 +68324,10 @@ msgstr "Nombre del mapa vectorial de puntos 3D de entrada" msgid "Name of input surface raster map for cross-section" msgstr "Nombre del mapa ráster de superficie para sección transversal" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "Entradas opcionales" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -67914,9 +68437,9 @@ msgstr "" "salida o archivos devi" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "No ha sido posible crear %s" @@ -67930,7 +68453,7 @@ msgstr "No ha sido posible abrir %s" msgid "Vector is not 3D" msgstr "El vectorial no es 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "No ha sido posible crear tabla '%s'" @@ -68018,7 +68541,6 @@ msgid "Cannot allocate memory for point" msgstr "No se puede asignar memoria para punto" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "No se puede insertar %lf,%lf,%lf,%lf,%lf a=%d" @@ -68050,8 +68572,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" "%d puntos dados para interpolación (luego de adelgazamiento (thinning)) es " "menor que NPMIN=%d que se dio" @@ -68744,7 +69266,7 @@ msgid "Categories already exist in layer %d" msgstr "Las categorías ya existen en capa %d" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "No es posible calcular el centroide de área" @@ -68882,11 +69404,11 @@ msgstr "Error al escribir archivo de configuración" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" -"Fuente de datos inicia con prefijo \"PG:\", se esperaba formato \"PostgreSQL" -"\" (\"%s\" dado)" +"Fuente de datos inicia con prefijo \"PG:\", se esperaba formato " +"\"PostgreSQL\" (\"%s\" dado)" #: ../vector/v.external.out/link.c:97 #, c-format @@ -70766,17 +71288,17 @@ msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" "Error al leer el mapa vectorial <%s> - algunos datos pueden no ser correctos" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "Ensamblar contornos (umbral = %.3e):" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "Limpiando límites y nodos..." -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "Uniendo contornos..." @@ -70960,7 +71482,7 @@ msgstr "No ha sido posible definir conexión DB predeterminada" msgid "No default DB defined" msgstr "No hay una base de datos (DB) predeterminada definida" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" @@ -70968,7 +71490,7 @@ msgstr "" "Entrada es 3D: usando valores del atributo en vez de la coordenada z paradas " "aproximación" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "Entrada es 3D: usando coordenadas z para aproximación" @@ -71237,42 +71759,47 @@ msgid "Field separator for print mode" msgstr "Separador de campos para modo de impresión" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Capa de puntos" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "Mostrar solamente sentencias SQL" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "Mostrar también totales para opción length, area o count" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Esta opción requiere una columna" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Esta opción requiere dos columnas" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Esta opción requiere al menos dos columnas" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "Se debe especificar el parámetro 'qcolumn' para 'option=query'" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "La opción 'lados' sólo tiene sentido para perímetros" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "La opción 'sinuous'' sólo tiene sentido para líneas" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "La opción 'azimuth' sólo tiene sentido para líneas" @@ -72285,16 +72812,6 @@ msgstr "Recopilando caminos más cortos..." msgid "Writing shortest paths..." msgstr "Escribiendo caminos más cortos..." -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Imprime atributos de mapa vectorial." @@ -73866,18 +74383,18 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" "El nombre del mapa vectorial de salida <%s> no es un nombre válido de mapa" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "No se está produciendo mapas raster ni vectoriales" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" @@ -73885,7 +74402,7 @@ msgstr "" "Se deben especificar las dos opciones de validación cruzada (opción -c y " "salida vectorial cvdev)" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" @@ -73893,44 +74410,44 @@ msgstr "" "La validación cruzada no se puede procesar de forma simultánea a la salida " "ráster o archivo devi" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "Usando anisotropía se deben especificar tanto theta como scalex" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "Constantes smatt y smooth especificadas - se usa una constante" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "El procesado tardará demasiado - se sugiere un npmin más bajo" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "Entrada es 2D: usando valores de atributo para aproximación" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "Entrada es 2D: usando valores de categoría para aproximación" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "falló Interp_segmets" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "Procesando segmentos..." -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" "No ha sido posible escribir mapas ráster -- intente aumentar la resolución" @@ -74226,7 +74743,7 @@ msgstr "Uniendo las líneas..." msgid "Querying vector map <%s>..." msgstr "Consultando mapa vectorial <%s>..." -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Escribiendo centroides..." @@ -74710,164 +75227,165 @@ msgstr "La conexión a la base de datos no ha sido definida para la capa <%s>" msgid "Unable to open driver <%s>" msgstr "No se puede abrir el driver <%s>" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "Nombre:" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "Directorio de mapas:" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "Localización:" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Proyección" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "Base de datos:" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "Título:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "Escala de mapa:" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "Nombre del creador:" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "Organización:" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "Fecha del origen:" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "Marca de tiempo (primer capa):" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "Marca de tiempo (primer capa): nada" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "Formato del mapa:" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "Capa OGR:" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "Fuente de datos OGR:" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "Tipo de elemento:" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "Tabla DB:" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "Nombre DB" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "Columna de geometría:" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "Topología:" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "esquema:" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "Columna de topología" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "Tipo de mapa" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "nivel" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "Cantidad de puntos:" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "Cantidad de centroides:" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "Cantidad de líneas:" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "Cantidad de contornos:" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "Cantidad de áreas:" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "Cantidad de líneas:" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "Cantidad de faces:" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "Cantidad de kernels:" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "Cantidad de volúmenes:" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "Cantidad de agujeros:" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "Mapa es 3D:" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "Sí" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "No" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "Cantidad de dblinks:" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "zona" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "Umbral de digitalización" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "Comentario" @@ -75053,29 +75571,59 @@ msgstr "No se encontró ningún elemento, nada que exportar" msgid "An error occurred, nothing to be exported" msgstr "Ocurrió un error, nada que exportar" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" +"La proyección del conjunto de datos parece no corresponder con la " +"localización actual.\n" +"\n" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" +"Las proyecciones del conjunto de datos de entrada y de la localización " +"actual parecen coincidir" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" "Convierte nubes de puntos LAS LiDAR a un mapa vectorial GRASS con libLAS." -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -75153,20 +75701,20 @@ msgstr "No limpiar polígonos (no recomendado)" msgid "Force 2D output even if input is 3D" msgstr "Forzar salida 2D aunque la entrada sea 3D" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "Cambiar nombres de columna a minúsculas" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." @@ -75174,101 +75722,101 @@ msgstr "" "Opción <%s> será ignorada. OGR no lo soporta para el formato seleccionado " "(%s)." -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "Valor codificado no soportado por el controlador OGR <%s>" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "No hay capas OGR disponibles" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "Fuente de datos <%s> (formato '%s') contiene %d capas:" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" "Todos las capas OGR disponibles serán importadas al mapa vectorial <%s>" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "Columna geometría <%s> no encontrada en capa OGR <%s>" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "Revise si capa OGR <%s> contiene polígonos..." -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "Distancia de división de límites en unidades de mapa: %G" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "Usando vectorial temporal <%s>" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "Nombre de columna <%s> renombrada como <%s>" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "Escribiendo columna <%s> con entero 64 como entero 32" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" "Escribiendo columna <%s> con longitud fija de %d caracteres (puede quedar " "truncada)" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " @@ -75277,159 +75825,159 @@ msgstr "" "Anchura para la columna %s establecida a 255 (no fue especificada por OGR). " "¡Algunas cadenas pueden quedar truncadas!" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" "Escribiendo la columna %s con longitud fija de %d caracteres (puede quedar " "truncada)" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "No ha sido posible eliminar tabla: '%s'" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "Limpiando polígonos" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "Cambiando puentes de contornos a líneas..." -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "Encontrando centroides para capa OGR <%s>..." -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "%d polígonos de entrada\n" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "%d polígonos de entrada" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "Área total: %G (%d areas)\n" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "Área total: %G (%d areas)" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "Área solapada: %G (%d areas)\n" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "Área solapada: %G (%d areas)" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "Área sin categoría: %G (%d areas)\n" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "Área sin categoría: %G (%d areas)" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "La entrada puede ser limpiada ensamblando vértices entre ellos." -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "Rango estimado para umbral de ensamblado: [%g, %g]" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "Trate de importar de nuevo, ensamblando con %g: 'snap=%g'" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "Trate de importar de nuevo, ensamblando con al menos %g: 'snap=%g'" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "Es posible que sea necesario limpiar manualmente." -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -75438,32 +75986,32 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "%d polígonos de entrada fueron perdidos durante la importación." -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "%d áreas adicionales fueron creadas durante la importación." -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "El umbral %g para ensamblado puede ser demasiado grande." -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." @@ -75471,20 +76019,20 @@ msgstr "" "Datos de entrada contienen elementos 3D. El vectorial creado es 2D. Use la " "bandera -2 para importar vectorial 3D." -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -75649,10 +76197,21 @@ msgstr "Se necesita un archivo de puntos de control 3D para transformación 3D" msgid "The vector map <%s> already exists in" msgstr "El mapa vectorial <%s> ya existe en" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "" +"El grupo <%s> se destinó a la localización [%s], conjunto de mapas [%s]" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "Rectificación cancelada." +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Localización de destino <%s> no encontrada" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "Por favor, ejecutar i.targer para group." @@ -75825,7 +76384,7 @@ msgstr "Ruta al archivo de fuentes" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "Text encoding (sólo aplicable a fuentes 'TrueType fonts'" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -75833,7 +76392,7 @@ msgstr[0] "%d col" msgstr[1] "%d cols" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -75845,7 +76404,7 @@ msgstr "" "mostradas en su pantalla pueden ser demasiado pequeñas para que el número de " "la categoría de la celda sea visible." -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" "Abortando (no está permitida una región mayor a 200 filas X 200 columnas)" @@ -76490,6 +77049,7 @@ msgid "Mapset switched." msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -76501,6 +77061,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -79091,6 +79656,10 @@ msgstr "Renderizando" msgid "Highlight color" msgstr "Color de selección" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "Usar cálculos geodésicos para localizaciones latitud-longitud" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "Renderizar líneas en negrita" @@ -79694,6 +80263,23 @@ msgstr "" "Muestra tres mapas raster especificados por el usuario como superposiciones " "de rojo, verde y azul en el marco gráfico activo." +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "No se puede abrir el archivo '%s' para lectura" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "No ha sido posible abrir archivo '%s' para escritura" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -80298,7 +80884,7 @@ msgid "No monitors running" msgstr "No hay monitores funcionando" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -80539,22 +81125,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -89611,38 +90190,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -89722,11 +90301,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -89751,103 +90330,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -89859,336 +90438,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "Formato JPEG no soporta transparencia" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "Código EPSG no válido %d" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "No ha sido posible obtener información de la proyección" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "Reproyectando ráster..." -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "<%s> creado." -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "No ha sido posible abrir %s" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -90241,50 +90820,50 @@ msgstr "Ocurrió un error mientras corría v.in.ogr" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -90312,7 +90891,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -90533,7 +91112,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -90590,85 +91169,87 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Usar coordenadas del mapa en vez de coordenadas XYZ" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Creando archivos temporales..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Creando algunos archivos temporales..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" msgstr "" +"No se puede obtener información de la proyección de la localización actual" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "Reproyectando <%s>..." -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -90714,28 +91295,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -90792,27 +91373,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "No se ha podido importar <%s>" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "No se puede abrir entrada de datos OGR '%s'" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "Importando <%s>..." -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -90822,7 +91403,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -90832,14 +91412,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -90847,72 +91427,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -91143,7 +91723,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -91161,66 +91741,67 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" "No se olvide de definir adecuadamente la región para que cubra todas las " "imágenes." -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "Hecho. Mapa ráster <%s> creado." #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -91360,79 +91941,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -91544,40 +92125,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -91613,7 +92194,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -91624,35 +92205,43 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +#, fuzzy +msgid "Overriding projection check (using current project's CRS)." msgstr "" +"Invalida verificación de la proyección (usar la proyección de la " +"localización actual)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" +"\n" +"En caso de que no haya diferencias significativas en las definiciones de " +"proyección, use la bandera -o para ignorarlas y use la definición de la " +"Localización actual.\n" #: ../scripts/r.unpack/r.unpack.py:249 #, python-brace-format @@ -91743,34 +92332,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -91849,320 +92438,320 @@ msgstr "Error al añadir categorías" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 #, fuzzy msgid "Failed to get Git version." msgstr "Ha fallao la búsqueda de segmento de intersección" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 #, fuzzy msgid "Could not found Git. Please install it." msgstr "requiere gnuplot, por favor instálelo primero" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 #, fuzzy msgid "Cannot write to working directory {}." msgstr "No se puede crear directorio %s" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "Nada que instalar" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Región <%s> no encontrada" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "Instalando..." -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -92170,60 +92759,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, fuzzy, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "No se puede abrir controlador" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -92275,29 +92864,41 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "No se puede abrir el archivo rule <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Columna <%s> no encontrada en la tabla <%s>" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Error al crear capa 2" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" +msgstr "\"*\" para todas las columnas" + #: ../scripts/g.download.location/g.download.location.py:105 msgid "Location named <{}> already exists, download canceled" msgstr "" @@ -92341,16 +92942,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -92421,41 +93012,55 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "" +"No se ha encontrado el mapa ráster <%s> en el directorio de mapas actual" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +#, fuzzy +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "" +"Nombre y tipo de la nueva(s) columna(s) ('nombre tipo [,nombre tipo, ...]')" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +#, fuzzy +msgid "Column <{}> is already in the table. Skipping." msgstr "Columna <%s> ya existe en la tabla. Saltando." -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +#, fuzzy +msgid "Adding column <{}> to the table" msgstr "Añadiendo columna <%s> a la tabla" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." -msgstr "No ha sido posible añadir la columna <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Error al añadir categorías" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -92503,20 +93108,242 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, c-format +#~ msgid "Unable to create new location <%s>" +#~ msgstr "No se puede crear nueva Localización <%s>" + +#~ msgid "Overwrite font configuration file if already existing" +#~ msgstr "Sobreescribir archivo de configuración de fuente si ya existe" + +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "" +#~ "Imprime/establece la conexión a la base de datos para un mapa vectorial a " +#~ "la tabla de atributos." + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Nombre de mapa vectorial" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Número o nombre de la capa (vectorial)" + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "Número de capa o nombre para mapeo temático" + +#, fuzzy +#~ msgid "layer number/name for the ML results" +#~ msgstr "Número o nombre de capa (write to)" + +#, fuzzy +#~ msgid "Numpy array with vector cats." +#~ msgstr "No hay áreas en mapa vectorial <%s>" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Demasiados nombres de columna" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Número de columnas en la nueva región" + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "Formato de archivos de salida" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Tipo de almacenamiento para el mapa ráster resultante" + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "clasificación supervisada" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "" +#~ "Nombre del mapa ráster que contiene el resultado de la reclasificación" + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "Nombre de mapa ráster de entrada de red codificada de arroyos" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Nombre para el mapa ráster de salida" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "Cerrando mapa de acumulación" + +#, fuzzy +#~ msgid "Flow accumulation units" +#~ msgstr "acumulación" + +#, fuzzy +#~ msgid "Multiplier to convert flow accumulation to your chosen unit" +#~ msgstr "" +#~ "Factor de multiplicación para convertir unidades de elevación a unidades " +#~ "horizontales" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "longitud en unidades de mapa" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "" +#~ "Enlistar mapas registrados en un conjunto de datos ráster espacio " +#~ "temporales." + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Exporta u conjunto de datos espacio temporales." + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Resolución" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Modo dibujo" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Tamaño de fuente" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Formato de tabla" + +#, fuzzy +#~ msgid "limit value axis" +#~ msgstr "Invertir lista de valores" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Anchura de línea del texto" + +#, fuzzy +#~ msgid "density" +#~ msgstr "densidad de puntos" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Puntos vectoriales" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Requerido" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Nombre de la columna que contiene los datos numéricos" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Nombre de la columna que contiene las coordenadas X" + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "El valor umbral debe ser >=0" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Formato del archivo de entrada" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Producir mapa de orientación (o fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "clasificación supervisada" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Distancias a elementos 'to'..." + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Resolución de mapa ráster de salida" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Nombre de tabla de salida" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "" +#~ "Nombre del mapa vectorial de salida para puntos de corriente ajustados" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nombre para archivo de salida que contendrá el reporte" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nombre para archivo de salida que contendrá el reporte" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Nombre de mapa ráster a muestrear" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Formato" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Nombre de mapa ráster a muestrear" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Número de niveles a usar para cada componente" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Invertir selección" + +#, fuzzy +#~ msgid "" +#~ "Number of k-fold cross-validation for grid search parameter optimization" +#~ msgstr "" +#~ "Realiza un procedimiento de validación cruzada sin aproximación ráster" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Sobrescribir los parámetros de conexión para cierta capa" + +#~ msgid "Location:" +#~ msgstr "Localización:" + +#, python-format +#~ msgid "Unable to add column <%s>." +#~ msgstr "No ha sido posible añadir la columna <%s>." + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "" #~ "Remove all registered maps from the temporal and also from the spatial " #~ "database" @@ -95598,8 +96425,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Color para dibujar la cuadrícula o \"ninguno\"" #, fuzzy @@ -96867,6 +97694,7 @@ msgid "Initial Camera Phi (pitch) degrees" msgstr "Grados Phi iniciales de Cámara (cabeceo, pitch)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "<%s> not found" msgstr "<%s> no encontrado" @@ -96911,6 +97739,8 @@ msgstr "El número de banda de entrada debería ser 15" ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgid "<%s> not found" @@ -97043,6 +97873,9 @@ msgstr "El número de banda de entrada debería ser 15" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -97053,6 +97886,7 @@ msgid "Vector map <%s> is 3D. Use format specific layer creation options (parame msgstr "El mapa vectorial <%s> es 3D. Use opciones de creación de capa específicas (parámetro 'Ico') para exportar en 3D en vez de 2D (predeterminado)." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -97064,3 +97898,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 27234386b03..7fc2ddb2a89 100644 --- a/locale/po/grassmods_fi.po +++ b/locale/po/grassmods_fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2015-08-17 23:02+0300\n" "Last-Translator: Kari Salovaara \n" "Language-Team: Finnish \n" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Ei voida luoda taulua." -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1585,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1715,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1756,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1772,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1829,24 +1821,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1964,7 +1950,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1974,7 +1960,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2094,7 +2079,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2123,6 +2108,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2256,7 +2242,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2265,8 +2257,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2298,7 +2290,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2354,7 +2346,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2399,7 +2390,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2452,7 +2443,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2864,7 +2855,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2952,14 +2943,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3118,7 +3111,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3426,6 +3419,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3514,17 +3516,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3545,7 +3545,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3617,7 +3617,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3650,160 +3650,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3836,19 +3828,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3917,9 +3909,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3933,36 +3925,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4017,6 +4009,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4037,46 +4032,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4085,82 +4089,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4960,7 +4976,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5039,7 +5055,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5168,7 +5184,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5367,9 +5383,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5385,7 +5400,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5592,9 +5607,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5612,7 +5627,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5697,10 +5712,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5739,30 +5754,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5883,123 +5898,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6099,7 +6114,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6133,7 +6148,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6165,7 +6180,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6219,9 +6234,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6237,8 +6252,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6248,24 +6263,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6317,7 +6363,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6617,7 +6663,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6723,7 +6769,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6809,7 +6854,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7428,7 +7473,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7437,7 +7482,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7542,7 +7587,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7566,15 +7611,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7647,7 +7692,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7697,17 +7742,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7765,6 +7807,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7903,7 +7946,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7986,7 +8029,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8045,7 +8088,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8106,7 +8149,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8229,7 +8272,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8368,7 +8410,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8460,8 +8502,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8470,8 +8512,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8489,7 +8531,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8869,9 +8911,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9096,13 +9138,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9115,7 +9155,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9357,31 +9396,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9397,12 +9436,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9417,18 +9455,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9452,10 +9489,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9485,7 +9521,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9494,210 +9530,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10363,7 +10415,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10476,6 +10527,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10507,26 +10570,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10551,12 +10594,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10564,40 +10601,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10748,7 +10785,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10992,29 +11029,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11069,71 +11106,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11176,6 +11180,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11879,7 +11916,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11893,12 +11930,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11924,10 +11960,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11983,12 +12017,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12005,12 +12039,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12018,7 +12052,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12026,7 +12060,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12042,12 +12076,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12126,7 +12160,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12379,8 +12413,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12546,7 +12581,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12557,6 +12592,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13168,15 +13215,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13255,7 +13302,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13265,7 +13312,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13353,7 +13400,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13362,7 +13409,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13674,7 +13721,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13685,19 +13732,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13705,15 +13752,28 @@ msgstr "" msgid "Query" msgstr "Kysely" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13722,62 +13782,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13947,9 +14015,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14289,21 +14354,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14488,80 +14553,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15436,32 +15501,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15477,61 +15542,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15555,7 +15620,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16495,46 +16559,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16859,7 +16923,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17313,8 +17377,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17441,97 +17505,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17794,11 +17858,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17997,32 +18061,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18105,7 +18169,8 @@ msgid "Units" msgstr "Yksiköt" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +#, fuzzy +msgid "Default: project map units" msgstr "Oletus: paikan karttayksiköt" #: ../misc/m.measure/main.c:60 @@ -18128,8 +18193,9 @@ msgstr "Ala:" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18883,8 +18949,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18894,28 +18960,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18924,57 +18990,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18983,7 +19049,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18992,7 +19058,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19484,6 +19550,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19542,64 +19612,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19705,7 +19783,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19718,10 +19795,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19735,11 +19810,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20233,10 +20308,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20292,9 +20367,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20354,13 +20429,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20721,67 +20796,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21025,8 +21100,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21292,154 +21367,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21527,9 +21602,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Ei voida luoda taulua." #: ../general/g.proj/create.c:21 #, c-format @@ -21537,98 +21612,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Ei voida luoda taulua." #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21771,7 +21846,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21854,33 +21930,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21889,69 +21987,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21966,37 +22068,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22349,7 +22448,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23536,7 +23635,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23632,7 +23731,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23640,7 +23740,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23673,35 +23773,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "OGR tasoa <%s> ei löytynyt" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23754,61 +23855,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23818,7 +23924,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23826,21 +23932,21 @@ msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Ei voida luoda taulua." -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23955,15 +24061,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24003,101 +24107,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24221,6 +24323,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24237,6 +24349,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24246,6 +24363,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24612,6 +24749,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Valinta" @@ -26176,8 +26314,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26501,17 +26639,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26520,17 +26655,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26539,17 +26671,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26559,17 +26688,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26578,12 +26704,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27364,11 +27488,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "Ei voitu jäsentää MySQL sisäistä tietokannan nimeä" @@ -27417,7 +27545,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27510,16 +27638,15 @@ msgid "OGR layer <%s> not found" msgstr "OGR tasoa <%s> ei löytynyt" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Saraketta <%s> ei löytynyt taulusta <%s>" @@ -28088,6 +28215,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28130,6 +28291,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28164,58 +28327,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28293,231 +28466,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28716,6 +28672,502 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Ei voida luoda taulua." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Paikka" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28906,10 +29358,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29135,6 +29592,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30299,7 +30764,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30343,11 +30808,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31397,7 +31857,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31431,6 +31890,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31783,7 +32253,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31976,7 +32445,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -32009,6 +32478,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33016,11 +33493,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33066,44 +33540,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33869,8 +34356,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33880,6 +34376,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33917,10 +34414,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34211,6 +34710,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34222,6 +34722,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34250,6 +34751,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34609,63 +35111,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -34999,11 +35444,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35832,6 +36279,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35958,12 +36413,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36099,9 +36554,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36144,19 +36598,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36165,7 +36629,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36292,31 +36756,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36939,6 +37378,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37219,7 +37662,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37250,8 +37693,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Ei voida luoda taulua." #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 msgid "Names of attribute columns to get aggregate statistics for" @@ -37926,9 +38370,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38176,6 +38626,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -38797,6 +39255,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38808,6 +39267,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -39193,8 +39657,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39286,39 +39750,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Ei voida luoda taulua." + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42455,8 +42928,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42494,6 +42967,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42891,6 +43365,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42940,6 +43421,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42975,6 +43468,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43378,8 +43901,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44101,6 +44624,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44383,6 +44910,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44800,10 +45331,85 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "metrit" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45287,17 +45893,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45321,22 +45917,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45346,9 +45939,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45366,13 +45958,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45382,14 +45972,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45422,14 +46010,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45440,26 +46020,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45503,15 +46079,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45529,7 +46096,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45539,48 +46105,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45588,101 +46145,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46855,6 +47334,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46877,6 +47364,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46967,282 +47462,282 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Saraketta ei voida lisätä." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Ei voida luoda taulua." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Saraketta ei voida lisätä." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Ei voida luoda taulua." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47571,8 +48066,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47652,166 +48147,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48599,11 +48934,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53352,6 +53682,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53883,8 +54252,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54185,8 +54554,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54366,7 +54735,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54380,7 +54749,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54910,7 +55279,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55200,7 +55569,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55290,49 +55659,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55342,33 +55707,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55405,7 +55770,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55482,178 +55847,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56130,7 +56495,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56368,11 +56733,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56399,7 +56764,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56408,7 +56773,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56428,7 +56793,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56464,11 +56829,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56503,13 +56868,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56524,12 +56893,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57697,7 +58066,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58320,7 +58689,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58627,12 +58996,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58832,19 +59201,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -59053,7 +59422,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59211,10 +59580,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59253,6 +59622,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59353,9 +59726,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59369,7 +59742,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59454,7 +59827,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59482,8 +59854,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -60104,7 +60476,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60238,8 +60610,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -62017,17 +62389,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62203,13 +62575,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62455,42 +62827,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63472,16 +63848,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -64907,66 +65273,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65255,7 +65621,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65712,164 +66078,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -66046,27 +66412,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -66133,274 +66522,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66409,51 +66798,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66609,10 +66998,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "OGR tasoa <%s> ei löytynyt" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66776,7 +67175,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -66784,7 +67183,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66792,7 +67191,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67778,6 +68177,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68346,6 +68749,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Kursoria ei voida avata" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Kursoria ei voida avata" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -68917,7 +69337,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -69156,22 +69576,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71200,38 +71613,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71311,11 +71724,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71340,103 +71753,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71448,336 +71861,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -71830,50 +72243,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -71901,7 +72314,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -72119,7 +72532,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -72176,85 +72589,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -72300,28 +72713,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -72378,27 +72791,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -72408,7 +72821,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72418,14 +72830,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72433,72 +72845,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72725,7 +73137,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72743,64 +73155,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72940,79 +73353,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -73124,40 +73537,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -73193,7 +73606,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -73204,34 +73617,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -73323,34 +73736,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73429,317 +73842,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Kursoria ei löytynyt" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73747,60 +74160,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73852,27 +74265,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Saraketta <%s> ei löytynyt taulusta <%s>" + +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73918,16 +74341,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73998,41 +74411,49 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Saraketta <%s> ei löytynyt taulusta <%s>" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -74080,15 +74501,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grassmods_fr.po b/locale/po/grassmods_fr.po index ed68cf99e37..eb848717a5b 100644 --- a/locale/po/grassmods_fr.po +++ b/locale/po/grassmods_fr.po @@ -12,16 +12,17 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" -"PO-Revision-Date: 2014-01-01 11:35+0100\n" -"Last-Translator: Sylvain Maillard \n" -"Language-Team: Français \n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" +"PO-Revision-Date: 2024-05-27 09:55+0000\n" +"Last-Translator: Edouard Choiniere \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 5.4.3\n" #: ../temporal/t.connect/main.c:34 #: ../locale/scriptstrings/t.merge_to_translate.c:2 @@ -91,7 +92,7 @@ msgstr "temporel" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "paramètres" @@ -129,35 +130,36 @@ msgstr "" #: ../temporal/t.connect/main.c:42 ../db/db.connect/main.c:50 msgid "Print current connection parameters and exit" -msgstr "Affiche les paramètres de connexion courants et quitte" +msgstr "Afficher les paramètres de connexion courants et quitter" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -183,21 +185,21 @@ msgstr "Affiche les paramètres de connexion courants et quitte" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Afficher" @@ -278,7 +280,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -303,7 +305,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -314,7 +316,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -336,7 +338,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -493,6 +495,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -512,7 +515,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -531,7 +533,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -545,6 +546,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -578,7 +580,7 @@ msgstr "Mon module raster de départ" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -588,8 +590,8 @@ msgstr "Mon module raster de départ" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -604,21 +606,21 @@ msgstr "Mon module raster de départ" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Carte raster <%s> non trouvée" @@ -627,7 +629,7 @@ msgstr "Carte raster <%s> non trouvée" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -662,7 +664,6 @@ msgstr "Carte raster <%s> non trouvée" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -675,7 +676,6 @@ msgstr "Carte raster <%s> non trouvée" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -714,6 +714,7 @@ msgstr "Carte raster <%s> non trouvée" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -735,7 +736,7 @@ msgstr "Carte raster <%s> non trouvée" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -801,7 +802,7 @@ msgstr "Carte raster <%s> non trouvée" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -815,7 +816,7 @@ msgstr "Mon module vecteur de départ." #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -828,8 +829,8 @@ msgstr "Mon module vecteur de départ." #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -844,16 +845,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -899,7 +900,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -915,7 +916,7 @@ msgstr "Impossible d'ouvrir la carte vecteur <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -924,7 +925,7 @@ msgstr "Impossible d'ouvrir la carte vecteur <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -954,13 +955,13 @@ msgstr "Impossible d'ouvrir la carte vecteur <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -989,7 +990,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1004,8 +1005,8 @@ msgstr "Impossible de lancer le pilote <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1039,10 +1040,10 @@ msgstr "Impossible de lancer le pilote <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1050,7 +1051,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Impossible d'ouvrir la base de données <%s> avec le pilote <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1080,23 +1081,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "Impossible de copier la table d'attributs vers la carte vecteur <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "Formats supportés : " @@ -1178,13 +1179,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1237,6 +1238,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1297,6 +1299,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1362,14 +1370,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1419,150 +1426,137 @@ msgstr "Titre de la carte raster créée" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Métadonnée" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Lister les formats supportés et sortir" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" "Supplanter la vérification de la projection (utiliser la projection du " -"secteur courant)" +"projet courant)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -"Considérer que le jeu de données d'entrée est dans la même projection que le " -"secteur courant" +"Considérer que le jeu de données a la même projection que le projet courant" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "Auto-ajustement pour lat/lon" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" "Tentative de résolution de'erreurs de petite précision dans la résolution et " "l'emprise" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "%s= et %s= sont mutuellement exclusifs" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1579,37 +1573,35 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -"Impossible de convertir la projection de la couche en entrée au format " -"GRASS ; impossible de créer le nouveau Secteur" +"Impossible de convertir la projection de la couche en entrée au format GRASS " +"; impossible de créer le nouveau projet" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" -msgstr "" +msgid "Unable to create new project <%s>" +msgstr "Impossible de créer le nouveau projet <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" -msgstr "Secteur <%s> créé" +msgid "Project <%s> created" +msgstr "Projet <%s> créé" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1617,55 +1609,62 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" -msgstr "" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" +msgstr "Le PROJ_INFO du jeu de données est : \n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "Le PROJ_INFO du jeu de données est : \n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 -#, c-format +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 +#, c-format, fuzzy msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" +"\n" +"Si les définitions des systèmes de référence des coordonnées ne présentent " +"pas de différences significatives, l'option -o permet de les ignorer et " +"d'utiliser la définition actuelle du projet.\n" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1745,12 +1744,10 @@ msgstr "algèbre" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1788,7 +1785,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1806,7 +1803,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1856,24 +1853,18 @@ msgstr "Nom pour la carte raster de sortie de courbure" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Sorties" @@ -1997,7 +1988,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2007,7 +1998,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2128,7 +2118,7 @@ msgstr "Afficher l'historique du raster à la place des informations générales msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2157,6 +2147,7 @@ msgstr "Allocation mémoire impossible pour le texte" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2294,7 +2285,13 @@ msgstr "Nombre invalide d'étapes: %s" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2303,8 +2300,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Pourcentage complété ..." @@ -2336,7 +2333,7 @@ msgstr "Mettre à jour les statistiques d'une carte raster" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2392,7 +2389,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "ré-échantilloner" @@ -2439,7 +2435,7 @@ msgid "Unknown method <%s>" msgstr "Méthode <%s> inconnue" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2494,7 +2490,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "Merci de spécifier %s= ou %s=" @@ -2916,7 +2912,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "Erreur, ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -3004,14 +3000,16 @@ msgstr "export" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3170,7 +3168,7 @@ msgid "List of cell values to be set to NULL" msgstr "Liste de valeurs de cellules auxquelles assigner la valeur NULL" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3492,6 +3490,15 @@ msgstr "Couche raster en sortie pour l'angle d'incidence (mode 1 uniquement)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3580,17 +3587,15 @@ msgstr "Couche raster en sortie pour l'angle d'incidence (mode 1 uniquement)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3611,7 +3616,7 @@ msgstr "Couche raster en sortie pour l'angle d'incidence (mode 1 uniquement)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Sortie" @@ -3697,7 +3702,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "Pas du coefficient d'échantillonnage (0.5-1.5)" @@ -3730,113 +3735,109 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "insol_time et incidout ne sont pas compatibles" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" "Si vous utilisez l'option horizon vous devez aussi fournir le paramètre " "'horizonstep'." -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "incidout demande de fixer le paramètre d'heure" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "Mode 2 : irradiation journalière cumulée pour un jour donné de l'année" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." @@ -3844,52 +3845,48 @@ msgstr "" "Si vous souhaitez économiser de la mémoire et utiliser les ombres, vous " "devez utiliser des horizons pré-calculés." -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -"Impossible d'obtenir les informations de projection pour le Secteur courant" +"Impossible d'obtenir les informations de projection pour le projet courant" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" -msgstr "Impossible d'obtenir les unités de projection pour le Secteur courant" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" +msgstr "Impossible d'obtenir les unités de projection pour le projet courant" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -"Impossible d'obtenir les valeurs clefs de projection pour le Secteur courant" +"Impossible d'obtenir les valeurs clefs de projection pour le projet courant" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3922,19 +3919,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Mémoire insuffisante" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4005,9 +4002,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -4021,36 +4018,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4105,6 +4102,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4125,47 +4125,58 @@ msgstr "" msgid "Optional" msgstr "Optionnel" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Format de sortie" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" "Nom du fichier en sortie (utilisez output=- pour le flux de sortie stdout)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Inclure les étiquettes de catégories dans la sortie" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4174,82 +4185,96 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Impossible d'ouvrir le fichier <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" +"Impossible d'obtenir les informations de projection pour le projet courant" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Impossible d'obtenir les unités de projection pour le projet courant" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" +"Impossible d'obtenir les valeurs clefs de projection pour le projet courant" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "OOPS : lignes changées de %d vers %d" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "OOPS : colonnes changées de %d vers %d" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4419,11 +4444,14 @@ msgid "unable to open input file <%s>" msgstr "" #: ../raster/r.quant/read_rules.c:89 -#, c-format +#, c-format, fuzzy msgid "" "\n" "Enter the rule or 'help' for the format description or 'end' to exit:\n" msgstr "" +"\n" +"Entrez la règle ou 'help' pour la description du format, ou 'end' pour la " +"quitter :\n" #: ../raster/r.quant/read_rules.c:114 msgid "quant rules do not cover the whole range map" @@ -4474,12 +4502,12 @@ msgstr "Arrondir les valeurs en virgule flottante" #: ../raster/r.quant/main.c:112 #, c-format msgid "-%c, -%c, %s=, %s= and %s= are mutually exclusive" -msgstr "" +msgstr "-%c, -%c, %s=, %s= et %s= sont mutuellement exclusifs" #: ../raster/r.quant/main.c:122 #, c-format msgid "%s= and %s= must be used together" -msgstr "" +msgstr "%s= et %s= doivent être utilisés ensemble" #: ../raster/r.quant/main.c:133 #, c-format @@ -4492,7 +4520,7 @@ msgstr "" #: ../raster/r.quant/main.c:146 msgid "Rounding..." -msgstr "" +msgstr "Arrondissement..." #: ../raster/r.quant/main.c:154 #, c-format @@ -4533,9 +4561,9 @@ msgid "Failed to set raster attribute table" msgstr "" #: ../raster/r.out.gdal/main.c:51 -#, c-format +#, c-format, fuzzy msgid "Supported formats:\n" -msgstr "" +msgstr "Formats supportés :\n" #: ../raster/r.out.gdal/main.c:134 msgid "Exports GRASS raster maps into GDAL supported formats." @@ -4764,7 +4792,7 @@ msgstr "" #: ../raster/r.out.gdal/main.c:701 msgid "Unable to set projection" -msgstr "" +msgstr "Impossible de définir la projection" #: ../raster/r.out.gdal/main.c:729 #, c-format @@ -5054,7 +5082,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Attributs" @@ -5133,7 +5161,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Impossible d'attribuer les privilèges sur la table <%s>" @@ -5267,7 +5295,7 @@ msgstr "Fichier contenant les règles de recodage" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5467,10 +5495,10 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" -msgstr "" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" +msgstr "Le PROJ_INFO du jeu de données est : \n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 #: ../raster/r.in.lidar/projection.c:47 ../raster/r.in.lidar/projection.c:53 @@ -5485,7 +5513,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5704,9 +5732,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "Transforme" @@ -5724,7 +5752,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5809,10 +5837,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5853,30 +5881,30 @@ msgstr "Échelle à appliquer aux données z" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "Projection" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6009,130 +6037,130 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Produit les statistiques à la façon d'un script shell" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Entrée <%s=%s> invalide" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Projection cible (utiliser la projection du Secteur)" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" "Supplanter la vérification de la projection (utiliser la projection du " "secteur courant)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Scan des données ..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "%lu points trouvés dans le fichier d'entrée" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Carte raster <%s> créée." @@ -6232,7 +6260,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "-%c et %s= sont mutuellement exclusifs" @@ -6266,7 +6294,7 @@ msgstr "Le raster d'entrée doit être de type CELL." #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6298,7 +6326,7 @@ msgstr "Impossible de créer le fichier temporaire <%s> -- erreur numéro = %d" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6354,9 +6382,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Nombre maximum d'itérations" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6372,8 +6400,8 @@ msgstr "Nombre maximum d'itérations" msgid "surface" msgstr "surface" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6383,24 +6411,55 @@ msgstr "surface" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Moyenne de la distribution" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Écart-type" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6456,7 +6515,7 @@ msgstr "Pas de couleur <%s>" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6756,7 +6815,7 @@ msgstr "Erreur à la lecture des données" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6862,7 +6921,6 @@ msgstr "Les résolutions E-O et N-S diffèrent. Utilisation de la moyenne." #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6949,8 +7007,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "Taille de fenêtre inappropriée (trop élevée ou valeur paire)" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "Projection lat/long non gérée pour le moment." #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7554,8 +7613,11 @@ msgid "virtual raster" msgstr "" #: ../raster/r.buildvrt/main.c:80 +#, fuzzy msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" +"Construire un VRT (raster virtuel) à partir de la liste de cartes raster " +"d'entrée." #: ../raster/r.buildvrt/main.c:83 msgid "Name of input raster files" @@ -7580,7 +7642,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "Pas de nom de carte raster trouvé dans le fichier d'entrée" @@ -7589,7 +7651,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Carte raster non trouvée" @@ -7696,7 +7758,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7720,15 +7782,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7805,7 +7867,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7855,17 +7917,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7923,6 +7982,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -8064,7 +8124,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8151,7 +8211,7 @@ msgstr "" "binaire" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8210,7 +8270,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8273,7 +8333,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8398,7 +8458,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8537,7 +8596,7 @@ msgstr "Appliquer le filtre uniquement aux valeurs NULL" msgid "<%d> is not valid number of threads." msgstr "Nombre invalide d'étapes: %s" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "Carte raster trop petite pour la taille du filtre" @@ -8637,8 +8696,8 @@ msgstr "Pourcentage de la couche à garder en mémoire" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "Scanner l'emprise des données d'entrée et quitter" @@ -8647,8 +8706,8 @@ msgstr "Scanner l'emprise des données d'entrée et quitter" msgid "Scan" msgstr "Scan" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "En mode scan, afficher en utilisant un style script shell" @@ -8666,7 +8725,7 @@ msgstr "Merci de spécifier un numéro de colonne raisonnable." msgid "Please specify reasonable number of lines to skip" msgstr "Merci de spécifier un nombre de lignes à sauter raisonnable" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "zrange invalide" @@ -9061,10 +9120,10 @@ msgstr "" "confiné, en deux dimensions" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "Projection lat/long non gérée pour le moment." #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9217,8 +9276,9 @@ msgid " ignored\n" msgstr "" #: ../raster/r.reclass/main.c:124 +#, fuzzy msgid " - invalid reclass rule" -msgstr "" +msgstr " - Règle de reclassement invalide" #: ../raster/r.reclass/main.c:140 #, c-format @@ -9290,13 +9350,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9309,7 +9367,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9552,31 +9609,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9592,12 +9649,12 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +#, fuzzy +msgid "create project" msgstr "créer un Secteur" #: ../raster/r.in.gdal/main.c:118 @@ -9612,18 +9669,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Nom du Secteur de destination du groupe d'images" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9647,10 +9704,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Nom du nouveau Secteur (location) à créer" #: ../raster/r.in.gdal/main.c:195 @@ -9680,7 +9737,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9689,214 +9746,246 @@ msgstr "" msgid "Region" msgstr "Région" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" "Forcer les cartes Lat/Lon à tenir dans les coordonnées géographiques (90N,S; " "180E,W)" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" "Conserver les numéros de bande plutôt que d'utiliser les noms de couleur des " "bandes" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"Impossible de convertir la projection de la couche en entrée au format " +"GRASS ; impossible de créer le nouveau Secteur" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "" +"Impossible d'obtenir les informations de projection de la carte en entrée" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" -msgstr "" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" +msgstr "Impossible d'obtenir les unités de projection de la carte en entrée" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "" +"Impossible d'obtenir les valeurs de clef de projection de la carte en entrée" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " -msgstr "" +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " +msgstr "Jeu de cartes <%s> dans le Secteur en entrée <%s> - %s" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "permission refusée" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "non trouvé" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"Impossible de convertir la projection de la couche en entrée au format " +"GRASS ; impossible de créer le nouveau Secteur" + +#: ../raster/r.in.gdal/proj.c:323 +#, fuzzy +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" +"\n" +"S'il n'y a pas de différences significatives entre les définitions des SCR, " +"utilisez l'option -o pour les ignorer et utiliser la définition du projet " +"actuel.\n" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10578,7 +10667,6 @@ msgid "Number of intermediate images to produce" msgstr "Nombre d'images intermédiaires à produire" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10693,6 +10781,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10724,26 +10824,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10768,12 +10848,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10781,40 +10855,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Echec de la saisie en entrée" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10965,7 +11039,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11221,29 +11295,29 @@ msgstr "" "Facteur de pondération pour chaque carte d'entrée, la valeur par défaut est " "1.0 pourchaque carte en entrée" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "Les poids doivent être positifs" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "Lecture de la carte raste <%s> en utilisant le poids %f ..." -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "input= et weights= doivent avoir le même nombre de valeurs" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "output= et method= doivent avoir le même nombre de valeurs" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11300,73 +11374,40 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" "Produit une couche raster de données aléatoires uniformément réparties dans " "une plage donnée par l'utilisateur." -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Valeur aléatoire minimum" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Valeur aléatoire maximum" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "Impossible de créer le segment de fichier %s" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "Impossible d'ouvrir le segment de fichier %s" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "Impossible d'ouvrir le segment de fichier %s" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11409,6 +11450,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "Impossible de créer le segment de fichier %s" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "Impossible d'ouvrir le segment de fichier %s" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "Impossible d'ouvrir le segment de fichier %s" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -12130,7 +12204,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12144,13 +12218,14 @@ msgid "transformation" msgstr "transformation" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" "Reprojeter une carte raster depuis un secteur donné vers le secteur courant." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "Secteur contenant les cartes raster d'entrée" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12176,10 +12251,9 @@ msgstr "Par défaut : nom du jeu de carte courant" msgid "Name of input raster map to re-project" msgstr "Nom de la carte raster a reprojeter" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Chemin vers la base de données GRASS du Secteur en entrée" #: ../raster/r.proj/main.c:174 @@ -12240,12 +12314,13 @@ msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" "option <%s> : <%s> existe. Pour l'écraser, utiliser l'argument --overwrite" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "Les Secteurs d'entrée et de sortie ne peuvent pas être les mêmes" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +#, fuzzy +msgid "Input and output projects are the same" msgstr "Les Secteurs d'entrée et de sortie sont les mêmes" #: ../raster/r.proj/main.c:268 @@ -12265,13 +12340,13 @@ msgstr "" "en sortie" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "Jeu de cartes <%s> dans le Secteur en entrée <%s> - %s" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Vérification du Secteur <%s> jeu de cartes <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12279,15 +12354,15 @@ msgstr "Vérification du Secteur <%s> jeu de cartes <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Le paramètre <%s> est requis mais non défini" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" "Carte raster <%s> du Secteur <%s> dans le jeu de cartes <%s> non trouvée" @@ -12306,12 +12381,13 @@ msgstr "" "Impossible d'obtenir les valeurs de clef de projection de la carte en entrée" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "Impossible de travailler sur des données non projetées (Secteur xy)" #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" msgstr "Carte en entrée <%s@%s> dans le Secteur <%s> :" #: ../raster/r.proj/main.c:524 @@ -12393,7 +12469,7 @@ msgid "Sorting events..." msgstr "Écriture des sommets ..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12658,8 +12734,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12725,9 +12802,9 @@ msgid "Amount of memory cannot be negative." msgstr "Maximum de mémoire à utiliser (en MB)" #: ../raster/r.viewshed/main.cpp:616 -#, c-format +#, c-format, fuzzy msgid " Converting %d to %d MB" -msgstr "" +msgstr " Conversion de %d en %d MB" #: ../raster/r.viewshed/distribute.cpp:80 msgid "Start distributed sweeping." @@ -12829,8 +12906,9 @@ msgid "S_decode ==> Please fix the shadowband sky factor: %f" msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 +#, fuzzy msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" "Impossible de calculer la position du soleil sur des secteur non projetés. " @@ -12845,6 +12923,23 @@ msgstr "" "Le point spécifié %f, %f est en dehors de la région courante, est-ce " "intentionnel ? Quoi qu'il en soit il sera utilisé." +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "" +"Impossible d'obtenir les informations de projection de la carte en entrée" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Impossible d'obtenir les unités de projection de la carte en entrée" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "" +"Impossible d'obtenir les valeurs de clef de projection de la carte en entrée" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13463,16 +13558,21 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +#, fuzzy +msgid "Cannot get projection info of current project" msgstr "" +"Impossible d'obtenir les informations de projection pour le Secteur courant" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Impossible d'obtenir les unités de projection pour le Secteur courant" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +#, fuzzy +msgid "Cannot get projection key values of current project" msgstr "" +"Impossible d'obtenir les valeurs clefs de projection pour le Secteur courant" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13551,7 +13651,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s=%s - doit être un nombre non négatif" @@ -13561,7 +13661,7 @@ msgstr "%s=%s - doit être un nombre non négatif" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s=%s - doit être un nombre positif" @@ -13653,7 +13753,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Impossible de créer la table : '%s'" @@ -13662,7 +13762,7 @@ msgstr "Impossible de créer la table : '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Impossible de créer l'index sur la table <%s>, clef <%s>" @@ -13976,7 +14076,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13987,20 +14087,20 @@ msgstr "" msgid "position" msgstr "position" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" "Interroger des cartes raster sur les valeurs et étiquettes de catégories." -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Nom de(s) la couche(s) raster à requêter" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Coordonnées pour la requête" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14008,15 +14108,28 @@ msgstr "Coordonnées pour la requête" msgid "Query" msgstr "Requête" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "Nom de la carte vecteur points à interroger " -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "Taille du cache du pointeur" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14025,63 +14138,72 @@ msgstr "Taille du cache du pointeur" msgid "Advanced" msgstr "Élaborée" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "Écrire la ligne d'en-tête" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "Afficher les étiquettes de catégories sur les cellules de la grille" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "Valeur de couleur en sortie au format RRR:VVV:BBB" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" "Produire des valeurs de catégorie entières au lieu de valeurs de cellule" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "Activer le retour d'information du cache" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "Afficher les catégories pour les points de la carte vecteur" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "L'option 'v' nécessite l'option 'points' " -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "Ne peut le faire que jusqu'à %d cartes raster (plus de %d fournies)" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "Impossible de lire le fichier de catégories pour <%s>" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "Impossible de lire la carte vecteur <%s>" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "La ligne %d n'est ni un point ni un centroïde, sauté" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "%s %s est en dehors de la région courante" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Impossible de fermer la couche : couche d'entrée introuvable" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importe un fichier binaire MAT-File (V.4) dans une carte raster GRASS." @@ -14251,9 +14373,6 @@ msgstr "Afficher la surface totale en mètres carrés" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14624,21 +14743,21 @@ msgstr "" "Résolution de la couche en entrée ne correspond pas à la résolution de la " "région courante!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14843,21 +14962,21 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -"Vous devez spécifier au moins un des paramètres : <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"Vous devez spécifier au moins un des paramètres : <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Mauvais type raster : %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." @@ -14865,62 +14984,62 @@ msgstr "" "r.slope.aspect ne converti pas les unités horizontales en mètres dans cette " "version, voir le manuel." -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "Produits d'altitude pour le jeu de cartes <%s> dans <%s>" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "Orientation min calculée %.4f, orientation max calculée %.4f" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Carte raster d'orientation <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "Pente minimale calculée %.4f, pente maximale calculée %.4f" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Carte raster de pente <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "Carte raster de courbure <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Carte raster de tangente à la courbure <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "Carte raster de pente E-O <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "Carte raster de pente N-S <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Carte raster dxx <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Carte raster dyy <%s> terminée" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Carte raster dxy <%s> terminée" @@ -15926,32 +16045,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "MFD : la proportion de cumul du flux distribué n'est pas 1.0 mais %f" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15967,61 +16086,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -16045,7 +16164,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -17011,11 +17129,11 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "flux souterrain" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -17023,36 +17141,36 @@ msgstr "" "Calcul numérique pour les eaux souterraines transitoires, confinées et non " "confinées, en deux dimensions." -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Impossible de créer et résoudre le système d'équation linéaire" @@ -17381,7 +17499,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17861,9 +17979,10 @@ msgid "Output RRR:GGG:BBB color values for each profile point" msgstr "Sortie des valeurs de couleur RRR:GGG:BBB pour chaque point du profil" #: ../raster/r.profile/main.c:102 +#, fuzzy msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" "Si les unités ne sont pas spécifiées, les unités du Secteur courant sont " "utilisées. Les mètres sont utilisés par défaut pour les Secteurs en " @@ -17996,98 +18115,98 @@ msgstr "Foster (1981)" msgid "El-Swaify (1985)" msgstr "El-Swaify (1985)" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "Utiliser uniquement les points valides" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" "Les points invalides selon les spécifications LAS APSRS vont être filtrés" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -18357,17 +18476,17 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 #: ../vector/v.class/main.c:45 msgid "classification" -msgstr "" +msgstr "classification" #: ../raster/r.kappa/main.c:72 msgid "" @@ -18567,32 +18686,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18675,8 +18794,9 @@ msgid "Units" msgstr "Unités" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Par défaut : en unité de carte au carré" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18698,8 +18818,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "image" @@ -19461,8 +19582,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -19472,28 +19593,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19502,57 +19623,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19561,7 +19682,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19570,7 +19691,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -20108,6 +20229,10 @@ msgstr "Impossible de lire la plage de la carte raster 3D <%s>" msgid "Error while reading history file" msgstr "Erreur à la lecture du fichier d'historique" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -20172,64 +20297,75 @@ msgstr "" "Utiliser la résolution réelle du raster plutôt que celle de la région de " "calcul" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "" +"Supplanter la vérification de la projection (utiliser la projection du " +"secteur courant)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "Impossible de créer la carte raster 3D <%s>" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "%lu points d'entrée ne sont pas valides et ont été filtrés" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "%lu points d'entrée ont été filtrés par le numéro du retour" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "%lu points d'entrée ont été filtrés par le numéro de classe" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -20338,7 +20474,6 @@ msgstr "Créer explicitement un fichier 3D de valeurs NULL." #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -20351,10 +20486,8 @@ msgstr "Créer explicitement un fichier 3D de valeurs NULL." #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -20368,11 +20501,11 @@ msgstr "Créer explicitement un fichier 3D de valeurs NULL." #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "affichage" @@ -20891,10 +21024,10 @@ msgstr "Erreur à la fermeture du fichier de script" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20953,9 +21086,9 @@ msgid "command line interface with GUI startup screen" msgstr "" "Interface en ligne de commande uniquement, avec écran de démarrage graphique" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Type" @@ -21018,13 +21151,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "support" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "scripts" @@ -21400,74 +21533,76 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "Enregistrer les paramètres de la région courante dans un nom de région" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Région <%s> non trouvée" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "Impossible de lire l'en-tête de la carte raster 3D <%s@%s>" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "Impossible de définir la région <%s>" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "Impossible de mettre à jour la région courante" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" "Impossible de modifier la région par défaut. Le jeu de carte courant n'est " "pas ." -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "Vous êtes déjà en Lat/Long. Utilisez l'option -p à la place." -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 +#, fuzzy msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" "Vous êtes dans un Secteur XY simple, la projection en Lat/Long n'est pas " "possible. Utilisez l'option -p à la place." -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "Impossible de projeter les données en WGS84 étant donné que ce Secteur ne " "possède pas de paramètres de transformation de datum. Essayez de lancer g." "setproj." -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "Impossible de mettre à jour les paramètres de projection lat/lon" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "Les calculs Lat/Long ne sont pas possibles dans un systme XY simple" @@ -21723,8 +21858,8 @@ msgstr "Lister les éléments existants et sortir" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" "Le paramètre 'fichier' contient une référence au jeu de cartes <%s>, mais le " "paramètre jeu de cartes <%s> ne correspond pas" @@ -22009,160 +22144,161 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "Affiche et manipule les fichiers d'information de projection GRASS" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" "Vérifier l'information de datum et afficher les paramètres de transformation" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Afficher l'information de projection au format PROJ.4" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" "Afficher une sortie 'à plat' sans sauts de ligne (s'applique à la sortie WKT " "et PROJ.4)" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 #, fuzzy msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" "Afficher une sortie 'à plat' sans sauts de ligne (s'applique à la sortie WKT " "et PROJ.4)" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "Afficher l'information de projection au format WKT" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "Utilisez le format style-ESRI (s'applique à la sortie WKT seulement)" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "Code de projection EPSG" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "Numéro d'index du paramètre de transformation" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Créer" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Nom du nouveau Secteur à créer" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Fichiers de projection manquant" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -22253,9 +22389,9 @@ msgstr "" "d'information de projection. 'XY (sans projection)' va être utilisé" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Impossible de créer le fichier <%s>" #: ../general/g.proj/create.c:21 #, c-format @@ -22263,102 +22399,102 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Impossible de créer le fichier <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" "Afficher un message, alerte, progression, ou erreur fatale à la manière " "GRASS." -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" "Ce module doit être utilisé dans un script pour distribuer les messages à " "l'utilisateur." -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "Afficher le message en temps qu'alerte" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "Afficher le message en temps qu'erreur fatale" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "Afficher le message en temps que message de debug" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "Afficher le message en temps qu'information de progression" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "Niveau" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "Afficher le message dans tous les modes excepté le mode silencieux" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "Le message est affiché pour GRASS_VERBOSE>=1" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "Afficher le message uniquement en mode verbeux" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "Le message est affiché seulement pour GRASS_VERBOSE>=3" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Texte du message a afficher" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "Le message est affiché pour GRASS_VERBOSE>=2" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "Niveau a utiliser pour les messages de debug" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "Sélectionner un seul niveau de message" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "Impossible d'analyser le message d'entrée" @@ -22503,7 +22639,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -22586,38 +22723,61 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "Jeux de cartes disponibles :" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "Jeux de cartes accessibles :" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "chemin de recherche" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" "Modifie/affiche le chemin de recherche de l'utilisateur dans le jeu de " "cartes courant." -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 +#, fuzzy msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" "Affecte les accès de l'utilisateur aux données existantes dans les autres " "jeux de données du Secteur courant." -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" "Nom(s) du(es) jeu(x) de données existant(s) à ajouter/supprimer ou définir" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22626,71 +22786,77 @@ msgstr "" msgid "Operation to be performed" msgstr "Opération à effectuer" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" msgstr "Séparateur de champs pour l'affichage (options -l ou -p)" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "Lister tous les jeux de cartes dans l'ordre alphabétique" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "Afficher les jeux de cartes dans le chemin de recherche" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "Lancer l'interface de sélection de jeux de cartes" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "Opération '%s' inconnue" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Entrer une règle dans un des formats suivants :" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "Option '-%c' ignorée" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "Option <%s> ignorée" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "Jeu de cartes <%s> non trouvé" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" "Le jeu de cartes courant (<%s>) doit toujours être inclu dans le chemin de " "recherche" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "Jeu de cartes <%s> déjà dans le chemin de recherche" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "Jeu de cartes <%s> ajouté au chemin de recherche" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "Jeu de cartes <%s> supprimé du chemin de recherche" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "Chemin de recherche non modifié" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "Impossible d'ouvrir SEARCH_PATH en écriture" @@ -22707,21 +22873,17 @@ msgstr "" "répertoires." #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "Écraser le fichier de configuration des polices s'il existe déjà" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" "Écrire le fichier de configuration des polices vers la sortie standard " "plutôt que $GISBASE/etc" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "Luste des répertoires supplémentaires à scanner" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" @@ -22730,15 +22892,16 @@ msgstr "" "pour des polices compatibles Freetype en même temps que ceux par défaut " "(voir la documentation)" -#: ../general/g.mkfontcap/main.c:104 -#, c-format +#: ../general/g.mkfontcap/main.c:98 +#, fuzzy, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" "Le fichier fontcap %s existe déjà; utilisez l'option -%c si vous voulez " "l'écraser" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" @@ -22746,7 +22909,7 @@ msgstr "" "Cette installation de GRASS a été compilée sans le support Freetype, le " "paramètre des dossiers supplémentaires est ignoré" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "Impossible d'ouvrir %s en écriture : %s" @@ -23099,7 +23262,7 @@ msgstr "écart-type" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23318,14 +23481,14 @@ msgid "Region%s" msgstr "" #: ../imagery/i.cluster/main.c:261 -#, c-format +#, c-format, fuzzy msgid " North: %12.2f East: %12.2f%s" -msgstr "" +msgstr " Nord : %12.2f Est : %12.2f%s" #: ../imagery/i.cluster/main.c:263 -#, c-format +#, c-format, fuzzy msgid " South: %12.2f West: %12.2f%s" -msgstr "" +msgstr " Sud : %12.2f Ouest : %12.2f%s" #: ../imagery/i.cluster/main.c:265 #, c-format @@ -23333,9 +23496,9 @@ msgid " Res: %12.2f Res: %12.2f%s" msgstr "" #: ../imagery/i.cluster/main.c:267 -#, c-format +#, c-format, fuzzy msgid " Rows: %12d Cols: %12d Cells: %d%s" -msgstr "" +msgstr " Lignes : %12d Colonnes : %12d Cellules : %d%s" #: ../imagery/i.cluster/main.c:269 #, c-format @@ -23363,19 +23526,19 @@ msgid " Minimum class size: %d%s" msgstr "" #: ../imagery/i.cluster/main.c:278 -#, c-format +#, c-format, fuzzy msgid " Minimum class separation: %f%s" -msgstr "" +msgstr " Séparation minimale des classes : %f%s" #: ../imagery/i.cluster/main.c:280 -#, c-format +#, c-format, fuzzy msgid " Percent convergence: %f%s" -msgstr "" +msgstr " Pourcentage de convergence : %f%s" #: ../imagery/i.cluster/main.c:282 -#, c-format +#, c-format, fuzzy msgid " Maximum number of iterations: %d%s" -msgstr "" +msgstr " Nombre maximum d'itérations : %d%s" #: ../imagery/i.cluster/main.c:285 #, c-format @@ -24292,7 +24455,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -24388,7 +24551,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -24396,8 +24560,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Nom du Secteur de destination du groupe d'images" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -24429,35 +24594,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Carte raster <%s> non trouvée" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "Jeu de cartes <%s> dans le Secteur en entrée <%s> - %s" + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -24510,61 +24676,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "Région <%s> non trouvée" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "Jeu de cartes <%s> dans le Secteur en entrée <%s> - %s" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -24574,29 +24745,31 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" msgstr "" +"Impossible d'obtenir les informations de projection pour le Secteur courant" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Impossible de créer la carte vecteur <%s>" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -24675,7 +24848,7 @@ msgstr "" #: ../imagery/i.rectify/cp.c:28 ../imagery/i.rectify/cp.c:53 #: ../vector/v.rectify/cp.c:358 msgid " Can not generate the transformation equation." -msgstr "" +msgstr " Impossible de générer l'équation de transformation." #: ../imagery/i.ortho.photo/i.ortho.rectify/cp.c:25 msgid " Run OPTION 7 of i.ortho.photo again!\n" @@ -24711,15 +24884,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24759,101 +24930,100 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" -msgstr "" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" +msgstr "Enregistrer les paramètres de la région courante dans un nom de région" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "Groupe <%s> non trouvé" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "créer un Secteur" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "Jeu de données : %s" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Vérification du Secteur <%s> jeu de cartes <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24977,6 +25147,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24995,6 +25175,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -25004,6 +25189,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -25267,7 +25472,7 @@ msgstr "Calcul des matrices de covariance de classe" #: ../imagery/i.gensig/main.c:40 ../imagery/i.smap/main.c:39 #: ../imagery/i.gensigset/main.c:42 msgid "supervised classification" -msgstr "" +msgstr "classification dirigée" #: ../imagery/i.gensig/main.c:41 ../imagery/i.maxlik/main.c:63 msgid "Maximum Likelihood Classification" @@ -25379,6 +25584,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "projection" @@ -26179,9 +26385,8 @@ msgstr "Afficher les jeux de cartes dans le chemin de recherche" #: ../locale/scriptstrings/d.vect.thematic2_to_translate.c:42 #: ../locale/scriptstrings/d.vect.thematic2_to_translate.c:46 #: ../locale/scriptstrings/d.vect.thematic2_to_translate.c:48 -#, fuzzy msgid "Files" -msgstr "mile" +msgstr "Fichiers" #: ../imagery/i.signatures/main.c:153 #, fuzzy @@ -26969,8 +27174,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "Recalculer l'échelle des valeurs" @@ -27299,17 +27504,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -27318,17 +27520,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -27337,17 +27536,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -27357,17 +27553,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -27376,12 +27569,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27879,6 +28070,9 @@ msgstr "" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -29223,9 +29417,9 @@ msgid "Lists all database drivers." msgstr "Lister tous les pilotes de bases de données." #: ../db/db.execute/main.c:55 ../db/db.select/main.c:62 -#, c-format +#, c-format, fuzzy msgid "Unable to open file <%s>: %s" -msgstr "" +msgstr "Impossible d'ouvrir le fichier <%s> : %s" #: ../db/db.execute/main.c:74 ../db/db.columns/main.c:52 #: ../db/db.describe/main.c:56 ../db/db.tables/main.c:50 @@ -29519,11 +29713,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -29576,7 +29774,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -29671,16 +29869,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -29966,6 +30163,7 @@ msgstr "Pilote SQLite : colonne '%s', type de donnée SQLite %d non géré" #, c-format msgid "Table <%s> not found in database <%s> using driver <%s>" msgstr "" +"Table <%s> non trouvée dans la Base de données <%s> utilisant le pilote <%s>" #: ../db/db.columns/main.c:96 msgid "List all columns for a given table." @@ -30124,25 +30322,26 @@ msgid "The password was stored in file (%s%cdblogin)" msgstr "" #: ../db/db.select/main.c:104 -#, c-format +#, c-format, fuzzy msgid "Test %s." -msgstr "" +msgstr "Test %s." #: ../db/db.select/main.c:104 msgid "succeeded" -msgstr "" +msgstr "à réussi" #: ../db/db.select/main.c:205 msgid "Name of file containing SQL select statement(s)" -msgstr "" +msgstr "Nom du fichier contenant la ou les instructions SELECT SQL" #: ../db/db.select/main.c:210 msgid "Name of table to query" -msgstr "" +msgstr "Nom de la table à interroger" #: ../db/db.select/main.c:229 +#, fuzzy msgid "Vertical record separator (requires -v flag)" -msgstr "" +msgstr "Séparateur vertical d'enregistrements (requiert l'option -v)." #: ../db/db.select/main.c:243 ../locale/scriptstrings/v.report_to_translate.c:9 #: ../locale/scriptstrings/m.cdo.download_to_translate.c:24 @@ -30257,6 +30456,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "histogramme" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Colonne(s) attributaire(s) contenant les données" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Nombre de bandes dans le fichier d'entrée" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -30301,6 +30536,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -30337,64 +30574,78 @@ msgstr "Cartes d'entrée" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Nom de la carte raster en sortie" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Nom de la carte vecteur en sortie" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Nom de la carte raster en sortie" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Nom de la carte vecteur en sortie" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Nom de la carte raster en sortie" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#, fuzzy +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" +"Valeur de pente minimale (en pourcentage) pour laquelle une orientation est " +"calculée" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Nom du fichier de base de données" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Recalculer l'échelle des valeurs" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Impossible d'écrire les fichiers temporaires" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Coordonnées du point germe" @@ -30477,241 +30728,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "entrée" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" -"Afficher/définir les connexions base de données pour la table d'attributs de " -"la carte vecteur." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "Nom de la carte vecteur en entrée" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Nom de la carte vecteur en entrée" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Code de couche" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Nombre de colonnes dans la nouvelle région" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "Format des fichiers en sortie" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Type de stockage pour la couche raster créée" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "Méthode utilisée pour la reclassification" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "reclassification" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -30923,6 +30947,533 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Création de la carte raster 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +#, fuzzy +msgid "modeling" +msgstr "modèle" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Interroge sune carte vecteur sur des positions données." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "Paramètre de tension des splines" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Nom de la couche cible" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Inclure les valeurs sans données" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Nom de la carte vecteur points à interroger " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Nom de la couche source" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Nom de la carte vecteur points à interroger " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nom de la couche source" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Nom de la carte raster à afficher" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Écriture des données transformées dans le fichier..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "Extrapoler" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "entités simples" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "entités simples" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "entités simples" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "Ne pas sélectionner automatiquement le moniteur au démarrage" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "visualisation" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Altitude" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Pourcentage du temps CPU à utiliser" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "Interroge sune carte vecteur sur des positions données." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Nom de la couche a utiliser pour la saturation" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Nombre maximum d'intégration" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Unités de distance" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Seuil" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Seuil" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Seuil" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Nombre de fois que sera répété le filtre" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +#, fuzzy +msgid "Regularization parameter for categorical features" +msgstr "Configuration de paramètre(s) non autorisée(s)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +#, fuzzy +msgid "Regularization parameter for hinge features" +msgstr "Paramètre de régulation de Tykhonov (affecte le lissage)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Nom de la nouvelle couche raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Nombre de cadres de l'animation" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +#, fuzzy +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "Maximum de mémoire à utiliser (en MB)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +#, fuzzy +msgid "Show the Maxent user interface" +msgstr "interface utilisateur" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "Importer un fichier SRTM HGT vers une carte raster" @@ -31152,10 +31703,17 @@ msgstr "Fichier de table à importer ou chaine de connexion DB" msgid "Name for output vector map" msgstr "Nom de la carte vecteur en sortie" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" +"Supplanter la vérification de la projection (utiliser la projection du " +"secteur courant)" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" "Considérer que le jeu de données a la même projection que le secteur courant" @@ -31410,6 +31968,17 @@ msgstr "Nom du fichier empaqueté d'entrée" msgid "Default: taken from input file internals" msgstr "Défaut : récupéré depuis le nom interne du fichier" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" +"Considérer que le jeu de données d'entrée est dans la même projection que le " +"secteur courant" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -32675,7 +33244,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -32722,12 +33291,6 @@ msgstr "" msgid "landscape" msgstr "Landsat" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -#, fuzzy -msgid "modeling" -msgstr "modèle" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -33848,7 +34411,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Numéro de couche ou nom." @@ -33888,6 +34450,18 @@ msgstr "Conditions WHERE de la requête SQL sans le mot-clef 'where' (vecteur)" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Lecture de la carte %s ..." + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -34274,7 +34848,6 @@ msgstr "Effectue l'extraction du réseau de chenaux." #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -34473,7 +35046,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Cartes d'entrée" @@ -34509,6 +35082,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Chemin vers la base de données GRASS du Secteur en entrée" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -35644,11 +36226,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -35702,45 +36281,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Couleur de fond" +msgid "Thin species and background points" +msgstr "Nombre de points d'interpolation" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Couleur de fond" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Numéro de colonne pour les valeurs dans le fichier en entrée" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Germe pour une génération aléatoire de nimbre" @@ -36565,8 +37158,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -36577,6 +37179,7 @@ msgid "Group of raster layers to be classified" msgstr "Type de couche raster à créer." #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -36618,11 +37221,13 @@ msgid "" msgstr "Nom de la colonne d'attribut pour stocker les valeurs" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Couche de sortie" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -36927,6 +37532,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -36938,6 +37544,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -36968,6 +37575,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Nom du fichier en sortie" @@ -37355,70 +37963,6 @@ msgstr "" "Effectue un test, calcule toutes les dépendances et appels aux modules mais " "ne les lance pas" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Nom de la carte raster en sortie" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "Nom de la carte raster d'accumulation en entrée" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -#, fuzzy -msgid "Flow accumulation units" -msgstr "Accumulation de flux minimale pour les chenaux" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -#, fuzzy -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" -"Facteur multiplicatif pour convertir les unités d'altitude en unités " -"horizontales" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "longueur en unité de carte" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -37783,11 +38327,15 @@ msgid "" msgstr "Lier les fichiers raster avec r.external" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Étendre l'emprise du Secteur en fonction des nouveaux jeux de données" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" +"Considérer que le jeu de données d'entrée est dans la même projection que le " +"secteur courant" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -38688,6 +39236,14 @@ msgid "" msgstr "" "Reprojeter une carte raster depuis un secteur donné vers le secteur courant." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "Secteur contenant les cartes raster d'entrée" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Chemin vers la base de données GRASS du Secteur en entrée" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -38832,12 +39388,12 @@ msgid "WFS standard" msgstr "Version standard de WMS" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "Nombre maximal d'entités à télécharger" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "(défaut : illimité)" @@ -38996,9 +39552,8 @@ msgstr "Paramètres de police" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -39041,10 +39596,10 @@ msgid "Path to the extraction directory" msgstr "Chemin vers le répertoire d'extraction" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +#, fuzzy msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" "Créer un nouveau Secteur et importer les données dedans. Ne pas lancer ce " "module en parallèle où l'interrompre quand un nouveau Secteur doit être créé" @@ -39053,11 +39608,29 @@ msgstr "" msgid "Set the current region from the last map that was imported" msgstr "Définir la région courante depuis la dernière carte qui a été importée" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Étendre l'emprise du Secteur en fonction des nouveaux jeux de données" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" +"Considérer que le jeu de données d'entrée est dans la même projection que le " +"secteur courant" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" +"Crée/modifie la table de couleur associée à chaque carte raster d'un jeu de " +"données temporel." #: ../locale/scriptstrings/v.external.all_to_translate.c:1 #, fuzzy @@ -39065,7 +39638,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "Lister les couches OGR disponibles dans les données sources et quitter" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "Lister les couches disponibles dans l'emplacement source et quitter" @@ -39209,34 +39782,6 @@ msgstr "Nom de la base de données source" msgid "Base name for output file" msgstr "Nom du fichier en sortie" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "topologie" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Colonne(s) attributaire(s) contenant les données" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Nombre de bandes dans le fichier d'entrée" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -39935,6 +40480,10 @@ msgstr "Fichier d'entrée LAS" msgid "Queries projection information spatially." msgstr "Afficher l'information de projection au format WKT" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "créer un Secteur" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -40237,8 +40786,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Fusionne des contours entre surfaces adjacentes partageant un attribut ou " @@ -40272,7 +40822,8 @@ msgid "Layer number or name." msgstr "Numéro de couche ou nom." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +#, fuzzy +msgid "Name of attribute column used to dissolve features" msgstr "" "Nom de la colonne d'attributs utilisée pour dissoudre les contours communs" @@ -40418,8 +40969,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:4 +#, fuzzy msgid "supervised" -msgstr "" +msgstr "dirigée" #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:6 #, fuzzy @@ -41019,9 +41571,18 @@ msgstr "" "Importer un jeu de données vectoriel temporel depuis un fichier d'archive " "GRASS GIS." +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +#, fuzzy +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" +"Créer un nouveau Secteur et importer les données dedans. Ne pas lancer ce " +"module en parallèle où l'interrompre quand un nouveau Secteur doit être créé" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -41128,9 +41689,8 @@ msgid "" msgstr "" #: ../locale/scriptstrings/i.ortho.corr_to_translate.c:3 -#, fuzzy msgid "orthorectification" -msgstr "reclassification" +msgstr "orthorectification" #: ../locale/scriptstrings/i.ortho.corr_to_translate.c:5 msgid "Suffix of ortophoto map, default is .ortho, use None for no suffix" @@ -41305,6 +41865,16 @@ msgstr "" msgid "Estimate resolution only" msgstr "Estimer la résolution unquement" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" +"Considérer que le jeu de données a la même projection que le secteur courant" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -42367,8 +42937,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -42468,44 +43038,53 @@ msgid "Comma separated names of data layers to download" msgstr "Noms des couches à télécharger séparés par des virgules" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Fichier de couches à importer" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" "Spécifier un système de coordonnées de référence alternatif (exemple : " "EPSG:4326)" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" "Le code fourni doit être supporté par le serveur, vérifiez le fichier " "capabilities" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" "Ignorer les IDs d'entités précédents et télécharger à partir de celui-ci" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "(défaut : commence avec la première entité)" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" "Restreindre le téléchargement aux entités qui touchent la région courante" @@ -43159,6 +43738,8 @@ msgid "" "Supervised classification and regression of GRASS rasters using the python " "scikit-learn package." msgstr "" +"Classification dirigée et régression de rasters GRASS en utilisant le paquet " +"python scikit-learn" #: ../locale/scriptstrings/r.learn.train_to_translate.c:10 msgid "" @@ -45902,8 +46483,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "écrans" @@ -45944,6 +46525,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "Implicite seulement quand les options -c ou --overwrite sont données" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "Redessiner le contenu de l'écran actuellement sélectionné" @@ -46372,6 +46954,13 @@ msgstr "reclassification" msgid "multiple" msgstr "multispectral" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "Nom de la carte vecteur en entrée" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -46432,6 +47021,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Lignes vectorielles" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Lignes vectorielles" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -46472,6 +47075,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Les nombres de cellules des tuiles devraient se superposer" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Type de couche raster à créer." + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Nombre de fois que sera répété le filtre" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -46922,8 +47557,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -47698,6 +48333,10 @@ msgid "Name for output raster map (default: coveragename)" msgstr "" "Nom de la carte raster en sortie (par défaut : nom du fichier d'entrée)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Nom du nouveau Secteur (location) à créer" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -48003,6 +48642,10 @@ msgstr "Nom du fichier d'entrée HDF NDVI VGT SPOT" msgid "Offset factor for input" msgstr "Facteur d'échelle pour l'altitude" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 #, fuzzy msgid "Adjacent downstream segment category" @@ -48454,10 +49097,94 @@ msgstr "Exagération verticale" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Nom du fichier en sortie" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Nom de la couche source" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Nom de la carte vecteur a utiliser comme masque" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "variables" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Nom de la carte raster d'accumulation en entrée" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Nom de la carte raster d'entrée avec les dépressions réelles" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Paramètres" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Affiche x et y (colonne et ligne)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "topologie" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Colonne(s) attributaire(s) contenant les données" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -48988,17 +49715,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -49026,23 +49743,20 @@ msgid "categorical map with zones" msgstr "Points vectoriels" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nom du fichier image entrée" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -49053,9 +49767,8 @@ msgid "Default font size" msgstr "L'unité par défaut est la cellule" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -49075,14 +49788,12 @@ msgid "Create a vector point layer of outliers" msgstr "Nom de la carte vecteur points à interroger " #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "Inclure les valeurs sans données" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -49092,14 +49803,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -49132,14 +49841,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -49151,27 +49852,23 @@ msgid "Plot format" msgstr "Format de table" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Afficher les étiquettes de catégorie" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -49219,15 +49916,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -49247,7 +49935,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -49257,49 +49944,40 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Format des fichiers en sortie" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -49307,111 +49985,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "même taille" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "Les octets ne correspondent pas à la taille du fichier" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Couleur de ligne" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Couleur de mise en valeur" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Lister les cartes enregistrées dans le jeu de données raster temporel." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Exporter un jeux de données raster temporel." - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Résolution" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Afficher les étiquettes de catégorie" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Format de table" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Couleur du texte" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -51071,6 +51665,14 @@ msgstr "Estimer la résolution unquement" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -51096,6 +51698,15 @@ msgstr "Lignes vectorielles" msgid "add grid lines" msgstr "Lignes %d étiquettées" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Couleur du texte" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -51200,190 +51811,196 @@ msgstr "" "Renomme une colonne dans une table attributaire connectée à une carte " "vecteur donnée." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Lignes vectorielles" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Nombre de colonnes" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Nom de la colonne d'attribut pour stocker les valeurs" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Nombre de colonnes" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Nom de la colonne d'attribut pour stocker les valeurs" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Type d'entité" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Nom de l'image en sortie (ou fichier texte pour -t)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Nom du fichier SRTM en entrée (fichier sans l'extention .hgt.zip)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Résolution de la carte raster en sortie" # c-format -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Secteur : %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "Unité verticale de la carte" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "statistiques" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "même taille" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Couleur du texte" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Couleurs" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "colonne" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "Nom de la carte de couleur en entrée" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Inverser les couleurs" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "ligne" # c-format -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Secteur : %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "table de couleur" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 #, fuzzy msgid "Line style trendline" msgstr "Style de ligne" @@ -51396,6 +52013,7 @@ msgid "no-data" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -51407,123 +52025,128 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Épaisseur de ligne" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "La colonne de la largeur de ligne n'est pas spécifiée." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Couleur de ligne" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Liste des percentiles" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Rang des valeurs entières: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Nom de la couche raster d'aspect à afficher" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Rang des valeurs entières: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Nom de la couche raster d'aspect à afficher" @@ -51887,8 +52510,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -51973,186 +52596,6 @@ msgstr "" "Calcule les statistiques univariées des attributs de chaque carte " "vectorielle enregistrée dans un jeu de données vectorielles temporel" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Points vectoriels" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Requis" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Colonne(s) attributaire(s) contenant les données" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Nom du fichier d'entrée contenant les paires de coordonnées" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Fichier source" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "couche d'aspect en sortie (ou fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "couche d'aspect en sortie (ou fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Zone(s) de distance" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Résolution de la carte raster en sortie" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Nom de la table de sortie" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "" -"Nom de la carte vecteur en sortie avec les identifiants uniques de chenaux" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Nom pour la carte raster de sortie de courbure" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Nom du fichier de sortie" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Nom de la couche raster à utiliser pour <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Format" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Nom de la couche raster à utiliser pour <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Nombre de niveaux utilisés pour chaque composant" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Méthode de mesure texturale" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -#, fuzzy -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "Procéde à une validation croisée sans valeurs raster approchées" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -52996,11 +53439,6 @@ msgstr "Options spline" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "histogramme" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -58709,6 +59147,47 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +#, fuzzy +msgid "Download whole tiles" +msgstr "Ne pas garder les fichiers ouverts" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "région de calculs" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "Extraire une partie du jeu de données raster 3D temporel." @@ -59273,8 +59752,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -61855,8 +62334,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -62036,7 +62515,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -62050,7 +62529,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -62621,7 +63100,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -62913,7 +63392,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -63033,49 +63512,45 @@ msgstr "" "quitte" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Ecrase les paramètres de connexion pour une couche donnée" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Efface la connexion pour une couche donnée (mais n'efface pas la table" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Veuillez choisir une et un seul style d'affichage" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "La connexion à la base de données n'a pas été définie" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -63085,17 +63560,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "Utilisez -o pour écraser le lien existant pour la couche <%d>" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "La table <%s> n'existe pas dans la base de données <%s>" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -63104,16 +63579,16 @@ msgstr "" "La table <%s> fait à présent partie de la couche vectorielle <%s> et risque " "d'être effacée ou écrasée par les modules GRASS" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Impossible d'accorder des privilèges sur la table : %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Des droits de sélection ont été accordés sur cette table" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -63154,7 +63629,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -63231,56 +63706,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -63545,127 +64027,131 @@ msgstr[1] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -64146,7 +64632,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -64389,11 +64875,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -64420,7 +64906,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -64429,7 +64915,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -64449,7 +64935,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -64485,13 +64971,15 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Re-projette une carte vecteur depuis un secteur dans le secteur courant." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Secteur contenant les cartes raster d'entrée" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -64525,14 +65013,20 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Les Secteurs d'entrée et de sortie ne peuvent pas être les mêmes" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" +"Carte raster <%s> du Secteur <%s> dans le jeu de cartes <%s> non trouvée" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 #: ../vector/v.proj/main.c:526 ../vector/v.rectify/main.c:236 @@ -64545,14 +65039,14 @@ msgid "Input vector map <%s> is empty" msgstr "" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" +msgstr "Jeu de cartes <%s> dans le Secteur en entrée <%s> - %s" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" +msgstr "Jeu de cartes <%s> dans le Secteur en entrée <%s> - %s" #: ../vector/v.proj/main.c:517 msgid "Reprojecting primitives ..." @@ -65483,7 +65977,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -66113,7 +66607,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -66423,12 +66917,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -66628,19 +67122,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -66849,7 +67343,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -67007,10 +67501,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -67051,6 +67545,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -67155,9 +67653,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -67171,7 +67669,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -67256,7 +67754,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -67284,8 +67781,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -67331,9 +67828,9 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:586 ../vector/v.vol.rst/user1.c:640 #: ../vector/v.vol.rst/user1.c:694 ../vector/v.vol.rst/user1.c:748 #: ../vector/v.vol.rst/user1.c:802 -#, c-format +#, c-format, fuzzy msgid "Error closing output file %s" -msgstr "" +msgstr "Erreur en fermant le fichier de sortie %s" #: ../vector/v.vol.rst/user1.c:480 ../vector/v.vol.rst/user1.c:535 #: ../vector/v.vol.rst/user1.c:589 ../vector/v.vol.rst/user1.c:643 @@ -67913,7 +68410,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -68047,8 +68544,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" <<<<<<< HEAD @@ -69896,17 +70393,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -70084,13 +70581,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -70336,42 +70833,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Lister les couches disponibles et quitter" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Cette option requiert une colonne" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "L'option 'sides' (voisins) n'a de sens que pour des contours" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -71358,16 +71860,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Afficher la table d'attributs de la carte vecteur." @@ -72916,6 +73408,7 @@ msgid "" 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 in an output raster map." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -72927,6 +73420,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 @@ -72956,6 +73454,7 @@ msgstr "" #: ../vector/v.neighbors/main.c:284 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -72967,6 +73466,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -73316,12 +73820,15 @@ msgstr "" #, c-format <<<<<<< 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 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "" "Vector map <%s> is 3D. Use format specific layer creation options (parameter " "'lco') to export in 3D rather than 2D (default)." @@ -73332,6 +73839,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -73579,17 +74089,17 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" @@ -73597,7 +74107,7 @@ msgstr "" "Vous devez spécifier les deux options de validation croisée (drapeau -c et " "sortie vecteur cvdev)" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" @@ -73605,48 +74115,48 @@ msgstr "" "La validation croisée ne peut être calculée simultanément avec la sortie " "raster ou la sortie du fichier devi" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "Utilisation de l'anisotropie - theta et scalex doivent être spécifiés" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" "Les options smatt et smooth sont toutes deux spécifiées - utilisation de " "constante" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" "Le calcul risque de durer trop longtemps - nous vous suggérons de choisir " "une npmin plus basse" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "Echec de l'interpolation de segment" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -73938,7 +74448,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -74961,164 +75471,165 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "Nom :" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "Jeu de cartes :" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Projection" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "Type d'entité :" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "Oui" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "Non" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "Commentaire" @@ -75295,6 +75806,19 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." @@ -75302,23 +75826,33 @@ msgstr "" "Convertir des nuages de points LIDAR LAS vers une carte vecteur GRASS avec " "libLAS" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -75387,274 +75921,274 @@ msgstr "Ne pas nettoyer les polygones (non recommandé)" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -75663,51 +76197,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -75865,10 +76399,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Jeu de cartes <%s> non trouvé" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -76035,7 +76579,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -76043,7 +76587,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -76051,7 +76595,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -76695,6 +77239,7 @@ msgid "Mapset switched." msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -76706,6 +77251,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -78812,6 +79362,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -79042,11 +79596,13 @@ msgid "" msgstr "" #: ../display/d.vect.thematic/main.c:515 -#, c-format +#, c-format, fuzzy msgid "" "\n" "Total number of records: %.0f\n" msgstr "" +"\n" +"Nombre total d'enregistrements : %.0f\n" #: ../display/d.vect.thematic/main.c:516 #, c-format @@ -79399,6 +79955,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Impossible d'ouvrir <%s> en écriture" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Impossible d'ouvrir <%s> en écriture" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -79718,6 +80291,7 @@ msgstr "" msgid "Option <%s> must be > 0" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -79725,6 +80299,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../display/d.vect/main.c:409 #, c-format msgid "%d error in cat option" @@ -79981,7 +80557,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -80071,6 +80647,9 @@ msgid "Manage" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -80094,6 +80673,7 @@ msgstr "" msgid "DONE: compressed file is %lu %s (%.2f%%) larger" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -80105,6 +80685,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 @@ -80258,22 +80843,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -86582,38 +87160,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -86693,11 +87271,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -86722,103 +87300,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -86830,336 +87408,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -87212,50 +87790,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -87283,7 +87861,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -87501,7 +88079,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -87558,85 +88136,87 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Utiliser les coordonnées de la carte à la place des coordonnées xyz" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Création des fichiers temporaires ..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Création des fichiers temporaires ..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" msgstr "" +"Impossible d'obtenir les unités de projection de la carte raster en sortie" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -87682,28 +88262,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -87760,27 +88340,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Impossible de créer la carte vecteur <%s>" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -87790,7 +88370,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -87800,14 +88379,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -87815,72 +88394,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -88107,7 +88686,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -88125,64 +88704,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -88322,79 +88902,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -88506,40 +89086,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -88575,7 +89155,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -88586,34 +89166,37 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +#, fuzzy +msgid "Overriding projection check (using current project's CRS)." msgstr "" +"Supplanter la vérification de la projection (utiliser la projection du " +"secteur courant)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -88705,34 +89288,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -88811,317 +89394,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Région <%s> non trouvée" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -89129,60 +89712,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -89234,29 +89817,41 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Impossible d'analyser le message d'entrée" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Arguments de l'erreur de scanning" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" +msgstr "Erreur au vidage des tuiles" + #: ../scripts/g.download.location/g.download.location.py:105 msgid "Location named <{}> already exists, download canceled" msgstr "" @@ -89300,16 +89895,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -89380,41 +89965,51 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Carte raster <%s> non trouvée dans le jeu de cartes courant" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +#, fuzzy +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" +"Nom et type de la(es) nouvelle(s) colonne(s) ('nom type [nom type, ...]')" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" +msgstr "Erreur d'ajout de colonnes {}" + #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -89462,20 +90057,188 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Overwrite font configuration file if already existing" +#~ msgstr "Écraser le fichier de configuration des polices s'il existe déjà" + +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "" +#~ "Afficher/définir les connexions base de données pour la table d'attributs " +#~ "de la carte vecteur." + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Nom de la carte vecteur en entrée" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Code de couche" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Nombre de colonnes dans la nouvelle région" + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "Format des fichiers en sortie" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Type de stockage pour la couche raster créée" + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "Méthode utilisée pour la reclassification" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "reclassification" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Nom de la carte raster en sortie" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "Nom de la carte raster d'accumulation en entrée" + +#, fuzzy +#~ msgid "Flow accumulation units" +#~ msgstr "Accumulation de flux minimale pour les chenaux" + +#, fuzzy +#~ msgid "Multiplier to convert flow accumulation to your chosen unit" +#~ msgstr "" +#~ "Facteur multiplicatif pour convertir les unités d'altitude en unités " +#~ "horizontales" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "longueur en unité de carte" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "" +#~ "Lister les cartes enregistrées dans le jeu de données raster temporel." + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Exporter un jeux de données raster temporel." + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Résolution" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Afficher les étiquettes de catégorie" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Format de table" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Points vectoriels" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Requis" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Colonne(s) attributaire(s) contenant les données" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Nom du fichier d'entrée contenant les paires de coordonnées" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Fichier source" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "couche d'aspect en sortie (ou fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "couche d'aspect en sortie (ou fy)" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Zone(s) de distance" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Résolution de la carte raster en sortie" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Nom de la table de sortie" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "" +#~ "Nom de la carte vecteur en sortie avec les identifiants uniques de chenaux" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nom pour la carte raster de sortie de courbure" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nom du fichier de sortie" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Nom de la couche raster à utiliser pour <%s>" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Format" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Nom de la couche raster à utiliser pour <%s>" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Nombre de niveaux utilisés pour chaque composant" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Méthode de mesure texturale" + +#, fuzzy +#~ msgid "" +#~ "Number of k-fold cross-validation for grid search parameter optimization" +#~ msgstr "Procéde à une validation croisée sans valeurs raster approchées" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Ecrase les paramètres de connexion pour une couche donnée" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Creates a raster map from LAS LiDAR points using univariate statistics " @@ -91371,19 +92134,11 @@ msgstr "" #~ "\n" #~ "Résolution = %d; période = %d" -#, fuzzy -#~ msgid "Output formating" -#~ msgstr "Format de sortie" - # c-format #, fuzzy #~ msgid "Unable to create 3D raster <%s>" #~ msgstr "Impossible de créer la couche raster <%s>" -#, fuzzy -#~ msgid "Unable to initialize G-submatrix..." -#~ msgstr "Impossible de fermer la couche : couche d'entrée introuvable" - #, fuzzy #~ msgid "Force 2D interpolation even if input is 3D" #~ msgstr "Forcer l'écriture de valeurs entières" @@ -91856,9 +92611,6 @@ msgstr "" #~ msgstr[0] "Interpolation de la couche raster <%s>... ligne %d ..." #~ msgstr[1] "Interpolation de la couche raster <%s>... ligne %d ..." -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "Projection lat/long non gérée pour le moment." - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Chaîne de caractère pour les cellules sans valeurs" @@ -91926,8 +92678,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Couleur pour tracer la grille ou aucune couleur (\"none\")" # c-format @@ -92127,6 +92879,7 @@ msgstr "" msgid "Missing table" msgstr "Table manquante" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Missing table" @@ -92162,6 +92915,17 @@ 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" @@ -92178,6 +92942,9 @@ msgstr "FAIT : le fichier décompressé est %lu %s (%.2f%) plus grand" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grassmods_hu.po b/locale/po/grassmods_hu.po index d17504bc880..45b545ccfbc 100644 --- a/locale/po/grassmods_hu.po +++ b/locale/po/grassmods_hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2018-03-10 17:22+0100\n" "Last-Translator: Zoltan Siki , 2018\n" "Language-Team: Hungarian (https://www.transifex.com/grass-gis/teams/45198/" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Nyomtatás" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "Nem tudom elindítani a <%s> meghajtót" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "Nem tudom elindítani a <%s> meghajtót" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Nem tudok memóriát foglalni" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "Raszter térkép olvasás <%s>..." -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1585,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1715,10 @@ msgstr "algebra" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1756,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1772,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1830,24 +1822,18 @@ msgstr "Input szín trékép neve" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1968,7 +1954,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1978,7 +1964,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2098,7 +2083,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2127,6 +2112,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2260,7 +2246,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2269,8 +2261,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2302,7 +2294,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2358,7 +2350,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "újramintavétel" @@ -2403,7 +2394,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2456,7 +2447,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2868,7 +2859,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2956,14 +2947,16 @@ msgstr "export" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3122,7 +3115,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3430,6 +3423,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3518,17 +3520,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3549,7 +3549,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Output" @@ -3621,7 +3621,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3654,160 +3654,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3840,19 +3832,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3922,9 +3914,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3938,36 +3930,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4022,6 +4014,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4042,46 +4037,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4090,82 +4094,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4965,7 +4981,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5044,7 +5060,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5173,7 +5189,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5372,9 +5388,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5390,7 +5405,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5597,9 +5612,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5617,7 +5632,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5702,10 +5717,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5744,30 +5759,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5887,123 +5902,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Raszter térkép olvasás <%s>..." @@ -6103,7 +6118,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6137,7 +6152,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6169,7 +6184,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6223,9 +6238,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6241,8 +6256,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6252,24 +6267,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6321,7 +6367,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6621,7 +6667,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6727,7 +6773,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6813,7 +6858,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7432,7 +7477,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7441,7 +7486,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7546,7 +7591,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7570,15 +7615,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7651,7 +7696,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7701,17 +7746,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7769,6 +7811,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7907,7 +7950,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7990,7 +8033,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8049,7 +8092,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8110,7 +8153,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8233,7 +8276,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8372,7 +8414,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8464,8 +8506,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8474,8 +8516,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8493,7 +8535,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8873,9 +8915,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9101,13 +9143,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9120,7 +9160,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9362,31 +9401,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9402,12 +9441,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9422,18 +9460,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Input szín trékép neve" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9457,10 +9495,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9490,7 +9527,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9499,210 +9536,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10368,7 +10421,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10481,6 +10533,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10512,26 +10576,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10556,12 +10600,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10569,40 +10607,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10753,7 +10791,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10997,29 +11035,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11074,71 +11112,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11181,6 +11186,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11884,7 +11922,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11898,12 +11936,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11929,10 +11966,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11988,12 +12023,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12010,12 +12045,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12023,7 +12058,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12031,7 +12066,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12047,12 +12082,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12132,7 +12167,7 @@ msgid "Sorting events..." msgstr "Töréspontok írása..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12387,8 +12422,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12554,7 +12590,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12565,6 +12601,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13176,15 +13224,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13263,7 +13311,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13273,7 +13321,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13361,7 +13409,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13370,7 +13418,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13682,7 +13730,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13693,19 +13741,19 @@ msgstr "" msgid "position" msgstr "pozíció" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13713,15 +13761,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13730,62 +13791,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13955,9 +14024,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14297,21 +14363,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14496,80 +14562,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15444,32 +15510,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15485,61 +15551,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15563,7 +15629,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16503,46 +16568,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16867,7 +16932,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17321,8 +17386,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17449,97 +17514,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17802,11 +17867,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18005,32 +18070,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18113,7 +18178,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18136,8 +18201,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18891,8 +18957,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18902,28 +18968,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18932,57 +18998,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18991,7 +19057,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19000,7 +19066,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19492,6 +19558,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19550,64 +19620,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19713,7 +19791,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19726,10 +19803,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19743,11 +19818,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20241,10 +20316,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20300,9 +20375,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20362,13 +20437,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20729,67 +20804,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21033,8 +21108,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21300,154 +21375,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Input szín trékép neve" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21535,9 +21611,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Nem tudom megnyitni a <%s> adatbázist" #: ../general/g.proj/create.c:21 #, c-format @@ -21545,98 +21621,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Nem tudom elindítani a <%s> meghajtót" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21779,7 +21855,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21862,33 +21939,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21897,69 +21996,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21974,37 +22077,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22357,7 +22457,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23544,7 +23644,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23640,7 +23740,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23648,8 +23749,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Input szín trékép neve" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23682,34 +23784,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23762,61 +23865,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23826,7 +23934,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23834,21 +23942,21 @@ msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Nem tudom megnyitni a <%s> adatbázist" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23963,15 +24071,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24011,101 +24117,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24229,6 +24333,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24245,6 +24359,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24254,6 +24373,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24620,6 +24759,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "pozíció" @@ -26188,8 +26328,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26513,17 +26653,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26532,17 +26669,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26551,17 +26685,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26571,17 +26702,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26590,12 +26718,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27381,11 +27507,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27434,7 +27564,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27527,16 +27657,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28107,6 +28236,41 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28149,6 +28313,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28184,60 +28350,71 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "Input szín trékép neve" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "Input szín trékép neve" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "Input szín trékép neve" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#, fuzzy +msgid "Name of output vector shadow mask" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 msgid "Name of output raster shadow mask" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28316,232 +28493,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Input szín trékép neve" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28741,6 +28700,506 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Output VRML fájl neve" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "interpoláció" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Raszter térkép olvasás <%s>..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28931,10 +29390,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29162,6 +29626,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30337,7 +30809,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30381,11 +30853,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31438,7 +31905,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31472,6 +31938,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31825,7 +32302,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32018,7 +32494,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -32051,6 +32527,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33069,11 +33553,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33119,44 +33600,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33935,8 +34429,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33946,6 +34449,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33983,11 +34487,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Output" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34278,6 +34784,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34289,6 +34796,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34317,6 +34825,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34679,63 +35188,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35074,11 +35526,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35918,6 +36372,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36045,12 +36507,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36187,9 +36649,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36232,19 +36693,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36253,7 +36724,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36381,32 +36852,6 @@ msgstr "" msgid "Base name for output file" msgstr "Output VRML fájl neve" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "hidrológia" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37037,6 +37482,10 @@ msgstr "Output VRML fájl neve" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37321,7 +37770,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37352,8 +37801,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Input szín trékép neve" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38040,9 +38490,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38292,6 +38748,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39295,8 +39759,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39389,39 +39853,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42602,8 +43075,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42641,6 +43114,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43039,6 +43513,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43089,6 +43570,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Input szín trékép neve" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -43125,6 +43620,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43532,8 +44057,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44260,6 +44785,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44545,6 +45074,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44964,10 +45497,88 @@ msgstr "Függőleges nagyítás" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "távolság" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Input szín trékép neve" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "hidrológia" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45458,17 +46069,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45495,23 +46096,20 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Output VRML fájl neve" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45522,9 +46120,8 @@ msgid "Default font size" msgstr "Alapértelmezett meghajtó nincs beállítva" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45542,13 +46139,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45558,14 +46153,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45598,14 +46191,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45616,26 +46201,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45679,15 +46260,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45705,7 +46277,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45715,49 +46286,40 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Output VRML fájl neve" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45765,101 +46327,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -47042,6 +47526,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -47064,6 +47556,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -47154,286 +47654,286 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Input szín trékép neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Input szín trékép neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Input szín trékép neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Input szín trékép neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Input szín trékép neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Output VRML fájl neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "statisztika" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "Input szín trékép neve" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47767,8 +48267,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47848,171 +48348,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Input szín trékép neve" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Output VRML fájl neve" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Input szín trékép neve" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Input szín trékép neve" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Input szín trékép neve" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48805,11 +49140,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -54272,6 +54602,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -54802,8 +55171,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -55104,8 +55473,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -55285,7 +55654,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -55299,7 +55668,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -55829,7 +56198,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -56119,7 +56488,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -56209,49 +56578,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -56261,33 +56626,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -56324,7 +56689,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -56401,56 +56766,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -56720,127 +57092,131 @@ msgstr[1] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -57317,7 +57693,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -57555,11 +57931,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -57586,7 +57962,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -57595,7 +57971,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -57615,7 +57991,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -57651,12 +58027,13 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Input szín trékép neve" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -57690,13 +58067,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -57711,12 +58092,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -58884,7 +59265,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -59507,7 +59888,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -59814,12 +60195,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -60019,19 +60400,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -60240,7 +60621,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -60398,10 +60779,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -60440,6 +60821,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -60540,9 +60925,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -60556,7 +60941,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -60641,7 +61026,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -60669,8 +61053,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -61291,7 +61675,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -61425,8 +61809,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -63204,17 +63588,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -63390,13 +63774,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -63642,42 +64026,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -64659,16 +65047,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -66094,66 +66472,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -66442,7 +66820,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -66899,164 +67277,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -67233,27 +67611,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -67320,274 +67721,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -67596,51 +67997,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -67796,10 +68197,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -67963,7 +68374,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -67971,7 +68382,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -67979,7 +68390,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -68965,6 +69376,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -69533,6 +69948,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Nem tudom elindítani a <%s> meghajtót" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Nem tudom elindítani a <%s> meghajtót" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -70104,7 +70536,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -70343,22 +70775,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -72387,38 +72812,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -72498,11 +72923,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -72527,103 +72952,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -72635,336 +73060,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -73017,50 +73442,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -73088,13 +73513,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -73151,85 +73576,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -73275,28 +73700,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -73353,27 +73778,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Nem tudom megnyitni a <%s> adatbázist" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -73383,7 +73808,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -73393,14 +73817,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -73408,72 +73832,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -73700,7 +74124,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -73718,64 +74142,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -73915,79 +74340,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -74099,40 +74524,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -74168,7 +74593,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -74179,34 +74604,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -74298,34 +74723,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -74404,316 +74829,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -74721,60 +75146,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -74826,27 +75251,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -74892,16 +75327,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -74972,41 +75397,50 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "" +"<%s> táblát nem találom a <%s> adatbázisban, a <%s> meghajtót használva" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -75054,20 +75488,43 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Input szín trékép neve" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Output VRML fájl neve" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Input szín trékép neve" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Input szín trékép neve" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Input szín trékép neve" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "JSON output" #~ msgstr "Output" diff --git a/locale/po/grassmods_id_ID.po b/locale/po/grassmods_id_ID.po index 0e6fb28011f..94abe5a03d1 100644 --- a/locale/po/grassmods_id_ID.po +++ b/locale/po/grassmods_id_ID.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_id_ID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-05-23 21:08+0200\n" "Last-Translator: \n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/grass-gis/" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1585,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1715,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1756,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1772,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1829,24 +1821,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1962,7 +1948,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1972,7 +1958,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2092,7 +2077,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2121,6 +2106,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2254,7 +2240,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2263,8 +2255,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2296,7 +2288,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2352,7 +2344,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2397,7 +2388,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2450,7 +2441,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2861,7 +2852,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2949,14 +2940,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3115,7 +3108,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3423,6 +3416,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3511,17 +3513,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3542,7 +3542,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3614,7 +3614,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3647,160 +3647,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3833,19 +3825,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3914,9 +3906,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3930,36 +3922,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4014,6 +4006,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4034,46 +4029,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4082,82 +4086,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4957,7 +4973,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5036,7 +5052,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5165,7 +5181,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5364,9 +5380,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5382,7 +5397,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5589,9 +5604,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5609,7 +5624,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5694,10 +5709,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5736,30 +5751,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5879,123 +5894,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6095,7 +6110,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6129,7 +6144,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6159,7 +6174,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6212,9 +6227,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6230,8 +6245,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6241,24 +6256,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6310,7 +6356,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6610,7 +6656,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6716,7 +6762,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6802,7 +6847,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7421,7 +7466,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7430,7 +7475,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7535,7 +7580,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7559,15 +7604,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7640,7 +7685,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7690,17 +7735,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7758,6 +7800,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7895,7 +7938,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7978,7 +8021,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8037,7 +8080,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8098,7 +8141,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8221,7 +8264,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8360,7 +8402,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8452,8 +8494,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8462,8 +8504,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8481,7 +8523,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8861,9 +8903,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9087,13 +9129,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9106,7 +9146,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9348,31 +9387,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9388,12 +9427,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9408,18 +9446,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9443,10 +9480,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9476,7 +9512,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9485,210 +9521,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10353,7 +10405,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10466,6 +10517,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10497,26 +10560,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10541,12 +10584,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10554,40 +10591,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10737,7 +10774,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10980,29 +11017,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11055,71 +11092,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11162,6 +11166,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11865,7 +11902,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11879,12 +11916,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11910,10 +11946,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11969,12 +12003,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -11991,12 +12025,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12004,7 +12038,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12012,7 +12046,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12028,12 +12062,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12112,7 +12146,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12364,8 +12398,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12531,7 +12566,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12542,6 +12577,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13153,15 +13200,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13240,7 +13287,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13250,7 +13297,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13336,7 +13383,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13345,7 +13392,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13657,7 +13704,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13668,19 +13715,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13688,15 +13735,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13705,62 +13765,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13930,9 +13998,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14271,21 +14336,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14469,80 +14534,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15417,31 +15482,31 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15457,61 +15522,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15535,7 +15600,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16474,46 +16538,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16838,7 +16902,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17289,8 +17353,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17417,97 +17481,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17770,11 +17834,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17973,32 +18037,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18081,7 +18145,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18104,8 +18168,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18859,8 +18924,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18870,28 +18935,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18900,57 +18965,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18959,7 +19024,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18968,7 +19033,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19460,6 +19525,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19518,64 +19587,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19681,7 +19758,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19694,10 +19770,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19711,11 +19785,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20209,10 +20283,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20268,9 +20342,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20330,13 +20404,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20697,67 +20771,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21001,8 +21075,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21268,154 +21342,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21504,7 +21578,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21514,97 +21588,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21747,7 +21821,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21830,33 +21905,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21865,69 +21962,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21942,37 +22043,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22325,7 +22423,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23512,7 +23610,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23608,7 +23706,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23616,7 +23715,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23650,34 +23749,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23730,61 +23830,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23794,7 +23899,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23803,20 +23908,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23931,15 +24036,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23979,101 +24082,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24197,6 +24298,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24213,6 +24324,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24222,6 +24338,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24587,6 +24723,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26146,8 +26283,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26471,17 +26608,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26490,17 +26624,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26509,17 +26640,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26529,17 +26657,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26548,12 +26673,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27334,11 +27457,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27387,7 +27514,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27480,16 +27607,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28058,6 +28184,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28100,6 +28260,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28134,58 +28296,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28263,231 +28435,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28686,6 +28641,500 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +msgid "Validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28876,10 +29325,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29105,6 +29559,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30267,7 +30729,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30311,11 +30773,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31364,7 +31821,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31398,6 +31854,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31749,7 +32216,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31942,7 +32408,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -31975,6 +32441,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -32980,11 +33454,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33030,44 +33501,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33832,8 +34316,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33843,6 +34336,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33880,10 +34374,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34174,6 +34670,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34185,6 +34682,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34213,6 +34711,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34572,63 +35071,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -34961,11 +35403,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35793,6 +36237,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35919,12 +36371,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36060,9 +36512,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36105,19 +36556,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36126,7 +36587,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36253,31 +36714,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36899,6 +37335,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37179,7 +37619,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37210,7 +37650,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37885,9 +38325,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38134,6 +38580,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39131,8 +39585,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39224,39 +39678,47 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 -msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgid "Name of data layers to import" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42387,8 +42849,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42426,6 +42888,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42823,6 +43286,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42872,6 +43342,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42907,6 +43389,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43309,8 +43821,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44030,6 +44542,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44309,6 +44825,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44725,10 +45245,84 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45212,17 +45806,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45246,22 +45830,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45271,9 +45852,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45290,13 +45870,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45306,14 +45884,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45346,14 +45922,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45364,26 +45932,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45427,15 +45991,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45453,7 +46008,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45463,48 +46017,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45512,101 +46057,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46779,6 +47246,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46801,6 +47276,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46890,278 +47373,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47490,8 +47973,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47571,166 +48054,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48518,11 +48841,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53269,6 +53587,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53799,8 +54156,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54101,8 +54458,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54282,7 +54639,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54296,7 +54653,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54824,7 +55181,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55114,7 +55471,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55203,49 +55560,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55255,33 +55608,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55318,7 +55671,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55395,178 +55748,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56037,7 +56390,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56273,11 +56626,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56304,7 +56657,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56313,7 +56666,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56333,7 +56686,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56369,11 +56722,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56408,13 +56761,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56429,12 +56786,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57582,7 +57939,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58204,7 +58561,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58508,12 +58865,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58713,19 +59070,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -58933,7 +59290,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59091,10 +59448,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59133,6 +59490,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59233,9 +59594,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59249,7 +59610,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59334,7 +59695,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59362,8 +59722,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -59980,7 +60340,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60112,8 +60472,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -61874,17 +62234,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62060,13 +62420,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62312,42 +62672,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63329,16 +63693,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -64732,66 +65086,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65077,7 +65431,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65534,164 +65888,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -65867,27 +66221,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -65954,274 +66331,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66230,51 +66607,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66430,10 +66807,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66597,14 +66984,14 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66612,7 +66999,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67598,6 +67985,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68160,6 +68551,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -68720,7 +69128,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -68959,22 +69367,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -70999,38 +71400,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71110,11 +71511,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71139,103 +71540,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71247,336 +71648,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -71629,50 +72030,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -71700,13 +72101,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -71763,85 +72164,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -71887,28 +72288,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -71965,27 +72366,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -71995,7 +72396,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72005,14 +72405,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72020,72 +72420,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72312,7 +72712,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72330,64 +72730,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72527,79 +72928,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -72711,40 +73112,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -72780,7 +73181,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -72791,34 +73192,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -72910,34 +73311,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73016,316 +73417,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73333,60 +73734,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73438,27 +73839,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73504,16 +73915,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73584,41 +73985,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -73666,15 +74074,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grassmods_it.po b/locale/po/grassmods_it.po index 39776225755..c64cb640ab4 100644 --- a/locale/po/grassmods_it.po +++ b/locale/po/grassmods_it.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2015-03-29 13:25+0100\n" "Last-Translator: Luca Delucchi \n" "Language-Team: Italian \n" @@ -95,7 +95,7 @@ msgstr "temporale" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "impostazioni" @@ -135,32 +135,33 @@ msgid "Print current connection parameters and exit" msgstr "Mostra i parametri della connessione in uso ed esce" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -186,21 +187,21 @@ msgstr "Mostra i parametri della connessione in uso ed esce" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Stampa" @@ -277,7 +278,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -302,7 +303,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -313,7 +314,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -335,7 +336,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -492,6 +493,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -511,7 +513,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -530,7 +531,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -544,6 +544,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -577,7 +578,7 @@ msgstr "Il mio primo modulo raster" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -587,8 +588,8 @@ msgstr "Il mio primo modulo raster" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -603,21 +604,21 @@ msgstr "Il mio primo modulo raster" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Mappa raster <%s> non trovata" @@ -626,7 +627,7 @@ msgstr "Mappa raster <%s> non trovata" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -661,7 +662,6 @@ msgstr "Mappa raster <%s> non trovata" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -674,7 +674,6 @@ msgstr "Mappa raster <%s> non trovata" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -713,6 +712,7 @@ msgstr "Mappa raster <%s> non trovata" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -734,7 +734,7 @@ msgstr "Mappa raster <%s> non trovata" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -800,7 +800,7 @@ msgstr "Mappa raster <%s> non trovata" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -814,7 +814,7 @@ msgstr "Il mio primo modulo vettoriale" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -827,8 +827,8 @@ msgstr "Il mio primo modulo vettoriale" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -843,16 +843,16 @@ msgstr "Impossibile impostare il predeterminato livello del vettoriale aperto" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -898,7 +898,7 @@ msgstr "Impossibile impostare il predeterminato livello del vettoriale aperto" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -914,7 +914,7 @@ msgstr "Impossibile aprire la mappa vettoriale <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -923,7 +923,7 @@ msgstr "Impossibile aprire la mappa vettoriale <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -953,13 +953,13 @@ msgstr "Impossibile aprire la mappa vettoriale <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -987,7 +987,7 @@ msgstr "Connessione al database non definita per il layer %d" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1002,8 +1002,8 @@ msgstr "Impossibile avviare il driver <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1037,10 +1037,10 @@ msgstr "Impossibile avviare il driver <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1048,7 +1048,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Impossibile aprire il database <%s> col driver <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1079,27 +1079,27 @@ msgstr "" "Impossibile copiare la tabella degli attributi nella mappa vettoriale <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" "Impostazione della tavola dei colori per il grigio per <%s> (8 bit, intera " "gamma)" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" "Impostazione della tavola dei colori per il grigio per <%s> (16 bit, gamma " "dell'immagine)" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1183,13 +1183,14 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" msgstr "La regione predefinita per questa location è stata aggiornata" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "La regione per questa location è stata aggiornata" @@ -1242,6 +1243,7 @@ msgstr "La regione per questa location è stata aggiornata" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1302,6 +1304,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1367,14 +1375,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1424,144 +1431,133 @@ msgstr "Titolo della mappa raster risultante" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadati" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Elenca i formati supportati ed esce" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +#, fuzzy +msgid "Override projection check (use current project's CRS)" msgstr "Sovrascrive la proiezione (usa la proiezione della location)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "Estende le dimensioni della regione basandosi sul nuovo dataset" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "Inoltre aggiorna la regione predefinita nel mapset PERMANENT" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "Si sta procedendo con l'importazione..." -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "Il gruppo di immagini <%s> esite già e verrà sovrascritto." -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "La banda (%d) selezionata non esiste" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "Gruppo di immagini <%s> creato" @@ -1578,37 +1574,36 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "Non si è in grado di convertire la proiezione della mappa di input nel " "formato di GRASS; impossibile creare una nuova location." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Non è possibile creare l'indece sulla tabella <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Location <%s> creata" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1616,60 +1611,66 @@ msgstr "" msgid "Over-riding projection check" msgstr "La verifica della proiezione verrà ignorata" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" "La proiezione del dataset sembra non corrispondere a quella della location " "corrente.\n" "\n" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "PROJ_INFO della location è:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "PROJ_INFO del dataset è:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 +#, fuzzy msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" "Si prenda in considerazione di generare una nuova location dal dataset di " "input usando il parametro location\n" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +#, fuzzy +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" "La proiezione del dataset di input e della location corrente sembrano " "corrispondere" @@ -1751,12 +1752,10 @@ msgstr "algebra" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1794,7 +1793,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1810,7 +1809,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1860,24 +1859,18 @@ msgstr "Nome ella mappa raster di output della curvatura del profilo" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Output" @@ -1999,7 +1992,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2009,7 +2002,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2130,7 +2122,7 @@ msgstr "Stampa la cronologia del raster invece delle informazioni" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2159,6 +2151,7 @@ msgstr "Non è possibile alloccare memoria per la stringa" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2295,7 +2288,13 @@ msgstr "<%s=%s> numero di punti non valido" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2304,8 +2303,8 @@ msgid "The minimum number of input raster maps is two" msgstr "Il numero minimo di mappe raster di input è due" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Percentuale completa..." @@ -2337,7 +2336,7 @@ msgstr "Aggiorna statistiche per un raster" msgid "Statistics for <%s> updated" msgstr "Statistiche per <%s> aggiornate" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2393,7 +2392,6 @@ msgstr "Dev'essere fornita una delle opzione \"-i\" o \"value=\"" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "ricampiona" @@ -2438,7 +2436,7 @@ msgid "Unknown method <%s>" msgstr "Metodo <%s> sconosciuto" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2491,7 +2489,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2913,7 +2911,7 @@ msgstr "Ricerca del percorso cost..." msgid "Error, ct == pres_cell" msgstr "Errore, ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -3001,14 +2999,16 @@ msgstr "esporta" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3168,7 +3168,7 @@ msgid "List of cell values to be set to NULL" msgstr "Elenco dei valori raster da impostare a NULL" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3494,6 +3494,15 @@ msgstr "Mappa raster di output dell'angolo di incidenza (solo modalità 1)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3582,17 +3591,15 @@ msgstr "Mappa raster di output dell'angolo di incidenza (solo modalità 1)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3613,7 +3620,7 @@ msgstr "Mappa raster di output dell'angolo di incidenza (solo modalità 1)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Output" @@ -3698,7 +3705,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3731,56 +3738,56 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" "Si deve fornire il raster delle longitudini per utilizzare l'ora legale" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "Errore nella lettura del valore del fuso orario legale" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "Valore del fuso orario legale non valido" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "insol_time e incidout sono opzioni incompatibili" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "Errore nella lettura della frequenza oraria" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "Misura della frequenza oraria non valida" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" "Se si utilizza l'opzione horizon bisogna anche impostare il parametro " "'horizonstep'" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "Time e insol_time sono opzioni incompatibili" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" @@ -3788,61 +3795,57 @@ msgstr "" "Modalità 1: angolo di incidenza e radiazione istantanei usando un'ora locale " "definita" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "incidout richiede che venga impostato il parametro time" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" "Modalità 2: radiazione giornaliera integrata per un dato giorno dell'anno" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" "Se si usa -s e nessun raster dell'orizzonte, il numpartitions dev'essere=1" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." @@ -3850,55 +3853,55 @@ msgstr "" "Per risparmiare memoria e usare l'ombreggiatura si devono usare orizzonti " "precalcolati" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "" "Non è possibile ottenere le informazioni sulla proiezione della location " "corrente" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "" "Non è possibile ottenere le unità della proiezione della location attuale" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "" "Non è possibile ottenere i valori chiave della proiezione della location " "attuale" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" -msgstr "" +#: ../raster/r.sun/main.c:824 +#, fuzzy +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" +msgstr "Devono essere fornite entrambe le mappe latin e longin, oppure nessuna" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "Devono essere fornite entrambe le mappe latin e longin, oppure nessuna" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3931,19 +3934,19 @@ msgstr "Devono essere fornite entrambe le mappe latin e longin, oppure nessuna" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Fuori memoria massima" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4013,9 +4016,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -4031,7 +4034,7 @@ msgstr "" "Per raster di orizzonte, legge dal DEM un buffer extra attorno alla regione " "attuale" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" @@ -4039,7 +4042,7 @@ msgstr "" "Per raster di orizzonte, legge dal DEM un buffer in direzione est rispetto " "alla regione attuale" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" @@ -4047,7 +4050,7 @@ msgstr "" "Per raster di orizzonte, legge dal DEM un buffer in direzione ovest rispetto " "alla regione attuale" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" @@ -4055,7 +4058,7 @@ msgstr "" "Per raster di orizzonte, legge dal DEM un buffer in direzione nord rispetto " "alla regione attuale" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" @@ -4063,12 +4066,12 @@ msgstr "" "Per raster di orizzonte, legge dal DEM un buffer in direzione sud rispetto " "alla regione attuale" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "La massima distanza da considerare nel trovare l'altezza di orizzonte" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4123,6 +4126,9 @@ msgstr "La massima distanza da considerare nel trovare l'altezza di orizzonte" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4143,46 +4149,58 @@ msgstr "La massima distanza da considerare nel trovare l'altezza di orizzonte" msgid "Optional" msgstr "Opzionale" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +#, fuzzy +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "Coordinata per la quale vuoi calcolare l'orizzonte" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Formato di output (in stile printf)" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Nome del file di output (utilizzare output=- per stampare a monitor)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Includi le etichette di categoria nell'output" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "Scrive l'output in gradi (il default è radianti)" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4191,91 +4209,108 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Impossibile aprire il file <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" "Non hai specificato il valore di direzione o la dimensione del passo. " "L'operazione verrà interrotta." -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" "Non hai specificato il nome di un raster di orizzonte. L'operazione verrà " "interrotta." -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" "Non hai specificato la misura del passo dell'angolo. L'operazione verrà " "interrotta." -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" "Impossibile leggere la dimensione della zona di buffer. L'operazione verrà " "interrotta." -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "est" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "ovest" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "sud" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "nord" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" "Impossibile leggere la distanza massima. L'operazione verrà interrotta." -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" +"Non è possibile ottenere le informazioni sulla proiezione della location " +"corrente" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" +"Non è possibile ottenere le unità della proiezione della location attuale" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" +"Non è possibile ottenere i valori chiave della proiezione della location " +"attuale" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "OOPS: righe cambiate da %d a %d" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "OOPS: colonne cambiate da %d a %d" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -5111,7 +5146,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Attributi" @@ -5190,7 +5225,7 @@ msgstr "Non è possibile creare l'indice" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Impossibile assegnare i privilegi sulla tabella <%s>" @@ -5319,7 +5354,7 @@ msgstr "File contenente le regole di ricodifica" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5520,9 +5555,9 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" msgstr "GRASS LOCATION PROJ_INFO è:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5537,10 +5572,13 @@ msgstr "Dataset importato PROJ_INFO è:\n" #: ../raster/r.in.pdal/projection.c:92 ../raster/r.in.lidar/projection.c:94 #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 +#, fuzzy msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" +"Si prenda in considerazione di generare una nuova location dal dataset di " +"input usando il parametro location\n" #: ../raster/r.in.pdal/projection.c:109 ../raster/r.in.pdal/projection.c:152 #: ../raster/r.in.pdal/projection.c:185 ../raster/r.in.lidar/projection.c:111 @@ -5751,9 +5789,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "Trasforma" @@ -5771,7 +5809,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5856,10 +5894,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5900,30 +5938,30 @@ msgstr "Scala da applicare ai dati z" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6052,128 +6090,128 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Stampa a video le statistiche con lo stile shell script" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "Il file di input <%s> non esiste" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Input <%s=%s> non valido" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Lettura dei dati in corso ..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Sovrascrive la proiezione (usa la proiezione della location)" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "Sovrascrive la proiezione (usa la proiezione della location)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Lettura punti in corso..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "Tovati %lu punti nella regione." -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Mappa raster <%s> creata." @@ -6273,7 +6311,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6307,7 +6345,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6339,7 +6377,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6395,9 +6433,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Numero massimo di iterazioni" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6413,8 +6451,8 @@ msgstr "Numero massimo di iterazioni" msgid "surface" msgstr "superficie" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6424,24 +6462,55 @@ msgstr "superficie" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Distribuzione media" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Deviazione standard" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6493,7 +6562,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6793,7 +6862,7 @@ msgstr "Errore nella lettura dei dati" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6899,7 +6968,6 @@ msgstr "Risoluzioni di griglia E-O e N-S diverse. Prendo la media." #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6985,8 +7053,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "Dimensione della finestra inappropriata (troppo grande o pari)" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "Proiezione lat/lon non supportata" #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7606,7 +7675,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7615,7 +7684,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Mappa raster non trovata" @@ -7720,7 +7789,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7744,17 +7813,17 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" "Non è possibile ottenere informazioni sulla proiezione della location " "corrente" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "Impossibile ottenere l'unità della proiezione della location corrente" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "Impossibile ottenere i valori della proiezione della location corrente" @@ -7829,7 +7898,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7879,17 +7948,14 @@ msgid "Output raster map required" msgstr "É richiesta la mappa raster di output" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "Il valore della distanza (%d): %lf dev'essere >= 0.0" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "Il valore dell'esponente (%lf) dev'essere >= 0.0" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7947,6 +8013,7 @@ msgstr "Generazione della mappa raster <%s> in corso..." #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -8089,7 +8156,7 @@ msgstr "Verrà importato il file con la griglia ascii SURFER (Golden Software)" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8172,7 +8239,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "Specificare un raggio min o max quando si usa il flag binario" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8231,7 +8298,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8292,7 +8359,7 @@ msgstr "Calcola le statistiche univariate per le celle non nulle di un raster" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "La tipologia del raster <%s> non combacia" @@ -8417,7 +8484,6 @@ msgid "Calculating flow directions..." msgstr "Calcolo delle direzioni di flusso in corso..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "direzione letta> %lf, vicini trovati: %i" @@ -8556,7 +8622,7 @@ msgstr "Applica il filtro solo per i valori null" msgid "<%d> is not valid number of threads." msgstr "<%s=%s> numero di punti non valido" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "Mappa raster troppo piccola per le dimensioni del filtro" @@ -8651,8 +8717,8 @@ msgstr "Percentuale di mappa da tenere in memoria" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8661,8 +8727,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "In modalità scansione, stampa usando lo stile dello script di shell" @@ -8680,7 +8746,7 @@ msgstr "Specificare un numero di colonna ragionevole." msgid "Please specify reasonable number of lines to skip" msgstr "Specificare un numero plausibile di linee da tralasciare" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "Range z non valido" @@ -9069,9 +9135,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" "La location Lat/Long non è supportata da %s. Prima riproiettare la mappa." @@ -9299,13 +9365,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "Media = %.5lf" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "Radice quadrata media (RMS) = %.5lf" @@ -9318,7 +9382,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9560,31 +9623,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9600,13 +9663,13 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" -msgstr "" +#, fuzzy +msgid "create project" +msgstr "Proiezione della sorgente" #: ../raster/r.in.gdal/main.c:118 msgid "Imports raster data into a GRASS raster map using GDAL library." @@ -9620,18 +9683,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Nome della location di destinazione delle immagini" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9655,10 +9718,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Nome della nuova location da creare" #: ../raster/r.in.gdal/main.c:195 @@ -9688,7 +9751,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9697,80 +9760,82 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" "Forza le mappe Lat/Lon per ricadere nelle coordinate geografiche (90N,S; " "180E,W)" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Usa i numeri delle bande invece che i nomi dei colori" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "Limita l'importazione alla regione corrente" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +#, fuzzy +msgid "You have to specify a target project different from output project" msgstr "" "Bisogna specificare una location d'origine differente da quella di output" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +#, fuzzy +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "La flag '-l' funziona solo in location Lat/Lon" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Mappa raster <%s> già esistente. Sarà sovrascritta" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "La mappa raster <%s> esiste già" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." @@ -9778,14 +9843,14 @@ msgstr "" "Il raster di input è capovolto o ruotato - non può essere importato. Si può " "utilizzare 'gdalwarp' per trasformare la mappa col Nord in alto." -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " @@ -9795,123 +9860,148 @@ msgstr "" "certamente controllare bordi e risoluzione della mappa con r.info e " "reimpostarli con r.region prima di andare ulteriormente avanti." -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "Si stanno copiando %d GCP nel file di punti per <%s>" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "I GCP hanno il seguente sistema di coordinate OpenGIS WKT:" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "Riproiezione della tabella dei GCP:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "* Proiezione di input per la tabella GCP: %s" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "* Proiezione dell'output per la tabella GCP: %s " -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"Non si è in grado di convertire la proiezione della mappa di input nel " +"formato di GRASS; impossibile creare una nuova location." + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" "Non è possibile tradurre i valori chiave di proiezione dei GCP di input" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "" "Impossibile ottenere informazioni sulla proiezione della location target" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "Impossibile ottene le unità della proiezione della location target" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "" "Impossibile ottene i valori chiave della proiezione della location target" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "Mapset <%s> nella location target <%s> - " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "permesso negato" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "non trovato" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"Non si è in grado di convertire la proiezione della mappa di input nel " +"formato di GRASS; impossibile creare una nuova location." + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10588,7 +10678,6 @@ msgid "Number of intermediate images to produce" msgstr "Numero di immagine intermediarie da produrre" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "La dimensione frattale di %.2lf deve essere tra 2 e 3." @@ -10703,6 +10792,18 @@ msgstr "Numero di walker" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10734,26 +10835,6 @@ msgstr "Intervallo di tempo per la creazione delle mappe di output [minuti]" msgid "Water diffusion constant" msgstr "Costante di diffusione dell'acqua" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10778,12 +10859,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10791,40 +10866,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "Più di 100 file stanno per essere creati !!!!!" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "predefinito nwalk=%d, rwalk=%f" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Input non riuscito" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "Non è possibile scrivere le mappe raster" @@ -10988,7 +11063,7 @@ msgstr "Fattore di pesatura per il vettore della velocità di flusso" msgid "Time-series output" msgstr "Output delle serie temporali" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "Non si sta producendo nessuna mappa raster" @@ -11237,29 +11312,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "output= e method= devono avere lo stesso numero di valori" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11314,115 +11389,115 @@ msgstr "File <%s> creato" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Valore random minimo" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Valore random massimo" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "Crea una mappa raster di valori interi" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 +#: ../raster/r.flow/mem.c:40 +#, c-format +msgid "Unable to write segment file for %s" +msgstr "" + +#: ../raster/r.flow/precomp.c:47 +msgid "Precomputing e/w distances..." +msgstr "" + +#: ../raster/r.flow/precomp.c:49 +msgid "Precomputing quantization tolerances..." +msgstr "" + +#: ../raster/r.flow/precomp.c:52 +msgid "Precomputing inverted elevations..." +msgstr "" + +#: ../raster/r.flow/precomp.c:56 +msgid "Precomputing interpolated border elevations..." +msgstr "" + +#: ../raster/r.flow/precomp.c:62 +msgid "Precomputing re-oriented aspects..." +msgstr "" + +#: ../raster/r.flow/precomp.c:66 +msgid "Precomputing aspects..." +msgstr "" + +#: ../raster/r.flow/precomp.c:109 +#, c-format +msgid "" +"Resolution too unbalanced:\n" +"atan2(%f deg, %f deg) =%f < %f tolerance\n" +"please resample input map" +msgstr "" + +#: ../raster/r.flow/precomp.c:114 +#, c-format +msgid "Resolution too unbalanced (%f x %f); please resample input map" +msgstr "" + +#: ../raster/r.flow/flow_io.c:89 msgid "Elevation raster map resolution differs from current region resolution" msgstr "" -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 #: ../raster/r.buffer/read_map.c:51 #, c-format msgid "Reading input raster map <%s>..." msgstr "Lettura della mappa raster di input <%s> in corso..." -#: ../raster/r.flow/io.c:107 +#: ../raster/r.flow/flow_io.c:107 msgid "Resolution of aspect file differs from current region resolution" msgstr "" "La risoluzione del file di esposizione è diversa da quella della regione " "corrente" -#: ../raster/r.flow/io.c:124 +#: ../raster/r.flow/flow_io.c:124 msgid "Reading input files: barrier" msgstr "" -#: ../raster/r.flow/io.c:152 +#: ../raster/r.flow/flow_io.c:152 #, c-format msgid "Cannot create segment file %s" msgstr "Cannot create segment file %s" -#: ../raster/r.flow/io.c:157 +#: ../raster/r.flow/flow_io.c:157 #, c-format msgid "Cannot format segment file %s" msgstr "" -#: ../raster/r.flow/io.c:163 +#: ../raster/r.flow/flow_io.c:163 #, c-format msgid "Cannot open segment file %s" msgstr "" -#: ../raster/r.flow/mem.c:40 -#, c-format -msgid "Unable to write segment file for %s" -msgstr "" - -#: ../raster/r.flow/precomp.c:47 -msgid "Precomputing e/w distances..." -msgstr "" - -#: ../raster/r.flow/precomp.c:49 -msgid "Precomputing quantization tolerances..." -msgstr "" - -#: ../raster/r.flow/precomp.c:52 -msgid "Precomputing inverted elevations..." -msgstr "" - -#: ../raster/r.flow/precomp.c:56 -msgid "Precomputing interpolated border elevations..." -msgstr "" - -#: ../raster/r.flow/precomp.c:62 -msgid "Precomputing re-oriented aspects..." -msgstr "" - -#: ../raster/r.flow/precomp.c:66 -msgid "Precomputing aspects..." -msgstr "" - -#: ../raster/r.flow/precomp.c:109 -#, c-format -msgid "" -"Resolution too unbalanced:\n" -"atan2(%f deg, %f deg) =%f < %f tolerance\n" -"please resample input map" -msgstr "" - -#: ../raster/r.flow/precomp.c:114 -#, c-format -msgid "Resolution too unbalanced (%f x %f); please resample input map" -msgstr "" - #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -12142,7 +12217,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12156,12 +12231,13 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "Riproietta una mappa vettoriale da una location alla location corrente" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "Location contenente la mappa raster di input" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12187,10 +12263,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "Nome della mappa raster di input da riproiettare" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Percorso al database GRASS della location di input" #: ../raster/r.proj/main.c:174 @@ -12246,12 +12321,13 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "Location di input e output non possono essere le stesse" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +#, fuzzy +msgid "Input and output projects are the same" msgstr "Location di input e output sono le stesse" #: ../raster/r.proj/main.c:268 @@ -12272,13 +12348,13 @@ msgstr "" "output" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "Mapset <%s> nella location di input <%s> - %s" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Controllo della location <%s> mapset <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12286,15 +12362,15 @@ msgstr "Controllo della location <%s> mapset <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Parametro richiesto <%s> non impostato" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "Mappa raster <%s> nella location <%s> nel mapset <%s> non trovata" #: ../raster/r.proj/main.c:323 @@ -12315,12 +12391,13 @@ msgstr "" "intput" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "Impossibile lavorare con dati non proiettati (location xy)" #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" msgstr "Mappa di input <%s@%s> nella location <%s>:" #: ../raster/r.proj/main.c:524 @@ -12402,7 +12479,7 @@ msgid "Sorting events..." msgstr "Importazione dei punti in corso ..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12662,8 +12739,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12834,8 +12912,9 @@ msgid "S_decode ==> Please fix the shadowband sky factor: %f" msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 +#, fuzzy msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" "Impossibile calcolare la posizione del sole in una location non proiettata. " @@ -12850,6 +12929,23 @@ msgstr "" "Il punto specificato %f, %f è fuori dalla regione corrente, è stato fatto " "intenzionalmente? Comunque, sarà utilizzato." +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "" +"Non è possibile ottenere informazioni sulla proiezione della location " +"corrente" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Impossibile ottenere l'unità della proiezione della location corrente" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Impossibile ottenere i valori della proiezione della location corrente" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13472,18 +13568,21 @@ msgid "Current projection is x,y (undefined)." msgstr "La proiezione corrente è x-y (non definita)." #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +#, fuzzy +msgid "Cannot get projection info of current project" msgstr "" "Non è possibile ottenere le informazioni sulla proiezione della location " "corrente" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +#, fuzzy +msgid "Cannot get projection units of current project" msgstr "" "Non è possibile ottenere le unità della proiezione della location corrente" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +#, fuzzy +msgid "Cannot get projection key values of current project" msgstr "" "Non è possibile ottenere i valori chiave della proiezione della location " "corrente" @@ -13565,7 +13664,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s=%s - dev'essere un numero non negativo" @@ -13575,7 +13674,7 @@ msgstr "%s=%s - dev'essere un numero non negativo" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s=%s - dev'essere un numero positivo" @@ -13665,7 +13764,7 @@ msgstr "Impossibile leggere l'intervallo fp della mappa raster <%s>" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Impossibile creare la tabella: %s" @@ -13674,7 +13773,7 @@ msgstr "Impossibile creare la tabella: %s" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Impossibile creare l'indice per la tabella <%s>, chiave <%s>" @@ -13989,7 +14088,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -14000,19 +14099,19 @@ msgstr "" msgid "position" msgstr "posizione" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Nome del raster da interrogare" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Coordinate da interrogare" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14020,15 +14119,28 @@ msgstr "Coordinate da interrogare" msgid "Query" msgstr "Interroga" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14037,63 +14149,72 @@ msgstr "" msgid "Advanced" msgstr "Avanzato" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "Mostra le etichette delle celle" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "I valori del colore di output come RRR:GGG:BBB " -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" "Visualizzare i valori delle categorie integer e non i valori delle celle" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Interpretazione della larghezza come intero fallita" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importa un MAT-File(v4) binario in un raster GRASS" @@ -14263,9 +14384,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14609,21 +14727,21 @@ msgstr "I valori di smoothing non possono essere negativi o NULL" msgid "Input map resolution differs from current region resolution!" msgstr "La risoluzione della mappa è diversa da quella della regione corrente" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14818,82 +14936,82 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -"Si deve specificare almeno uno dei parametri: <%s>, <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s> o <%s>" +"Si deve specificare almeno uno dei parametri: <%s>, <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s> o <%s>" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Tipo di raster non corretto: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "Esposizione min calcolata %.4f, esposizione max calcolata %.4f" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Mappa raster delle esposizioni <%s> completata" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "Pendenza min calcolata %.4f, pendenza max calcolata %.4f" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Mappa raster delle pendenze <%s> completata" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "Mappa raster della curvatura del profilo <%s> completata" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Mappa raster della curvatura tangenziale <%s> completata" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "Mappa raster delle pendenze E-O <%s> completata" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "Mappa raster delle pendenze N-S <%s> completata" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Mappa raster Dxx <%s> completata" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Mappa raster Dyy <%s> completata" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Mappa raster Dxy <%s> completata" @@ -15861,32 +15979,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "SEZIONE 4: determinazione RUSLE LS e/o fattore S" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "SEZIONE 3: Superficie del flusso di accumulazione con SFD." -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "MFD: proporzione cumulata del flusso di distribuzione non 1.0 ma %f" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15902,61 +16020,61 @@ msgstr "SEZIONE %d: Chiudendo Mappe." msgid "SECTION %d: Watershed determination." msgstr "SEZIONE %d: Determinazione del bacino idrografico." -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15980,7 +16098,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16926,46 +17043,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "Differenza massima tra questo e l'ultimo incremento: %g" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Impossibile creare e risolvere il sistema di equazioni lineari" @@ -17291,7 +17408,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17753,8 +17870,8 @@ msgstr "Valori RRR:GGG:BBB di colore di output per ogni punto del profilo" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17881,97 +17998,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "Non è possibile leggere l'intestazione LAS di <%s>" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -18245,11 +18362,11 @@ msgstr "Impossibile aprire il file <%s> per scrivere l'etichetta" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18451,32 +18568,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18559,8 +18676,9 @@ msgid "Units" msgstr "Unità" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Predefinito: centro della mappa" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18582,8 +18700,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -19344,8 +19463,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -19355,28 +19474,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "Errore del parametro" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "Coordinate non valide: [%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19385,57 +19504,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" "File contenente le coordinate da trasformare (\"-\" per leggere dallo stdin)" @@ -19445,7 +19564,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19454,7 +19573,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19972,6 +20091,10 @@ msgstr "Non è possibile leggere l'intervallo dati della mappa raster <%s>" msgid "Error while reading history file" msgstr "Errore nella lettura del file della cronologia" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "GRASS LOCATION PROJ_INFO è:\n" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -20030,64 +20153,73 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "Sovrascrive la proiezione (usa la proiezione della location)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "Impossibile creare la mappa raster 3D <%s>" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "Lettura punti in corso..." -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -20193,7 +20325,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -20206,10 +20337,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -20223,11 +20352,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "mostra" @@ -20721,10 +20850,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20780,9 +20909,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Tipo" @@ -20842,13 +20971,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -21213,71 +21342,72 @@ msgid "Save current region settings in named region file" msgstr "" "Salva le impostazioni della regione corrente in un file di regione con nome" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Regione <%s> non trovata" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "Non è possibile leggere l'intestazione della mappa raster <%s@%s>" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "Non è possibile impostare la regione <%s>" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "Non è possibile aggiornare la regione corrente" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" "Non è possibile cambiare la regione predefintia. Il mapset corrente non è " "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "Output WGS84 impossible a causa dell'assenza di parametri di trasformazione " "del datum. Prova ad eseguire g.setproj." -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "Non è possibile aggiornare i parametri della proiezione lat/long" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21521,8 +21651,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21790,166 +21920,169 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +#, fuzzy +msgid "Can also be used to create new GRASS projects." msgstr "Può essere usato anche per creare le location di GRASS." -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "Stampa le informazioni sulla proiezione nel formato GRASS" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "Stampa le informazioni sulla proiezione nello stile script shell" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" "Verifica le informazioni sul datum e stampa i parametri di trasformazione" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Stampa le informazioni di proiezione in formato PROJ4" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" "Stampa output 'flat' senza interruzioni di riga (applicabile ad output WKT e " "PROJ4)" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 #, fuzzy msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" "Stampa output 'flat' senza interruzioni di riga (applicabile ad output WKT e " "PROJ4)" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "Stampa le informazioni di proiezione in formato WKT" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "Usa formato in stile ESRI (solo per il formato WKT)" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "Specifica " -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" "Nome del file di dati georeferenziati dal quale leggere le informazioni " "sulla proiezione" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "Nome del file ASCII contenente la descrizione di una proiezione WKT" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "Descrizione della proiezione in stile PROJ4" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "Codice EPSG della proiezione" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "Datum" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" -msgstr "" +#: ../general/g.proj/main.c:216 +#, fuzzy +msgid "Modify current project's projection files" +msgstr "Non è possibile creare i file della proiezione: %s" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Crea" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Nome della nuova location da creare" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Mancano le informazioni sulla proiezione" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" "Solo una delle seguenti opzioni -%c, -%c, -%c, -%c, -%c o -%c può essere " "specificata" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" "Solo una delle seguenti opzioni -%c, -%c, -%c, -%c, -%c o -%c può essere " "specificata" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -22041,8 +22174,8 @@ msgstr "" "proiezione)'" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" msgstr "Non è possibile creare la location <%s>: %s" #: ../general/g.proj/create.c:21 @@ -22051,100 +22184,100 @@ msgid "Unable to create projection files: %s" msgstr "Non è possibile creare i file della proiezione: %s" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Impossibile creare il file <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "Informazioni sulla proiezione aggiornate" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" "Stampa un messaggio, un avvertimento, informazioni sullo stato di " "avanzamento, o un errore fatale alla maniera di GRASS." -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "Stampa il messaggio come avvertimento" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "Stampa il messaggio come errore fatale" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "Stampa il messaggio come messaggio di debug" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "Stampa il messaggio come informazioni sullo stato di avanzamento" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "Livello" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Testo del messaggio da stampare" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "Non è possibile eseguire il parsing del messaggio di input" @@ -22287,7 +22420,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -22370,35 +22504,58 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "Il mapset corrente è <%s>" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "Mapset disponibili:" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 +#, fuzzy msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" "Influisce sull'accesso da parte dell'utente ai dati esistenti negli altri " "mapset nella location corrente." -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22407,69 +22564,75 @@ msgstr "" msgid "Operation to be performed" msgstr "Operazione da eseguire" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" -msgstr "" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" +msgstr "Formato di output (in stile printf)" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "Elenca tutti i mapset disponibili in ordine alfabetico" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "Visualizza i mapset presenti nel percorso di ricerca corrente" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Inserire una regola in uno di questi formati:" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "Mapset <%s> non trovato" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "Mapset <%s> aggiunto al percorso di ricerca" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "Mapset <%s> rimosso dal percorso di ricerca" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22484,37 +22647,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22873,7 +23033,7 @@ msgstr "deviazione standard" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -24069,7 +24229,7 @@ msgstr "Trasformazione avvenuta con successo" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -24164,17 +24324,19 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "Il gruppo <%s> è stato assegnato alla location [%s], mapset [%s]" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Nome della location di destinazione delle immagini" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -24206,35 +24368,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" msgstr "Location di destinazione [%s] non trovata\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "Mapset <%s> nella location target <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "permesso negato\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "non trovato\n" @@ -24287,61 +24450,66 @@ msgstr "Mancano le informazioni sulla destinazione per il gruppo <%s>" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" msgstr "Location di destinazione <%s> non trovata" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "Mapset <%s> nella location target <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -24351,30 +24519,32 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Nome del gruppo di immagini per l'ortorettificazione" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Non è possibile accedere al percorso dei font %s: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "Le informazioni sulla proiezione non saranno aggiornate" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" +msgstr "Il gruppo <%s> è stato assegnato alla location [%s], mapset [%s]" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -24488,15 +24658,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 -#, c-format -msgid "Rectify <%s@%s> (location <%s>)" +#, fuzzy, c-format +msgid "Rectify <%s@%s> (project <%s>)" msgstr "Rettifica <%s@%s> (location <%s>)" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." msgstr "in <%s@%s> (location <%s>) ..." #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24537,101 +24705,101 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" +"Salva le impostazioni della regione corrente in un file di regione con nome" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "Gruppo <%s> non trovato" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "Non è possibile creare la location <%s>: %s" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "Impossibile leggere il file REF per il gruppo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "Il gruppo <%s> non contiene raster; eseguire i.group" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "L'estensione <%s> non è valida" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "La mappa raster seguente esiste già in" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "LOCATION di destinazione %s, MAPSET %s:" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Il gruppo <%s> è stato assegnato alla location [%s], mapset [%s]" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "La risoluzione del target deve essere > 0, ignorata" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "Si sta usando la regione: N=%f S=%f E=%f O=%f" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "Il raster di input <%s> non esiste nel gruppo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "Prova:" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "Uscita!" @@ -24755,6 +24923,16 @@ msgstr "Regione N=%f S=%f E=%f O=%f" msgid "Resolution EW=%f NS=%f" msgstr "Risoluzionen EW=%f NS=%f" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "Rettifica <%s@%s> (location <%s>)" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "in <%s@%s> (location <%s>) ..." + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24773,6 +24951,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24782,6 +24965,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "Ordine non valido (%d); prego inserire da 1 a %d" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "LOCATION di destinazione %s, MAPSET %s:" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "Location di destinazione <%s> non trovata" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "Mapset <%s> nella location target <%s> - " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -25152,6 +25355,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "proiezione" @@ -26744,8 +26948,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -27077,17 +27281,14 @@ msgid "Preliminary scene analysis:" msgstr "Analisi della scena preliminare:" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "* Indice di deserto: %.2lf" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "* Copertura nevosa: %.2lf %%" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "* Copertura nuvolare: %.2lf %%" @@ -27096,17 +27297,14 @@ msgid "* Temperature of clouds:" msgstr "* Temperatura delle nuvole:" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "** Massimo: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "** Media (%s nuvole): %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "** Minimo: %.2lf K" @@ -27115,17 +27313,14 @@ msgid "Histogram cloud signature:" msgstr "Istogramma della firma delle nuvole:" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "* Temperatura media: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "* Deviazione standard: %.2lf" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -27135,17 +27330,14 @@ msgid "* Histogram classes: %d" msgstr "* Classi dell'istogramma: %d" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "* 98.75 percentile: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "* 97.50 percentile: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "* 83.50 percentile: %.2lf K" @@ -27154,12 +27346,10 @@ msgid "Maximum temperature:" msgstr "Temperatura massima:" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "* Nuvola fredda: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "* Nuvola calda: %.2lf K" @@ -27959,6 +28149,7 @@ msgid "Apriori Phi (roll) standard deviation" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27970,6 +28161,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -28518,11 +28714,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28572,7 +28772,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28667,16 +28867,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Colonna <%s> non trovata nella tabella <%s>" @@ -29255,6 +29454,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Colonne degli attributi contenenti dati" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Numero di punti da creare" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -29297,6 +29532,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -29333,66 +29570,77 @@ msgstr "Mappe di input" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Nome della mappa raster di output" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Nome della mappa vettoriale di output" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Nome della mappa raster di output" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Nome della mappa vettoriale di output" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Nome della mappa raster di output" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 #, fuzzy msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "Nome del file metadata Landsat (.met o MTL.txt)" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Nome del file del database" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Fattore di scala verticale" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Impossibile creare i file temporanei" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "Nome di base delle bande raster di input" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Coordinate del punto seed" @@ -29474,243 +29722,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "input" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" -"Visualizza/imposta la connessione per una mappa vettoriale alla tabella " -"degli attributi" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Nome della mappa vettoriale" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Numero di layer" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "Numero o nome del layer 'to'" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Troppi nomi di colonna" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Numero di colonne nella nuova regione" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "Formato dei file di output" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Tipo di dati memorizzati per la mappa raster risultante" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "riclassificazione" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Nome del raster contenente il risultato della classificazione" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -29923,6 +29942,532 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Crea una mappa raster di valori interi" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Nome della location di destinazione delle immagini" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Nome della mappa/e vettoriale di sfondo" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Nome del layer di output" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s: specificazione di valore non consentita" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "Mappa vettoriale di output in cui verranno scritti i segmenti" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Generare punti vettoriali come punti 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Nome del layer di input" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Generare punti vettoriali come punti 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nome della mappa/e vettoriale di sfondo" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Nome della mappa raster da visualizzare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Scrivendo i dati trasformati su file..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +#, fuzzy +msgid "Multiply all automatic regularization parameters by this number." +msgstr "Moltiplica il risultato di densità per questo numero" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Ricerca degli elementi più vicini in corso..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Selezione degli elementi in corso..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Selezione degli elementi in corso..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Selezione degli elementi in corso..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "visualizzazione" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Location: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Percentuale of tempo CPU da usare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "Punto di riferimento" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Numero di livelli da utilizzare per <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Errore massimo di integrazione" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Fattore d convergenza per MFD (1-10)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Metodo da usare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Metodo da usare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Metodo da usare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Numero di volte da ripetere il filtro" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Rimozione dei centroidi duplicati in corso ..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Titolo per la nuova mappa raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Numero di livelli di quantizzazione" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +#, fuzzy +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "Memoria massima da utilizzare con la flag -m (in MB)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -30148,10 +30693,15 @@ msgstr "Tabella da importare o stringa di connessione al Database" msgid "Name for output vector map" msgstr "Nome della mappa vettoriale di output" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "Sovrascrive la proiezione (usa la proiezione della location)" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -30395,6 +30945,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31617,7 +32175,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31664,11 +32222,6 @@ msgstr "" msgid "landscape" msgstr "Landsat" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -32785,7 +33338,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Numero o nome del layer 'to'" @@ -32827,6 +33379,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Impostazione del nome della mappa a <%s>" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -33211,7 +33775,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -33408,7 +33971,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Mappe di input" @@ -33444,6 +34007,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Percorso al database GRASS della location di input" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -34508,11 +35080,8 @@ msgstr "File di configurazione" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -34562,45 +35131,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Colore di sfondo" +msgid "Thin species and background points" +msgstr "Numero di punti per l'interpolazione" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Colore di sfondo" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Numero di colonna dei valori dei dati nel file di input" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Sto generando punti..." @@ -35415,8 +35998,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -35427,6 +36019,7 @@ msgid "Group of raster layers to be classified" msgstr "Tipo della mappa raster da creare" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -35469,11 +36062,13 @@ msgstr "" "Nome della colonna numerica contenente l'angolo di rotazione del simbolo" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Mappa in output" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35779,6 +36374,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -35790,6 +36386,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -35819,6 +36416,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "File delle etichette" @@ -36192,67 +36790,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "Nome della mappa raster di input del reticolo idrografico codificato" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Nome della mappa raster di output" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "Nome del risultato raster 3D di accumulo di flusso" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "Lunghezza in unità di mappa" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36609,11 +37146,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -37504,6 +38043,14 @@ msgid "" "mapset." msgstr "Riproietta una mappa vettoriale da una location alla location corrente" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "Location contenente la mappa raster di input" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Percorso al database GRASS della location di input" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37642,12 +38189,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37795,9 +38342,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -37840,19 +38386,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Estende le dimensioni della regione basandosi sul nuovo dataset" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -37861,7 +38418,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "Elenca i tematismi disponibili nell'origine dati ed esce" @@ -37999,34 +38556,6 @@ msgstr "Nome del database in input" msgid "Base name for output file" msgstr "Nome del file in output" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "topologia" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Colonne degli attributi contenenti dati" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Numero di punti da creare" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -38702,6 +39231,10 @@ msgstr "Nome del file SVG in output" msgid "Queries projection information spatially." msgstr "Informazioni sulla proiezione aggiornate" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -38996,8 +39529,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Dissolve i confini tra aree adiacenti che condividono categorie o attributi " @@ -39030,8 +39564,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Nome colonna degli attributi da usare per l'opzione 'query'" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39771,9 +40306,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -40025,6 +40566,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40036,6 +40578,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -40148,6 +40695,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -41198,8 +41753,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -41297,39 +41852,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Elenco dei tematismi da importare" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -44671,8 +45235,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "monitor" @@ -44710,6 +45274,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -45127,6 +45692,13 @@ msgstr "riclassifica" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -45185,6 +45757,20 @@ msgstr "" msgid "Register empty maps" msgstr "Registra mappe vuote" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Linee vettoriali" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Linee vettoriali" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -45224,6 +45810,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Numero di iterazioni" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Tipo della mappa raster da creare" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Numero di volte da ripetere il filtro" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -45659,8 +46277,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -46418,6 +47036,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Nome del raster di output (saturazione)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Nome della nuova location da creare" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -46719,6 +47341,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Fattore di scala per l'elevazione" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -47166,10 +47792,94 @@ msgstr "Esagerazione verticale" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "File delle etichette" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Nome del layer di input" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Nome della mappa vettoriale da modificare" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Layer/tabella" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Creazione della mappa raster 3D" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Nome della mappa raster da utilizzare per <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parametri" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Visualizza x e y (colonna e riga)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "topologia" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Colonne degli attributi contenenti dati" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -47703,17 +48413,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -47741,24 +48441,21 @@ msgid "categorical map with zones" msgstr "Punti vettoriale" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nome del file in output" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 #, fuzzy msgid "Plot dimensions (width,height)" msgstr "Mostra le dimensioni dello schermo (larghezza, altezza)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Dimensione (larghezza, altezza) dell'immagine di output" @@ -47770,9 +48467,8 @@ msgid "Default font size" msgstr "L'unità di default è la cella" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -47792,13 +48488,11 @@ msgid "Create a vector point layer of outliers" msgstr "Generare punti vettoriali come punti 3D" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -47809,14 +48503,12 @@ msgid "Draw notches" msgstr "Modalità disegno" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -47849,14 +48541,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -47868,27 +48552,23 @@ msgid "Plot format" msgstr "Formato di input" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Visualizza le etichette delle categorie" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -47937,15 +48617,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -47965,7 +48636,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Dimensione icona" @@ -47976,53 +48646,44 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Spessore della linea vettoriale" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Formato dei file di output" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "Colore del testo e delle assi" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Colore per i dati Y" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 #, fuzzy msgid "Flier marker" msgstr "Indicatore di icona" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -48030,111 +48691,26 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "Bytes non corrisponde alla dimensione del file" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Colore del margine" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Imposta il colore del testo" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Nome della mappa/e raster di output" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Nome della mappa/e raster di output" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Risoluzione" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Modalità disegno" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Visualizza le etichette delle categorie" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Formato della tabella" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Colore del testo" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -49388,6 +49964,14 @@ msgstr "Ordina il risultato" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -49417,6 +50001,7 @@ msgid "no-data" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49428,12 +50013,26 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 msgid "add grid lines" msgstr "Etichettate %d linee" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Colore del testo" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -49533,312 +50132,312 @@ msgstr "" "Rinomina una colonna nella tabella degli attributi connessa a una mappa " "vettoriale" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Linee vettoriali" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Numero di colonne" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "" "Nome della colonna della tabella degli attributi da utilizzare per le " "etichette" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Nome della colonna del grado di centralità (degree centrality)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "" "Nome della colonna della tabella degli attributi da utilizzare per le " "etichette" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Tipo di elemento" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Nome del file raster di output" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Nome per il file immagine di output (senza estensione)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Estensione per i file in output" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Opzioni di input" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "p-esimo percentile dei valori" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "statistiche" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 #, fuzzy msgid "Dot marker" msgstr "Indicatore di icona" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Colore del testo" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Colore per i dati Y" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "colonna" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "Nome della mappa dei colori di input" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Colore dell'elemento" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "linea" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Opzioni di input" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "tabella dei colori" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Colore del testo e delle assi" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Spessore della linea vettoriale" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Colore della linea" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "Colore del testo e delle assi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Larghezza della pagina non valida" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Elenco di percentuali" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Campo di variazione dei valori interi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Nome della mappa raster da mostrare" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Campo di variazione dei valori interi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Nome della mappa raster da mostrare" @@ -50196,8 +50795,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -50280,185 +50879,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Punti vettoriale" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Richiesto" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Nome della colonna contenente dati numerici" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Nome della colonna contenente le coordinate x" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -#, fuzzy -msgid "Format: All values must be >0" -msgstr "Il valore di soglia dev'essere >= 0" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Formato del file di input" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Mappa delle esposizioni (o fy) di output" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "Input opzionali" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Mappa delle esposizioni (o fy) di output" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Zona/e di distanza" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Estensione per i file in output" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Nome della tabella in output" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Nome della mappa vettoriale di output" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Nome ella mappa raster di output della curvatura del profilo" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Nome del file in output o del dispositivo GPS" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Nome della mappa raster da mostrare" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Formato" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Nome della mappa raster da mostrare" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Numero di livelli da utilizzare per ogni componente" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Selezione inversa" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -51293,11 +51713,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -57053,6 +57468,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "Output da v.select" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Utilizza la regione corrente" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -57608,8 +58063,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -57916,8 +58371,9 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +#, fuzzy +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "Usa il calcolo geodetico per le location longitudine-latitudine" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -59589,7 +60045,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -59603,7 +60059,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -60135,7 +60591,7 @@ msgstr "Tipo di componenti" msgid "Add points on nodes" msgstr "Aggiunge punti sui nodi" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -60429,7 +60885,7 @@ msgstr "" "Il vettoriale di output, tabella <%s> (driver: <%s>, database: <%s>) esiste " "già" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "Il tipo di dati della colonna chiave dev'essere intero" @@ -62249,51 +62705,47 @@ msgstr "" "Stampa i tipi/nomi delle colonne della tabella del layer selezionato ed esce" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Sovrascrive il parametro di connessione per alcuni layer" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" "Cancella la connessione al database di alcuni layer (ma non la tabella)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Per favore scegli un solo stile di output" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" "Impossibile modificare la mappa vettoriale che si trova in un altro mapset" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Connessione al database non definita" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -62303,17 +62755,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "Usa il flag -o per sovrascrivere il link esistente del layer <%d>" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "La tabella <%s> non esiste nel database <%s>" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -62322,16 +62774,16 @@ msgstr "" "La tabella <%s> è ora parte del vettoriale <%s> e può essere cancellata o " "sovrascritta dai moduli GRASS" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Non è possibile assegnare i permessi sulla tabella %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Permessi selezionati concessi alla tabella" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -62370,7 +62822,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -62447,180 +62899,180 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" "Selezionare o il flag per la regione corrente o l'opzione spatial, non " "entrambi" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "Per il parametro 'spatial' sono richiesti 4 parametri" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "La mappa vettoriale <%s> esiste già e sarà sovrascritta" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "La mappa vettoriale <%s> esiste già" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -63106,7 +63558,7 @@ msgstr "Etichette di colonne non specificate, nessuna etichetta sarà scritta" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -63349,11 +63801,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -63380,7 +63832,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "Layer <%s> non disponibile" @@ -63389,7 +63841,7 @@ msgstr "Layer <%s> non disponibile" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "Impossibile aprire l'origine dati <%s>" @@ -63409,7 +63861,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -63445,11 +63897,13 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "Riproietta una mappa vettoriale da una location alla location corrente" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "Location contenente la mappa vettoriale di input" #: ../vector/v.proj/main.c:88 @@ -63484,13 +63938,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Location di input e output non possono essere le stesse" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "Mappa vettoriale <%s> nella location <%s> mapset <%s> non trovata" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -63504,13 +63963,13 @@ msgid "Input vector map <%s> is empty" msgstr "" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" +msgstr "Mapset <%s> nella location di input <%s> - %s" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "Mapset <%s> nella location di input <%s> non trovato" #: ../vector/v.proj/main.c:517 @@ -64488,7 +64947,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -65140,7 +65599,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -65447,12 +65906,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -65652,19 +66111,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "Si sta rompendo i poligoni..." #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Rimozione dei duplicati in corso..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -65874,7 +66333,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -66032,10 +66491,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -66074,6 +66533,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "Input opzionali" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -66174,9 +66637,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "Impossibile creare %s" @@ -66190,7 +66653,7 @@ msgstr "Impossibile aprire %s" msgid "Vector is not 3D" msgstr "Il vettore non è 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "Impossibile creare la tabella '%s'" @@ -66275,7 +66738,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -66303,8 +66765,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -66964,7 +67426,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "Non è possibile calcolare il centroide dell'area" @@ -67098,8 +67560,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -68902,17 +69364,17 @@ msgstr "" "Errore nella lettura della mappa vettoriale <%s> - alcuni dati possono non " "essere corretti" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -69088,13 +69550,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -69347,42 +69809,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Tematismo di punti" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "Stampa solo le istruzioni SQL" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Quest'opzione richiede una colonna" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Quest'opzione richiede due colonne" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Quest'opzione richiede almeno due colonne" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "Il parametro qcolumn' dev'essere specificato per 'option=query'" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "L'opzione 'sides' si usa solo per i confini" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "L'opzione 'sinuous' si usa solo per le linee" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "L'opzione 'azimuth' si usa solo per le linee" @@ -69578,8 +70045,8 @@ msgstr "" #, c-format msgid "Unable to add database link for vector map <%s>" msgstr "" -"Impossibile aggiungere il collegamento al database per la mappa vettoriale <" -"%s>" +"Impossibile aggiungere il collegamento al database per la mappa vettoriale " +"<%s>" #: ../vector/v.clean/split.c:86 #, c-format @@ -70370,16 +70837,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Visualizza gli attributi della mappa vettoriale" @@ -71830,67 +72287,67 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" "Il nome della mappa vettoriale di output <%s> non è un nome di mappa valido" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -72179,7 +72636,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "Sto interrogando la mappa vettoriale <%s>" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Sto scrivendo i centroidi..." @@ -72638,164 +73095,165 @@ msgstr "Connessione al database non definita per il layer <%s>" msgid "Unable to open driver <%s>" msgstr "Impossibile aprire il driver <%s>" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Proiezioni" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -72976,28 +73434,58 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" +"La proiezione del dataset sembra non corrispondere a quella della location " +"corrente.\n" +"\n" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" +"La proiezione del dataset di input e della location corrente sembrano " +"corrispondere" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "Converte un file DWG/DXF in una mappa vettoriale di GRASS" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -73074,274 +73562,274 @@ msgstr "Non esegue la pulizia (clean) dei poligoni (non raccomandato)" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "Trasforma i nomi delle colonne in caratteri minuscoli" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "Si sta usando il vettore temporaneo <%s>" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "%d poligoni di input\n" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "%d poligoni di input" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "Area totale: %G (%d aree)\n" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "Area totale: %G (%d aree)" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "Area di sovrapposizione: %G (%d aree)\n" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "Area di sovrapposizione: %G (%d aree)" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "Aree senza categoria: %G (%d aree)\n" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "Aree senza categoria: %G (%d aree)" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -73350,51 +73838,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -73550,10 +74038,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "Il gruppo <%s> è stato assegnato alla location [%s], mapset [%s]" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Location di destinazione <%s> non trovata" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "Eseguire i.target per il gruppo" @@ -73719,7 +74217,7 @@ msgstr "Percorso del file del font" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -73727,7 +74225,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -73735,7 +74233,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -78170,6 +78668,10 @@ msgstr "" msgid "Highlight color" msgstr "Colore di evidenziazione" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "Usa il calcolo geodetico per le location longitudine-latitudine" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -78745,6 +79247,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Impossibile aprire il file '%s' per la lettura" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Impossibile aprire il file per <%s> per la scrittura" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -79028,6 +79547,7 @@ msgstr "L'intervallo dati è da %ld a %ld\n" msgid "Problem parsing coordinates [%s]" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../raster/r.colors/rules.c:81 @@ -79038,6 +79558,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../display/d.graph/do_graph.c:98 msgid "Unable to read color" msgstr "Non è possibile leggere il colore" @@ -79052,6 +79574,9 @@ msgid "Unable to open color rule" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -79611,7 +80136,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -79850,22 +80375,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -81898,38 +82416,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -82009,11 +82527,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -82038,103 +82556,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -82146,336 +82664,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -82528,50 +83046,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -82599,7 +83117,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -82817,7 +83335,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -82874,85 +83392,88 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Utilizza le coordinate della mappa invece delle coordinate xyz" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Creando file temporanei..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Creazione di alcuni file temporanei in corso..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" msgstr "" +"Non è possibile ottenere informazioni sulla proiezione della location " +"corrente" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -82998,28 +83519,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -83076,27 +83597,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Non è possibile aprire l'origine dati OGR '%s'" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -83106,7 +83627,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -83116,14 +83636,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -83131,72 +83651,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -83423,7 +83943,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -83441,64 +83961,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -83638,79 +84159,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -83822,40 +84343,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -83891,7 +84412,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -83902,34 +84423,35 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." -msgstr "" +#: ../scripts/r.unpack/r.unpack.py:143 +#, fuzzy +msgid "Overriding projection check (using current project's CRS)." +msgstr "Sovrascrive la proiezione (usa la proiezione della location)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -84021,34 +84543,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -84127,317 +84649,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Regione <%s> non trovata" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -84445,60 +84967,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -84550,27 +85072,38 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Non è possibile aprire il file delle regole <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Colonna <%s> non trovata nella tabella <%s>" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Errore nell'interpretazione del colore %s" + +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -84616,16 +85149,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -84696,41 +85219,49 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Mappa raster <%s> non trovata nel mapset corrente" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -84778,20 +85309,186 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "" +#~ "Visualizza/imposta la connessione per una mappa vettoriale alla tabella " +#~ "degli attributi" + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Nome della mappa vettoriale" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Numero di layer" + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "Numero o nome del layer 'to'" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Troppi nomi di colonna" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Numero di colonne nella nuova regione" + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "Formato dei file di output" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Tipo di dati memorizzati per la mappa raster risultante" + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "riclassificazione" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "Nome del raster contenente il risultato della classificazione" + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "" +#~ "Nome della mappa raster di input del reticolo idrografico codificato" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Nome della mappa raster di output" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "Nome del risultato raster 3D di accumulo di flusso" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "Lunghezza in unità di mappa" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Nome della mappa/e raster di output" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Nome della mappa/e raster di output" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Risoluzione" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Modalità disegno" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Visualizza le etichette delle categorie" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Formato della tabella" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Punti vettoriale" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Richiesto" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Nome della colonna contenente dati numerici" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Nome della colonna contenente le coordinate x" + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "Il valore di soglia dev'essere >= 0" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Formato del file di input" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Mappa delle esposizioni (o fy) di output" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Mappa delle esposizioni (o fy) di output" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Zona/e di distanza" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Estensione per i file in output" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Nome della tabella in output" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Nome della mappa vettoriale di output" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nome ella mappa raster di output della curvatura del profilo" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nome del file in output o del dispositivo GPS" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Nome della mappa raster da mostrare" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Formato" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Nome della mappa raster da mostrare" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Numero di livelli da utilizzare per ogni componente" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Selezione inversa" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Sovrascrive il parametro di connessione per alcuni layer" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -86622,9 +87319,6 @@ msgstr "" #~ msgid "Name of vector map to import in actinia" #~ msgstr "Nome della mappa vettoriale da modificare" -#~ msgid "Maximum memory to be used with -m flag (in MB)" -#~ msgstr "Memoria massima da utilizzare con la flag -m (in MB)" - #~ msgid "Sorry, you must choose an output map." #~ msgstr "Spiacente, si deve scegliere una mappa di output" @@ -86998,9 +87692,6 @@ msgstr "" #~ msgstr[0] "Interpolazione in corso della mappa raster <%s>... %d righe..." #~ msgstr[1] "Interpolazione in corso della mappa raster <%s>... %d righe..." -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "Proiezione lat/lon non supportata" - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Stringa per rappresentare celle senza valore" @@ -87203,6 +87894,7 @@ msgstr "Le colonne chiave sono differenti" msgid "Column types differ" msgstr "I tipi di colonna sono differenti" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "<%s> not found" @@ -87235,6 +87927,14 @@ 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" @@ -87254,6 +87954,9 @@ msgstr "Il numero di colonne è differente" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grassmods_ja.po b/locale/po/grassmods_ja.po index 57503c25470..2c63d7be557 100644 --- a/locale/po/grassmods_ja.po +++ b/locale/po/grassmods_ja.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2012-03-08 17:49+0900\n" "Last-Translator: taniguchi \n" "Language-Team: Japanese \n" @@ -91,7 +91,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "設定" @@ -131,32 +131,33 @@ msgid "Print current connection parameters and exit" msgstr "現在の接続パラメータを出力して終了" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -182,21 +183,21 @@ msgstr "現在の接続パラメータを出力して終了" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "プリント" @@ -271,7 +272,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -296,7 +297,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -307,7 +308,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -329,7 +330,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -486,6 +487,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -505,7 +507,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -524,7 +525,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -538,6 +538,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -571,7 +572,7 @@ msgstr "自分の最初のラスターモジュール" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -581,8 +582,8 @@ msgstr "自分の最初のラスターモジュール" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -597,21 +598,21 @@ msgstr "自分の最初のラスターモジュール" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "ラスタマップ <%s> が見つかりません" @@ -620,7 +621,7 @@ msgstr "ラスタマップ <%s> が見つかりません" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -655,7 +656,6 @@ msgstr "ラスタマップ <%s> が見つかりません" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -668,7 +668,6 @@ msgstr "ラスタマップ <%s> が見つかりません" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -707,6 +706,7 @@ msgstr "ラスタマップ <%s> が見つかりません" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -728,7 +728,7 @@ msgstr "ラスタマップ <%s> が見つかりません" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -794,7 +794,7 @@ msgstr "ラスタマップ <%s> が見つかりません" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -808,7 +808,7 @@ msgstr "自分の最初のベクトルモジュール" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -821,8 +821,8 @@ msgstr "自分の最初のベクトルモジュール" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -837,16 +837,16 @@ msgstr "既設のベクトル オープン レベルを設定できません" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -892,7 +892,7 @@ msgstr "既設のベクトル オープン レベルを設定できません" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -908,7 +908,7 @@ msgstr "ベクトルマップ <%s> を開けません" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -917,7 +917,7 @@ msgstr "ベクトルマップ <%s> を開けません" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -947,13 +947,13 @@ msgstr "ベクトルマップ <%s> を開けません" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -981,7 +981,7 @@ msgstr "データベース接続はレイヤー %d に定義されていませ #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -996,8 +996,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1031,10 +1031,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1042,7 +1042,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "ドライバー <%s> でデータベース <%s> を開けません" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1072,23 +1072,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "属性テーブルをベクトルマップ <%s> へコピーできません" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr " <%s>にグレー色テーブルを設定します(8bit, full range)" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr " <%s>にグレー色テーブルを設定します(16bit, image range)" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1170,13 +1170,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1229,6 +1229,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1289,6 +1290,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1354,14 +1361,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1411,144 +1417,132 @@ msgstr "結果ラスターマップのタイトル" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "メタデータ" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "使用可能なフォーマットの一覧を表示して終了" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "選択されたバンド (%d) は存在しません" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1565,35 +1559,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "レポートファイルを作成できません <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "ロケーション <%s> が作成されました" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1601,55 +1593,58 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "ロケーションの PROJ_INFO 情報は:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "データセットの PROJ_INFO 情報は:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1729,12 +1724,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1772,7 +1765,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1788,7 +1781,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1838,24 +1831,18 @@ msgstr "出力ラスターマップ名" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "出力" @@ -1977,7 +1964,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1987,7 +1974,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2108,7 +2094,7 @@ msgstr "情報の代わりに履歴を出力します" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2137,6 +2123,7 @@ msgstr "文字列を格納するメモリを割当できません" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2270,7 +2257,13 @@ msgstr "ステップの不正な数: %s" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2279,8 +2272,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2312,7 +2305,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2368,7 +2361,6 @@ msgstr "\"-i\" か \"value=\" のどちらかが必要です" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2413,7 +2405,7 @@ msgid "Unknown method <%s>" msgstr "登録されてないメソッド <%s>" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2466,7 +2458,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2877,7 +2869,7 @@ msgstr "コストパスを探す..." msgid "Error, ct == pres_cell" msgstr "エラー ct == pres_cell " -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2965,14 +2957,16 @@ msgstr "エクスポート " #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3131,7 +3125,7 @@ msgid "List of cell values to be set to NULL" msgstr "NULL値をセットするセルの一覧" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3439,6 +3433,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3527,17 +3530,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3558,7 +3559,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "出力" @@ -3630,7 +3631,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "サンプリング距離ステップ係数 (0.5-1.5) " @@ -3663,160 +3664,155 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "現在のロケーションの投影情報を取得できません" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "現在のロケーションの投影ユニットを取得できません" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "現在のロケーションの投影キー値を取得できません" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3849,19 +3845,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "メモリーが足りません" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3931,9 +3927,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3947,36 +3943,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "地平線の高さを探す際に考慮する最大距離" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4031,6 +4027,9 @@ msgstr "地平線の高さを探す際に考慮する最大距離" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4051,46 +4050,58 @@ msgstr "地平線の高さを探す際に考慮する最大距離" msgid "Optional" msgstr "オプション" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +#, fuzzy +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "地平線を計算したい座標" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "出力フォーマット (printf-style)" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "出力するファイル 名（'output=-' で標準出力）" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "アウトプットにカテゴリーラベルを含みます" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "出力を度で書き込みます (デフォルトはラジアンです)" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4099,82 +4110,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "ファイル <%s> が開けません " -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "方向値またはステップサイズは指定されませんでした. 中断しています." -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "地平線ラスター名は指定されませんでした. 中断しています." -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "アングルステップサイズは指定されませんでした. 中断しています" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "緩衝地帯を読み込めませんでした. 中断しています" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "東" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "西" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "南" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "北" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "最大距離を読み込めませんでした. 中断しています" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "現在のロケーションの投影情報を取得できません" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "現在のロケーションの投影ユニットを取得できません" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "現在のロケーションの投影キー値を取得できません" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "OOPS: 行は %d から %d に変更しました " -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "OOPS: 列は %d から %d に変更しました " -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4975,7 +4998,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "属性" @@ -5054,7 +5077,7 @@ msgstr "索引を作成できません" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "テーブル <%s> に対する特権はありません" @@ -5185,7 +5208,7 @@ msgstr "最コードルールを含むファイル" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5384,10 +5407,10 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" -msgstr "" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" +msgstr "ロケーションの PROJ_INFO 情報は:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 #: ../raster/r.in.lidar/projection.c:47 ../raster/r.in.lidar/projection.c:53 @@ -5402,7 +5425,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5614,9 +5637,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5634,7 +5657,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5719,10 +5742,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5763,30 +5786,30 @@ msgstr "z データに指定する縮尺" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5914,127 +5937,127 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "シェルスクリプトスタイルの統計を出力します" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "不正な入力 <%s=%s>" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "データを読取中... " -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "目的投影、このロケーション投影にデフォルトする" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 #, fuzzy msgid "The input dataset has undefined projection" msgstr "入力するラスターマップが指定されていません。" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "データをスキャンしています..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "ラスターマップ <%s> が作成されました" @@ -6134,7 +6157,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6168,7 +6191,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6198,7 +6221,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6251,9 +6274,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6269,8 +6292,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6280,24 +6303,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "分布平均 " -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "標準偏差 " +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6349,7 +6403,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6649,7 +6703,7 @@ msgstr "色相データ読み込み中のエラー" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6755,7 +6809,6 @@ msgstr "E-W と N-S グリッド解像度は異なります. 平均をとって #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6841,8 +6894,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "不適当なウインドウサイズ (大きすぎる または 同じ) " #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "緯度/経度投影はこの時点ではサポートされていません. " #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7460,7 +7514,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7469,7 +7523,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "ラスターマップが見つかりません" @@ -7574,7 +7628,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7598,15 +7652,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7679,7 +7733,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7729,17 +7783,14 @@ msgid "Output raster map required" msgstr "出力ラスターマップ・タイトル " #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "距離値（%d）: %lfは >= 0.0でなければなりません" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "指数の値 (%lf)は >= 0 でなければなりません " #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "平面値（%lf）は距離値（%lf）以下でなければなりません" @@ -7797,6 +7848,7 @@ msgstr "ラスターマップ <%s> を書出し中..." #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7941,7 +7993,7 @@ msgstr "SURFER(Golden Software) ASCII ファイルをインポート" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8024,7 +8076,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "最大・最小半径のどちらかを指定してください（バイナリフラッグの場合）" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8083,7 +8135,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8144,7 +8196,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "ラスター <%s> タイプは一致しません" @@ -8267,7 +8319,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8406,7 +8457,7 @@ msgstr "値0にのみフィルタを適用 " msgid "<%d> is not valid number of threads." msgstr "ステップの不正な数: %s" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "ラスターマップがフィルターサイズより小さすぎます " @@ -8498,8 +8549,8 @@ msgstr "メモリに残すマップの割合（％） " msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "データ ファイルの範囲をスキャンして終了" @@ -8508,8 +8559,8 @@ msgstr "データ ファイルの範囲をスキャンして終了" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "スキャンモードで，シェルスクリプト形式で出力" @@ -8527,7 +8578,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "スキップする適切なライン数を指定して下さい" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "不正なZ座標範囲" @@ -8908,10 +8959,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "緯度/経度投影はこの時点ではサポートされていません. " #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9134,13 +9185,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "平均値 = %.5lf " #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9153,7 +9202,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9395,31 +9443,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9435,13 +9483,13 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" -msgstr "" +#, fuzzy +msgid "create project" +msgstr "ソース投影" #: ../raster/r.in.gdal/main.c:118 msgid "Imports raster data into a GRASS raster map using GDAL library." @@ -9455,18 +9503,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "画像ターゲットロケーション名" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9490,11 +9538,11 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" -msgstr "" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" +msgstr "作成する新しいロケーション名" #: ../raster/r.in.gdal/main.c:195 msgid "File prefix for raster attribute tables" @@ -9523,7 +9571,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9532,210 +9580,231 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "地理座標におけるスクリーン位置" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "バンド色名を使う代わりに、バンド番号を保持します" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +#, fuzzy +msgid "You have to specify a target project different from output project" msgstr "出力ロケーションとは異なる目標ロケーションを指定してください" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +#, fuzzy +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "-l'フラグは緯度/経度ロケーションでのみ動作します" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "ポイントファイルの %d GCPS を <%s> にコピーしています" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "GCPsは以下のオープンGIS WKT座標系を持っています:" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "GCPsテーブルを再投影します:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "* GCPテーブルの入力投影: %s" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "* GCPテーブルの出力投影: %s" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "入力したGCPsの投影キー値を変換できません" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "ロケーションの投影情報を取得出来ません" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "ロケーションの投影単位を取得出来ません" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "ロケーションの投影キー値を取得出来ません" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "マップセット <%s> （ターゲットロケーション <%s> ）- " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "権限がありません" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "見つかりません" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10407,7 +10476,6 @@ msgid "Number of intermediate images to produce" msgstr "作成する中間画像の数" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "フラクタル次元数 %.2lf は2と3の間でなければいけません" @@ -10520,6 +10588,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10551,26 +10631,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10595,12 +10655,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10608,40 +10662,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10791,7 +10845,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11034,29 +11088,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "output= と method= の値は同じ数が必要です" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11109,71 +11163,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "ラスターマップ <%s>を読込中..." - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "現在の領域解像度と異なる方位ファイルの解像度" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "インプットフィルを読み込んでいます: バリア " - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "セグメントファイル %s 作成できませｎ" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "セグメントファイル %s をフォーマットできません" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "セグメントファイル %s を開けません" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11221,6 +11242,39 @@ msgstr "" "解像度のバランスが悪すぎます (%f x %f); 入力マップを再度サンプリングしてくだ" "さい" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "ラスターマップ <%s>を読込中..." + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "現在の領域解像度と異なる方位ファイルの解像度" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "インプットフィルを読み込んでいます: バリア " + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "セグメントファイル %s 作成できませｎ" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "セグメントファイル %s をフォーマットできません" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "セグメントファイル %s を開けません" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11925,7 +11979,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11939,12 +11993,13 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "ロケーションのベクトルマップを現在のロケーションに投影変換" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "指定したベクトルマップを含むロケーション" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11970,10 +12025,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "再投影するラスターマップ名" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "データベース" #: ../raster/r.proj/main.c:174 @@ -12029,12 +12083,13 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "入力と出力で同一のロケーションは指定出来ません" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +#, fuzzy +msgid "Input and output projects are the same" msgstr "入力と出力で同一のロケーションは指定出来ません" #: ../raster/r.proj/main.c:268 @@ -12050,13 +12105,13 @@ msgid "Unable to get projection key values of output raster map" msgstr "出力ラスターマップの投影キー値を取得できません" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "マップセット <%s> ＜入力ロケーション <%s> - %s" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "ロケーション <%s> マップセット <%s> を確認中" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12064,15 +12119,15 @@ msgstr "ロケーション <%s> マップセット <%s> を確認中" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "必須パラメータ <%s> がありません" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" "ラスターマップ <%s> ＜ロケーション <%s> ＜マップセット <%s> が見つかりません" @@ -12089,12 +12144,13 @@ msgid "Unable to get projection key values of input map" msgstr "入力マップの投影キー値を取得できません" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "未投影のデータでは作業できません(xy location) " #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" msgstr "入力マップ <%s@%s> (ロケーション <%s>) " #: ../raster/r.proj/main.c:524 @@ -12176,7 +12232,7 @@ msgid "Sorting events..." msgstr "エッジを書き込み中、、、" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12437,8 +12493,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12611,7 +12668,7 @@ msgstr "S_decode ==> シャドウバンドのスカイファクターを修正 #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12622,6 +12679,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "ロケーションの投影情報を取得出来ません" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "ロケーションの投影単位を取得出来ません" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "ロケーションの投影キー値を取得出来ません" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13233,16 +13305,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "現在のロケーションの投影情報を取得できません" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "現在のロケーションの投影ユニットを取得できません" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "現在のロケーションの投影キー値を取得できません" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13320,7 +13395,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13330,7 +13405,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13416,7 +13491,7 @@ msgstr "ラスターマップ <%s> から浮動小数点レンジが読み取れ #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "テーブル %s を作成できません" @@ -13425,7 +13500,7 @@ msgstr "テーブル %s を作成できません" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "テーブル <%s> ，キー <%s> のインデックスを作成できません" @@ -13737,7 +13812,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13748,19 +13823,19 @@ msgstr "" msgid "position" msgstr "位置" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "検索する座標" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13768,15 +13843,28 @@ msgstr "検索する座標" msgid "Query" msgstr "クエリ" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13785,62 +13873,71 @@ msgstr "" msgid "Advanced" msgstr "アドバンス" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "メートル単位のみで出力 " -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "倍精度浮動小数値を整数に変換できませんでした" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "バイナリのMAT-File(v4) を GRASSラスタにインポート" @@ -14010,9 +14107,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14351,21 +14445,21 @@ msgstr "平滑値に負の値やNULL値は使えません" msgid "Input map resolution differs from current region resolution!" msgstr "入力マップの解像度が現在の領域の解像度と異なります！" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "処理中の全ての選択された指定ファイルが要求されます" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14549,80 +14643,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15551,31 +15645,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "セクション 4: RUSLE LS および S ファクター の決定" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "セクション 3: SFDで表層流を累計する" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "MFD: 流動分布の累積比率は 1.0 ではなく %f" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" +msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15591,61 +15686,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15669,7 +15764,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16609,46 +16703,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "線形方程式の作成や解を求めることができません" @@ -16975,7 +17069,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17426,8 +17520,8 @@ msgstr "各プロファイルポイントの RRR:GGG:BBB 形式の色値を出 #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17554,97 +17648,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "スキャン中，zrange は評価に取り込まれません" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17908,11 +18002,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18111,32 +18205,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18219,8 +18313,9 @@ msgid "Units" msgstr "単位" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "デフォルト単位はセルです" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18242,8 +18337,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18998,8 +19094,8 @@ msgid "Not enough points, %d are required" msgstr "ポイントは不十分, %d は要求されています" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "変換を作成中にエラー (%d)" @@ -19009,28 +19105,28 @@ msgid "Poorly placed control points" msgstr "不十分な制御ポイントの設置 " #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "メモリー不足" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "パラメーターエラー" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "作動しているコントロールポイントはありません" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "不正な座標値 :[%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "制御ポイントに基づいて座標変換を計算します " @@ -19039,57 +19135,57 @@ msgid "Rectification polynomial order" msgstr "改正多項式オーダー" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "サマリー情報を表示します" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" "カテゴリーラベルルールを含むファイル (または \"-\" 標準入力から読み込み)" @@ -19099,7 +19195,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "座標の中心（東，北）" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "逆変換； 3D ベクトルフィーチャーを 2D へ" @@ -19108,7 +19204,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "マップの左下隅での東進と北進の座標" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "x係数のマップ" @@ -19604,6 +19700,10 @@ msgstr "3D ラスターマップ <%s> の範囲を読めません" msgid "Error while reading history file" msgstr "履歴ファイル読み込みエラー" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19662,64 +19762,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "ラスターマップ <%s> が作成できません" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19825,7 +19933,6 @@ msgstr "3D NULL-値のビットマップファイルの作成" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19838,10 +19945,8 @@ msgstr "3D NULL-値のビットマップファイルの作成" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19855,11 +19960,11 @@ msgstr "3D NULL-値のビットマップファイルの作成" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "表示" @@ -20353,10 +20458,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20413,9 +20518,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "タイプ" @@ -20475,13 +20580,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20842,67 +20947,71 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "現在の領域の設定を名前をつけて保存" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "領域 <%s> は見つかりませんでした" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "3D ラスターマップ <%s@%s> のヘッダーを読み込めません" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "領域 <%s> を設定できません" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "現在の領域をアップデートできません" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "すでに緯度/経度にあります. 代わりに -p flag を使用してください." -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 +#, fuzzy msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." -msgstr "" +msgstr "すでに緯度/経度にあります. 代わりに -p flag を使用してください." -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" +"このロケーションには含まれていないためWGS84アウトプットは不可です\n" +"データ変換パラメーター. g.setprojを実行してください. " -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "緯度/経度投影パラメーターをアップデートできません" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "シンプルXYシステムから緯度/経度計算はできません" @@ -21146,8 +21255,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21418,154 +21527,156 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "データ情報を認証し変換パラメーターを出力します" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "投影を情報 PROJ.4 フォーマットで出力 " -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "投影情報をWKTフォーマットで出力します " -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "ESRI-スタイルフォーアットを使用します (WKT出力にのみ適用) " -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "EPSG 投影コード" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "データ" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "データ変換パラメーターのインデックスナンバー" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "未指定には \"0\" または リストと終了には \"-1\"" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" -msgstr "" +#: ../general/g.proj/main.c:216 +#, fuzzy +msgid "Modify current project's projection files" +msgstr "プロジェクションファイルを作成できません: %s" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "作成" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "作成する新しいロケーション名" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "投影ファイルが見つかりません " -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "入力するファイル" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21654,9 +21765,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "プロジェクションファイルを作成できません: %s" #: ../general/g.proj/create.c:21 #, c-format @@ -21664,98 +21775,98 @@ msgid "Unable to create projection files: %s" msgstr "プロジェクションファイルを作成できません: %s" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "ファイルが作成できません <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "ユーザーへのメッセージのためこのモジュールはスクリプトで使用します" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "警告としてメッセージを出力します " -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "致命的エラーとしてメッセージを出力します" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "デバッグメッセージとしてメッセージを出力します" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "進捗状況としてメッセージを出力します " -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "レベル" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "説明モードにおいてのみメッセージを出力します " -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "出力するメッセージのテキスト" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "デバッグメッセージ使用のレベル" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "メッセージレベルを1つのみ選択してください" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "入力メッセージを解析できません" @@ -21898,7 +22009,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21983,33 +22095,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "現在のマップセットは <%s>です " -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "利用可能なマップセット" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "検索パス" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22018,69 +22152,75 @@ msgstr "" msgid "Operation to be performed" msgstr "実行するオペレーション" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" -msgstr "" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" +msgstr "出力フォーマット (printf-style)" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "使用可能なマップセットの一覧を表示 " -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "現在のマップセットを表示 " -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "これらのフォーマットの1つにルールを入力します: " + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "マップセット <%s> 見つかりませんでした" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "マップセット <%s> サーチパスに追加されました" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "マップセット <%s> サーチパスから削除されました" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22095,37 +22235,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22483,7 +22620,7 @@ msgstr " 標準偏差 " #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23671,7 +23808,7 @@ msgstr "変換に成功しました" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23766,17 +23903,19 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "ロケーション[%s]の対象になったグループ<%s>, マップセット [%s]" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "画像ターゲットロケーション名" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23808,35 +23947,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" msgstr "ターゲットロケーション [%s] が見つかりません\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 -#, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "マップセット <%s> （ターゲットロケーション <%s> ）- " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "許可されませんでした\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "見つかりません\n" @@ -23889,61 +24029,66 @@ msgstr "グループのターゲット情報 <%s>が見つかりません" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" msgstr "ターゲットロケーション <%s> は見つかりません" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "マップセット <%s> （ターゲットロケーション <%s> ）- " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "グループの選択されたカメラ参照ファイルがありません [%s]" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "グループ[%s]のカメラファイルにある不正なフォーマット" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "グループ [%s]の初期風雨ステーションファイルの不正なフォーマット" @@ -23953,30 +24098,32 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "オルソ修正の画像グループ名" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "プロジェクションファイルを作成できません: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "投影情報はアップデートされません" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" +msgstr "ロケーション[%s]の対象になったグループ<%s>, マップセット [%s]" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -24090,15 +24237,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 -#, c-format -msgid "Rectify <%s@%s> (location <%s>)" +#, fuzzy, c-format +msgid "Rectify <%s@%s> (project <%s>)" msgstr "修正 <%s@%s> (ロケーション <%s>)" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." msgstr "へ <%s@%s> (ロケーション <%s>) ... " #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24138,101 +24283,100 @@ msgstr "目標精度(-c フラグがあれば無視されます)" msgid "Raster map with camera angle relative to ground surface" msgstr "地面と相対的なカメラアングル値を持つラスターマップ" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" -msgstr "" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" +msgstr "現在の領域の設定を名前をつけて保存" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "グループの全ラスターマップを修正する" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "グループ<%s> は見つかりません" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "投影" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr " <%s>から読み込むことができません" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "グループ <%s>にラスターマップはありません; i.groupを実行" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "<%s> は不正なファイル名です" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "ラスターマップ <%s> は既に存在します" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "目標　ロケーション %s、マップセット %s:" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "ロケーション[%s]の対象になったグループ<%s>, マップセット [%s]" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "オルソ補正はキャンセルされました" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "目標精度はゼロ以上である必要があります。値は無視されました。" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "領域の使用: 北=%f 南=%f, 東=%f 西=%f " -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "グループを選択するために指定された標高モデルが存在しません [%s]" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "入力するラスターマップ <%s> はグループ <%s>にありません" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "試行:" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "終了!" @@ -24358,6 +24502,16 @@ msgstr "領域 北=%f 南=%f 東=%f 西=%f " msgid "Resolution EW=%f NS=%f" msgstr "解像度 東西=%f 南北=%f " +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "修正 <%s@%s> (ロケーション <%s>)" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "へ <%s@%s> (ロケーション <%s>) ... " + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24374,6 +24528,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24383,6 +24542,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "無効な順 (%d); 1を入力%d " +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "目標　ロケーション %s、マップセット %s:" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "ターゲットロケーション <%s> は見つかりません" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "マップセット <%s> （ターゲットロケーション <%s> ）- " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24751,6 +24930,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "投影法" @@ -26331,8 +26511,8 @@ msgid "For no rescaling use 0,0" msgstr "再スケーリングでない場合は0,0を使用" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "再スケール" @@ -26660,17 +26840,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "* 砂漠指数: %.2lf" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "* 積雪被覆: %.2lf %%" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "* 雲量: %.2lf %%" @@ -26679,17 +26856,14 @@ msgid "* Temperature of clouds:" msgstr "* 雲頂温度:" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "** 最大: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "** 平均 (%s 雲): %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "** 最小: %.2lf K" @@ -26698,17 +26872,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26718,17 +26889,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26737,12 +26905,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "* 寒冷雲: %.2lf K" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "* 温暖雲: %.2lf K" @@ -27539,6 +27705,7 @@ msgid "Apriori Phi (roll) standard deviation" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27550,6 +27717,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -28098,11 +28270,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "接続に失敗しました" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28154,7 +28330,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28247,16 +28423,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "テーブル <%s> に列 <%s> が見つかりません" @@ -28827,6 +29002,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "ヒストグラム" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "データを含む属性列 " + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "新規領域における列数" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28869,6 +29080,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28905,64 +29118,75 @@ msgstr "入力オプション " #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "出力ラスターマップ名" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "出力するベクトルマップ名" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "出力ラスターマップ名" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "出力するベクトルマップ名" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "出力ラスターマップ名" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "データベースファイル名" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "再スケール" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "一時ファイルが作成できません " -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "シードポイント座標" @@ -29044,238 +29268,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "入力 " -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "ベクトルマップと属性テーブルのDB接続を出力/設定" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "ベクトルマップ名" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "キーカラム" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "レイヤー数 (from)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "列名が多すぎます " - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "新規領域における列数" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "保存形式 " - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -29481,6 +29481,535 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "3Dラスターマップを作成" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +#, fuzzy +msgid "modeling" +msgstr "モデル" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "画像ターゲットロケーション名" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "背景のベクトルマップ名" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "スプラインテンションパラメータ" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "出力レイヤー名" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s: 不正な値の定義" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "基点が書き込まれたベクトルマップを出力" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "3列 Matlabデータから3Dベクトルポイントマップを作成する" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "入力ラスター標高マップ名" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "3列 Matlabデータから3Dベクトルポイントマップを作成する" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "背景のベクトルマップ名" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "ラスターマップ名が表示されています" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "変換データをファイルへ書き込み中" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "エリアフィーチャの平坦なコーナー" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "フィーチャーを選択中、、、" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "フィーチャーを選択中、、、" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "フィーチャーを選択中、、、" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "スタート時に自動的に選択しないでください" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "フォント" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "CPU タイムの使用量[%]" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "参照位置" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "彩度で使用するレイヤー名" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "最大積算エラー" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "MFD (1-10)の収束変数" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "異常値の許容限界" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "異常値の許容限界" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "異常値の許容限界" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "フィルタをかける回数 " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +#, fuzzy +msgid "Regularization parameter for treshold features" +msgstr "残留評価における正規化重量" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +#, fuzzy +msgid "Regularization parameter for hinge features" +msgstr "Tykhonov 正規化パラメーター (スムージングに影響します) " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "重複するセントロイドを取り除いています" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "上の曲面2Dラスターマップ" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "区画数" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +#, fuzzy +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "-m フラッグで使用する最大メモリ (MB) " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29677,10 +30206,15 @@ msgstr "インポートされるテーブルファイル、あるいはDB接続 msgid "Name for output vector map" msgstr "出力するベクトルマップ名" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29922,6 +30456,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31140,7 +31682,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31186,12 +31728,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -#, fuzzy -msgid "modeling" -msgstr "モデル" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -32299,7 +32835,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "レイヤー数 (from)" @@ -32337,6 +32872,18 @@ msgstr "where' 句なしのSQL文のWHEREコンディション" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "マップ名を <%s> に設定しています" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -32715,7 +33262,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32910,7 +33456,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "入力ファイルのフォーマット" @@ -32946,6 +33492,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "データベース" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33995,11 +34550,8 @@ msgstr "設定ファイル" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -34050,45 +34602,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "背景" +msgid "Thin species and background points" +msgstr "補間に用いるポイント数" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "背景" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "入力ファイルのデータ値の列番号" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "行/列 の分割のための重複" @@ -34899,8 +35465,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34911,6 +35486,7 @@ msgid "Group of raster layers to be classified" msgstr "作成されたラスターマップのタイプ" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34952,11 +35528,13 @@ msgid "" msgstr "y座標を含む列名" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "出力タイプ" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35262,6 +35840,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -35273,6 +35852,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -35302,6 +35882,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "ラベルファイル" @@ -35674,67 +36255,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "入力ラスターマップ名" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "出力ラスターマップ名" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "出力する積算流量3Dラスターマップ名" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "マップ単位での距離" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36089,11 +36609,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -36979,6 +37501,14 @@ msgid "" "mapset." msgstr "ロケーションのベクトルマップを現在のロケーションに投影変換" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "指定したベクトルマップを含むロケーション" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "データベース" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37110,12 +37640,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37264,9 +37794,8 @@ msgstr "フォント設定 " #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -37309,19 +37838,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -37330,7 +37869,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "指定可能なレイヤー一覧を表示して終了" @@ -37467,34 +38006,6 @@ msgstr "入力するデータベース名" msgid "Base name for output file" msgstr "出力するファイル名" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "トポロジ" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "データを含む属性列 " - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "新規領域における列数" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -38169,6 +38680,10 @@ msgstr "SVG 出力ファイル名" msgid "Queries projection information spatially." msgstr "投影情報をWKTフォーマットで出力します " +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -38464,7 +38979,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -38495,8 +39010,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "query'オプションに使用される属性列名" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39220,9 +39736,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -39478,6 +40000,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39489,6 +40012,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -39599,6 +40127,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -40639,8 +41175,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -40737,39 +41273,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "再投影するラスターマップ名" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -44084,8 +44629,8 @@ msgstr "ユーザーのグラフィックモニターにおける表示フレー #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -44123,6 +44668,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -44536,6 +45082,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -44590,6 +45143,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "ベクトルライン" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "ベクトルライン" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -44631,6 +45198,38 @@ msgstr "タイル" msgid "Number of tiles in y direction" msgstr "セルタイル数は各方向と重複しているべきです" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "作成されたラスターマップのタイプ" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "フィルタをかける回数 " + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -45065,8 +45664,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -45824,6 +46423,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "出力するラスターマップ名（彩度）" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -46118,6 +46721,10 @@ msgstr "" msgid "Offset factor for input" msgstr "標高のスケールファクター" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -46565,10 +47172,93 @@ msgstr "高さの強調 " msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "ラベルファイル" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "出力レイヤー名" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "編集するベクトルマップ名" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "変数" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "クロスセクション2Dラスターマップを作成" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "<%s>に対応させるラスターマップ" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "パラメーターエラー" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "トポロジ" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "データを含む属性列 " + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -47083,17 +47773,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -47121,24 +47801,21 @@ msgid "categorical map with zones" msgstr "ベクトルポイント" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "出力するファイル名" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 #, fuzzy msgid "Plot dimensions (width,height)" msgstr "スクリーンディメンションを表示します (幅, 高さ) " #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "出力画像の幅と高さ" @@ -47150,9 +47827,8 @@ msgid "Default font size" msgstr "デフォルト単位はセルです" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -47172,14 +47848,12 @@ msgid "Create a vector point layer of outliers" msgstr "3列 Matlabデータから3Dベクトルポイントマップを作成する" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "異常値の許容限界" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -47190,14 +47864,12 @@ msgid "Draw notches" msgstr "ドローモード" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -47230,14 +47902,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -47249,27 +47913,23 @@ msgid "Plot format" msgstr "入力ファイルのフォーマット" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "カテゴリーラベルの非表示 " #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -47317,15 +47977,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -47346,7 +47997,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "カラーテーブルのカラーを分けるセパレータの色" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "アイコン幅" @@ -47358,54 +48008,45 @@ msgid "The width of the boxplots (0,1])" msgstr "テキストの線幅" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "ベクトルライン幅" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 #, fuzzy msgid "The linewidth of the boxplots" msgstr "テキストの線幅" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "フォントファイルへのパス" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "軸とテキストの色 " #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Y データのカラー" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 #, fuzzy msgid "Flier marker" msgstr "アイコン マーカー" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -47413,113 +48054,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "エリア サイズ" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "ファイルサイズの不一致 " #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "ラインの色 " #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "テキストの色を設定します" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "出力ラスターマップ名" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "出力ラスターマップ名" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "解像度" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "ドローモード" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "カテゴリーラベルの非表示 " - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "テーブルフォーマット" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "テキストの線幅" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "テキストカラー" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -49140,6 +49695,14 @@ msgstr "結果をソートする" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -49169,6 +49732,7 @@ msgid "no-data" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49180,12 +49744,26 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 msgid "add grid lines" msgstr "不正なグリッドサイズ <%s> " +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "テキストカラー" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -49282,310 +49860,310 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "ベクトルライン" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "列数 " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "バッファー距離に使用する列名" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "列名" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "バッファー距離に使用する列名" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "タイプ" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "赤色で使用するレイヤー名" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "出力ファイル名（拡張を追加しないように）" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "出力マップの範囲を再計測 (0,0を使う再計測はありません)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "入力オプション " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "マップの鉛直単位" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "統計" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 #, fuzzy msgid "Dot marker" msgstr "アイコン マーカー" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "エリア サイズ" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 #, fuzzy msgid "Set marker size" msgstr "エリア サイズ" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "フォントカラー" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Y データのカラー" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "列" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "逆走査が完了しました " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "ライン" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "入力オプション " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "カラー" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "軸とテキストの色 " +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 #, fuzzy msgid "Line style trendline" msgstr "ラインスタイル" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "ベクトルライン幅" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "テキストの線幅" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "ライン色" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "軸とテキストの色 " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "ディスプレイキャンバスの幅 " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "整数の範囲： min,max " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "ラスターマップ名が表示されています" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "整数の範囲： min,max " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "ラスターマップ名が表示されています" @@ -49938,8 +50516,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -50021,185 +50599,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "ベクトルポイント" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "必須" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "データを含む属性列 " - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "y座標を含む列名" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -#, fuzzy -msgid "Format: All values must be >0" -msgstr "閾値は >= 0 でなければなりません " - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "入力ファイルのフォーマット" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "出力方位マップ (または fy) " - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "オプションでの入力" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "出力方位マップ (または fy) " - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "範囲 " - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "出力マップの範囲を再計測 (0,0を使う再計測はありません)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "出力するテーブル名" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "調整された河川ポイントの出力ベクトルマップの名前" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "バッファー距離に使用する列名" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "出力ファイル名、GPSデバイス名" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "ラスターマップ名が表示されています" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "フォーマット" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "ラスターマップ名が表示されています" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "区画数" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "逆選択" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -51031,11 +51430,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "ヒストグラム" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -56773,6 +57167,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "出力フォーマット" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "現在の領域の設定を使用 " + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -57319,8 +57753,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -57623,8 +58057,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -57804,7 +58238,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -57818,7 +58252,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -58346,7 +58780,7 @@ msgstr "" msgid "Add points on nodes" msgstr "%d の点がロードされました" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -58636,7 +59070,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -58726,49 +59160,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "テーブル列のタイプ/名前を指定したレイヤーへ出力して終了" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "指定したレイヤーに接続パラメーターを上書き" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "指定したレイヤー (テーブルではない) の接続を削除" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "他のマップセットに保管されているベクトルマップ修正できません" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "データベース接続は定義されていません" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -58778,33 +59208,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "今あるレイヤー <%d> のリンクを上書きには -o を使用して下さい" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "テーブル <%s> はデータベース <%s> 中にありません" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "テーブル %s に許可がありません" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "テーブルに許可を与えられました" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -58841,7 +59271,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "カテゴリー" @@ -58918,56 +59348,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "ベクトルマップ <%s> は既に存在し上書きされます" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -59234,127 +59671,131 @@ msgstr[0] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "ベクトルマップ <%s> は既に存在" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -59833,7 +60274,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -60070,11 +60511,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -60101,7 +60542,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -60110,7 +60551,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -60130,7 +60571,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -60166,11 +60607,13 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "ロケーションのベクトルマップを現在のロケーションに投影変換" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "指定したベクトルマップを含むロケーション" #: ../vector/v.proj/main.c:88 @@ -60205,13 +60648,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "入力と出力で同一のロケーションは指定出来ません" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" "ロケーション <%s> マップセット <%s> 中にベクトルマップ <%s> が見つかりません" @@ -60226,13 +60674,13 @@ msgid "Input vector map <%s> is empty" msgstr "" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "指定したロケーション <%s> にマップセット <%s> - 許可がありません" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "指定したロケーション <%s> 中にマップセット <%s> がありません" #: ../vector/v.proj/main.c:517 @@ -62118,7 +62566,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62745,7 +63193,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -63049,12 +63497,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -63255,19 +63703,19 @@ msgid "Snapping boundaries..." msgstr "境界を接合しています、、、" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -63476,7 +63924,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -63634,10 +64082,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -63676,6 +64124,10 @@ msgstr "入力する3Dベクトルポイントマップ名" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "オプションでの入力" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -63776,9 +64228,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "%s が作成できません" @@ -63792,7 +64244,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "ベクターは3Dではありません" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -63877,7 +64329,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -63905,8 +64356,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -64553,7 +65004,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -64685,8 +65136,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -66447,17 +66898,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -66633,13 +67084,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -66887,42 +67338,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "ポイントレイヤー" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "SQL文のみ出力" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "このオプションには１列必要です " -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "このオプションには2列必要です " -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "このオプションには少なくとも２列必要です" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "option=query' のためパラメーター 'qcolumn' を指定してください" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "この '側面' オプションは境界にのみ有意義です " -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "曲がりくねり' オプションはラインにのみ有効です " -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "曲がりくねり' オプションはラインにのみ有効です " @@ -67904,16 +68360,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -69311,66 +69757,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -69656,7 +70102,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "ベクトルマップ <%s> を検索中、、、" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -70115,164 +70561,165 @@ msgstr "データベース接続はレイヤー %d に定義されていませ msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "投影" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -70448,27 +70895,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -70535,274 +71005,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -70811,51 +71281,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -71011,10 +71481,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "ロケーション[%s]の対象になったグループ<%s>, マップセット [%s]" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "ターゲットロケーション <%s> は見つかりません" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "グループに i.targetを実行してください" @@ -71178,14 +71658,14 @@ msgstr "フォントファイルへのパス" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "テキスト符号化 (TrueTypeフォントにのみ適用可能) " -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -71193,7 +71673,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -72195,6 +72675,10 @@ msgstr "レンダリング" msgid "Highlight color" msgstr "ハイライトカラー" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "ボールドラインを表示します" @@ -76398,6 +76882,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "TIFFワールドファイルを出力できません" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "TIFFワールドファイルを出力できません" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -76546,6 +77047,10 @@ msgid "Unable to open color rule" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -77100,7 +77605,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -77339,22 +77844,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -79381,38 +79879,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -79492,11 +79990,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -79521,103 +80019,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -79629,336 +80127,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -80011,50 +80509,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -80082,7 +80580,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -80301,7 +80799,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -80358,85 +80856,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "xyz座標系の代わりにマップ座標系を" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "一時ファイルを作成中... " -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "一時ファイルを作成中... " -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "ロケーションの投影情報を取得出来ません" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -80482,28 +80981,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -80560,27 +81059,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "OGRデータソースを開けません '%s'" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -80590,7 +81089,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -80600,14 +81098,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -80615,72 +81113,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -80907,7 +81405,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -80925,64 +81423,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -81122,79 +81621,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -81306,40 +81805,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -81375,7 +81874,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -81386,34 +81885,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -81505,34 +82004,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -81611,317 +82110,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "領域 <%s> は見つかりませんでした" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -81929,60 +82428,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, fuzzy, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "ドライバー %s を開けません" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -82034,27 +82533,38 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "ルールファイル <%s> を開けません" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "テーブル <%s> に列 <%s> が見つかりません" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "色 %s の解釈におけるエラー" + +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -82100,16 +82610,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -82180,41 +82680,51 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "ラスターマップ <%s> が現在ののマップセットにありません " + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +#, fuzzy +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "新規列の名前とタイプ（'name type [,name type, ...]'）" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "セグメントファイル書き込みのエラー" + #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -82262,20 +82772,175 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "ベクトルマップと属性テーブルのDB接続を出力/設定" + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "ベクトルマップ名" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "キーカラム" + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "レイヤー数 (from)" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "列名が多すぎます " + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "新規領域における列数" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "保存形式 " + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "入力ラスターマップ名" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "出力ラスターマップ名" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "出力する積算流量3Dラスターマップ名" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "マップ単位での距離" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "出力ラスターマップ名" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "出力ラスターマップ名" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "解像度" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "ドローモード" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "カテゴリーラベルの非表示 " + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "テーブルフォーマット" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "テキストの線幅" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "ベクトルポイント" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "必須" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "データを含む属性列 " + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "y座標を含む列名" + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "閾値は >= 0 でなければなりません " + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "入力ファイルのフォーマット" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "出力方位マップ (または fy) " + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "出力方位マップ (または fy) " + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "範囲 " + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "出力マップの範囲を再計測 (0,0を使う再計測はありません)" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "出力するテーブル名" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "調整された河川ポイントの出力ベクトルマップの名前" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "バッファー距離に使用する列名" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "出力ファイル名、GPSデバイス名" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "ラスターマップ名が表示されています" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "フォーマット" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "ラスターマップ名が表示されています" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "区画数" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "逆選択" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "指定したレイヤーに接続パラメーターを上書き" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -84003,6 +84668,7 @@ msgstr "" #~ msgid "Output buffer map" #~ msgstr "出力フォーマット" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "<%s> not found" @@ -84019,6 +84685,8 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Text color, either a standard GRASS color or R:G:B triplet" #~ msgstr "テキストカラー, 標準GRASSカラーまたはR:G:B triplet" @@ -84066,9 +84734,6 @@ msgstr "" #~ msgid "Name of vector map to import in actinia" #~ msgstr "編集するベクトルマップ名" -#~ msgid "Maximum memory to be used with -m flag (in MB)" -#~ msgstr "-m フラッグで使用する最大メモリ (MB) " - #~ msgid "Sorry, you must choose an output map." #~ msgstr "出力マップを選択して下さい" @@ -84590,9 +85255,6 @@ msgstr "" #~ msgstr[0] "ラスターマップ <%s>... %d 行を補完中... " #~ msgstr[1] "ラスターマップ <%s>... %d 行を補完中... " -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "緯度/経度投影はこの時点ではサポートされていません. " - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "データのないセルに代入する記号" @@ -84646,8 +85308,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "グリッドのカラー, または \"なし\"" #, fuzzy @@ -84913,6 +85575,9 @@ msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grassmods_ko.po b/locale/po/grassmods_ko.po index 8f5024df68a..61e8aa04f86 100644 --- a/locale/po/grassmods_ko.po +++ b/locale/po/grassmods_ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_ko\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2005-08-09 22:53-0500\n" "Last-Translator: Huidae Cho \n" "Language-Team: Korean \n" @@ -85,7 +85,7 @@ msgstr "시간" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "설정" @@ -125,32 +125,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -176,21 +177,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "출력" @@ -262,7 +263,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -287,7 +288,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -298,7 +299,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -320,7 +321,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -477,6 +478,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -496,7 +498,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -515,7 +516,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -529,6 +529,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -562,7 +563,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -572,8 +573,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -588,21 +589,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "래스터 지도 <%s>를 찾을 수 없습니다" @@ -611,7 +612,7 @@ msgstr "래스터 지도 <%s>를 찾을 수 없습니다" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -646,7 +647,6 @@ msgstr "래스터 지도 <%s>를 찾을 수 없습니다" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -659,7 +659,6 @@ msgstr "래스터 지도 <%s>를 찾을 수 없습니다" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -698,6 +697,7 @@ msgstr "래스터 지도 <%s>를 찾을 수 없습니다" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -719,7 +719,7 @@ msgstr "래스터 지도 <%s>를 찾을 수 없습니다" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -785,7 +785,7 @@ msgstr "래스터 지도 <%s>를 찾을 수 없습니다" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -799,7 +799,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -812,8 +812,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -828,16 +828,16 @@ msgstr "미리 결정된 벡터 열기 단계를 설정할 수 없습니다" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -883,7 +883,7 @@ msgstr "미리 결정된 벡터 열기 단계를 설정할 수 없습니다" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -899,7 +899,7 @@ msgstr "벡터 지도 <%s>를 열 수 없습니다" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -908,7 +908,7 @@ msgstr "벡터 지도 <%s>를 열 수 없습니다" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -938,13 +938,13 @@ msgstr "벡터 지도 <%s>를 열 수 없습니다" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -972,7 +972,7 @@ msgstr "레이어 %d를 위한 데이터베이스 연결이 정의되지 않았 #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -987,8 +987,8 @@ msgstr "드라이버 <%s>를 시작할 수 없습니다" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1022,10 +1022,10 @@ msgstr "드라이버 <%s>를 시작할 수 없습니다" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1033,7 +1033,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "데이터베이스 <%s>를 드라이버 <%s>로 열 수 없습니다" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1063,23 +1063,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "속성 테이블을 벡터 지도 <%s>로 복사할 수 없습니다" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "지원되는 포맷:" @@ -1163,13 +1163,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1222,6 +1222,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1282,6 +1283,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1347,14 +1354,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1404,144 +1410,132 @@ msgstr "결과 래스터 지도의 제목" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "메타자료" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "%s=와 %s=를 같이 지정할 수 없습니다" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "현재 작업 디렉토리를 얻을 수 없습니다" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1558,37 +1552,36 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "입력 지도의 투영을 GRASS 포맷으로 변환할 수 없습니다; 새 로케이션을 생성할 " "수 없습니다." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "로케이션 <%s>를 생성할 수 없습니다" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "래스터 지도 <%s>를 생성했습니다." -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1596,55 +1589,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1724,12 +1719,10 @@ msgstr "대수" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1767,7 +1760,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1783,7 +1776,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1833,24 +1826,18 @@ msgstr "출력 표고 래스터 지도를 위한 이름" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1972,7 +1959,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1982,7 +1969,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2103,7 +2089,7 @@ msgstr "정보 대신 래스터의 히스토리를 출력합니다" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2132,6 +2118,7 @@ msgstr "문자열을 위한 메모리를 할당할 수 없습니다" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2265,7 +2252,13 @@ msgstr "<%s=%s> 점의 무효한 개수" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2274,8 +2267,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2307,7 +2300,7 @@ msgstr "래스터 지도의 통계를 갱신하기" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2363,7 +2356,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "리샘플" @@ -2408,7 +2400,7 @@ msgid "Unknown method <%s>" msgstr "알려지지 않은 방법 <%s>" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2461,7 +2453,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2872,7 +2864,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2960,14 +2952,16 @@ msgstr "내보내기" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3126,7 +3120,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3434,6 +3428,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3522,17 +3525,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3553,7 +3554,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "출력" @@ -3625,7 +3626,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3658,160 +3659,155 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "현재 로케이션의 투영 정보를 얻을 수 없습니다" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "현재 로케이션의 투영 키값을 얻을 수 없습니다" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3844,19 +3840,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "메모리가 부족합니다" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3926,9 +3922,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3942,36 +3938,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4026,6 +4022,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4046,46 +4045,55 @@ msgstr "" msgid "Optional" msgstr "선택" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "\"coordinate\" 옵션으로부터 좌표를 읽을 수 없습니다." -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4094,82 +4102,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "파일 <%s>를 열 수 없습니다" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "bufferzone 크기를 읽을 수 없었습니다. 취소합니다." -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "%s bufferzone 크기를 읽을 수 없었습니다. 취소합니다." -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "최대 거리를 읽을 수 없었습니다. 취소합니다." -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "현재 로케이션의 투영 정보를 얻을 수 없습니다" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "현재 로케이션의 투영 키값을 얻을 수 없습니다" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4975,7 +4995,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5054,7 +5074,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "테이블 <%s>에 관한 권한을 부여할 수 없습니다" @@ -5183,7 +5203,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5382,9 +5402,8 @@ msgid "Cannot open file %s for reading" msgstr "파일 %s를 읽기 위해 열 수 없습니다" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5400,7 +5419,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5609,9 +5628,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "변환" @@ -5629,7 +5648,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5714,10 +5733,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5757,30 +5776,30 @@ msgstr "출력할 격자지도" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "투영" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5906,127 +5925,127 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "지역정보를 셸 스크립트 형식으로 출력합니다" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "무효한 입력 <%s=%s>" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "로케이션의 투영설정을 대화식으로 재설정합니다." -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "점을 추출하는 중입니다..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "출력 래스터 지도를 쓰는 중입니다..." -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "입력 파일 <%2$s> 안에 지도 이름 %1$s를 찾을 수 없습니다" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "래스터 지도 <%s>를 생성했습니다." @@ -6126,7 +6145,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "-%c와 %s=를 같이 지정할 수 없습니다" @@ -6160,7 +6179,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6190,7 +6209,7 @@ msgstr "임시파일 <%s>를 생성할 수 없습니다 -- errno = %d" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "임시 파일 <%s>를 쓰는데 오류" @@ -6243,9 +6262,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6261,8 +6280,8 @@ msgstr "" msgid "surface" msgstr "표면" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6272,24 +6291,55 @@ msgstr "표면" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6341,7 +6391,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6641,7 +6691,7 @@ msgstr "자료를 읽는 중 오류" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6747,7 +6797,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6833,7 +6882,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7456,7 +7505,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7465,7 +7514,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7572,7 +7621,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7596,15 +7645,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7677,7 +7726,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7727,17 +7776,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7795,6 +7841,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7933,7 +7980,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8016,7 +8063,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8075,7 +8122,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8136,7 +8183,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8259,7 +8306,6 @@ msgid "Calculating flow directions..." msgstr "흐름 방향을 계산하는 중입니다..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8398,7 +8444,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "<%s=%s> 점의 무효한 개수" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8490,8 +8536,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8500,8 +8546,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8519,7 +8565,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8899,9 +8945,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9125,13 +9171,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9144,7 +9188,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9386,31 +9429,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "filter=와 [xy_]radius= 값의 개수가 다릅니다." -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9426,13 +9469,13 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" -msgstr "" +#, fuzzy +msgid "create project" +msgstr "출처 투영" #: ../raster/r.in.gdal/main.c:118 msgid "Imports raster data into a GRASS raster map using GDAL library." @@ -9446,18 +9489,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "투영을 설정할 수 없습니다" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9481,11 +9524,11 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" -msgstr "" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" +msgstr "출력 3차원 흐름누적 래스터 지도를 위한 이름" #: ../raster/r.in.gdal/main.c:195 msgid "File prefix for raster attribute tables" @@ -9514,7 +9557,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9523,77 +9566,78 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +#, fuzzy +msgid "You need to specify valid project name." msgstr "유효한 로케이션 이름을 지정해야 합니다." -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "래스터 지도 <%s>가 이미 존재하지만 덮어 씁니다" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "래스터 지도 <%s>가 이미 존재합니다" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." @@ -9601,7 +9645,7 @@ msgstr "" "입력 래스터 지도가 반전 또는 회전되어 있습니다 - 가져올 수 없습니다. " "'gdalwarp'를 이용해서 지도를 북향이 되게 변환할 수 있습니다." -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " @@ -9609,127 +9653,152 @@ msgid "" msgstr "" "아핀 변환 계수를 가져올 수 없습니다. 이 경우 플래그 -%c를 사용할 수 없습니다." -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "지도명 출력 문자파일을 열 수 없습니다" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "래스터 밴드 번호 %d를 얻을 수 없습니다" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"입력 지도의 투영을 GRASS 포맷으로 변환할 수 없습니다; 새 로케이션을 생성할 " +"수 없습니다." + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "표적 로케이션의 투영 정보를 얻을 수 없습니다" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "표적 로케이션의 투영 단위를 얻을 수 없습니다" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" -msgstr "" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" +msgstr "입력 지도의 투영 키값을 얻을 수 없습니다" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "무효한 행" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "파일 <%s>를 열 수 없습니다: %s." +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"입력 지도의 투영을 GRASS 포맷으로 변환할 수 없습니다; 새 로케이션을 생성할 " +"수 없습니다." + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "rclist 메모리가 부족합니다" @@ -10395,7 +10464,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10508,6 +10576,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10539,26 +10619,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10583,12 +10643,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10596,40 +10650,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "래스터 지도를 쓸 수 없습니다" @@ -10782,7 +10836,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11027,29 +11081,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11102,71 +11156,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "최소 난수값" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "분절 파일 %s를 생성할 수 없습니다" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "분절 파일 %s를 포맷할 수 없습니다" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "분절 파일 %s를 열 수 없습니다" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11209,6 +11230,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "분절 파일 %s를 생성할 수 없습니다" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "분절 파일 %s를 포맷할 수 없습니다" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "분절 파일 %s를 열 수 없습니다" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11914,7 +11968,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11928,13 +11982,14 @@ msgid "transformation" msgstr "변환" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "출력할 격자지도" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "입력 래스터 지도를 닫을 수 없습니다" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11959,10 +12014,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -12018,13 +12071,14 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "입력과 출력 로케이션은 같을 수 없습니다" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" -msgstr "" +#, fuzzy +msgid "Input and output projects are the same" +msgstr "입력과 출력 로케이션은 같을 수 없습니다" #: ../raster/r.proj/main.c:268 msgid "Unable to get projection info of output raster map" @@ -12040,12 +12094,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12053,16 +12107,16 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" +msgstr "출력할 격자지도" #: ../raster/r.proj/main.c:323 msgid "Unable to get projection info of input map" @@ -12077,12 +12131,12 @@ msgid "Unable to get projection key values of input map" msgstr "입력 지도의 투영 키값을 얻을 수 없습니다" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12163,7 +12217,7 @@ msgid "Sorting events..." msgstr "모서리를 쓰는 중입니다..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12419,8 +12473,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12586,8 +12641,9 @@ msgid "S_decode ==> Please fix the shadowband sky factor: %f" msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 +#, fuzzy msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" "비투영 로케이션 안에서는 해의 위치를 계산할 수 없습니다. sunposition을 직접 " @@ -12600,6 +12656,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "입력 지도의 투영 키값을 얻을 수 없습니다" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13211,15 +13282,18 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +#, fuzzy +msgid "Cannot get projection info of current project" msgstr "현재 로케이션의 투영 정보를 얻을 수 없습니다" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +#, fuzzy +msgid "Cannot get projection units of current project" msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +#, fuzzy +msgid "Cannot get projection key values of current project" msgstr "현재 로케이션의 투영 키값을 얻을 수 없습니다" #: ../raster/r.sunhours/main.c:367 @@ -13298,7 +13372,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13308,7 +13382,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13394,7 +13468,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "테이블 '%s'를 생성할 수 없습니다" @@ -13403,7 +13477,7 @@ msgstr "테이블 '%s'를 생성할 수 없습니다" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "테이블 <%s>, 키 <%s>를 위한 색인을 생성할 수 없습니다" @@ -13717,7 +13791,7 @@ msgstr "출력 지형지표 래스터 지도를 위한 이름" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13728,19 +13802,19 @@ msgstr "" msgid "position" msgstr "위치" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "질의할 기존 래스터 지도의 이름" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "질의를 위한 좌표" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13748,15 +13822,28 @@ msgstr "질의를 위한 좌표" msgid "Query" msgstr "질의" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "질의를 위한 벡터 점 지도의 이름" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "점 캐시의 크기" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13765,62 +13852,70 @@ msgstr "점 캐시의 크기" msgid "Advanced" msgstr "고급" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "출력 헤더 행" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "캐시 보고를 켭니다" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "벡터 지도 <%s>를 읽을 수 없습니다" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "선 %d는 점이나 도심이 아니므로 넘어갑니다" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "%s %s는 현재지역의 바깥입니다" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13990,9 +14085,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14331,21 +14423,21 @@ msgstr "평탄화값은 음수이거나 널일 수 없습니다" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "임시 파일을 위한 %.2f GB의 디스크 공간" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "임시 파일을 위한 %.2f MB의 디스크 공간" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "임시 파일을 위한 %.2f KB의 디스크 공간" @@ -14529,80 +14621,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15480,31 +15572,31 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15520,61 +15612,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15598,7 +15690,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16541,46 +16632,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "지하수 흐름" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "연립선형방정식을 생성하고 풀 수 없습니다" @@ -16905,7 +16996,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17356,8 +17447,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17484,99 +17575,99 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "유효한 점들만 쓰기" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "<%s>의 LAS 헤더를 읽을 수 없습니다" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "알려지지 않은 필터 옵션 <%s>" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "무효한 %s" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "%lu개의 무효한 입력 점들을 걸러 냈습니다" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" "%lu개의 입력 점들이 무효했습니다, 이 점들을 걸러 내려면 -%c 플래그를 사용하세" "요" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17839,11 +17930,11 @@ msgstr "꼬리표를 쓰기 위해 파일 <%s>를 열 수 없습니다" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18044,32 +18135,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18152,8 +18243,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "기본값: 자동축척" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18175,8 +18267,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "그래픽스" @@ -18930,8 +19023,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18941,28 +19034,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "무효한 좌표: [%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18971,57 +19064,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19030,7 +19123,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19039,7 +19132,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19531,6 +19624,10 @@ msgstr "3차원 래스터 지도 <%s>의 범위를 읽을 수 없습니다" msgid "Error while reading history file" msgstr "히스토리 파일을 읽는 동안 오류" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19589,64 +19686,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "3차원 래스터 지도 <%s>를 생성할 수 없습니다" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19752,7 +19857,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19765,10 +19869,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19782,11 +19884,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "디스플레이" @@ -20282,10 +20384,10 @@ msgstr "스크립트 파일을 닫는데 오류" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20341,9 +20443,9 @@ msgstr "명령 줄 인터페이스에만 적용" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "타입" @@ -20403,13 +20505,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "<%s> GUI를 배경프로세스에서 시작합니다. 기다려주세요..." #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "지원" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20774,67 +20876,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "3차원 래스터 지도 <%s@%s>의 헤더를 읽을 수 없습니다" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "영역 <%s>를 설정할 수 없습니다" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "위도/경도 투영 매개변수를 갱신할 수 없습니다" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21084,8 +21186,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21358,154 +21460,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "사양" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "EPSG 투영 코드" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "출력 표고 래스터 지도를 위한 이름" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21594,8 +21697,8 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" msgstr "로케이션 <%s>를 생성할 수 없습니다: %s" #: ../general/g.proj/create.c:21 @@ -21604,99 +21707,99 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" +#, fuzzy, c-format +msgid "Unable to create project <%s>" msgstr "로케이션 <%s>를 생성할 수 없습니다" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "투영 정보가 갱신되었습니다" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" "메시지, 경고, 경과 정보, 또는 치명적인 오류를 GRASS 방식으로 출력합니다." -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "단계" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "출력될 메시지의 문자" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "입력 메시지를 해석할 수 없습니다" @@ -21840,7 +21943,8 @@ msgstr "현재 지도 세트를 바꾸거나 보고합니다." #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21923,35 +22027,58 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "유효한 지도 세트들:" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "접근 가능한 지도 세트들:" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "검색 경로" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "사용자의 지도 세트 검색 경로를 수정하거나 출력합니다." -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 +#, fuzzy msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" "현재 로케이션 안에 있는 다른 지도 세트 내에 존재하는 자료에 관한 사용자의 접" "근에 영향을 미칩니다." -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "추가/제거 또는 설정하고 싶은 기존 지도 세트의 이름" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21960,69 +22087,74 @@ msgstr "추가/제거 또는 설정하고 싶은 기존 지도 세트의 이름" msgid "Operation to be performed" msgstr "실행할 명령" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +#, fuzzy +msgid "Output format for printing (-l and -p flags)" msgstr "출력을 위한 필드구분자(-l과 -p 플래그)" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "모든 지도 세트을 알파벳순으로 나열합니다" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "검색 경로에 있는 지도 세트을 출력합니다" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "지도 세트 선택을 위한 GUI 대화 상자를 시작합니다" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "알려지지 않은 조작 '%s'" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "-%c 플래그를 무시합니다" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "<%s> 옵션을 무시합니다" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "지도 세트 <%s>를 찾을 수 없습니다" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "현재 지도 세트(<%s>)가 반드시 검색 경로에 포함되어야 합니다" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "지도 세트 <%s>가 경로에 이미 존재합니다" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "지도 세트 <%s>를 검색 경로에 추가했습니다" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "지도 세트 <%s>를 검색 경로에서 제거했습니다" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "검색 경로가 수정되지 않았습니다" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "SEARCH_PATH를 쓰기 위해 열 수 없습니다" @@ -22037,37 +22169,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "%s를 쓰기 위해 열 수 없습니다: %s" @@ -22427,7 +22556,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23616,7 +23745,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23712,7 +23841,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23720,8 +23850,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "입력 벡터 점 지도의 이름" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23753,35 +23884,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "래스터 지도 <%s>를 찾을 수 없습니다" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "그룹 [%s] 내의 표적을 위한 기본 표고 지도를 찾을 수 없습니다" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23834,61 +23966,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "지도 세트 <%s>를 찾을 수 없습니다" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 #, c-format -msgid "Target location <%s> not found" +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "그룹 <%s>를 위한 참고점을 읽을 수 없습니다" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "그룹 <%s>를 위한 카메라 파일 내에 잘못된 포맷" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23898,29 +24035,31 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "표적 로케이션의 투영 정보를 얻을 수 없습니다" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "오류 벡터 지도 <%s>를 생성할 수 없습니다" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "투영정보가 갱신되지 않을 것입니다" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -24035,15 +24174,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24083,101 +24220,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "로케이션: %s" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "로케이션 <%s>를 생성할 수 없습니다" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "그룹 <%s>를 위한 REF 파일을 읽을 수 없었습니다" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24301,6 +24436,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24317,6 +24462,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24326,6 +24476,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "로케이션: %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24693,6 +24863,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "투영" @@ -26277,8 +26448,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26602,17 +26773,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26621,17 +26789,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26640,17 +26805,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26660,17 +26822,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26679,12 +26838,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27180,6 +27337,7 @@ msgid "Unable to access target location/mapset %s/%s" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27191,6 +27349,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -27708,11 +27871,15 @@ msgstr "자료를 선택할 수 없습니다:" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27761,7 +27928,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "트랜잭션을 커밋할 수 없습니다" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27856,16 +28023,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28440,6 +28606,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "삭제할 속성 열의 이름" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "생성될 점의 개수" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28482,6 +28684,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28518,63 +28722,74 @@ msgstr "출력할 격자지도" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "출력 래스터 지도를 위한 이름" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "출력 벡터 지도를 위한 이름" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "출력 래스터 지도를 위한 이름" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "출력 벡터 지도를 위한 이름" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "출력 래스터 지도를 위한 이름" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "임시 파일을 생성할 수 없습니다" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "입력 래스터 밴드의 기반 이름" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "출력할 격자지도" @@ -28654,239 +28869,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "벡터 지도의 이름" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "주제도 제작을 위한 레이어 번호 또는 이름" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -#, fuzzy -msgid "layer number/name for the ML results" -msgstr "레이어 번호 또는 이름(쓰기용)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "새 영역 내 열의 개수" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "래스터 지도의 통계를 보고합니다" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "감독 분류" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "감독 분류" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 #, fuzzy msgid "Delete segments where there is an existing plant" @@ -29091,6 +29081,525 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "3차원 래스터 지도를 생성하는 중입니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "로케이션 <%s>를 생성할 수 없습니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "출력 파일을 위한 이름" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "출력할 격자지도" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "질의를 위한 벡터 점 지도의 이름" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "입력 좌표 파일의 이름" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "질의를 위한 벡터 점 지도의 이름" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "출력 파일을 위한 이름" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "보여 줄 래스터 지도의 이름" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "피처의 도형을 보여 줍니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "피처를 선택하는 중입니다..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "피처를 선택하는 중입니다..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "피처를 선택하는 중입니다..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "시각화" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "출력할 격자지도" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "보간 점의 개수" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "로케이션 <%s>를 생성할 수 없습니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "출력할 격자지도" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "디지털화 임계값" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "질의를 위한 임계값은 %.2f입니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "생성될 점의 개수" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "중복된 면 도심을 제거합니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "3차원 래스터 지도를 열 수 없습니다" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "출력할 격자지도" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +#, fuzzy +msgid "Show the Maxent user interface" +msgstr "사용자 인터페이스" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29289,10 +29798,15 @@ msgstr "" msgid "Name for output vector map" msgstr "출력 벡터 지도를 위한 이름" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29534,6 +30048,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30741,7 +31263,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30785,11 +31307,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31890,7 +32407,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "레이어 번호 또는 이름." @@ -31927,6 +32443,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -32297,7 +32824,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32491,7 +33017,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "입력" @@ -32527,6 +33053,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33573,11 +34107,8 @@ msgstr "설정 파일" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33627,45 +34158,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "배경 색상" +msgid "Thin species and background points" +msgstr "보간 점의 개수" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "배경 색상" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "출력 파일을 열 수 없습니다" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -34466,8 +35011,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34478,6 +35032,7 @@ msgid "Group of raster layers to be classified" msgstr "재분류될 래스터 지도의 이름" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34519,11 +35074,13 @@ msgid "" msgstr "출력할 격자지도" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "출력 지도" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34822,6 +35379,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34833,6 +35391,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34862,6 +35421,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "출력 파일을 위한 이름" @@ -35234,66 +35794,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "출력 래스터 지도를 위한 이름" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "출력 3차원 흐름누적 래스터 지도를 위한 이름" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "지도 단위의 길이" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35648,11 +36148,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36523,6 +37025,14 @@ msgid "" "mapset." msgstr "출력할 격자지도" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36653,12 +37163,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36802,9 +37312,8 @@ msgstr "글꼴설정" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36847,19 +37356,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36868,7 +37387,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -37000,34 +37519,6 @@ msgstr "입력 데이터베이스 이름" msgid "Base name for output file" msgstr "출력 파일을 위한 이름" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "위상" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "생성될 점의 개수" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37686,6 +38177,10 @@ msgstr "출력 파일을 위한 이름" msgid "Queries projection information spatially." msgstr "투영 정보가 갱신되었습니다" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -37979,7 +38474,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -38010,8 +38505,9 @@ msgid "Layer number or name." msgstr "레이어 번호 또는 이름." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "삭제할 속성 열의 이름" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38723,9 +39219,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38895,6 +39397,9 @@ msgid "image collections" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -39006,6 +39511,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "해상도만 추측합니다" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -40037,8 +40550,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -40133,39 +40646,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "생성될 점의 개수" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "대체할 공간 참조 체계를 지정하세요 (예: EPSG:4326)" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -43440,8 +43962,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -43479,6 +44001,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43890,6 +44413,13 @@ msgstr "재분류" msgid "multiple" msgstr "다중 스팩트럼" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43943,6 +44473,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "벡터" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "벡터" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -43982,6 +44526,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "새 영역 내 열의 개수" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "재분류될 래스터 지도의 이름" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "생성될 점의 개수" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -44409,8 +44985,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -45155,6 +45731,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "출력할 격자지도" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -45447,6 +46027,10 @@ msgstr "입력 TOPMODEL 매개변수 파일의 이름" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 #, fuzzy msgid "Adjacent downstream segment category" @@ -45887,10 +46471,93 @@ msgstr "수직 과장" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "출력 파일을 위한 이름" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "출력 파일 %s를 열 수 없습니다" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "마스크로 쓸 벡터 지도의 이름" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "레이어/테이블" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "3차원 래스터 지도를 생성하는 중입니다" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "변경할 래스터 지도의 이름" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "매개변수" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "위상" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "출력할 격자지도" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -46395,17 +47062,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -46432,23 +47089,20 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "출력 파일을 위한 이름" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -46459,9 +47113,8 @@ msgid "Default font size" msgstr "기본 단위는 셀입니다" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -46481,13 +47134,11 @@ msgid "Create a vector point layer of outliers" msgstr "질의를 위한 벡터 점 지도의 이름" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -46497,14 +47148,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -46538,14 +47187,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -46557,26 +47198,22 @@ msgid "Plot format" msgstr "테이블 포맷" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -46622,15 +47259,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -46650,7 +47278,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -46660,49 +47287,40 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "글꼴파일의 경로" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -46710,109 +47328,25 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "글꼴크기" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "색상을 반전합니다" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "해상도만 추측합니다" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "글꼴크기" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "테이블 포맷" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "문자 색상" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -48317,6 +48851,7 @@ msgid "no-data" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -48328,6 +48863,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 @@ -48437,6 +48977,14 @@ msgstr "해상도만 추측합니다" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -48462,6 +49010,15 @@ msgstr "선을 병합하는 중입니다..." msgid "add grid lines" msgstr "무효한 격자 크기 <%s>" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "문자 색상" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -48560,302 +49117,302 @@ msgid "" "layer in a scatterplot." msgstr "주어진 벡터 지도에 연결된 속성 테이블로부터 열을 삭제합니다." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "벡터" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "입력 색상 지도의 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "제거할 파일의 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "입력 색상 지도의 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "제거할 파일의 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "자료형" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "출력 벡터 지도를 위한 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "최종 보고서를 포함할 출력 파일을 위한 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "출력할 격자지도" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "출력할 격자지도" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "지도의 수직 단위" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "통계" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "문자 색상" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "열" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "입력 색상 지도의 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "색상을 반전합니다" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "선" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "출력할 격자지도" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "색상 테이블" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "무효한 폭" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "문자 색상" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "정수 범위: 최소,최대" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "보여질 래스터 지도의 이름" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "정수 범위: 최소,최대" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "보여질 래스터 지도의 이름" @@ -49203,8 +49760,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -49286,180 +49843,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -#, fuzzy -msgid "density" -msgstr "조밀화" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "분절 규칙을 포함하는 파일의 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "입력파일" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "감독 분류" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "출력 기반 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "출력 벡터 지도를 위한 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "보고서를 보관할 출력 파일을 위한 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "보고서를 보관할 출력 파일을 위한 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "보여질 래스터 지도의 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "보여질 래스터 지도의 이름" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "출력할 격자지도" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "어떤 피처도 선택하지 않았으므로 수정할 것이 없습니다" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -50278,11 +50661,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -55925,6 +56303,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "지정하지 않으면 기본 데이터베이스를 씁니다" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -56471,8 +56889,8 @@ msgid "Unable to open file '%s': %s" msgstr "파일 '%s'를 열 수 없습니다: %s" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -56773,8 +57191,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -56954,7 +57372,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -56968,7 +57386,7 @@ msgstr "십진화를 위해 z를 사용할 수 없습니다, 입력이 3차원 msgid "Cannot select by z range, input is not 3D" msgstr "z 범위로 선택할 수 없습니다, 입력이 3차원이 아닙니다" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -57498,7 +57916,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -57790,7 +58208,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -57879,49 +58297,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "(테이블이 아닌) 어떤 레이어를 위한 연결을 삭제합니다" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -57931,17 +58345,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "레이어 <%s>를 위한 데이터베이스 연결이 정의되지 않았습니다" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" -msgstr "" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" +msgstr "기존 래스터 지도 <%s>를 덮어쓸 수 없습니다" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -57950,16 +58364,16 @@ msgstr "" "테이블 <%s>는 이제 벡터 지도 <%s>의 일부이며 GRASS 모듈에 의해 삭제되거나 덮" "어써질 수 있습니다" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "테이블 %s에 권한을 부여할 수 없습니다" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -57996,7 +58410,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -58073,56 +58487,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "파일 <%s>를 LiDAR 점 구름으로 열 수 없습니다. %s" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -58389,21 +58810,25 @@ msgstr[0] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." @@ -58411,107 +58836,107 @@ msgstr "" "하부의 libLAS 라이브러리가 한계에 도달했습니다. 이전에 보고된 개수들이 왜곡됐" "을 수 있습니다. 하지만 가져오기 자체는 영향을 받지 않아야 합니다." -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -58984,7 +59409,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -59223,11 +59648,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -59254,7 +59679,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -59263,7 +59688,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "자료 원천 <%s>를 열 수 없습니다" @@ -59283,7 +59708,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -59319,12 +59744,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "출력할 격자지도" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "입력 벡터 선 지도의 이름" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -59358,14 +59785,19 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "입력과 출력 로케이션은 같을 수 없습니다" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" +msgstr "벡터 시드 맵 <%s>를 찾을 수 없습니다" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 #: ../vector/v.proj/main.c:526 ../vector/v.rectify/main.c:236 @@ -59379,13 +59811,13 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" +msgstr "지도 세트 <%s>를 찾을 수 없습니다" #: ../vector/v.proj/main.c:517 msgid "Reprojecting primitives ..." @@ -61859,7 +62291,7 @@ msgstr "무효한 옵션을 건너뛰었습니다: %s" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62483,7 +62915,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -62791,12 +63223,12 @@ msgid "Cleaning output topology" msgstr "출력 위상을 정리하는 중입니다" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "댕글을 제거하는 중입니다..." #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "브리지를 제거하는 중입니다..." @@ -62996,19 +63428,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "다각형을 분해하는 중입니다..." #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "중복을 제거하는 중입니다..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "경계를 분해하는 중입니다..." @@ -63216,7 +63648,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -63374,10 +63806,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -63416,6 +63848,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -63516,9 +63952,9 @@ msgid "" msgstr "교차 검증은 출력 격자 또는 편차 파일과 함께 동시에 계산할 수 없습니다" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "%s를 생성할 수 없습니다" @@ -63532,7 +63968,7 @@ msgstr "%s를 열 수 없습니다" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -63617,7 +64053,6 @@ msgid "Cannot allocate memory for point" msgstr "점을 위해 메모리를 할당할 수 없습니다" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "%lf,%lf,%lf,%lf,%lf a=%d를 삽입할 수 없습니다" @@ -63645,8 +64080,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -64268,7 +64703,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "면의 도심을 계산할 수 없습니다" @@ -64400,8 +64835,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -66168,17 +66603,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "교점에 있는 경계를 정리하는 중입니다..." -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "경계를 병합하는 중입니다..." @@ -66354,13 +66789,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -66606,42 +67041,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -67635,16 +68074,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -69048,67 +69477,67 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" "교차 검증은 출력 래스터 또는 편차 파일과 함께 동시에 계산할 수 없습니다" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "래스터 지도를 쓸 수 없습니다 - 해상도를 올려 보세요" @@ -69394,7 +69823,7 @@ msgstr "선을 병합하는 중입니다..." msgid "Querying vector map <%s>..." msgstr "벡터 지도 <%s>를 검색하는 중입니다..." -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "도심을 쓰는 중입니다..." @@ -69853,164 +70282,165 @@ msgstr "레이어 <%s>를 위한 데이터베이스 연결이 정의되지 않 msgid "Unable to open driver <%s>" msgstr "드라이버 <%s>를 열 수 없습니다" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "이름:" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "지도 세트:" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "로케이션:" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "투영" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "데이터베이스:" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "제목:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "지도 축척:" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "제작자 이름:" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "기관:" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "원천 자료 날짜:" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "타임스탬프 (첫째 레이어):" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "타임스탬프 (첫째 레이어): 없음" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "지도 포맷:" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "DB 이름:" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "위상:" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "지도 유형" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "단계" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "점의 개수:" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "도심의 개수:" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "선의 개수:" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "경계의 개수:" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "면의 개수:" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "섬의 개수:" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "페이스의 개수:" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "3차원 지도:" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "예" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "아니오" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "DB 연결 개수:" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "디지털화 임계값" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "주석" @@ -70187,28 +70617,51 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "DWG/DXF를 GRASS 벡터 지도로 변환합니다" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -70275,276 +70728,277 @@ msgstr "다각형을 정리하지 않습니다 (추천하지 않습니다)" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "잘못된 출력 이름 <%s>" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 +#, fuzzy msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" "새 로케이션을 생성할 때는 현재 영역을 공간 필터로 사용할 수 없습니다, 사용하" "지 않습니다" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "OGR 레이어 <%s>가 다각형을 포함하고 있는지 확인하는 중입니다..." -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "입력 레이어 <%s>를 위한 새 행을 삽입할 수 없습니다: %s" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "테이블을 삭제할 수 없습니다: '%s'" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "다각형을 정리하는 중입니다" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "OGR 레이어 <%s>를 위한 도심을 찾는 중입니다..." -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "%d개의 입력 다각형\n" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "%d개의 입력 다각형" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "총면적: %G (%d개의 면)\n" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "정점을 서로에게 끌어 붙여서 입력을 정리할 수도 있습니다." -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "수작업 정리가 필요할 수 있습니다." -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -70553,51 +71007,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "끌어 붙이기 임계값 %g이 너무 큽니다." -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "끌어 붙이기 임계값을 줄이거나 출력을 수작업으로 정리해 보세요." -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -70753,10 +71207,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "지도 세트 <%s>를 찾을 수 없습니다" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -74743,14 +75207,14 @@ msgstr "글꼴파일의 경로" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -74758,7 +75222,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -75745,6 +76209,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -76312,6 +76780,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "파일 '%s'를 읽기 위해 열 수 없습니다" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "파일 '%s'를 쓰기 위해 열 수 없습니다" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -76883,7 +77368,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "파일 '%s'를 열 수 없습니다" @@ -77122,22 +77607,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -79166,38 +79644,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -79277,11 +79755,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "계산 도중 %i개의 타일을 생성할 수 없었습니다" @@ -79306,103 +79784,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "널 지역에 ID를 할당하는 중입니다" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -79414,169 +79892,169 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "무효한 EPSG 코드 %d" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "임시 파일로 자료를 쓸 수 없습니다" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "임시 파일을 생성할 수 없습니다" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" @@ -79585,7 +80063,7 @@ msgstr "" "임시 파일로 자료를 쓸 수 없습니다.\n" "%s" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" @@ -79594,160 +80072,160 @@ msgstr "" "임시 파일로부터 자료를 읽을 수 없습니다.\n" "%s" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "WMS 서버에 알려지지 않은 오류" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -79800,50 +80278,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -79871,7 +80349,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -80093,7 +80571,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -80150,85 +80628,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "임시 파일을 생성하는 중입니다..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "임시 파일을 생성하는 중입니다..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "현재 로케이션의 투영 단위를 얻을 수 없습니다" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -80274,29 +80753,29 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "열 <%s>가 삭제될 것입니다." -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" "실제로 제거하기 위해서는 -f 강제 플래그 를 사용해야 합니다. 종료합니다." -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "계속할 수 없습니다 (열 삭제시 문제 발생)" @@ -80353,27 +80832,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "OGR 자료 원천 '%s'를 열 수 없습니다" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -80383,7 +80862,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -80395,14 +80873,14 @@ msgstr "" "입력 벡터 지도에 연결된 테이블이 존재하지 않습니다. 어떤 열의 이름도 바꿀 수 " "없습니다" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -80412,72 +80890,72 @@ msgstr "" "없습니다" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "열 <%s>를 생성할 수 없습니다 (이미 존재)." -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -80705,7 +81183,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -80723,66 +81201,67 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "무효한 최대 피처 개수" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 -#, python-format +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 +#, fuzzy, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" "서버가 요청을 이행할 수 없었습니다.\n" "오류 코드: %s" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -80924,79 +81403,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -81109,40 +81588,40 @@ msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" "현재 지도 세트 안에 마스크가 이미 존재합니다. 먼저 삭제하거나 덮어쓰세요." -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -81178,7 +81657,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -81189,34 +81668,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -81308,34 +81787,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -81420,247 +81899,247 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 #, fuzzy msgid "Cannot write to working directory {}." msgstr "%s 디렉토리를 생성할 수 없습니다" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "%s <%s>를 찾을 수 없습니다" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" @@ -81669,73 +82148,73 @@ msgstr "" "알려지지 않은 확장 (애드온) 원천 유형 '{0}'. grass-user 메일링 리스트에 이 문" "제를 보고하세요." -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "제거된 파일의 목록:" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "제거할 파일:" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" "확장 <%s>가 제거되지 않았습니다. 강제 제거를 위해서는 '%s'를 '-f' 플래그와 함" "께 다시 실행하세요." -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -81743,60 +82222,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, fuzzy, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "드라이버를 열 수 없습니다" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -81848,27 +82327,38 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "규칙 파일 <%s>를 열 수 없습니다" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "분절을 생성하는데 오류" + +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -81914,16 +82404,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -81994,14 +82474,19 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "현재 지도 세트 안에서 그룹 <%s>를 찾을 수 없습니다" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, fuzzy, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " @@ -82010,27 +82495,30 @@ msgstr "" "입력 벡터 지도에 연결된 테이블이 없습니다. 어떤 열도 삭제할 수 없습니다. 종료" "합니다." -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -82078,20 +82566,149 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "벡터 지도의 이름" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "출력할 격자지도" + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "주제도 제작을 위한 레이어 번호 또는 이름" + +#, fuzzy +#~ msgid "layer number/name for the ML results" +#~ msgstr "레이어 번호 또는 이름(쓰기용)" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "새 영역 내 열의 개수" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "래스터 지도의 통계를 보고합니다" + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "감독 분류" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "감독 분류" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "출력 래스터 지도를 위한 이름" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "출력 3차원 흐름누적 래스터 지도를 위한 이름" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "지도 단위의 길이" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "출력할 격자지도" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "출력할 격자지도" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "해상도만 추측합니다" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "글꼴크기" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "테이블 포맷" + +#, fuzzy +#~ msgid "density" +#~ msgstr "조밀화" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "출력할 격자지도" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "분절 규칙을 포함하는 파일의 이름" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "입력파일" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "감독 분류" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "출력할 격자지도" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "출력 기반 이름" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "출력 벡터 지도를 위한 이름" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "보고서를 보관할 출력 파일을 위한 이름" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "보고서를 보관할 출력 파일을 위한 이름" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "보여질 래스터 지도의 이름" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "보여질 래스터 지도의 이름" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "출력할 격자지도" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "어떤 피처도 선택하지 않았으므로 수정할 것이 없습니다" + +#~ msgid "Location:" +#~ msgstr "로케이션:" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "" #~ "Remove all registered maps from the temporal and also from the spatial " #~ "database" @@ -84009,10 +84626,6 @@ msgstr "" #~ msgid "Could not rewind input file" #~ msgstr "출력할 격자지도" -#, fuzzy -#~ msgid "Raster map <%s> already exists in mapset <%s>" -#~ msgstr "출력할 격자지도" - #~ msgid "Page length (default: %d lines)" #~ msgstr "쪽길이 (기본값: %d줄)" @@ -84180,6 +84793,7 @@ msgstr "" #~ msgid "Error in pj_do_proj2" #~ msgstr "pj_do_proj2 내에 오류" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Can not read control points for group <%s>" @@ -84196,6 +84810,8 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속 ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "Error in pj_do_proj3" #~ msgstr "pj_do_proj3 내에 오류" @@ -84262,6 +84878,9 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grassmods_lv.po b/locale/po/grassmods_lv.po index 185fb38ce36..b71b7a085ce 100644 --- a/locale/po/grassmods_lv.po +++ b/locale/po/grassmods_lv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_lv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-04-01 16:41+0200\n" "Last-Translator: Maris Nartiss \n" "Language-Team: Latvian \n" @@ -89,7 +89,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -129,32 +129,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -180,21 +181,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Drukāt" @@ -266,7 +267,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -291,7 +292,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -302,7 +303,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -324,7 +325,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -481,6 +482,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -500,7 +502,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -519,7 +520,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -533,6 +533,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -566,7 +567,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -576,8 +577,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -592,21 +593,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -615,7 +616,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -650,7 +651,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -663,7 +663,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -702,6 +701,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -723,7 +723,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -789,7 +789,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -803,7 +803,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -816,8 +816,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -832,16 +832,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -887,7 +887,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -903,7 +903,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -912,7 +912,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -942,13 +942,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -976,7 +976,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -991,8 +991,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1026,10 +1026,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1037,7 +1037,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1067,23 +1067,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1166,13 +1166,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1225,6 +1225,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1285,6 +1286,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1350,14 +1357,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1407,144 +1413,133 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" -msgstr "" +#, fuzzy +msgid "Override projection check (use current project's CRS)" +msgstr "Neņemt vērā projekciju (izmantot pašreizējā novietojuma projekciju)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1561,35 +1556,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "Novietojums %s ir izveidots!" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1597,55 +1590,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1725,12 +1720,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1768,7 +1761,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1784,7 +1777,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1835,24 +1828,18 @@ msgstr "Vektorkartes nosaukums" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Izvades" @@ -1974,7 +1961,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1984,7 +1971,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2104,7 +2090,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2133,6 +2119,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2266,7 +2253,13 @@ msgstr "izejas līmeņa nosaukums" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2275,8 +2268,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2308,7 +2301,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2364,7 +2357,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2409,7 +2401,7 @@ msgid "Unknown method <%s>" msgstr "Nezināma metode <%s>" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2462,7 +2454,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2879,7 +2871,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2967,14 +2959,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3133,7 +3127,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3441,6 +3435,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3529,17 +3532,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3560,7 +3561,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Izvade" @@ -3633,7 +3634,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "Drukājamo kopiju sakits" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3666,161 +3667,154 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, fuzzy, c-format msgid "Number of threads <%d>" msgstr "Punktu skaits: %d" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" -msgstr "" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" +msgstr "Pārsauc datubāzes elementu failus lietotāja pašreizējā karšu kopā." -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 #, fuzzy msgid "Unable to initialize coordinate transformation" msgstr "Nevar atrast ieejas karti <%s>\n" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3853,19 +3847,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3935,9 +3929,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3951,36 +3945,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4035,6 +4029,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4055,47 +4052,57 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Izvades vienības" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 #, fuzzy msgid "Coordinates are outside of the current region" msgstr "Drukāt tekošo reģionu pēc platuma/garuma" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4104,82 +4111,94 @@ msgstr "Drukāt tekošo reģionu pēc platuma/garuma" msgid "Unable to open file <%s>" msgstr "Nebija iespējams atvērt failu <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "ziemeļi" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, fuzzy, c-format msgid "Error in %s" msgstr "Kļūda: %s" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4984,7 +5003,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5063,7 +5082,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5192,7 +5211,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5391,9 +5410,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5409,7 +5427,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5619,9 +5637,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5640,7 +5658,7 @@ msgstr "Vienu koordinātu pāri uz līniju, lūdzu" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5725,10 +5743,10 @@ msgstr "Vienu koordinātu pāri uz līniju, lūdzu" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5768,30 +5786,30 @@ msgstr "neiespējami atvērt <%s>" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5916,128 +5934,128 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Drukāt statistiku komandrindas skripta stilā" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Neņemt vērā projekciju (izmantot pašreizējā novietojuma projekciju)" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "Neņemt vērā projekciju (izmantot pašreizējā novietojuma projekciju)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Izveidot punktus visā garumā ilīniju garumā" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "reģions <%s> nav atrasts" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "KĻŪDA: <%s> jau eksistē\n" @@ -6137,7 +6155,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6171,7 +6189,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6205,7 +6223,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6260,9 +6278,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6278,8 +6296,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6289,24 +6307,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6358,7 +6407,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6661,7 +6710,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6767,7 +6816,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6853,8 +6901,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "Kolonas tips nav atbalstīts" #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7474,7 +7523,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7483,7 +7532,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7589,7 +7638,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7613,15 +7662,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7694,7 +7743,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7744,17 +7793,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7812,6 +7858,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7950,7 +7997,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8033,7 +8080,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8092,7 +8139,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8153,7 +8200,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8276,7 +8323,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8415,7 +8461,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "Nederīgs soļu skaits: %s" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8507,8 +8553,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8517,8 +8563,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8536,7 +8582,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8916,9 +8962,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9145,13 +9191,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9164,7 +9208,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9409,31 +9452,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9449,12 +9492,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9469,18 +9511,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Jaunā novietojuma nosaukums" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9504,10 +9546,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Janveidojamā novietojuma nosaukums" #: ../raster/r.in.gdal/main.c:195 @@ -9537,7 +9579,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9546,210 +9588,230 @@ msgstr "" msgid "Region" msgstr "Reģions" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" -msgstr "" +#: ../raster/r.in.gdal/main.c:354 +#, fuzzy +msgid "The '-l' flag only works in Lat/Lon projects" +msgstr "Šo moduli var darbināt tikai LatLong novietojumos" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, fuzzy, c-format msgid "No raster bands found in <%s>" msgstr "Nevar atrast ieejas vektoru karti <%s>" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, fuzzy, c-format msgid "Importing %d raster bands..." msgstr "Eksistējošas rastra kartes nosaukums" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" -msgstr "" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" +msgstr "Nevar izveidot projekcijas failus: %s" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" -msgstr "" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" +msgstr "Nerādīt kategoriju nummurus" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, fuzzy, c-format msgid "Unable to read row %d" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "Nevar izveidot projekcijas failus: %s" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10421,7 +10483,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10534,6 +10595,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10565,26 +10638,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10610,12 +10663,6 @@ msgstr "Drukājamo kopiju sakits" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10623,40 +10670,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, fuzzy, c-format msgid "Number of threads: %d" msgstr "Punktu skaits: %d" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10808,7 +10855,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11053,29 +11100,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, fuzzy, c-format msgid "Unable to open input raster <%s>" msgstr "Rastra kartes nosaukums" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11132,71 +11179,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11239,6 +11253,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11951,7 +11998,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "Nevar izveidot projekcijas failus: %s" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11965,13 +12012,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "Konvertē OGR vektorus uz GRASS vektoriem. Pieejamie draiveri:\n" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "Vektorkartes nosaukums" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11996,10 +12044,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -12056,13 +12102,14 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" -msgstr "" +#, fuzzy +msgid "Input and output projects are the same" +msgstr "Drukāt tekošo reģionu pēc platuma/garuma" #: ../raster/r.proj/main.c:268 msgid "Unable to get projection info of output raster map" @@ -12077,21 +12124,21 @@ msgid "Unable to get projection key values of output raster map" msgstr "" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" +msgstr "reģions <%s> nav atrasts" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" +msgstr "reģions <%s> nav atrasts" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 #: ../vector/v.proj/main.c:248 ../vector/v.what.rast/main.c:120 #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12099,7 +12146,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12115,13 +12162,14 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" -msgstr "" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" +msgstr "Nevar izveidot projekcijas failus: %s" #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" -msgstr "" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" +msgstr "reģions <%s> nav atrasts" #: ../raster/r.proj/main.c:524 msgid "Input:" @@ -12200,7 +12248,7 @@ msgid "Sorting events..." msgstr "Rakstu jaunu failu... \n" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12461,8 +12509,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12630,7 +12679,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12641,6 +12690,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "Nevar izveidot projekcijas failus: %s" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Nevar izveidot projekcijas failus: %s" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Nevar izveidot projekcijas failus: %s" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13252,15 +13316,16 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "Pārsauc datubāzes elementu failus lietotāja pašreizējā karšu kopā." #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13340,7 +13405,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13350,7 +13415,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13440,7 +13505,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13449,7 +13514,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13777,7 +13842,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13788,19 +13853,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Vaicājuma koordinātes" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13808,15 +13873,28 @@ msgstr "Vaicājuma koordinātes" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13825,63 +13903,71 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 #, fuzzy msgid "Show the category for vector points map" msgstr "Vektorkartes nosaukums" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -14051,9 +14137,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14394,21 +14477,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14594,80 +14677,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15544,33 +15627,33 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15586,61 +15669,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15665,7 +15748,6 @@ msgstr "lietus" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16613,46 +16695,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16987,7 +17069,7 @@ msgstr "Izveidot punktus visā garumā ilīniju garumā" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17447,8 +17529,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17575,97 +17657,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17933,11 +18015,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18138,32 +18220,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, fuzzy, c-format msgid "Computing %s weights..." msgstr "Tabulu kopēšana" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18246,8 +18328,9 @@ msgid "Units" msgstr "Vienības" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "nevar atvērt %s" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18269,8 +18352,9 @@ msgstr "Platība:" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -19025,8 +19109,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -19036,28 +19120,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19066,57 +19150,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19125,7 +19209,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19134,7 +19218,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19626,6 +19710,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, fuzzy, c-format msgid "Invalid range <%s> for option %s" @@ -19685,69 +19773,78 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "Neņemt vērā projekciju (izmantot pašreizējā novietojuma projekciju)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 #, fuzzy msgid "Preparing the maps..." msgstr "Lasam dig_att failu...\n" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 #, fuzzy msgid "Computing proportional count map..." msgstr "Elementa nosaukums" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 #, fuzzy msgid "Computing proportional sum map..." msgstr "Tabulu kopēšana" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 #, fuzzy msgid "Computing mean map..." msgstr "Tabulu kopēšana" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 #, fuzzy msgid "Closing the maps..." msgstr "baāzes rastra karte" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, fuzzy, c-format msgid "%lu input points had intensity out of range" msgstr "%d punkti ielādēti\n" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19853,7 +19950,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19866,10 +19962,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19883,11 +19977,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20383,10 +20477,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20442,9 +20536,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20504,13 +20598,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20875,68 +20969,68 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 #, fuzzy msgid "Unable to get map bounding box" msgstr "Nevar atrast vektoru karti [%s]" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21180,8 +21274,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21451,154 +21545,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "Nebija iespējams atvērt failu <%s>" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "Datums" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Izveidot" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Jaunā novietojuma nosaukums" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, fuzzy, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "2 līmeņiem jābūt norādītiem" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Trūkst projekcijas failu" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "2 līmeņiem jābūt norādītiem" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21689,9 +21784,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" #: ../general/g.proj/create.c:21 #, c-format @@ -21699,98 +21794,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21934,7 +22029,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -22017,33 +22113,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22052,69 +22170,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22129,37 +22251,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 -#, c-format +#: ../general/g.mkfontcap/main.c:98 +#, fuzzy, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" -msgstr "" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" +msgstr "Izejas karte kurā tiks ierakstīti punkti" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22512,7 +22631,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23700,7 +23819,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23795,9 +23914,10 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "3d skata fails <%s> nav atrasts" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." @@ -23805,7 +23925,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 #, fuzzy -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "Jaunā novietojuma nosaukums" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23841,35 +23961,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "3d skata fails <%s> nav atrasts" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, fuzzy, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "3d skata fails <%s> nav atrasts" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 -#, c-format -msgid "Mapset [%s] in target location [%s] - %s " -msgstr "" - #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "3d skata fails <%s> nav atrasts" + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23925,61 +24046,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "reģions <%s> nav atrasts" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 #, c-format -msgid "Target location <%s> not found" +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23990,7 +24116,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 #, fuzzy -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "Rastra kartes nosaukums" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -24000,22 +24126,22 @@ msgstr "Izmantojamās rastra kartes nosaukums priekš <%s>" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, fuzzy, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "Nevar izveidot novietojumu: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 #, fuzzy -msgid "Target locations with XY (unreferenced) are not supported" +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "Kolonas tips nav atbalstīts" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 #, fuzzy -msgid "Target locations with lon/lat are not supported" +msgid "Target projects (locations) with lon/lat are not supported" msgstr "Kolonas tips nav atbalstīts" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, fuzzy, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "3d skata fails <%s> nav atrasts" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -24130,16 +24256,14 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." -msgstr "" +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." +msgstr "Rakstu jaunu failu... \n" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 #, c-format @@ -24178,101 +24302,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "3d skata fails <%s> nav atrasts" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "Iziet!" @@ -24403,6 +24525,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24419,6 +24551,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24428,6 +24565,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24795,6 +24952,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Izvēle" @@ -26382,8 +26540,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26707,17 +26865,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26726,17 +26881,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26745,17 +26897,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26765,17 +26914,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26784,12 +26930,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27577,11 +27721,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27630,7 +27778,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27723,16 +27871,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28307,6 +28454,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Izejas rastra kartes nosaukums" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Izveidojamo punktu skaits" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28349,6 +28532,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28385,63 +28570,74 @@ msgstr "nevar atvērt %s" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#, fuzzy +msgid "Name of output raster shadow mask" +msgstr "Izejas rastra kartes nosaukums" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Datubāzes faila nosaukums" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Sākuma punkta koordinātes" @@ -28522,236 +28718,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -#, fuzzy -msgid "Name of input vector map" -msgstr "Vektorkartes nosaukums" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Vektorkartes nosaukums" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Slāņa numurs vai nosaukums" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Atslēga (id) kolonas nosaukums" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Jaunā reģiona kolonu skaits" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28956,6 +28930,527 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Jaunā novietojuma nosaukums" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Jaunā novietojuma nosaukums" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Izejas rastra kartes nosaukums" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Lasam dig failu... \n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Attēlojamā rastra karte" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Vektorkartes nosaukums" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Attēlojamā rastra karte" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Izvades skripta nosaukums" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Attēlojamā rastra karte" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Līnījveida objektu orientācija" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +#, fuzzy +msgid "Disable quadratic features" +msgstr "Objektu virsotnes" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Objektu tips" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Objektu tips" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Objektu ģeometrija" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "vizualizācija" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "nevar atvērt %s" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Rakstu jaunu failu... \n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Izmantojamo līmeņu skaits priekš <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "" +"\n" +"\n" +" Punktu skaits: %d\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Rīks: pielaide" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Līnījveida objektu orientācija" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Izveidojamo punktu skaits" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Lasam dig_att failu...\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Līniju skaits" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29149,10 +29644,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29393,6 +29893,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30593,7 +31101,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 #, fuzzy msgid "features" msgstr "Objektu tips" @@ -30638,11 +31146,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31738,7 +32241,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Slāņa numurs vai nosaukums." @@ -31775,6 +32277,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -32140,7 +32653,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32334,7 +32846,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Izvades kartes" @@ -32369,6 +32881,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33419,11 +33939,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33471,45 +33988,58 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -#, fuzzy -msgid "Background SWD file" -msgstr "Fona krāsa" +msgid "Thin species and background points" +msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Fona krāsa" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Rakstu jaunu failu... \n" @@ -34309,8 +34839,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34321,6 +34860,7 @@ msgid "Group of raster layers to be classified" msgstr "Eksistējošas rastra kartes nosaukums" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34362,11 +34902,13 @@ msgid "" msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Izvades kartes" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34665,6 +35207,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34676,6 +35219,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34705,6 +35249,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -35074,65 +35619,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -#, fuzzy -msgid "Plots to generate" -msgstr "Sākuma punkta koordinātes" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35481,11 +35967,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Paplašināt novietojuma apjomu pamatojoties uz jauno datu kopu" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36349,6 +36837,14 @@ msgid "" "mapset." msgstr "Konvertē OGR vektorus uz GRASS vektoriem. Pieejamie draiveri:\n" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36478,12 +36974,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36628,9 +37124,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36674,19 +37169,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Paplašināt novietojuma apjomu pamatojoties uz jauno datu kopu" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36695,7 +37201,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36829,34 +37335,6 @@ msgstr "Ieejas datubāzes nosaukums" msgid "Base name for output file" msgstr "Izvades ACII faila nosaukums" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "hidroloģija" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Izmantojamās rastra kartes nosaukums priekš <%s>" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Izveidojamo punktu skaits" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37511,6 +37989,10 @@ msgstr "Ieejas fails" msgid "Queries projection information spatially." msgstr "Nevar izveidot projekcijas failus: %s" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -37802,7 +38284,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37833,8 +38315,9 @@ msgid "Layer number or name." msgstr "Slāņa numurs vai nosaukums." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38548,9 +39031,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38810,6 +39299,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39839,8 +40336,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39935,39 +40432,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Izveidojamo punktu skaits" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -43229,8 +43735,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -43268,6 +43774,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43676,6 +44183,14 @@ msgstr "Klases" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +#, fuzzy +msgid "Name of input vector map" +msgstr "Vektorkartes nosaukums" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43732,6 +44247,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Vektors" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Vektors" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -43773,6 +44302,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Vektorkartes nosaukums" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Eksistējošas rastra kartes nosaukums" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Izveidojamo punktu skaits" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -44199,8 +44760,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44947,6 +45508,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Izvades rastra karte ar ezeru" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Janveidojamā novietojuma nosaukums" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -45238,6 +45803,10 @@ msgstr "Vektorkartes nosaukums" msgid "Offset factor for input" msgstr "neiespējami atvērt <%s>" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -45677,10 +46246,92 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Vektorkartes nosaukums" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Attēlojamā rastra karte" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Atslēgt" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Vektorkartes nosaukums" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Izmantojamās rastra kartes nosaukums priekš <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "metri" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "hidroloģija" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Izmantojamās rastra kartes nosaukums priekš <%s>" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -46180,17 +46831,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -46218,23 +46859,20 @@ msgid "categorical map with zones" msgstr "vektora karte <%s> nav atrasta" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Izvades skripta nosaukums" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -46245,9 +46883,8 @@ msgid "Default font size" msgstr "neiespējami atvērt <%s>" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -46267,13 +46904,11 @@ msgid "Create a vector point layer of outliers" msgstr "Attēlojamā rastra karte" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -46284,14 +46919,12 @@ msgid "Draw notches" msgstr "Zīmēšanas stils" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -46325,14 +46958,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -46344,27 +46969,23 @@ msgid "Plot format" msgstr "Izejas rastra kartes nosaukums" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Nerādīt kategoriju uzrakstus" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -46411,15 +47032,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -46439,7 +47051,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -46449,49 +47060,40 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Sākuma punkta koordinātes" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -46499,111 +47101,25 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "Fonta nosaukums" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Līnijas krāsa" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Izšķirtspēja" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Zīmēšanas stils" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Nerādīt kategoriju uzrakstus" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Kartes formāts:" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Sākuma punkta koordinātes" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Teksta krāsa" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -47824,6 +48340,14 @@ msgstr "Vēlamā austrumi-rietumi izšķirtspēja" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -47848,6 +48372,15 @@ msgstr "Rakstu jaunu failu... \n" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Teksta krāsa" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -47947,302 +48480,302 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Vektors" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Kolonu skaits" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Jaunā reģiona kolonu skaits" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Kolonu skaits" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Jaunā reģiona kolonu skaits" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Objektu tips" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Līmeņa nosaukums kuru izmantos BLUE(zielais)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Izejas rastra kartes nosaukums" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Izejas rastra kartes nosaukums" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "nevar atvērt %s" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Teksta krāsa" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Krāsas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Kolonas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Objekta krāsa" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "Rakstu jaunu failu... \n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "nevar atvērt %s" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Krāsa" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Sākuma punkta koordinātes" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Līnijas platums" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Sākuma punkta koordinātes" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Līnijas krāsa" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 #, fuzzy msgid "Line style of the ellipse" msgstr "Sākuma punkta koordinātes" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Sākuma punkta koordinātes" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Attēlojamā rastra karte" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Attēlojamā rastra karte" @@ -48591,8 +49124,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -48676,181 +49209,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "vektora karte <%s> nav atrasta" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Ieejošā karte satur līnijas" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Ieejas fails" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "3d skata fails <%s> nav atrasts" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Vektorkartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Izejas tabulas nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Vektorkartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Attēlojamā rastra karte" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Attēlojamā rastra karte" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Drukājamo kopiju sakits" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Izejas rastra kartes nosaukums" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -49665,11 +50023,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -54896,6 +55249,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Drukāt tekošo reģionu pēc platuma/garuma" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -55437,8 +55830,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -55739,8 +56132,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -55920,7 +56313,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -55934,7 +56327,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -56468,7 +56861,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -56760,7 +57153,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -56851,49 +57244,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Nav definēts datubāzes savienojums" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -56903,33 +57292,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Nevar piešķirt privilēģijas tabulai %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -56966,7 +57355,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "Kategorijas" @@ -57043,178 +57432,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -57705,7 +58094,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -57946,11 +58335,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -57977,7 +58366,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -57986,7 +58375,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -58006,7 +58395,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, fuzzy, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -58042,12 +58431,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "Konvertē OGR vektorus uz GRASS vektoriem. Pieejamie draiveri:\n" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Vektorkartes nosaukums" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -58081,14 +58472,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" +msgstr "vektora karte <%s> nav atrasta" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 #: ../vector/v.proj/main.c:526 ../vector/v.rectify/main.c:236 @@ -58102,13 +58497,13 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" +msgstr "3d skata fails <%s> nav atrasts" #: ../vector/v.proj/main.c:517 msgid "Reprojecting primitives ..." @@ -58647,7 +59042,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -59272,7 +59667,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -59584,12 +59979,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -59789,19 +60184,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -60011,7 +60406,7 @@ msgstr[2] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -60169,10 +60564,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -60211,6 +60606,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -60311,9 +60710,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -60327,7 +60726,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -60412,7 +60811,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -60440,8 +60838,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -61066,7 +61464,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -61202,8 +61600,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -63020,17 +63418,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -63207,13 +63605,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -63460,42 +63858,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -64479,16 +64881,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -65958,67 +66350,67 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 #, fuzzy msgid "Processing segments in parallel..." msgstr "Izveidot punktus visā garumā ilīniju garumā" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -66312,7 +66704,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -66770,164 +67162,164 @@ msgstr "Nav definēts datubāzes savienojums" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "Virsraksts:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "Kartes formāts:" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "Objektu tips:" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "DB tabula:" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "DB nosaukums:" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "Punktu skaits:" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "Līniju skaits:" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "Jā" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "Komentārs" @@ -67105,27 +67497,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -67192,275 +67607,275 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, fuzzy, c-format msgid "Illegal output name <%s>" msgstr "Nederīga x koordināta <%s>" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, fuzzy, c-format msgid "Error setting attribute filter '%s'" msgstr "Kļūda rakstot krāsu failu priekš <%s@%s>!" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, fuzzy, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "reģions <%s> nav atrasts" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, fuzzy, c-format msgid "Creating attribute table for layer <%s>..." msgstr "Draiveris %s nav atrasts" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, fuzzy, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "reģions <%s> nav atrasts" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, fuzzy, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "Eksistējošas rastra kartes nosaukums" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, fuzzy, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "Nevar izveidot jaunu rindu: %s" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 #, fuzzy msgid "feature" msgstr "Objektu tips" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, fuzzy, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "Nevar noteikt poligona centroīdu" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, fuzzy, c-format msgid "Number of incorrect boundaries: %d" msgstr "Punktu skaits: %d" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, fuzzy, c-format msgid "Number of centroids outside area: %d" msgstr "Punktu skaits: %d" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, fuzzy, c-format msgid "Number of duplicate centroids: %d" msgstr "Punktu skaits: %d" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -67469,51 +67884,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -67670,10 +68085,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "3d skata fails <%s> nav atrasts" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "3d skata fails <%s> nav atrasts" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -67838,7 +68263,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -67847,7 +68272,7 @@ msgstr[1] "" msgstr[2] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -67855,7 +68280,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -68842,6 +69267,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -69425,6 +69854,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Neiespējami atvērt šūnu failu[%s]" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Neiespējami atvērt šūnu failu[%s]" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -69991,7 +70437,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -87335,22 +87781,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "reģions <%s> nav atrasts" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, fuzzy, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -87512,39 +87951,39 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, fuzzy, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "Nederīgs soļu skaits: %s" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 #, fuzzy msgid "Key column must be of type integer or string" msgstr "vektora karte <%s> nav atrasta" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -87627,12 +88066,12 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 #, fuzzy msgid "Computing tiling..." msgstr "Tabulu kopēšana" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -87659,106 +88098,106 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 #, fuzzy msgid "Restoring user mask (MASK)..." msgstr "Lasam dig_att failu...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, fuzzy, python-format msgid "Processing %d map holes" msgstr "Izveidot punktus visā garumā ilīniju garumā" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, fuzzy, python-format msgid "Interpolating %d points" msgstr "Rakstu jaunu failu... \n" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 #, fuzzy msgid "No points to interpolate" msgstr "Sākuma punkta koordinātes" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, fuzzy, python-format msgid "Failed to fill hole %s" msgstr "Neveiksme atverot ieejas dig ieejas failu" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, fuzzy, python-format msgid "Using %s bspline interpolation" msgstr "maksimālais ierāciju skaits" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 #, fuzzy msgid "Patching fill data into NULL areas..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, fuzzy, python-format msgid "Filled raster map is: %s" msgstr "Lasam dig_att failu...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -87770,349 +88209,349 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 #, fuzzy msgid "Importing raster map into GRASS..." msgstr "Eksistējošas rastra kartes nosaukums" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 #, fuzzy msgid "JPEG format does not support transparency" msgstr "rastra karte [%s] nav atrasta" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, fuzzy, python-format msgid "Invalid EPSG code %d" msgstr "nederīgs reģions: %s" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 #, fuzzy msgid "Unable to get projection info" msgstr "Nevar izveidot projekcijas failus: %s" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 #, fuzzy msgid "Maxcols must be greater than 100" msgstr "2 līmeņiem jābūt norādītiem" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 #, fuzzy msgid "Maxrows must be greater than 100" msgstr "2 līmeņiem jābūt norādītiem" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, fuzzy, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "Nevar atlasīt datus no tabulas" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, fuzzy, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "Neiespējami atvērt šūnu failu[%s]" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 #, fuzzy msgid "Unable to write data into tempfile" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, fuzzy, python-format msgid "Unable to determine region, %s failed" msgstr "Nevar izveidot jaunu rindu: %s" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 #, fuzzy msgid "Region definition: 4 points required" msgstr "Vaicājuma koordinātes" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 #, fuzzy msgid "Reprojecting raster..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, fuzzy, python-format msgid "%s failed" msgstr "Aizvēršana neizdevās." -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 #, fuzzy msgid "Unable to create temporary files" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 #, fuzzy msgid "WMS import failed, nothing imported" msgstr "WFS importēšana bija nesekmīga" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, fuzzy, python-format msgid "<%s> created." msgstr "Novietojums %s ir izveidots!" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, fuzzy, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "Nevar atlasīt datus no tabulas" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, fuzzy, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, fuzzy, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "Rastra izejas fails" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, fuzzy, python-format msgid "WMS server error: %s" msgstr "%d papildinājuma/atjauninājuma kļūda\n" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "Nezināma WMS servera kļūda" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, fuzzy, python-format msgid "Driver %s does not supports Create() method" msgstr "rastra karte [%s] nav atrasta" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, fuzzy, python-format msgid "Unable to open %s " msgstr "Neiespējami atvērt šūnu failu[%s]" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, fuzzy, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "neiespējami atvērt <%s>" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, fuzzy, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "rastrs <%s> nav atrasts" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, fuzzy, python-format msgid "Layer '%s' is not available with %s code." msgstr "rastra karte <%s> nav atrasta" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, fuzzy, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "vektora karte <%s> nav atrasta" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 #, fuzzy msgid "Unable to open GDAL WMS driver" msgstr "neiespējami atjaunot robežas" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, fuzzy, python-format msgid "Unable to find %s driver" msgstr "neiespējami atvērt <%s>" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 #, fuzzy msgid "Unable to parse XML file" msgstr "neiespējami atjaunot robežas" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, fuzzy, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "Neiespējami atvērt šūnu failu[%s]" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 #, fuzzy msgid "Root node was not found." msgstr "rastra karte <%s> nav atrasta" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -88166,53 +88605,53 @@ msgstr "%-5d mirušo/neizmantoto punktu kategorijas izlaistas\n" msgid "Imported <%s> vector map <%s>." msgstr "%d punkti ierakstīti izejas kartē\n" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "Šo moduli var darbināt tikai LatLong novietojumos" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, fuzzy, python-format msgid "File '%s' or '%s' not found" msgstr "rastrs <%s> nav atrasts" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, fuzzy, python-format msgid "Extracting '%s'..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 #, fuzzy msgid "Unable to unzip file." msgstr "Rastra izejas fails" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 #, fuzzy msgid "Converting input file to BIL..." msgstr "Drukā ... " -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 #, fuzzy msgid "Unable to import data" msgstr "neiespējami atvērt <%s>" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -88240,13 +88679,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, fuzzy, python-format msgid "Converting %d place names..." msgstr "Konvertē <%s>..." #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 #, fuzzy msgid "Forcing ..." msgstr "Zīmē..." @@ -88304,87 +88743,87 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, fuzzy, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "neiespējami atvērt <%s>" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, fuzzy, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, fuzzy, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "neiespējami atvērt <%s>" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, fuzzy, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 #, fuzzy msgid "Unable to get reprojected map extent" msgstr "Nevar izveidot projekcijas failus: %s" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 #, fuzzy -msgid "Unable to reproject to source location" +msgid "Unable to reproject to source project" msgstr "%d punkti ierakstīti izejas kartē\n" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, fuzzy, python-format msgid "Reprojecting <%s>..." msgstr "Konvertē <%s>..." -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, fuzzy, python-format msgid "Unable to to reproject raster <%s>" msgstr "Rastra kartes nosaukums" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, fuzzy, python-format msgid "The reprojected raster <%s> is empty" msgstr "vektora karte <%s> nav atrasta" @@ -88433,28 +88872,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, fuzzy, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "Eksistējošas rastra kartes nosaukums" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, fuzzy, python-format msgid "Column <%s> not found in table" msgstr "reģions <%s> nav atrasts" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, fuzzy, python-format msgid "Column <%s> would be deleted." msgstr "rastra karte [%s] nav atrasta" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 #, fuzzy msgid "Cannot continue (problem deleting column)" msgstr "Nevar savietot 'no_tabula' un 'select' īpašības" @@ -88515,27 +88954,27 @@ msgstr "cnevar atvērt nepieciešamo daļu faila priekš %s" msgid "Unable to import <%s>" msgstr "Neiespējami atvērt šūnu failu[%s]" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, fuzzy, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "Nevar izveidot novietojumu: %s" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, fuzzy, python-format msgid "Importing <%s> ..." msgstr "Konvertē <%s>..." -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, fuzzy, python-format msgid "Unable to import OGR datasource <%s>" msgstr "neiespējami atvērt <%s>" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, fuzzy, python-format msgid "option <%s>: <%s> exists." msgstr "reģions <%s> nav atrasts" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, fuzzy, python-format msgid "Unable to to reproject vector <%s>" msgstr "neiespējami atvērt <%s>" @@ -88545,7 +88984,6 @@ msgstr "neiespējami atvērt <%s>" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, fuzzy, python-format msgid "Vector map <%s> not found in current mapset" msgstr "vektora karte <%s> nav atrasta" @@ -88555,14 +88993,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, fuzzy, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -88570,76 +89008,76 @@ msgid "" msgstr "Eksistējošas rastra kartes nosaukums" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, fuzzy, python-format msgid "Processing input data (%d categories)..." msgstr "Kalkulējam ēnas no DEM..." -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 #, fuzzy msgid "Updating the database ..." msgstr "Drukā ... " -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, fuzzy, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "neiespējami atvērt <%s>" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 #, fuzzy msgid "An error occurred while converting vector to raster" msgstr "%-5d mirušo/neizmantoto punktu kategorijas izlaistas\n" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 #, fuzzy msgid "No categories found in raster map" msgstr "Rastra karte kura tiks pārkodēta" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 #, fuzzy msgid "Use -c flag to update values in this column." msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "Pievieno kolonas '%s'" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -88874,7 +89312,7 @@ msgstr "Novietojums %s ir izveidots!" msgid "Input file <%s> not found" msgstr "3d skata fails <%s> nav atrasts" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 #, fuzzy msgid "Importing data..." msgstr "Drukā ... " @@ -88894,22 +89332,22 @@ msgstr "Rakstu jaunu failu... \n" msgid "An error occurred on creating \"%s\", please check" msgstr "%-5d mirušo/neizmantoto punktu kategorijas izlaistas\n" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, fuzzy, python-format msgid "Mosaicing %d images..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, fuzzy, python-format msgid "Done. Raster map <%s> created." msgstr "KĻŪDA: <%s> jau eksistē\n" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 #, fuzzy msgid "Invalid maximum number of features" msgstr "" @@ -88918,30 +89356,31 @@ msgstr "" " Punktu skaits: %d\n" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "Saņem datus..." -#: ../scripts/v.in.wfs/v.in.wfs.py:173 -#, python-format +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 +#, fuzzy, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" "Serveris nespēja izpildīt pieprasījumu.\n" "Kļūdas kods: %s" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" @@ -88950,16 +89389,16 @@ msgstr "" "Neizdevās sasniegt serveri.\n" "Iemesls: %s" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "WFS vektordatu karte <%s> ir importēta." -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "WFS importēšana bija nesekmīga" @@ -89106,83 +89545,83 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 #, fuzzy msgid "Calculating Brovey transformation..." msgstr "Kalkulējam ēnas no DEM..." -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 #, fuzzy msgid "Transforming to IHS color space..." msgstr "Drukā ... " -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 #, fuzzy msgid "Input has no data. Check region settings." msgstr "Drukāt tekošo reģionu pēc platuma/garuma" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 #, fuzzy msgid "Performing inverse PCA ..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -89300,44 +89739,44 @@ msgstr "MASK nevar noņemt, jo neeksistē" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 #, fuzzy msgid "MASK already exists and will be overwritten" msgstr "Izejas karte kurā tiks ierakstīti punkti" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, fuzzy, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "Rastra kartes nosaukums" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 #, fuzzy msgid "Creating inverted raster MASK..." msgstr "Eksistējošas rastra kartes nosaukums" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 #, fuzzy msgid "Inverted raster MASK created" msgstr "KĻŪDA: <%s> jau eksistē\n" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 #, fuzzy msgid "Raster MASK created" msgstr "KĻŪDA: <%s> jau eksistē\n" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -89374,7 +89813,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "Izejas karte kurā tiks ierakstīti punkti" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -89385,35 +89824,35 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 +#: ../scripts/r.unpack/r.unpack.py:143 #, fuzzy -msgid "Overriding projection check (using current location's projection)." +msgid "Overriding projection check (using current project's CRS)." msgstr "Neņemt vērā projekciju (izmantot pašreizējā novietojuma projekciju)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -89512,34 +89951,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, fuzzy, python-format msgid "Coping table <%s> as table <%s>" msgstr "reģions <%s> nav atrasts" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, fuzzy, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "Rastra izejas fails" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, fuzzy, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "neiespējami atvērt <%s>" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, fuzzy, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "neiespējami atvērt <%s>" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, fuzzy, python-format msgid "Vector map <%s> successfully unpacked" msgstr "KĻŪDA: <%s> jau eksistē\n" @@ -89627,336 +90066,336 @@ msgstr "Nevarēja atrast rastra failu %s" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 #, fuzzy msgid "Failed to get Git version." msgstr "Rastra kartes nosaukums" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 #, fuzzy msgid "Cannot write to working directory {}." msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 #, fuzzy msgid "No extension (toolbox) installed" msgstr "Jaunā novietojuma nosaukums" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 #, fuzzy msgid "No extension (module) installed" msgstr "Jaunā novietojuma nosaukums" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 #, fuzzy msgid "List of available extensions (toolboxes):" msgstr "izveidot sarakstu ar visām pieejamajām karšu biblotēkām/mapsets" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 #, fuzzy msgid "List of available extensions (modules):" msgstr "izveidot sarakstu ar visām pieejamajām karšu biblotēkām/mapsets" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 #, fuzzy msgid "Unable to fetch addons metadata file" msgstr "Nevar atlasīt datus no tabulas" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, fuzzy, python-format msgid "Unable to fetch '%s'" msgstr "Nevar ienest datus" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 #, fuzzy msgid "$GISBASE not defined" msgstr "Tabulas nosaukums" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, fuzzy, python-format msgid "Installing toolbox <%s>..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 #, fuzzy msgid "Nothing to install" msgstr "Nekas nav atrasts.\n" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 #, fuzzy msgid "Updating extensions metadata file..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 #, fuzzy msgid "Updating extension modules metadata file..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 #, fuzzy msgid "Unable to read addons metadata file from the remote server" msgstr "Rastra izejas fails" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, fuzzy, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "Rastra izejas fails" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, fuzzy, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "neiespējami atvērt <%s>" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, fuzzy, python-format msgid "GRASS Addons <%s> not found" msgstr "reģions <%s> nav atrasts" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, fuzzy, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "Ieejas fails ir pārnesams.\n" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "reģions <%s> nav atrasts" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 #, fuzzy msgid "Path to the source code:" msgstr "Izejas rastra kartes nosaukums" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 #, fuzzy msgid "To compile run:" msgstr "Pabeigts: " -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 #, fuzzy msgid "Compiling..." msgstr "Konvertē..." -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 #, fuzzy msgid "Installing..." msgstr "atubāzes atrašnās" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 #, fuzzy msgid "List of removed files:" msgstr "Sākuma punkta koordinātes" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 #, fuzzy msgid "Files to be removed:" msgstr "%s fails(i) kuri tiks dzēsti" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 #, fuzzy msgid "Updating addons metadata file..." msgstr "Rakstu jaunu failu... \n" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, fuzzy, python-format msgid "Extension <%s> successfully uninstalled." msgstr "izejas līmeņa nosaukums" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, fuzzy, python-format msgid "Extension <%s> not found" msgstr "reģions <%s> nav atrasts" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -89964,60 +90403,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, fuzzy, python-format msgid "Unable to create '%s': %s" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, fuzzy, python-format msgid "Manual page for <%s> updated" msgstr "Krāsu tabula [%s] uzstādīta uz %s" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, fuzzy, python-format msgid "Unable to read manual page: %s" msgstr "neiespējami atvērt <%s>" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, fuzzy, python-format msgid "Unable for write manual page: %s" msgstr "Nav iespēju atvērt šūnu failu priekš[%s]" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -90072,27 +90511,39 @@ msgstr "nederīgs reģions: %s" msgid "Building topology for vector map <%s> failed" msgstr "Lasam dig_att failu...\n" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Nebija iespējams atvērt failu <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, fuzzy, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "reģions <%s> nav atrasts" + +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" msgstr "Kļūda rakstot krāsu failu priekš <%s@%s>!" -#: ../scripts/v.db.join/v.db.join.py:191 -#, fuzzy, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:224 +#, fuzzy, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "Lasam dig_att failu...\n" -#: ../scripts/v.db.join/v.db.join.py:197 -#, fuzzy, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" msgstr "Kļūda rakstot krāsu failu priekš <%s@%s>!" #: ../scripts/g.download.location/g.download.location.py:105 @@ -90140,16 +90591,6 @@ msgstr "Kopē tabulas..." msgid "Path to the location now <{path}>" msgstr "Jaunā novietojuma nosaukums" -#: ../scripts/d.redraw/d.redraw.py:53 -#, fuzzy, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "Neiespējami atvērt šūnu failu[%s]" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, fuzzy, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "Neiespējami atvērt šūnu failu[%s]" - #: ../scripts/r.plane/r.plane.py:84 #, fuzzy msgid "Input coordinates seems to be invalid" @@ -90228,41 +90669,52 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "vektora karte <%s> nav atrasta" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, fuzzy, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +#, fuzzy +msgid "Column <{}> is already in the table. Skipping." msgstr "reģions <%s> nav atrasts" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, fuzzy, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +#, fuzzy +msgid "Adding column <{}> to the table" msgstr "Izmantojamās rastra kartes nosaukums priekš <%s>" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, fuzzy, python-format -msgid "Unable to add column <%s>." -msgstr "Neiespējami atvērt šūnu failu[%s]" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Kļūda rakstot krāsu failu priekš <%s@%s>!" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 #, fuzzy msgid "xy-locations are not supported" msgstr "Kolonas tips nav atbalstīts" @@ -90313,16 +90765,16 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 #, fuzzy msgid "Latitude-longitude locations are not supported" msgstr "Kolonas tips nav atbalstīts" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, fuzzy, python-format msgid "Generating output raster map <%s>..." msgstr "Izejas rastra kartes nosaukums" @@ -92247,6 +92699,125 @@ msgstr "" #~ msgstr "Vertikālais mērogs" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Vektorkartes nosaukums" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Slāņa numurs vai nosaukums" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Atslēga (id) kolonas nosaukums" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Jaunā reģiona kolonu skaits" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "Plots to generate" +#~ msgstr "Sākuma punkta koordinātes" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Izšķirtspēja" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Zīmēšanas stils" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Nerādīt kategoriju uzrakstus" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Kartes formāts:" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Sākuma punkta koordinātes" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "vektora karte <%s> nav atrasta" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Ieejošā karte satur līnijas" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Ieejas fails" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "3d skata fails <%s> nav atrasts" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Vektorkartes nosaukums" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Izejas tabulas nosaukums" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Vektorkartes nosaukums" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Attēlojamā rastra karte" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Attēlojamā rastra karte" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Drukājamo kopiju sakits" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Izejas rastra kartes nosaukums" + +#, fuzzy, python-format +#~ msgid "Unable to add column <%s>." +#~ msgstr "Neiespējami atvērt šūnu failu[%s]" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Creates a raster map from LAS LiDAR points using univariate statistics " diff --git a/locale/po/grassmods_ml.po b/locale/po/grassmods_ml.po index 208058dcfbd..e223d9e4ce4 100644 --- a/locale/po/grassmods_ml.po +++ b/locale/po/grassmods_ml.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ml\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-05-23 21:08+0200\n" "Last-Translator: \n" "Language-Team: Malayalam (https://www.transifex.com/grass-gis/teams/45198/" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1585,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1715,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1756,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1772,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1829,24 +1821,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1962,7 +1948,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1972,7 +1958,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2092,7 +2077,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2121,6 +2106,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2254,7 +2240,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2263,8 +2255,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2296,7 +2288,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2352,7 +2344,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2397,7 +2388,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2450,7 +2441,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2862,7 +2853,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2950,14 +2941,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3116,7 +3109,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3424,6 +3417,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3512,17 +3514,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3543,7 +3543,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3615,7 +3615,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3648,160 +3648,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3834,19 +3826,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3915,9 +3907,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3931,36 +3923,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4015,6 +4007,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4035,46 +4030,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4083,82 +4087,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4958,7 +4974,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5037,7 +5053,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5166,7 +5182,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5365,9 +5381,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5383,7 +5398,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5590,9 +5605,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5610,7 +5625,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5695,10 +5710,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5737,30 +5752,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5880,123 +5895,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6096,7 +6111,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6130,7 +6145,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6162,7 +6177,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6216,9 +6231,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6234,8 +6249,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6245,24 +6260,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6314,7 +6360,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6614,7 +6660,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6720,7 +6766,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6806,7 +6851,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7425,7 +7470,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7434,7 +7479,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7539,7 +7584,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7563,15 +7608,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7644,7 +7689,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7694,17 +7739,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7762,6 +7804,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7899,7 +7942,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7982,7 +8025,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8041,7 +8084,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8102,7 +8145,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8225,7 +8268,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8364,7 +8406,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8456,8 +8498,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8466,8 +8508,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8485,7 +8527,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8865,9 +8907,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9092,13 +9134,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9111,7 +9151,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9353,31 +9392,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9393,12 +9432,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9413,18 +9451,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9448,10 +9485,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9481,7 +9517,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9490,210 +9526,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10359,7 +10411,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10472,6 +10523,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10503,26 +10566,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10547,12 +10590,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10560,40 +10597,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10744,7 +10781,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10988,29 +11025,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11065,71 +11102,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11172,6 +11176,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11875,7 +11912,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11889,12 +11926,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11920,10 +11956,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11979,12 +12013,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12001,12 +12035,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12014,7 +12048,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12022,7 +12056,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12038,12 +12072,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12122,7 +12156,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12374,8 +12408,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12541,7 +12576,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12552,6 +12587,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13163,15 +13210,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13250,7 +13297,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13260,7 +13307,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13348,7 +13395,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13357,7 +13404,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13669,7 +13716,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13680,19 +13727,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13700,15 +13747,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13717,62 +13777,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13942,9 +14010,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14284,21 +14349,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14483,80 +14548,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15431,32 +15496,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15472,61 +15537,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15550,7 +15615,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16490,46 +16554,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16854,7 +16918,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17308,8 +17372,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17436,97 +17500,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17789,11 +17853,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17992,32 +18056,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18100,7 +18164,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18123,8 +18187,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18878,8 +18943,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18889,28 +18954,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18919,57 +18984,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18978,7 +19043,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18987,7 +19052,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19479,6 +19544,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19537,64 +19606,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19700,7 +19777,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19713,10 +19789,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19730,11 +19804,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20228,10 +20302,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20287,9 +20361,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20349,13 +20423,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20716,67 +20790,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21020,8 +21094,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21287,154 +21361,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21523,7 +21597,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21533,97 +21607,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21766,7 +21840,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21849,33 +21924,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21884,69 +21981,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21961,37 +22062,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22344,7 +22442,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23531,7 +23629,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23627,7 +23725,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23635,7 +23734,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23669,34 +23768,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23749,61 +23849,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23813,7 +23918,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23822,20 +23927,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23950,15 +24055,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23998,101 +24101,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24216,6 +24317,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24232,6 +24343,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24241,6 +24357,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24607,6 +24743,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26166,8 +26303,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26491,17 +26628,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26510,17 +26644,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26529,17 +26660,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26549,17 +26677,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26568,12 +26693,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27354,11 +27477,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27407,7 +27534,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27500,16 +27627,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28078,6 +28204,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28120,6 +28280,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28154,58 +28316,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28283,231 +28455,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28706,6 +28661,500 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +msgid "Validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28896,10 +29345,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29125,6 +29579,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30287,7 +30749,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30331,11 +30793,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31384,7 +31841,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31418,6 +31874,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31769,7 +32236,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31962,7 +32428,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -31995,6 +32461,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33000,11 +33474,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33050,44 +33521,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33852,8 +34336,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33863,6 +34356,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33900,10 +34394,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34194,6 +34690,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34205,6 +34702,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34233,6 +34731,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34592,63 +35091,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -34981,11 +35423,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35813,6 +36257,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35939,12 +36391,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36080,9 +36532,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36125,19 +36576,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36146,7 +36607,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36273,31 +36734,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36919,6 +37355,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37199,7 +37639,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37230,7 +37670,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37905,9 +38345,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38154,6 +38600,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39151,8 +39605,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39244,39 +39698,47 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 -msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgid "Name of data layers to import" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42407,8 +42869,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42446,6 +42908,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42843,6 +43306,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42892,6 +43362,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42927,6 +43409,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43329,8 +43841,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44050,6 +44562,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44329,6 +44845,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44745,10 +45265,84 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45232,17 +45826,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45266,22 +45850,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45291,9 +45872,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45310,13 +45890,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45326,14 +45904,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45366,14 +45942,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45384,26 +45952,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45447,15 +46011,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45473,7 +46028,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45483,48 +46037,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45532,101 +46077,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46799,6 +47266,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46821,6 +47296,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46910,278 +47393,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47510,8 +47993,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47591,166 +48074,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48538,11 +48861,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53289,6 +53607,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53819,8 +54176,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54121,8 +54478,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54302,7 +54659,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54316,7 +54673,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54846,7 +55203,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55136,7 +55493,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55226,49 +55583,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55278,33 +55631,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55341,7 +55694,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55418,178 +55771,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56066,7 +56419,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56304,11 +56657,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56335,7 +56688,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56344,7 +56697,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56364,7 +56717,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56400,11 +56753,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56439,13 +56792,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56460,12 +56817,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57633,7 +57990,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58256,7 +58613,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58563,12 +58920,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58768,19 +59125,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -58989,7 +59346,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59147,10 +59504,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59189,6 +59546,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59289,9 +59650,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59305,7 +59666,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59390,7 +59751,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59418,8 +59778,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -60039,7 +60399,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60173,8 +60533,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -61952,17 +62312,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62138,13 +62498,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62390,42 +62750,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63407,16 +63771,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -64842,66 +65196,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65190,7 +65544,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65647,164 +66001,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -65981,27 +66335,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -66068,274 +66445,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66344,51 +66721,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66544,10 +66921,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66711,7 +67098,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -66719,7 +67106,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66727,7 +67114,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67713,6 +68100,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68281,6 +68672,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -68844,7 +69252,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -69083,22 +69491,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71127,38 +71528,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71238,11 +71639,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71267,103 +71668,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71375,336 +71776,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -71757,50 +72158,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -71828,13 +72229,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -71891,85 +72292,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -72015,28 +72416,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -72093,27 +72494,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -72123,7 +72524,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72133,14 +72533,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72148,72 +72548,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72440,7 +72840,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72458,64 +72858,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72655,79 +73056,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -72839,40 +73240,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -72908,7 +73309,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -72919,34 +73320,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -73038,34 +73439,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73144,316 +73545,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73461,60 +73862,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73566,27 +73967,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73632,16 +74043,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73712,41 +74113,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -73794,15 +74202,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grassmods_pl.po b/locale/po/grassmods_pl.po index c2cefa37ae7..9fed891f500 100644 --- a/locale/po/grassmods_pl.po +++ b/locale/po/grassmods_pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2013-07-16 12:26+0100\n" "Last-Translator: Milena Nowotarska \n" "Language-Team: Polish \n" @@ -89,7 +89,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -129,32 +129,33 @@ msgid "Print current connection parameters and exit" msgstr "Wyświetl parametry bieżącego połączenia i wyjdź" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -180,21 +181,21 @@ msgstr "Wyświetl parametry bieżącego połączenia i wyjdź" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Wyświetl" @@ -269,7 +270,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -294,7 +295,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -305,7 +306,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -327,7 +328,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -484,6 +485,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -503,7 +505,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -522,7 +523,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -536,6 +536,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -569,7 +570,7 @@ msgstr "Mój pierwszy moduł rastrowy" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -579,8 +580,8 @@ msgstr "Mój pierwszy moduł rastrowy" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -595,21 +596,21 @@ msgstr "Mój pierwszy moduł rastrowy" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Mapa rastrowa <%s> nie została znaleziona" @@ -618,7 +619,7 @@ msgstr "Mapa rastrowa <%s> nie została znaleziona" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -653,7 +654,6 @@ msgstr "Mapa rastrowa <%s> nie została znaleziona" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -666,7 +666,6 @@ msgstr "Mapa rastrowa <%s> nie została znaleziona" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -705,6 +704,7 @@ msgstr "Mapa rastrowa <%s> nie została znaleziona" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -726,7 +726,7 @@ msgstr "Mapa rastrowa <%s> nie została znaleziona" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -792,7 +792,7 @@ msgstr "Mapa rastrowa <%s> nie została znaleziona" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -806,7 +806,7 @@ msgstr "Mój pierwszy moduł wektorowy" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -819,8 +819,8 @@ msgstr "Mój pierwszy moduł wektorowy" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -835,16 +835,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -890,7 +890,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -906,7 +906,7 @@ msgstr "Nie można otworzyć mapy wektorowej <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -915,7 +915,7 @@ msgstr "Nie można otworzyć mapy wektorowej <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -945,13 +945,13 @@ msgstr "Nie można otworzyć mapy wektorowej <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -979,7 +979,7 @@ msgstr "Połączenie z bazą danych nie zostało zdefiniowane dla warstwy %d" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -994,8 +994,8 @@ msgstr "Nie można uruchomić sterownika <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1029,10 +1029,10 @@ msgstr "Nie można uruchomić sterownika <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1040,7 +1040,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Nie można otworzyć bazy danych <%s> za pomocą sterownika <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1070,23 +1070,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "Nie można skopiować tabeli atrybutów do mapy wektorowej <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1168,13 +1168,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1227,6 +1227,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1287,6 +1288,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1352,14 +1359,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1409,144 +1415,132 @@ msgstr "Tutuł wyjściowej mapy rastrowej" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadane" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Wyświetl listę wspieranych formatów i wyjdź" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "Odbij poziomo" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "Odbij pionowo" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1563,35 +1557,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Nie można utworzyć pliku raportu <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Lokacja <%s> została stworzona" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1599,55 +1591,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1727,12 +1721,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1770,7 +1762,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1786,7 +1778,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1836,24 +1828,18 @@ msgstr "Nazwa wyjściowego pliku krzywizny profilu" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Wyjście" @@ -1977,7 +1963,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1987,7 +1973,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2107,7 +2092,7 @@ msgstr "Wyświetl historię mapy" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2136,6 +2121,7 @@ msgstr "Nie można przydzielić pamięci dla ciągu znaków" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2272,7 +2258,13 @@ msgstr "Niewłaściwa liczba przedziałów: %s" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2281,8 +2273,8 @@ msgid "The minimum number of input raster maps is two" msgstr "Minimalna liczba wejściowych map rastrowych to dwa." #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Procent wykonania ..." @@ -2314,7 +2306,7 @@ msgstr "Aktualizuj statystyki mapy rastrowej" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2370,7 +2362,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2416,7 +2407,7 @@ msgid "Unknown method <%s>" msgstr "Nieznana metoda <%s>" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2469,7 +2460,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2890,7 +2881,7 @@ msgstr "Znajdowanie ścieżki kosztu..." msgid "Error, ct == pres_cell" msgstr "BŁĄD: ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2978,14 +2969,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3144,7 +3137,7 @@ msgid "List of cell values to be set to NULL" msgstr "Lista wartości do ustawienia jako NULL" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3466,6 +3459,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3554,17 +3556,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3585,7 +3585,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Wyjście" @@ -3665,7 +3665,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3698,160 +3698,155 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "opcje 'insol_time' i 'incidout' są niekompatybilne" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "opcje 'time' i 'insol_time' są niekompatybilne" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "'incidout' wymaga ustawienia parametru czasu" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "Tryb 2: zintegrowane dzienne napromienienie dla danego dnia roku" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "Nie można pobrać informacji o projekcji bieżącej lokacji" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "Nie można pobrać jednostek projekcji bieżącej lokacji" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "Nie można pobrać kluczowych wartości projekcji bieżącej lokacji" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3884,19 +3879,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Brak wolnej pamięci" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3967,9 +3962,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3983,36 +3978,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4067,6 +4062,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4087,46 +4085,57 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Format wyjściowy" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Nazwa dla pliku wyjściowego (użyj output=- dla stdout)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Włącz do wyniku końcowego etykiety kategorii" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4135,82 +4144,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Nie można otworzyć pliku <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "Nie można odczytać maksymalnej odległości. Przerywam." -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "Nie można pobrać informacji o projekcji bieżącej lokacji" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Nie można pobrać jednostek projekcji bieżącej lokacji" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "Nie można pobrać kluczowych wartości projekcji bieżącej lokacji" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -5010,7 +5031,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Atrybuty" @@ -5089,7 +5110,7 @@ msgstr "Nie można utworzyć indeksu" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Nie można przydzielić uprawnień dla tabeli <%s>" @@ -5218,7 +5239,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5417,9 +5438,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5435,7 +5455,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5647,9 +5667,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5667,7 +5687,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5752,10 +5772,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5796,30 +5816,30 @@ msgstr "Współczynnik skali dla danych z" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5948,126 +5968,126 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Wyświetl statystyki w stylu skryptu shell" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Niewłaściwe dane wejściowe <%s=%s>" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Odczyt danych..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Projekcja docelowa, domyślna jest projekcja tej lokacji" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Skanowanie danych..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Mapa rastrowa <%s> została utworzona." @@ -6167,7 +6187,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6201,7 +6221,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6237,7 +6257,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6293,9 +6313,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Maksymalna liczba iteracji" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6311,8 +6331,8 @@ msgstr "Maksymalna liczba iteracji" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6322,24 +6342,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Średnia rozkładu" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Odchylenie standardowe" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6391,7 +6442,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6691,7 +6742,7 @@ msgstr "Błąd podczas czytania danych" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6797,7 +6848,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6884,8 +6934,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "Odwzorowanie lat/lon nie jest obsługiwane at this time." #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7506,7 +7557,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7515,7 +7566,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Mapa rastrowa nie została znaleziona" @@ -7620,7 +7671,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7644,15 +7695,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7726,7 +7777,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7776,17 +7827,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7844,6 +7892,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7984,7 +8033,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8068,7 +8117,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8127,7 +8176,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8188,7 +8237,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "Nieodpowiedni typ <%s> mapy rastrowej" @@ -8312,7 +8361,6 @@ msgid "Calculating flow directions..." msgstr "Obliczanie kierunków spływu..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8451,7 +8499,7 @@ msgstr "Zastosuj filtr tylko do wartości NULL" msgid "<%d> is not valid number of threads." msgstr "Niewłaściwa liczba przedziałów: %s" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "Mapa rastrowa za mała w stosunku do rozmiaru filtra" @@ -8545,8 +8593,8 @@ msgstr "Procent mapy przechowywanej w pamięci" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "Skanuj plik danych w poszukiwaniu zakresu i wyjdź" @@ -8555,8 +8603,8 @@ msgstr "Skanuj plik danych w poszukiwaniu zakresu i wyjdź" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "W trybie skanowania, wyświetl informacje w stylu skryptu shell" @@ -8574,7 +8622,7 @@ msgstr "Wprowadź właściwy numer kolumny." msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "Niewłaściwy zakres z" @@ -8954,10 +9002,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "Odwzorowanie lat/lon nie jest obsługiwane at this time." #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9185,13 +9233,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9204,7 +9250,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9446,31 +9491,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9486,13 +9531,13 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" -msgstr "" +#, fuzzy +msgid "create project" +msgstr "Źródłowa projekcja" #: ../raster/r.in.gdal/main.c:118 msgid "Imports raster data into a GRASS raster map using GDAL library." @@ -9506,18 +9551,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Nazwa docelowej lokacji obrazu" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9541,10 +9586,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Nazwa lokacji która ma być utworzona" #: ../raster/r.in.gdal/main.c:195 @@ -9574,7 +9619,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9583,210 +9628,229 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Zachowaj numery pasm zamiast używać nazw kolorów pasm" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "Ogranicz import do bieżącego regionu" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Mapa rastrowa <%s> już istnieje i zostanie nadpisana" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "Mapa rastrowa <%s> już istnieje" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "Nie można przełożyć kluczowych wartości projekcji punktów GCPs" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "Nie można pobrać informacji o projekcji lokacji docelowej" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "Nie można pobrać jednostek projekcji docelowej lokacji" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "Nie można pobrać kluczowych wartości projekcji docelowej lokacji" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "odmowa dostępu" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "nie znaleziono" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10460,7 +10524,6 @@ msgid "Number of intermediate images to produce" msgstr "Liczba obrazów pośrednich do wygenerowanie" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10573,6 +10636,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10604,26 +10679,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10648,12 +10703,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10661,40 +10710,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Wykonanie nie powiodło się" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "Nie można zapisać mapy rastrowej" @@ -10847,7 +10896,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11097,29 +11146,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11178,71 +11227,38 @@ msgstr "Plik <%s> został utworzony" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "Wczytywanie plików wejściowych: ???" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11285,6 +11301,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "Wczytywanie plików wejściowych: ???" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11993,7 +12042,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12007,12 +12056,15 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" +"Zmienia odwzorowanie mapy rastrowej kopiując go z innej lokacji do bieżącej " +"lokacji." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "Lokacja zawierająca wejściową mapę rastrową" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12038,10 +12090,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "Nazwa wejściowej mapy rastrowej do zmiany projekcji" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Ścieżka wejściowej lokacji w bazie danych GRASS" #: ../raster/r.proj/main.c:174 @@ -12097,12 +12148,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12119,12 +12170,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Sprawdzam lokację <%s> w mapsecie <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12132,16 +12183,17 @@ msgstr "Sprawdzam lokację <%s> w mapsecie <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "Wymagany parameter <%s> nie jest ustawiony" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" +"Mapa wektorowa <%s> w lokacji <%s> mapsecie <%s> nie została znaleziona" #: ../raster/r.proj/main.c:323 msgid "Unable to get projection info of input map" @@ -12156,12 +12208,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12243,7 +12295,7 @@ msgid "Sorting events..." msgstr "Zapisywanie węzłów ..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12504,8 +12556,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12675,7 +12728,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12686,6 +12739,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "Nie można pobrać informacji o projekcji lokacji docelowej" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Nie można pobrać jednostek projekcji docelowej lokacji" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Nie można pobrać kluczowych wartości projekcji docelowej lokacji" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13303,16 +13371,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "Nie można pobrać informacji o projekcji bieżącej lokacji" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Nie można pobrać jednostek projekcji bieżącej lokacji" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "Nie można pobrać kluczowych wartości projekcji bieżącej lokacji" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13390,7 +13461,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13400,7 +13471,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13493,7 +13564,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Nie można utworzyć tabeli: '%s'" @@ -13502,7 +13573,7 @@ msgstr "Nie można utworzyć tabeli: '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Nie można utworzyć indeksu dla tabeli <%s>, klucz <%s>" @@ -13814,7 +13885,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13825,19 +13896,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Nazwa istniejącej mapy rastrowej do odpytania" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Współrzędne do zapytania" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13845,15 +13916,28 @@ msgstr "Współrzędne do zapytania" msgid "Query" msgstr "Pytanie" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13862,62 +13946,71 @@ msgstr "" msgid "Advanced" msgstr "Zaawansowane" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Zapis numerów kategorii komórek zamiast ich wartości" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Ilość miejsc po przecinku musi być liczbą całkowitą" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importuje binarny plik MAT (v4) do rastrowego formatu GRASS." @@ -14087,9 +14180,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14435,21 +14525,21 @@ msgid "Input map resolution differs from current region resolution!" msgstr "" "Rozdzielczość mapy wejściowej różni się od rozdzielczości bieżacego regionu!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14641,81 +14731,81 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Nieprawidłowy typ rastra: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" "minimalna obliczona ekspozycja %.4f, maksymalna obliczona ekspozycja %.4f" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Rastrowa mapa ekspozycji terenu <%s> gotowa" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Rastrowa mapa spadków <%s> gotowa" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "Rastrowa mapa spadków E-W <%s> gotowa" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "Rastrowa mapa spadków N-S <%s> gotowa" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Rastrowa mapa Dxx <%s> gotowa" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Rastrowa mapa Dyy <%s> gotowa" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Rastrowa mapa Dxy <%s> gotowa" @@ -15600,34 +15690,33 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15643,61 +15732,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15721,7 +15810,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16665,46 +16753,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Nie można utworzyć i rozwiązać układu równań liniowych" @@ -17031,7 +17119,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17494,8 +17582,8 @@ msgstr "Zapisz wartości RRR:GGG:BBB kolorów dla każdego punktu profilu" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17622,97 +17710,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17975,11 +18063,11 @@ msgstr "Nie można otworzyć pliku <%s> by zapisać etykietę" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18184,32 +18272,32 @@ msgstr "Rozmiar sąsiedztwa musi być dodatni" msgid "Neighborhood size must be odd" msgstr "Rozmiar sąsiedztwa musi być nieparzysty" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18292,8 +18380,9 @@ msgid "Units" msgstr "Jednostki" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Dane wejściowe" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18315,8 +18404,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -19071,8 +19161,8 @@ msgid "Not enough points, %d are required" msgstr "Zbyt mało punktów, %d jest wymagane" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -19082,28 +19172,28 @@ msgid "Poorly placed control points" msgstr "Niezbyt dobrze rozmieszczone punkty kontrolne" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "Brak wolnej pamięci" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "Błąd parametru" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "Brak aktywnych punktów kontrolnych" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "Nieodpowiednie współrzędne: [%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19112,57 +19202,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19171,7 +19261,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19180,7 +19270,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19689,6 +19779,10 @@ msgstr "Nie można odczytać zakresu danych mapy rastrowej 3D <%s>" msgid "Error while reading history file" msgstr "Błąd podczas odczytywania pliku historii" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19747,64 +19841,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "Nie można utworzyć mapy rastrowej 3D <%s>" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19910,7 +20012,6 @@ msgstr "Utwórz plik bitmapy wartości NULL 3D" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19923,10 +20024,8 @@ msgstr "Utwórz plik bitmapy wartości NULL 3D" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19940,11 +20039,11 @@ msgstr "Utwórz plik bitmapy wartości NULL 3D" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "wyświetl" @@ -20441,10 +20540,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20500,9 +20599,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Typ" @@ -20562,13 +20661,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20933,69 +21032,70 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "Zapisz bieżące ustawienia regionu do nazwanego pliku regionu" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Nie znaleziono regionu <%s>" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "Nie można wstawić regionu <%s>" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "Nie można zaktualizować bieżącego regionu" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "Utworzenie projekcji WGS84 nie było możliwe, lokacja nie posiada parametrów " "transformacji układu. Spróbuj uruchomić g.setproj." -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "Nie można zaktualizować parametrów projekcji lat/long" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21239,8 +21339,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21510,159 +21610,161 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" "Weryfikuj informacje o układzie odniesienia i wyświetl parametry " "transformacji" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Wyświetl informacje o projekcji w formacie PROJ.4" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" "Wyświetl 'płasko' bez separatorów liniowych (zastosowanie do WKT i PROJ.4)" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 #, fuzzy msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" "Wyświetl 'płasko' bez separatorów liniowych (zastosowanie do WKT i PROJ.4)" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "Wyświetl informacje o projekcji w formacie WKT" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "Użyj formatu styl-ESRI (zastosowanie tylko do WKT)" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "Kod EPSG projekcji" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" -msgstr "" +#: ../general/g.proj/main.c:216 +#, fuzzy +msgid "Modify current project's projection files" +msgstr "Nie można utworzyć plików odwzorowania: %s" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Utwórz" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Nazwa nowej lokacji, która ma być utworzona" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Brak plików projekcji" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "Tekst powinien być wprowadzony lub użyte -c" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21753,9 +21855,9 @@ msgstr "" "'układ XY (nieprojekcyjny)' zostanie użyty" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Nie można utworzyć plików odwzorowania: %s" #: ../general/g.proj/create.c:21 #, c-format @@ -21763,98 +21865,98 @@ msgid "Unable to create projection files: %s" msgstr "Nie można utworzyć plików odwzorowania: %s" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Nie można utworzyć pliku <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "Wypisz wiadomość jako ostrzeżenie" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "Wypisz wiadomość jako błąd fatalny" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "Wypisz wiadomość jako informację o postępie" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "Poziom" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "Wypisz wiadomość tylko w głośnym wyjściu" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21997,7 +22099,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -22080,33 +22183,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "Bieżący mapset to <%s>" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "Dostępne mapsety:" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22115,69 +22240,74 @@ msgstr "" msgid "Operation to be performed" msgstr "Operacja do wykonania" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Wprowadź formułę w jednym z formatów:" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "MAPSET <%s> nie został znaleziony" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "Mapset <%s> dodany do ścieżek przeszukiwań" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22192,37 +22322,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22575,7 +22702,7 @@ msgstr " odchylenie standardowe" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23764,7 +23891,7 @@ msgstr "Transformacja zakończona z sukcesem." #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23859,17 +23986,19 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "Grupa <%s> załadowana do lokacji[%s], w mapsecie [%s]" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Nazwa docelowej lokacji obrazu" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23901,35 +24030,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Mapa rastrowa <%s> nie została znaleziona" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "Grupa <%s> załadowana do lokacji[%s], w mapsecie [%s]" + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "odmowa dostępu\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "nie znaleziono\n" @@ -23982,61 +24112,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "Nie znaleziono regionu <%s>" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 #, c-format -msgid "Target location <%s> not found" +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -24046,30 +24181,32 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Nie można pobrać informacji o projekcji lokacji docelowej" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Nie mozna otworzyć ścieżki czcionki %s: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "Informacje o odwzorowaniu nie zostaną zaktualizowane." -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" +msgstr "Grupa <%s> załadowana do lokacji[%s], w mapsecie [%s]" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -24183,15 +24320,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 -#, c-format -msgid "Rectify <%s@%s> (location <%s>)" +#, fuzzy, c-format +msgid "Rectify <%s@%s> (project <%s>)" msgstr "Rektyfikacja <%s@%s> (lokacja <%s>)" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 -#, c-format -msgid "into <%s@%s> (location <%s>) ..." +#, fuzzy, c-format +msgid "into <%s@%s> (project <%s>) ..." msgstr "do <%s@%s> (lokacji <%s>) ..." #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24231,101 +24366,100 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" -msgstr "" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" +msgstr "Zapisz bieżące ustawienia regionu do nazwanego pliku regionu" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "Rektyfikuj wszystkie obrazy w grupie" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "Grupy <%s> nie znaleziono" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "Lokacja: %s" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "Projekcje" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "Grupa <%s> nie zawiera żadnych plików, użyj i.group" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "Niedozwolone rozszerzenie <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "Mapa rastrowa już istnieje w " -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Grupa <%s> załadowana do lokacji[%s], w mapsecie [%s]" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "Wejściowa mapa rastrowa <%s> istnieje w grupie <%s>." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "Próba:" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "Zakończ!" @@ -24449,6 +24583,16 @@ msgstr "Region N=%f S=%f E=%f W=%f" msgid "Resolution EW=%f NS=%f" msgstr "Rozdzielczość EW=%f NS=%f" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "Rektyfikacja <%s@%s> (lokacja <%s>)" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "do <%s@%s> (lokacji <%s>) ..." + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24467,6 +24611,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24476,6 +24625,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "Lokacja: %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24845,6 +25014,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Tworzenie" @@ -26430,8 +26600,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "Przeskaluj" @@ -26758,17 +26928,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26777,17 +26944,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26796,17 +26960,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26816,17 +26977,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26835,12 +26993,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27636,6 +27792,7 @@ msgid "Apriori Phi (roll) standard deviation" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27647,6 +27804,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -28194,11 +28356,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28247,7 +28413,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28342,16 +28508,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Kolumna <%s> nie została znaleziona w tabeli <%s>" @@ -28927,6 +29092,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Kolumny atrybutów zawierających dane" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Liczba punktów do utworzenia" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28969,6 +29170,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -29005,64 +29208,75 @@ msgstr "Wykonanie nie powiodło się" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Nazwa dla wynikowej mapy rastrowej " + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Nazwa źródłowej mapy wektorowej (A)" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Nazwa dla wynikowej mapy rastrowej " -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Nazwa źródłowej mapy wektorowej (A)" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Nazwa dla wynikowej mapy rastrowej " -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Nazwa pliku bazy danych" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Przeskaluj" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Nie można utworzyć pliku tymczasowego" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Podaj współrzędne punktu" @@ -29145,238 +29359,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "Wyświetla/ustawia połączenie DB mapy wektorowej z tabelą atrybutów." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Nazwa mapy wektorowej" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Liczba warstw (na)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Zbyt dużo nazw kolmun" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Liczba kolumn w nowym regionie" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Sposób zapisu wynikowej mapy rastrowej" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Mapa rastrowa zawierająca wynik klasyfikacji" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -29584,6 +29574,527 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Utwórz mapę wektorową 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Nazwa docelowej lokacji obrazu" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "Parametr napiecia krzywej spline" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Nazwa wyjściowej warstwy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s: niewłaściwa wartość" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Utwórz warstwę wektorową punktów jako punkty 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Nazwa wejściowej warstwy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Utwórz warstwę wektorową punktów jako punkty 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nazwa wejściowej warstwy" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Nazwa mapy rastrowej do wyświetlenia" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Zapisywanie przetransformowanych danych do pliku..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Wygładzaj brzegi obiektów powierzchniowych" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Wybieranie obiektów..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Wybieranie obiektów..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Wybieranie obiektów..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "Nie wybieraj automatycznie przy starcie" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "wizualizacja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Lokacja: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "pth percentyl wartości" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Liczba poziomów które mają być użyte dla <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Maksymalna liczba powtórzeń" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Narzędzie: Próg" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Transformacja obiektów..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Liczba powtórzeń filtra" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Usuń powielone centroidy obszarów" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Tytuł nowej mapy rastrowej" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Liczba klatek" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29807,10 +30318,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -30052,6 +30568,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31265,7 +31789,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31309,11 +31833,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -32421,7 +32940,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Numer warstwy" @@ -32459,6 +32977,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Ustawianie nazwy mapy na <%s>" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -32834,7 +33364,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -33029,7 +33558,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Mapa wyjściowa" @@ -33065,6 +33594,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Ścieżka wejściowej lokacji w bazie danych GRASS" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -34117,11 +34655,8 @@ msgstr "Plik konfiguracyjny" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -34172,45 +34707,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Kolor tła (dla null)" +msgid "Thin species and background points" +msgstr "Liczba punktów interpolacji" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Kolor tła (dla null)" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Numer kolumny pliku wejściowego przechowującej dane" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Wielkość zakładki rzędów/kolumn dla segmentacji" @@ -35018,8 +35567,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -35030,6 +35588,7 @@ msgid "Group of raster layers to be classified" msgstr "Nazwa mapy rastrowej do przeskalowania" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -35071,11 +35630,13 @@ msgid "" msgstr "Nazwa kolumny atrubutów do stworzenia etykiet" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Mapa wyjściowa" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35380,6 +35941,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -35391,6 +35953,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -35420,6 +35983,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Plik etykiet" @@ -35791,66 +36355,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "Wejściowa mapa rastrowa zakodowanej sieci rzecznej" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Nazwa dla wynikowej mapy rastrowej " - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "Odległość położenia kamery (w jednostkach mapy)" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36203,11 +36707,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Rozszerz zasięg lokacji opartej na nowych ustawieniach danych" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -37091,6 +37597,14 @@ msgstr "" "Zmienia odwzorowanie mapy rastrowej kopiując go z innej lokacji do bieżącej " "lokacji." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "Lokacja zawierająca wejściową mapę rastrową" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Ścieżka wejściowej lokacji w bazie danych GRASS" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37221,12 +37735,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37373,9 +37887,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -37418,19 +37931,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Rozszerz zasięg lokacji opartej na nowych ustawieniach danych" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -37439,7 +37963,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -37574,34 +38098,6 @@ msgstr "Wprowadź nazwę bazy danych" msgid "Base name for output file" msgstr "Nazwa dla pliku wyjściowego" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "hydrologia" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Kolumny atrybutów zawierających dane" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Liczba punktów do utworzenia" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -38281,6 +38777,10 @@ msgstr "Nazwa dla pliku wyjściowego SVG" msgid "Queries projection information spatially." msgstr "Wyświetl informacje o projekcji w formacie WKT" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -38575,8 +39075,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Usuwa granice pomiędzy sąsiadującymi obszarami o tej samej kategorii lub " @@ -38609,8 +39110,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Nazwa kolumny atrybutów użytej do wysokości" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39335,9 +39837,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -39597,6 +40105,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39608,6 +40117,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -39717,6 +40231,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -40756,8 +41278,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -40855,39 +41377,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Lista warstw do importu" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -44195,8 +44726,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -44234,6 +44765,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -44646,6 +45178,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -44700,6 +45239,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Linie wektorowe" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Linie wektorowe" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -44740,6 +45293,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Liczba kafli powinna nakładać się we wszystkich kierunkach" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Nazwa mapy rastrowej do przeskalowania" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Liczba powtórzeń filtra" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -45173,8 +45758,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -45921,6 +46506,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Nazwa dla wynikowej mapy rastrowej (saturation)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Nazwa lokacji która ma być utworzona" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -46216,6 +46805,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Współczynnik skali dla wysokości" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -46663,10 +47256,94 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Plik etykiet" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Nazwa wejściowej warstwy" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Nazwa mapy wektorowej do edycji" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Wyłącz" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Wynikowa mapa rastrowa (2D) przekroju" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Nazwa mapy rastrowej która ma zostać użyta dla <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parametry" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Wyświetl x i y (kolumny i rzędy)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "hydrologia" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Kolumny atrybutów zawierających dane" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -47177,17 +47854,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -47215,24 +47882,21 @@ msgid "categorical map with zones" msgstr "Punkty wektorowe" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nazwa dla pliku wyjściowego" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 #, fuzzy msgid "Plot dimensions (width,height)" msgstr "Wyświetl wymiary ekranu (szerokość, wysokość)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Rozmiar (szerokość, wysokość) wyjściowego obrazu" @@ -47244,9 +47908,8 @@ msgid "Default font size" msgstr "Domyślny sterownik nie jest ustawiony" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -47266,13 +47929,11 @@ msgid "Create a vector point layer of outliers" msgstr "Utwórz warstwę wektorową punktów jako punkty 3D" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -47283,14 +47944,12 @@ msgid "Draw notches" msgstr "Tryb rysowania" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -47323,14 +47982,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -47342,27 +47993,23 @@ msgid "Plot format" msgstr "Format tabeli" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Wyświetl etykiety kategorii" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -47411,15 +48058,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -47439,7 +48077,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Szerokość ramki" @@ -47451,54 +48088,45 @@ msgid "The width of the boxplots (0,1])" msgstr "Szerokość linii tekstu" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Szerokość linii" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 #, fuzzy msgid "The linewidth of the boxplots" msgstr "Szerokość linii tekstu" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Scieżka do pliku z fontami" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "Kolor dla tekstu i osi" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Kolor dla danych osi Y" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 #, fuzzy msgid "Flier marker" msgstr "Symbol ikony" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -47506,113 +48134,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "Rozmiar czcionki" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "Ilość bajtów nie jest zgodna z rozmiarem pliku" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Kolor obramowania" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Kolor tekstu" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Nazwa wyjściowej mapy rastrowej" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Nazwa wyjściowej mapy rastrowej" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Rozdzielczość" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Tryb rysowania" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Rozmiar czcionki" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Format tabeli" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Szerokość linii tekstu" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Kolor tekstu" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -48866,6 +49408,14 @@ msgstr "Sortuj wynik" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -48891,6 +49441,15 @@ msgstr "Linie wektorowe" msgid "add grid lines" msgstr "Zaetykietowano %d linii." +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Kolor tekstu" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -48989,307 +49548,307 @@ msgid "" msgstr "" "Zmienia nazwę kolumny w tabeli atrybutów połączonej z zadaną mapą wektorową." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Linie wektorowe" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Liczba kolumn" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Nazwa kolumny z szerokościami buforów" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Liczba kolumn" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Nazwa kolumny z szerokościami buforów" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Typ obiektu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Nazwa wyjściowej mapy rastrowej" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Nazwa wyjściowego pliku (bez rozszerzenia)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Prefix dla wyjściowych map rastrowych" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Dane wejściowe" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "pth percentyl wartości" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 #, fuzzy msgid "Dot marker" msgstr "Symbol ikony" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Kolor tekstu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Kolor dla danych osi Y" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Kolumny" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Kolor obiektu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "linia" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Dane wejściowe" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Kolor" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Kolor dla tekstu i osi" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Szerokość linii" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Szerokość linii tekstu" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Kolor linii" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "Kolor dla tekstu i osi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Niedozwolona szerokość strony " -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Szerokość płótna mapy" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Zakres wartości całkowitych: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Nazwa wyświetanej rastrowej mapy ekspozycji" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Zakres wartości całkowitych: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Nazwa wyświetanej rastrowej mapy ekspozycji" @@ -49640,8 +50199,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -49723,184 +50282,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Punkty wektorowe" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Wymagane" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Nazwa kolumny zawierającej dane numeryczne" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Nazwa kolumny zawierającej współrzędną x" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Format pliku wejściowego" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Wyjściowa mapa ekspozycji (lub fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Wyjściowa mapa ekspozycji (lub fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Odległości stref" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Prefix dla wyjściowych map rastrowych" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Wprowadź docelową nazwę tabeli" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Nazwa dla wynikowej mapy rastrowej (intensity)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Nazwa kolumny z szerokościami buforów" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Nazwa dla pliku wyjściowego lub urządzenia GPS" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Nazwa mapy rastrowej która ma zostać użyta dla <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Format" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Nazwa mapy rastrowej która ma zostać użyta dla <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Liczba poziomów które mają być użyte dla każdego komponentu" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Odwróć selekcję" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -50728,11 +51109,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -56454,6 +56830,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "Wyjście v.select" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Odczytaj fragment mapy tylko w bieżącym regionie" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -57004,8 +57420,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -57306,8 +57722,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -57487,7 +57903,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -57501,7 +57917,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -58035,7 +58451,7 @@ msgstr "Typ komponentów" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -58327,7 +58743,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "Typ danych kolumny musi być integer" @@ -58419,49 +58835,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "Wyświetl typy/nazwy kolumn tabeli dla wskazanej warstwy i wyjdź" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Nadpisz parametry połączenia dla wskazanej warstwy" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Usuń połączenie wskazanej warstwy (nie tabelę)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Połączenie bazy danych nie zdefiniowane" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -58471,33 +58883,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "Tabela <%s> nie istnieje w bazie danych <%s>" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -58534,7 +58946,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -58611,56 +59023,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "Dla parametru 'przestrzennego' wymagane są 4 parametry" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "Mapa wektorowa <%s> już istnieje i zostanie nadpisana" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -58936,127 +59355,131 @@ msgstr[3] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -59546,7 +59969,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -59789,11 +60212,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -59820,7 +60243,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "Warstwa <%s> jest niedostępna" @@ -59829,7 +60252,7 @@ msgstr "Warstwa <%s> jest niedostępna" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "Nie można otworzyć źródła danych <%s>" @@ -59849,7 +60272,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -59885,14 +60308,16 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Zmienia odwzorowanie mapy rastrowej kopiując go z innej lokacji do bieżącej " "lokacji." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Lokacja zawierająca wejściową mapę rastrową" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -59926,13 +60351,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" "Mapa wektorowa <%s> w lokacji <%s> mapsecie <%s> nie została znaleziona" @@ -59948,13 +60377,14 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "" +"Mapa wektorowa <%s> w lokacji <%s> mapsecie <%s> nie została znaleziona" #: ../vector/v.proj/main.c:517 msgid "Reprojecting primitives ..." @@ -62280,7 +62710,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62907,7 +63337,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -63220,12 +63650,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -63425,19 +63855,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Usuwanie duplikatów..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -63648,7 +64078,7 @@ msgstr[3] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -63806,10 +64236,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -63849,6 +64279,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -63949,9 +64383,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -63965,7 +64399,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "Wektor nie jest trójwymiarowy" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -64050,7 +64484,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -64078,8 +64511,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -64730,7 +65163,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -64868,8 +65301,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -66683,17 +67116,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -66869,13 +67302,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -67121,42 +67554,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Warstwa punktowa" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Opcja ta wymaga 1 kolumny" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Opcja ta wymaga 2 kolumn" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Opcja ta wymaga przynajmniej 2 kolumn" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -68138,16 +68576,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Wyświetla atrybuty mapy wektorowej." @@ -69638,68 +70066,68 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "Nazwa pliku wyjściowego <%s> nie jest poprawną nazwą mapy wektorowej." -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" "Podczas użycia anizotropii współczynniki 'theta' i 'scalex' muszą być " "określone" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -69994,7 +70422,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "Odpytywanie mapy wektorowej <%s>..." -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Zapisywanie centroidów ..." @@ -70452,164 +70880,165 @@ msgstr "Połączenie z bazą danych nie zostało zdefiniowane dla warstwy %d" msgid "Unable to open driver <%s>" msgstr "Nie można uruchomić sterownika <%s>" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "Nazwa:" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "Mapset:" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "Lokacja:" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Projekcje" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "Baza danych:" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "Tytuł:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "Skala mapy:" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -70788,27 +71217,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -70875,274 +71327,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -71151,51 +71603,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -71351,10 +71803,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "Grupa <%s> załadowana do lokacji[%s], w mapsecie [%s]" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "MAPSET <%s> nie został znaleziony" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -71519,7 +71981,7 @@ msgstr "Scieżka do pliku z fontami" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -71529,7 +71991,7 @@ msgstr[2] "" msgstr[3] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -71537,7 +71999,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -75934,6 +76396,10 @@ msgstr "Renderowanie" msgid "Highlight color" msgstr "Kolor wyróżnienia" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "Renderuj grube linie" @@ -76520,6 +76986,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Nie można otworzyć pliku <%s> do zapisu" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Nie można otworzyć pliku <%s> do zapisu" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -76799,6 +77282,7 @@ msgid "Unable to open color rule" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -76810,6 +77294,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -77374,7 +77863,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -77613,22 +78102,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -79669,38 +80151,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -79780,11 +80262,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -79809,103 +80291,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -79917,336 +80399,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -80299,50 +80781,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -80370,7 +80852,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -80588,7 +81070,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -80645,85 +81127,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Użyj współrzędnych mapy zamiast X, Y, Z" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Tworzenie plików dla <%s>..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Torzenie plików tymczasowych..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "Nie można pobrać informacji o projekcji lokacji docelowej" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -80769,28 +81252,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -80847,27 +81330,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Nie można otworzyć źródła danych OGR '%s'" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -80877,7 +81360,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -80887,14 +81369,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -80902,72 +81384,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -81194,7 +81676,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -81212,64 +81694,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -81409,79 +81892,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -81593,40 +82076,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -81662,7 +82145,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -81673,34 +82156,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -81792,34 +82275,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -81898,317 +82381,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Nie znaleziono regionu <%s>" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -82216,60 +82699,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -82321,27 +82804,38 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Nie mozna otworzyć pliku etykiet <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Kolumna <%s> nie została znaleziona w tabeli <%s>" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Błąd podczas skanowania argumentów" + +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -82387,16 +82881,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -82467,41 +82951,51 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Mapa rastrowa <%s> nie została znaleziona w bieżącym mapsecie" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +#, fuzzy +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "Nazwa i typ nowej kolumny/kolumn ('nazwa typ [,name type, ...]')" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Błąd podczas skanowania argumentów" + #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -82549,20 +83043,170 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "Wyświetla/ustawia połączenie DB mapy wektorowej z tabelą atrybutów." + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Nazwa mapy wektorowej" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Liczba warstw (na)" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Zbyt dużo nazw kolmun" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Liczba kolumn w nowym regionie" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Sposób zapisu wynikowej mapy rastrowej" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "Mapa rastrowa zawierająca wynik klasyfikacji" + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "Wejściowa mapa rastrowa zakodowanej sieci rzecznej" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Nazwa dla wynikowej mapy rastrowej " + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "Odległość położenia kamery (w jednostkach mapy)" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Nazwa wyjściowej mapy rastrowej" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Nazwa wyjściowej mapy rastrowej" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Rozdzielczość" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Tryb rysowania" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Rozmiar czcionki" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Format tabeli" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Szerokość linii tekstu" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Punkty wektorowe" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Wymagane" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Nazwa kolumny zawierającej dane numeryczne" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Nazwa kolumny zawierającej współrzędną x" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Format pliku wejściowego" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Wyjściowa mapa ekspozycji (lub fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Wyjściowa mapa ekspozycji (lub fy)" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Odległości stref" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Prefix dla wyjściowych map rastrowych" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Wprowadź docelową nazwę tabeli" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Nazwa dla wynikowej mapy rastrowej (intensity)" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nazwa kolumny z szerokościami buforów" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nazwa dla pliku wyjściowego lub urządzenia GPS" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Nazwa mapy rastrowej która ma zostać użyta dla <%s>" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Format" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Nazwa mapy rastrowej która ma zostać użyta dla <%s>" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Liczba poziomów które mają być użyte dla każdego komponentu" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Odwróć selekcję" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Nadpisz parametry połączenia dla wskazanej warstwy" + +#~ msgid "Location:" +#~ msgstr "Lokacja:" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -84370,10 +85014,6 @@ msgstr "" #~ "\n" #~ "Rozdzielczość = %d; okres = %d" -#, fuzzy -#~ msgid "Output formating" -#~ msgstr "Format wyjściowy" - #, fuzzy #~ msgid "Unable to create 2D raster <%s>" #~ msgstr "Nie można utworzyć mapy rastrowej 3D <%s>" @@ -84674,9 +85314,6 @@ msgstr "" #~ msgstr[1] "Interpolowanie mapy rastrowej <%s>... %d wierszy..." #~ msgstr[2] "Interpolowanie mapy rastrowej <%s>... %d wierszy..." -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "Odwzorowanie lat/lon nie jest obsługiwane at this time." - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Ciąg znaków reprezentujący komórki, w których jest brak danych" @@ -84730,8 +85367,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Kolor wyświetlanej siatki, lub \"none\"" #, fuzzy diff --git a/locale/po/grassmods_pt.po b/locale/po/grassmods_pt.po index 088ec04856e..e82ca8d5f3c 100644 --- a/locale/po/grassmods_pt.po +++ b/locale/po/grassmods_pt.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2007-06-21 21:54-0300\n" "Last-Translator: Daniel de Castro Victoria \n" @@ -90,7 +90,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -130,32 +130,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -181,21 +182,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -267,7 +268,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -292,7 +293,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -303,7 +304,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -325,7 +326,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -482,6 +483,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -501,7 +503,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -520,7 +521,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -534,6 +534,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -567,7 +568,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -577,8 +578,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -593,21 +594,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -616,7 +617,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -651,7 +652,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -664,7 +664,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -703,6 +702,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -724,7 +724,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -790,7 +790,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -804,7 +804,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -817,8 +817,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -833,16 +833,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -888,7 +888,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -904,7 +904,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -913,7 +913,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -943,13 +943,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -977,7 +977,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -992,8 +992,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1027,10 +1027,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1038,7 +1038,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1068,23 +1068,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1166,13 +1166,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1225,6 +1225,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1285,6 +1286,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1350,14 +1357,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1407,144 +1413,132 @@ msgstr "Título para o mapa resultante" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1561,37 +1555,36 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "Não consegui converter a projeção do mapa de entrada para o formato do " "GRASS, não posso criar nova locação." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Não consegui alocar buffer de células." -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "Mapa raster 3D <%s> não encontrado" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1599,55 +1592,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1727,12 +1722,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1770,7 +1763,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1786,7 +1779,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1836,24 +1829,18 @@ msgstr "Nome do Raster de entrada" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1975,7 +1962,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1985,7 +1972,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2105,7 +2091,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2134,6 +2120,7 @@ msgstr "Não consegui alocar memória para 'string'" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2269,7 +2256,13 @@ msgstr "Número inválido de passos: %s" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2278,8 +2271,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2311,7 +2304,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2367,7 +2360,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2412,7 +2404,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2465,7 +2457,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2880,7 +2872,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2968,14 +2960,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3134,7 +3128,7 @@ msgid "List of cell values to be set to NULL" msgstr "Lista de valores de célula para marcar como NULO" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3447,6 +3441,15 @@ msgstr "Saída de mapa de ângulo de incidência (apenas modo 1)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3535,17 +3538,15 @@ msgstr "Saída de mapa de ângulo de incidência (apenas modo 1)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3566,7 +3567,7 @@ msgstr "Saída de mapa de ângulo de incidência (apenas modo 1)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3647,7 +3648,7 @@ msgstr "Hora (solar) local (ajustar apenas para modo 1) [horas decimais]" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3680,160 +3681,155 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "Não consegui informações de projeção da locação atual" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "Não consegui unidades de projeção da locação atual" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "Não obtive os valores de projeção da locação atual" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3866,19 +3862,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Memória Esgotada! (Out of Memory)" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3948,9 +3944,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3964,36 +3960,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4048,6 +4044,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4068,46 +4067,57 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Formato de saída" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Nome do arquivo de saída (use output=- para saída padrão)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Inlcui" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4116,82 +4126,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "Não consegui informações de projeção da locação atual" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Não consegui unidades de projeção da locação atual" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "Não obtive os valores de projeção da locação atual" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4993,7 +5015,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5072,7 +5094,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5201,7 +5223,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5400,9 +5422,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5418,7 +5439,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5632,9 +5653,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5652,7 +5673,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5737,10 +5758,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5780,30 +5801,30 @@ msgstr "Fator de escala para elevação" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5926,124 +5947,124 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Mostra as estatísticas em estilo shell script" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Mapa raster 3D <%s> não encontrado" @@ -6143,7 +6164,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6177,7 +6198,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6209,7 +6230,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6263,9 +6284,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6281,8 +6302,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6292,24 +6313,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Média da distribuição" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Desvio padrão" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6361,7 +6413,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6661,7 +6713,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6767,7 +6819,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6853,8 +6904,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "não." #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7474,7 +7526,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7483,7 +7535,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7588,7 +7640,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7612,15 +7664,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7694,7 +7746,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7744,17 +7796,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7812,6 +7861,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7950,7 +8000,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8033,7 +8083,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8092,7 +8142,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8154,7 +8204,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8277,7 +8327,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8416,7 +8465,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "Número inválido de passos: %s" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8508,8 +8557,8 @@ msgstr "Porcentagem do mapa para manter em memória" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8518,8 +8567,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8537,7 +8586,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8917,10 +8966,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "não." #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9144,13 +9193,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9163,7 +9210,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9405,31 +9451,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9445,12 +9491,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9465,18 +9510,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Nome de destino da locação da imagem" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9500,10 +9545,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Nome da nova locação a criar" #: ../raster/r.in.gdal/main.c:195 @@ -9533,7 +9578,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9542,210 +9587,233 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Manter os números das bandas em vez de usar os nomes das cores" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"Não consegui converter a projeção do mapa de entrada para o formato do " +"GRASS, não posso criar nova locação." + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" -msgstr "" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" +msgstr "Não consegui obter informações de camada para o mapa vetorial" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"Não consegui converter a projeção do mapa de entrada para o formato do " +"GRASS, não posso criar nova locação." + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10415,7 +10483,6 @@ msgid "Number of intermediate images to produce" msgstr "Número de imagens intermediárias a produzir" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10528,6 +10595,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10559,26 +10638,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10603,12 +10662,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10616,40 +10669,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Entrada falhou" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10800,7 +10853,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11046,29 +11099,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11123,71 +11176,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Mínimo valor aleatório" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Máximo valor aleatório" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11230,6 +11250,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11936,7 +11989,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11950,13 +12003,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "todos em atual para atual" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "Ajustar a região coincidente com esse mapa raster" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11981,10 +12035,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Caminho para o banco de dados GRASS da locação de entrada" #: ../raster/r.proj/main.c:174 @@ -12040,12 +12093,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12062,12 +12115,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12075,7 +12128,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12083,7 +12136,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12099,12 +12152,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12185,7 +12238,7 @@ msgid "Sorting events..." msgstr "Iniciando FFT inversa..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12441,8 +12494,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12610,7 +12664,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12621,6 +12675,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "Não consegui informações de projeção da locação atual" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Não consegui unidades de projeção da locação atual" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Não obtive os valores de projeção da locação atual" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13239,16 +13308,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "Não consegui informações de projeção da locação atual" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Não consegui unidades de projeção da locação atual" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "Não obtive os valores de projeção da locação atual" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13326,7 +13398,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13336,7 +13408,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13424,7 +13496,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13433,7 +13505,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13745,7 +13817,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13756,19 +13828,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Nome dos mapas raster existentes para pesquisar" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Coordenadas para pesquisa" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13776,15 +13848,28 @@ msgstr "Coordenadas para pesquisa" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "Tamanho do cache de pontos" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13793,62 +13878,71 @@ msgstr "Tamanho do cache de pontos" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Gera valores inteiros de categorias, em vez de valores de célula" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "Habilitar relatório de cache" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "falha interpretando dp como inteiro" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -14018,9 +14112,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14360,21 +14451,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14559,80 +14650,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15524,32 +15615,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15565,61 +15656,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15643,7 +15734,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16583,46 +16673,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16947,7 +17037,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17404,8 +17494,8 @@ msgstr "Saída de valores RRR:GGG:BBB para cada ponto do perfil" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17532,97 +17622,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17885,11 +17975,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18092,32 +18182,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18200,8 +18290,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Locação: %s\n" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18223,8 +18314,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18978,8 +19070,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18989,28 +19081,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19019,57 +19111,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19078,7 +19170,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19087,7 +19179,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19582,6 +19674,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19640,64 +19736,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19803,7 +19907,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19816,10 +19919,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19833,11 +19934,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20331,10 +20432,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20390,9 +20491,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20452,13 +20553,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20819,67 +20920,70 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" +"Saída WGS84 não é possível pois esta locação não contém\n" +"parâmetros de transformação do .datum. Execute g.setproj" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21123,8 +21227,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21391,154 +21495,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Nome da nova locação a criar" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21626,9 +21731,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Não consegui alocar buffer de células." #: ../general/g.proj/create.c:21 #, c-format @@ -21636,98 +21741,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Não consegui alocar buffer de células." #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21870,7 +21975,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21953,33 +22059,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21988,69 +22116,74 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Carregue uma regra em um destes formatos:\n" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22065,37 +22198,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22448,7 +22578,7 @@ msgstr " desvio padrão" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23635,7 +23765,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23731,7 +23861,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23739,8 +23870,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Nome de destino da locação da imagem" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23772,35 +23904,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Mapa raster 3D <%s> não encontrado" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23853,61 +23986,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23917,8 +24055,9 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Não consegui informações de projeção da locação atual" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" @@ -23926,20 +24065,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -24054,15 +24193,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24102,101 +24239,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24320,6 +24455,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24336,6 +24481,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24345,6 +24495,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24713,6 +24883,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Locação: %s\n" @@ -26290,8 +26461,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26615,17 +26786,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26634,17 +26802,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26653,17 +26818,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26673,17 +26835,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26692,12 +26851,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27488,6 +27645,7 @@ msgid "Apriori Phi (roll) standard deviation" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27499,6 +27657,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -28047,11 +28210,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28101,7 +28268,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28194,16 +28361,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28776,6 +28942,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Nome da coluna de atributo para usar como rótulos" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Número de cópias" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28818,6 +29020,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28854,63 +29058,74 @@ msgstr "Entrada falhou" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Nome do Raster de entrada" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Tipo dos mapas de saída de direção e declividade de encosta" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Nome do Raster de entrada" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Tipo dos mapas de saída de direção e declividade de encosta" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Nome do Raster de entrada" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Fator de sobrelevação" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Erro tentando ler o arquivo dbmscap\n" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Coordenadas do mapa" @@ -28992,234 +29207,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Nome do mapset de destino" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Camada número" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Tipo de armazenamento para o mapa resultante" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -29427,6 +29422,521 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Nome de destino da locação da imagem" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Nome de uma camada de saída" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Valor do raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Gera pontos como pontos 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Nome de uma camada de entrada" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Gera pontos como pontos 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nome de uma camada de entrada" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Nome do mapa de orientação para exibição" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Escrevendo dados transformados para o arquivo ..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Título do mapa vetoria" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Título do mapa vetoria" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "Não selecionar atumaticamente quando iniciar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Locação: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Número de pontos de interpolação" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "Posição de referência" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Número de níveis a usar para <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Número de iterações máximas" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Unidade de distância" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Número de vezes para repetir o filtro" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Título para o novo mapa raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Número de quadros" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29654,10 +30164,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29896,6 +30411,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31097,7 +31620,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31141,11 +31664,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -32240,7 +32758,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Camada número" @@ -32278,6 +32795,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -32646,7 +33174,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32841,7 +33368,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Saída de mapa" @@ -32876,6 +33403,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Caminho para o banco de dados GRASS da locação de entrada" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33942,11 +34478,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33996,45 +34529,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Cor de fundo" +msgid "Thin species and background points" +msgstr "Número de pontos de interpolação" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Cor de fundo" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Valor máximo na saída: %e." -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Semente para geração de número aleatório" @@ -34830,8 +35377,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34842,6 +35398,7 @@ msgid "Group of raster layers to be classified" msgstr "Nome do mapa raster para ser reescalonado" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34882,11 +35439,13 @@ msgid "" msgstr "Nome da coluna de atributo para usar como rótulos" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Saída de mapa" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35183,6 +35742,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -35194,6 +35754,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -35223,6 +35784,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Nome do arquivo de saída" @@ -35595,65 +36157,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Sem mapa de saída" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "Distância da câmera (em unidades do mapa)" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36005,11 +36508,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Estender locação baseado nos novos dados" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36874,6 +37379,14 @@ msgid "" "mapset." msgstr "todos em atual para atual" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Caminho para o banco de dados GRASS da locação de entrada" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37002,12 +37515,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37151,9 +37664,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -37196,19 +37708,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Estender locação baseado nos novos dados" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -37217,7 +37740,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -37352,34 +37875,6 @@ msgstr "Nome do banco de dados de entrada" msgid "Base name for output file" msgstr "Nome do arquivo de saída" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "" -"Coluna da tabela de atributos com valores para interpolar (se camada > 0)" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Número de cópias" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -38038,6 +38533,10 @@ msgstr "Nome do arquivo de saída" msgid "Queries projection information spatially." msgstr "Não consegui informações de projeção da locação atual" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -38328,7 +38827,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -38359,8 +38858,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Nome da coluna de atributo para usar como rótulos" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39070,9 +39570,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -39327,6 +39833,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -40351,8 +40865,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -40449,39 +40963,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Lista de camadas para importar" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -43729,8 +44252,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -43768,6 +44291,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -44173,6 +44697,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -44227,6 +44758,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Título do mapa vetoria" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Título do mapa vetoria" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -44266,6 +44811,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Número de cópias" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Nome do mapa raster para ser reescalonado" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Número de vezes para repetir o filtro" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -44687,8 +45264,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -45427,6 +46004,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Título do raster de saída" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Nome da nova locação a criar" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -45717,6 +46298,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Fator de escala para elevação" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -46158,10 +46743,94 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Nome do arquivo de saída" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Nome de uma camada de entrada" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Mapa de entrada contendo linhas" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Nome da tabela de entrada" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Nome do mapa raster de elevação" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Nome do mapa raster a ser usado para <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parâmetro de suavização" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Mostra x e y (coluna e linha)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "" +"Coluna da tabela de atributos com valores para interpolar (se camada > 0)" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -46664,17 +47333,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -46702,23 +47361,20 @@ msgid "categorical map with zones" msgstr "Título do mapa vetoria" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nome do arquivo de saída" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -46728,9 +47384,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -46749,13 +47404,11 @@ msgid "Create a vector point layer of outliers" msgstr "Gera pontos como pontos 3D" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -46765,14 +47418,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -46806,14 +47457,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -46825,27 +47468,23 @@ msgid "Plot format" msgstr "Formato de saída" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Mostra rótulos de categorias" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -46893,15 +47532,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -46921,7 +47551,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -46931,49 +47560,40 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Nome do arquivo de saída" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -46981,108 +47601,24 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Cor da Linha" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Nome do Raster de saída" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Nome do Raster de saída" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Nome do mapa raster de saída" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Mostra rótulos de categorias" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Formato de saída" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Cor do Texto" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -48318,6 +48854,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -48342,6 +48886,15 @@ msgstr "" msgid "add grid lines" msgstr "Rotuladas %d linhas" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Cor do Texto" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -48438,297 +48991,297 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Título do mapa vetoria" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Número de colunas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Nome da coluna de atributo para usar como rótulos" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Número de colunas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Nome da coluna de atributo para usar como rótulos" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Tipo de feição" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Nome da camada de saída a usar para AZUL" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Nome do arquivo povray de saída (arquivo de campo de altura TGA)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Nome do mapa raster de saída" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Locação: %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Cor do Texto" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Locação: %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Locação: %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Largura da linha" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Coluna de largura da linha não especificada." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Cor da Linha" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Intervalo de inteiro: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Nome do mapa de orientação para exibição" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Intervalo de inteiro: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Nome do mapa de orientação para exibição" @@ -49081,8 +49634,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -49163,182 +49716,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Título do mapa vetoria" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Nome da coluna de atributo para usar como rótulos" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Nome do arquivo raster de elevação para entrada (metros)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Arquivo de entrada" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Gera arquivo com a direção da encosta" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Gera arquivo com a direção da encosta" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Zonas de distância" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Nome do mapa raster de saída" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Nome da tabela de saída" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Nome do Raster de saída" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Nome do Raster de entrada" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Nome do arquivo de saída" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Nome do mapa raster a ser usado para <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Nome do mapa raster a ser usado para <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Número de níveis a usar para componente" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Converter para o tipo de feição" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -50149,11 +50526,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -55118,6 +55490,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Usa a região atual" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -55659,8 +56071,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -55961,8 +56373,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -56142,7 +56554,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -56156,7 +56568,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -56686,7 +57098,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -56976,7 +57388,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -57067,49 +57479,45 @@ msgstr "" "Mostra tipos/nomes das colunas da tabela para a camada especificada e sai" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Substituir parâmetro de conexão para camada definida" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Apagar conexão para camada determinada (não para a tabela)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Escolha apenas um estilo de impressão" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Conexão com banco de dados não definida" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -57119,17 +57527,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "Use -o para sobrescrever ligação existente para camada <%d>" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "Tabela <%s> não existe no banco de dados <%s>" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -57138,16 +57546,16 @@ msgstr "" "A tabela <%s> é agora parte do mapa veeteoria <%s> e pode ser apagada ou " "sobrescrita pelos módulos do GRASS/" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Não posso dar privilégios na tabela %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Privilégios de seleção foram concedidos na tabela" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -57186,7 +57594,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -57263,56 +57671,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -57582,127 +57997,131 @@ msgstr[1] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -58180,7 +58599,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -58420,11 +58839,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -58451,7 +58870,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -58460,7 +58879,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -58480,7 +58899,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -58516,12 +58935,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "todos em atual para atual" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Nome do mapset de destino" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -58555,13 +58976,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -58576,12 +59001,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -60864,7 +61289,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -61487,7 +61912,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -61794,12 +62219,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -61999,19 +62424,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -62220,7 +62645,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -62378,10 +62803,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -62420,6 +62845,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -62520,9 +62949,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -62536,7 +62965,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "Mapa vetorial não é 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -62625,7 +63054,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -62653,8 +63081,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -63278,7 +63706,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -63412,8 +63840,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -65193,17 +65621,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -65379,13 +65807,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -65631,42 +66059,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Lista camadas disponíveis e finaliza" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Esta opção requer uma coluna" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "A opção 'sides' só faz sentido para fronteiras" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -66648,16 +67081,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -68089,17 +68512,17 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" @@ -68107,7 +68530,7 @@ msgstr "" "Ambas opções de validação cruzada devem ser especificadas (opção -v e saída " "de vetor cvdev)" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" @@ -68115,44 +68538,44 @@ msgstr "" "A validação cruzada não pode ser calculada juntamente com o raster de saída " "ou arquivo devi" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "Usando anisotropia - tanto theta quanto scalex devem ser especificados" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "Ambas opções smatt e smooth foram especificadas - usando constante" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "A computação irá demorar demais - sugiro diminuir npmin" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "Interp_segmets falhou" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -68441,7 +68864,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -68898,164 +69321,164 @@ msgstr "Conexão com banco de dados não definida" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -69232,27 +69655,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -69321,274 +69767,274 @@ msgstr "Não limpar polígonos (operação não recomendada)" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -69597,51 +70043,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -69797,10 +70243,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Mapa raster 3D <%s> não encontrado" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -74209,7 +74665,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -74217,7 +74673,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -74225,7 +74681,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -75226,6 +75682,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -75796,6 +76256,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr " [do arquivo de assinatura %s]" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr " [do arquivo de assinatura %s]" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -79727,7 +80204,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -79966,22 +80443,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -82014,38 +82484,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -82125,11 +82595,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -82154,103 +82624,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -82262,336 +82732,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -82644,50 +83114,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -82715,7 +83185,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -82933,7 +83403,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -82990,85 +83460,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Usar coordenadas do mapa ao invés de xyz" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Não consigo abrir arquivo temporário <%s>" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -83114,28 +83584,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -83192,27 +83662,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "para site" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -83222,7 +83692,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -83232,14 +83701,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -83247,72 +83716,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -83539,7 +84008,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -83557,64 +84026,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -83754,79 +84224,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -83938,40 +84408,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -84007,7 +84477,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -84018,34 +84488,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -84137,34 +84607,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -84243,317 +84713,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Coluna <%s> não encontrada" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -84561,60 +85031,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -84666,27 +85136,38 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Erro procurando argumentos" + +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -84732,16 +85213,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -84812,41 +85283,50 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Coluna <%s> não encontrada" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Erro procurando argumentos" + #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -84894,20 +85374,126 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Camada número" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Tipo de armazenamento para o mapa resultante" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Sem mapa de saída" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "Distância da câmera (em unidades do mapa)" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Nome do Raster de saída" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Nome do Raster de saída" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Nome do mapa raster de saída" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Mostra rótulos de categorias" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Formato de saída" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Título do mapa vetoria" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Nome da coluna de atributo para usar como rótulos" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Nome do arquivo raster de elevação para entrada (metros)" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Arquivo de entrada" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Gera arquivo com a direção da encosta" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Gera arquivo com a direção da encosta" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Zonas de distância" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Nome do mapa raster de saída" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Nome da tabela de saída" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Nome do Raster de saída" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nome do Raster de entrada" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nome do arquivo de saída" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Nome do mapa raster a ser usado para <%s>" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Nome do mapa raster a ser usado para <%s>" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Número de níveis a usar para componente" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Converter para o tipo de feição" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Substituir parâmetro de conexão para camada definida" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -86654,10 +87240,6 @@ msgstr "" #~ msgid "Only TERRAIN points" #~ msgstr "Somente pontos TERRENO" -#, fuzzy -#~ msgid "Output formating" -#~ msgstr "Formato de saída" - #, fuzzy #~ msgid "Error writing cell (%d,%d,%d) with value %f, nrows = %d" #~ msgstr "Erro tentando ler o arquivo dbmscap\n" @@ -87023,10 +87605,6 @@ msgstr "" #~ msgid "%s=%s - illegal number of interpolation points" #~ msgstr "%s=%s - número de pontos de interpolação ilegal" -#, fuzzy -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "não." - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Texto para representar célula sem dados" @@ -87087,8 +87665,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Cor para desenhar malhas, ou \"none\"" #, fuzzy diff --git a/locale/po/grassmods_pt_BR.po b/locale/po/grassmods_pt_BR.po index dd7366b65bd..07b9184ddf2 100644 --- a/locale/po/grassmods_pt_BR.po +++ b/locale/po/grassmods_pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-05-23 21:08+0200\n" "Last-Translator: Daniel Victoria , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/grass-gis/" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Impressão" @@ -1079,7 +1080,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -1104,7 +1105,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -1115,7 +1116,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -1137,7 +1138,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -1294,6 +1295,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -1313,7 +1315,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -1332,7 +1333,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -1346,6 +1346,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -1379,7 +1380,7 @@ msgstr "Meu primeiro módulo raster" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -1389,8 +1390,8 @@ msgstr "Meu primeiro módulo raster" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -1405,22 +1406,26 @@ msgstr "Meu primeiro módulo raster" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 +<<<<<<< HEAD #: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 >>>>>>> osgeo-main +======= +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 +>>>>>>> osgeo-main #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Mapa raster <%s> não encontrado" @@ -1429,7 +1434,7 @@ msgstr "Mapa raster <%s> não encontrado" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -1464,7 +1469,6 @@ msgstr "Mapa raster <%s> não encontrado" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -1477,7 +1481,6 @@ msgstr "Mapa raster <%s> não encontrado" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -1516,6 +1519,7 @@ msgstr "Mapa raster <%s> não encontrado" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -1537,7 +1541,7 @@ msgstr "Mapa raster <%s> não encontrado" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -1603,7 +1607,7 @@ msgstr "Mapa raster <%s> não encontrado" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -1617,7 +1621,7 @@ msgstr "Meu primeiro módulo vetorial" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -1630,8 +1634,8 @@ msgstr "Meu primeiro módulo vetorial" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -1646,16 +1650,16 @@ msgstr "Não foi possível definir o nível vetorial aberto pré-determinado" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -1701,7 +1705,7 @@ msgstr "Não foi possível definir o nível vetorial aberto pré-determinado" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -1717,7 +1721,7 @@ msgstr "Não foi possível abrir mapa vetorial <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -1726,7 +1730,7 @@ msgstr "Não foi possível abrir mapa vetorial <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -1756,13 +1760,13 @@ msgstr "Não foi possível abrir mapa vetorial <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -1790,7 +1794,7 @@ msgstr "Conexão do banco de dados não definida para camada %d" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1805,8 +1809,8 @@ msgstr "Não foi possível iniciar o driver <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1840,10 +1844,10 @@ msgstr "Não foi possível iniciar o driver <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1851,7 +1855,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Não foi possível abrir banco de dados <%s> com driver <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1882,25 +1886,25 @@ msgstr "" "Não foi possível copiar a tabela de atributos para o mapa vetorial <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "Regras de cores inconsistentes no RAT" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" "Configurando tabela de cores cinza para <%s> (8bit, intervalo completo)" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" "Configurando tabela de cores cinza para <%s> (16bit, intervalo de imagem)" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "Formatos suportados:" @@ -1983,13 +1987,14 @@ msgstr "Invertendo horizontalmente" msgid "Applying vertical flip" msgstr "Invertendo verticalmente" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" msgstr "Região padrão para esta location atualizada" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "Região para o mapset atual atualizada" @@ -2042,6 +2047,7 @@ msgstr "Região para o mapset atual atualizada" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -2102,6 +2108,12 @@ msgstr "Nome do arquivo raster a ser vinculado" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -2167,14 +2179,13 @@ msgstr "Nome do arquivo raster a ser vinculado" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -2224,149 +2235,139 @@ msgstr "Título para o mapa resultante" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadados" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Mostra os formatos suportados e encerra" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +#, fuzzy +msgid "Override projection check (use current project's CRS)" msgstr "Substituir a verificação de projeção (usar a projeção do local atual)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" "Suponha que o conjunto de dados tenha a mesma projeção da location atual" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "Executar apenas a verificação de projeção e sair" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "Estender extensões de região com base no novo conjunto de dados" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "Também atualiza a região padrão se estiver no mapset PERMANENT" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "Ajuste automático para lat/lon" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "Tentar corrigir pequenos erros de precisão na resolução e extensões" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "Inverter horizontalmente" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "Inverter verticalmente" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" "Listar as bandas disponíveis, incluindo o tipo de banda no conjunto de dados " "e sair" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "Criar um link rápido sem intervalo de dados" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" "AVISO: alguns módulos não funcionam corretamente sem intervalo de dados " "conhecido" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "%s= ou %s= deve ser fornecido" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "%s= e %s= são mutuamente excludentes" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "Não foi possível obter o diretório de trabalho atual" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "Seguindo com a importação..." -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "O grupo de imagens <%s> já existe e será substituído." -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "Lendo banda %d de %d..." -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "Banda selecionada (%d) não existe" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "Grupo de imagens <%s> criado" @@ -2385,39 +2386,38 @@ msgstr "" msgid "No projection information available" msgstr "Nenhuma informação de projeção disponível" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" "Não consegui converter a projeção do mapa de entrada para o formato do " "GRASS, não posso criar nova locação." -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" msgstr "Não foi possível criar nova location <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Location <%s> criada" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 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." -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -2425,62 +2425,68 @@ msgstr "" msgid "Over-riding projection check" msgstr "Se sobrepondo à verificação da projeção" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" "Projeção do conjunto de dados parece não combinar com a locação atual.\n" "\n" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "Locação PROJ_INFO é:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "PROJ_INFO do conjunto de dados é:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 -#, c-format +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 +#, fuzzy, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" "\n" "No caso de não haver diferenças significativas nas definições de projeção, " "use a flag -o para ignorá-las e use a definição de location atual.\n" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 +#, fuzzy msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" "Considere gerar uma nova locação a partir do conjunto de dados de entrada " "usando o parâmetro 'location'.\n" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +#, fuzzy +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" "Projeção do conjunto de dados de entrada e locação atual parecem combinar" @@ -2561,12 +2567,10 @@ msgstr "álgebra" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -2604,7 +2608,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -2620,7 +2624,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -2670,24 +2674,18 @@ msgstr "Nome para o mapa raster de elevação de saída" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Saídas" @@ -2809,7 +2807,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2819,7 +2817,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2939,7 +2936,7 @@ msgstr "Imprime histórico do raster ao invés de informações" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2968,6 +2965,7 @@ msgstr "Não consegui alocar memória para 'string'" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -3106,7 +3104,13 @@ msgstr "" "GRASS GIS não é compilado com suporte a OpenMP, a computação paralela está " "desabilitada." -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -3115,8 +3119,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -3148,7 +3152,7 @@ msgstr "Atualizar estatísticas do mapa raster" msgid "Statistics for <%s> updated" msgstr "Estatísticas para <%s> atualizadas" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -3204,7 +3208,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -3249,7 +3252,7 @@ msgid "Unknown method <%s>" msgstr "Método desconhecido <%s>" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -3302,7 +3305,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -3724,7 +3727,7 @@ msgstr "Encontrando caminho de custo..." msgid "Error, ct == pres_cell" msgstr "Erro, ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -3812,14 +3815,16 @@ msgstr "exportação" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3981,7 +3986,7 @@ msgid "List of cell values to be set to NULL" msgstr "Lista de valores de célula para marcar como NULO" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -4301,6 +4306,15 @@ msgstr "Saída de mapa de ângulo de incidência (apenas modo 1)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -4389,17 +4403,15 @@ msgstr "Saída de mapa de ângulo de incidência (apenas modo 1)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -4420,7 +4432,7 @@ msgstr "Saída de mapa de ângulo de incidência (apenas modo 1)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Saída" @@ -4503,7 +4515,7 @@ msgstr "Hora (solar) local (ajustar apenas para modo 1) [horas decimais]" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -4536,162 +4548,157 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "insol_time e incidout são opções incompatíveis" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "Erro lendo o tamanho do intervalo de tempo" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "Erro lendo o tamanho de passo do horizonte" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "O tamanho do passo do horizonte deve ser maior que 0." -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" "Se você usar a opção horizonte, você também deve definir o parâmetro " "'horizonstep'." -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "Tempo e insol_time são opções incompatíveis" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "incidout precisa que o parâmetro de tempo seja ajustado" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "Modo 2: irradiação diária integrada para um dado dia do ano" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "Usando a constante de declividade:%lf" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "Usando mapa de declive <%s>" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "Não consegui informações de projeção da locação atual" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "Não consegui unidades de projeção da locação atual" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "Não obtive os valores de projeção da locação atual" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "Não foi possível inicializar a transformação de coordenadas" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -4724,19 +4731,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Memória Esgotada! (Out of Memory)" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4806,9 +4813,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -4822,36 +4829,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4906,6 +4913,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4926,46 +4936,57 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Formato de saída" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "Nome do arquivo de saída (use output=- para saída padrão)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Inclui etiquetas de categoria na saída" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4974,82 +4995,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Não consegui abrir o arquivo <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "Não consegui informações de projeção da locação atual" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Não consegui unidades de projeção da locação atual" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "Não obtive os valores de projeção da locação atual" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -5535,8 +5568,8 @@ msgid "" "Precision loss: Float32 can not preserve the DCELL precision of raster <%s>. " "This can be avoided by using Float64" msgstr "" -"Perda de precisão: Float32 não pode preservar a precisão DCELL do raster <" -"%s>. Isso pode ser evitado usando Float64" +"Perda de precisão: Float32 não pode preservar a precisão DCELL do raster " +"<%s>. Isso pode ser evitado usando Float64" #: ../raster/r.out.gdal/main.c:579 msgid "Forcing raster export" @@ -5891,7 +5924,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Atributos" @@ -5970,7 +6003,7 @@ msgstr "Não foi possível criar índice" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Não posso dar privilégios na tabela <%s>" @@ -6099,7 +6132,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -6299,9 +6332,9 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" msgstr "GRASS LOCATION PROJ_INFO é:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -6316,8 +6349,9 @@ msgstr "PROJ_INFO do conjunto de dados importado é:\n" #: ../raster/r.in.pdal/projection.c:92 ../raster/r.in.lidar/projection.c:94 #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 +#, fuzzy msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" "Considere a geração de uma nova location com o parâmetro 'location' do " @@ -6533,9 +6567,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -6553,7 +6587,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -6638,10 +6672,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -6682,30 +6716,30 @@ msgstr "Escala interna para aplicar aos valores X e Y" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "Projeção" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6834,131 +6868,131 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "Imprimir informações do arquivo LAS e sair" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "" "Imprime todos os parâmetros de conexão do mapa no estilo shell script e sai" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "O arquivo de entrada <%s> não existe" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 #, fuzzy msgid "Output map type set to CELL" msgstr "Mapa de saída %s X %s" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Lendo dados... " -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Substituir a verificação de projeção (usar a projeção do local atual)" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "Substituir a verificação de projeção (usar a projeção do local atual)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 #, fuzzy msgid "Running PDAL algorithms..." msgstr "Algoritmo Reumann-Witkam" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Verificando %lu pontos..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "Escrevendo mapa raster de saída..." -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "Nenhum nome de mapa %s encontrado no arquivo de entrada <%s>" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Mapa raster <%s> criado." @@ -7058,7 +7092,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "-%c= e %s= são mutuamente excludentes" @@ -7092,7 +7126,7 @@ msgstr "O raster de entrada deve ser do tipo CELL." #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -7124,7 +7158,7 @@ msgstr "Não foi possível criar arquivo temporário <%s> -- errno = %d" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "Erro ao escrever arquivo temporário <%s>" @@ -7180,9 +7214,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Número máximo de iterações" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -7198,8 +7232,8 @@ msgstr "Número máximo de iterações" msgid "surface" msgstr "superfície" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -7209,24 +7243,55 @@ msgstr "superfície" msgid "random" msgstr "aleatório" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "Gera um mapa raster usando um gerador de números aleatórios gaussiano." -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Média da distribuição" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Desvio padrão" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -7281,7 +7346,7 @@ msgstr "Essa cor não existe <%s>" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -7581,7 +7646,7 @@ msgstr "Erro na leitura de dados" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -7687,7 +7752,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -7773,8 +7837,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "não." #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -8401,7 +8466,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -8410,7 +8475,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Mapa raster não encontrado" @@ -8515,7 +8580,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -8539,15 +8604,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -8622,7 +8687,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -8672,17 +8737,14 @@ msgid "Output raster map required" msgstr "Mapa raster de saída necessário" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "Valor de distância (%d): %lf deve ser >= 0,0" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "O valor do expoente (%lf) deve ser > 0.0" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -8740,6 +8802,7 @@ msgstr "Gerando mapa raster <%s>..." #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -8878,7 +8941,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8961,7 +9024,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -9021,7 +9084,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -9083,7 +9146,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "tipo do raster <%s> não combina" @@ -9206,7 +9269,6 @@ msgid "Calculating flow directions..." msgstr "Calculando direções do fluxo..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -9345,7 +9407,7 @@ msgstr "Aplicar filtro somente para valores de dados null" msgid "<%d> is not valid number of threads." msgstr "Número inválido de passos: %s" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "Mapa raster muito pequeno para o tamanho do filtro" @@ -9437,8 +9499,8 @@ msgstr "Porcentagem do mapa para manter em memória" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -9447,8 +9509,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -9466,7 +9528,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "Por favor, especifique um número razoável de linhas para pular" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -9853,9 +9915,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" "Locação Lat/Long não é suportada por %s. Favor reprojetar o mapa primeiro." @@ -10119,8 +10181,8 @@ msgid "" "Too many splines (%d x %d). Consider changing spline steps \"ew_step=\" " "\"ns_step=\"." msgstr "" -"Muitas splines (%d x %d). Considere alterar os passos de spline \"ew_step =" -"\" \"ns_step =\"." +"Muitas splines (%d x %d). Considere alterar os passos de spline \"ew_step " +"=\" \"ns_step =\"." #: ../raster/r.resamp.bspline/crosscorr.c:224 #: ../vector/v.surf.bspline/crosscorr.c:177 @@ -10130,13 +10192,11 @@ msgstr "Começando a validação cruzada com lambda_i=%.4f ... (%d de %d)" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "Média = %.5lf" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "Root Mean Square (RMS) = %.5lf" @@ -10151,7 +10211,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "O valor mínimo para o teste (rms=%lf) foi obtido com: lambda_i =%.3f" @@ -10395,31 +10454,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "%s= e %s=/%s= são mutuamente excludentes" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "Número diferente de valores para filter= e [xy_]radius=" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -10435,12 +10494,12 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +#, fuzzy +msgid "create project" msgstr "criar location" #: ../raster/r.in.gdal/main.c:118 @@ -10455,18 +10514,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Nome de destino da locação da imagem" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -10490,10 +10549,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Nome da nova locação a criar" #: ../raster/r.in.gdal/main.c:195 @@ -10523,7 +10582,7 @@ msgstr "Lista separada por vírgulas de pares key=value" msgid "GDAL dataset open options" msgstr "Opções de abertura do conjunto de dados GDAL" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -10532,211 +10591,246 @@ msgstr "Opções de abertura do conjunto de dados GDAL" msgid "Region" msgstr "Região" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" "Força mapas Lat/Lon a se ajustarem em coordenadas geográficas (90N,S; 180E,W)" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Manter os números das bandas em vez de usar os nomes das cores" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" +"Criar a locatin especificado pelo parâmetro \"location\" e sair. Não " +"importar os dados vetoriais." -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "Limitar importação à região atual" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +#, fuzzy +msgid "You have to specify a target project different from output project" msgstr "Você tem que especificar uma locação alvo diferente da locação saída" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +#, fuzzy +msgid "You need to specify valid project name." msgstr "Você precisa especificar um nome de location válido." -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +#, fuzzy +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "A opção '-l' funciona apenas em locações Lat/Lon" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Mapa raster <%s> já existe e será sobreescrito" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "Mapa raster <%s> já existe" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "Não foi possível obter número da banda raster %d" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "Copiando %d GCPS em arquivo de pontos para <%s>" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "Re-projetando tabela GCPs:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "* Projeção de entrada para a tabela GCP: %s" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "* Projeção de saída para a tabela GCP: %s" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" +"Não consegui converter a projeção do mapa de entrada para o formato do " +"GRASS, não posso criar nova locação." + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "Não consegui traduzir valores chave de projeção das entradas GCPs" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "Não consegui informações de projeção da locação destino" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "Não consegui unidades de projeção da locação alvo" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "Não obtive os valores chave de projeção da locação alvo" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "conjunto de mapas <%s> na locação destino <%s> - " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "permissão negada" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "não encontrado" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" +"Não consegui converter a projeção do mapa de entrada para o formato do " +"GRASS, não posso criar nova locação." + +#: ../raster/r.in.gdal/proj.c:323 +#, fuzzy +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" +"\n" +"No caso de não haver diferenças significativas nas definições de projeção, " +"use a flag -o para ignorá-las e use a definição de location atual.\n" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -11428,7 +11522,6 @@ msgid "Number of intermediate images to produce" msgstr "Número de imagens intermediárias a produzir" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -11541,6 +11634,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -11572,26 +11677,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -11616,12 +11701,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -11629,40 +11708,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Entrada falhou" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -11816,7 +11895,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -12062,29 +12141,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "Pesos devem ser positivos" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -12139,71 +12218,38 @@ msgstr "Arquivo <%s> criado" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Mínimo valor aleatório" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Máximo valor aleatório" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "Lendo mapa raster de entrada <%s>..." - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -12246,6 +12292,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "Lendo mapa raster de entrada <%s>..." + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -12962,7 +13041,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12976,13 +13055,14 @@ msgid "transformation" msgstr "transformação" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "Reprojeta um mapa vetorial de um location para o location atual." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "Location contendo mapa vetorial de entrada" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -13007,10 +13087,9 @@ msgstr "Padrão: nome do mapset atual" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Caminho para o banco de dados GRASS da locação de entrada" #: ../raster/r.proj/main.c:174 @@ -13066,13 +13145,14 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "opção <%s>: <%s> existe. Para substituir, use a flag --overwrite" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "Os locations de entrada e saída não podem ser os mesmos" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" -msgstr "" +#, fuzzy +msgid "Input and output projects are the same" +msgstr "Os locations de entrada e saída não podem ser os mesmos" #: ../raster/r.proj/main.c:268 msgid "Unable to get projection info of output raster map" @@ -13087,13 +13167,13 @@ msgid "Unable to get projection key values of output raster map" msgstr "" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" +msgstr "Mapset <%s> em location de entrada <%s> não encontrado" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Verificando location <%s> mapset <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -13101,16 +13181,16 @@ msgstr "Verificando location <%s> mapset <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "parâmetro <%s> necessário não configurado" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" +msgstr "Mapa vetorial <%s> em location <%s> mapset <%s> não encontrado" #: ../raster/r.proj/main.c:323 msgid "Unable to get projection info of input map" @@ -13125,13 +13205,13 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 -#, c-format -msgid "Input map <%s@%s> in location <%s>:" -msgstr "" +#, fuzzy, c-format +msgid "Input map <%s@%s> in project <%s>:" +msgstr "O mapa vetorial de entrada <%s> não é 3D!" #: ../raster/r.proj/main.c:524 msgid "Input:" @@ -13212,7 +13292,7 @@ msgid "Sorting events..." msgstr "Escrevendo bordas..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -13473,8 +13553,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -13645,7 +13726,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -13656,6 +13737,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "Não consegui informações de projeção da locação destino" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Não consegui unidades de projeção da locação alvo" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Não obtive os valores chave de projeção da locação alvo" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -14277,16 +14373,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "Não consegui informações de projeção da locação atual" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Não consegui unidades de projeção da locação atual" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "Não obtive os valores de projeção da locação atual" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -14364,7 +14463,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -14374,7 +14473,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -14464,7 +14563,7 @@ msgstr "Não consegui ler intervalo pf do mapa raster <%s>" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Não consegui criar tabela: '%s'" @@ -14473,7 +14572,7 @@ msgstr "Não consegui criar tabela: '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Não consegui criar índice para tabela <%s>, chave <%s>" @@ -14785,7 +14884,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -14796,19 +14895,19 @@ msgstr "" msgid "position" msgstr "posição" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Nome dos mapas raster existentes para pesquisar" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Coordenadas para pesquisa" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14816,15 +14915,28 @@ msgstr "Coordenadas para pesquisa" msgid "Query" msgstr "Consulta" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "Tamanho do cache de pontos" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14833,62 +14945,71 @@ msgstr "Tamanho do cache de pontos" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Gera valores inteiros de categorias, em vez de valores de célula" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "Habilitar relatório de cache" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Falha interpretando dp como inteiro" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -15059,9 +15180,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -15405,21 +15523,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "O processamento de todos os arquivos de saída selecionados exigirá" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "%.2f GB de espaço em disco para arquivos temporários." -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "%.2f MB de espaço em disco para arquivos temporários." -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "%.2f KB de espaço em disco para arquivos temporários." @@ -15608,80 +15726,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -16586,32 +16704,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -16627,61 +16745,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -16705,7 +16823,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -17659,46 +17776,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "Favor fornecer os mapas river_head, river_leak e river_bed" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "Favor forneça os mapas drain_head e drain_leak" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "Máxima diferença entre este e o próximo incremento: %g" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "Não consegui criar e resolver o sistema de equações lineares" @@ -18146,7 +18263,7 @@ msgstr "Processando pontos iniciais..." #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "Não é possível criar mapa vetorial temporário" @@ -18610,8 +18727,8 @@ msgstr "Saída de valores RRR:GGG:BBB para cada ponto do perfil" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -18738,98 +18855,98 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "Usar apenas pontos válidos" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" "Os pontos inválidos de acordo com a especificação APSRS LAS serão filtrados" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "Não foi possível ler o cabeçalho LAS de <%s>" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -19103,11 +19220,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -19312,26 +19429,26 @@ msgstr "O tamanho da vizinhança deve ser positivo" msgid "Neighborhood size must be odd" msgstr "O tamanho da vizinhança deve ser ímpar" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "%s= e %s= devem ter o mesmo número de valores" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" @@ -19339,7 +19456,7 @@ msgstr "" "Método %s não compatível com janela de pesagem, ao invés disso, usando " "máscara de peso" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "Abrindo mapa de seleção <%s>" @@ -19422,8 +19539,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "\"*\" para todas as colunas" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -19445,8 +19563,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -20200,8 +20319,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -20211,28 +20330,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -20241,57 +20360,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -20300,7 +20419,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -20309,7 +20428,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -20813,6 +20932,10 @@ msgstr "" msgid "Error while reading history file" msgstr "Erro na leitura do arquivo de histórico" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "GRASS LOCATION PROJ_INFO é:\n" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -20871,64 +20994,73 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "Substituir a verificação de projeção (usar a projeção do local atual)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "Lendo pontos..." -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "%lu pontos de entrada não eram válidos e foram filtrados" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "%lu pontos de entrada foram filtrados por número de classe" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "%lu pontos de entrada não eram válidos, use a flag -%c para filtrá-los" @@ -21034,7 +21166,6 @@ msgstr "Explicitamente cria o arquivo bitmap 3D com valores NULL" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -21047,10 +21178,8 @@ msgstr "Explicitamente cria o arquivo bitmap 3D com valores NULL" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -21064,11 +21193,11 @@ msgstr "Explicitamente cria o arquivo bitmap 3D com valores NULL" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "exibir" @@ -21562,10 +21691,10 @@ msgstr "Erro ao fechar o arquivo de script" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -21621,9 +21750,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -21683,13 +21812,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "ajuda" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -22051,67 +22180,70 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "Não foi possível ler o cabeçalho do mapa raster 3D <%s@%s>" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" +"Saída WGS84 não é possível pois esta locação não contém\n" +"parâmetros de transformação do .datum. Execute g.setproj" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -22355,8 +22487,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -22626,154 +22758,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Imprimir informações de projeção no formato PROJ.4" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "Especificação" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "Código de projeção EPSG" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "Datum" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Nome da nova locação a criar" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "Um de -%c, -%c ou %s=, %s= ou %s= deve ser especificado" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -22862,9 +22995,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Não consegui criar arquivo <%s>" #: ../general/g.proj/create.c:21 #, c-format @@ -22872,98 +23005,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Não consegui criar arquivo <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Texto da mensagem a ser impressa" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -23105,8 +23238,10 @@ msgid "Changes/reports current mapset." msgstr "" #: ../general/g.mapset/main.c:52 +#, fuzzy msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" "Opcionalmente, crie um novo mapset ou liste mapsets disponíveis em uma " "determinada location." @@ -23193,34 +23328,56 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" "Nome(s) do(s) mapset(s) existente (s) para adicionar/remover ou definir" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -23229,69 +23386,74 @@ msgstr "" msgid "Operation to be performed" msgstr "Operação a ser realizada" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Carregue uma regra em um destes formatos:\n" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "O mapset atual (<%s>) deve sempre ser incluído no caminho de pesquisa" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -23306,37 +23468,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -23689,7 +23848,7 @@ msgstr " desvio padrão" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -24963,7 +25122,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -25059,7 +25218,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -25067,8 +25227,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Nome de destino da locação da imagem" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -25100,35 +25261,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Location destino <%s> não encontrada" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 -#, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "conjunto de mapas <%s> na locação destino <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -25181,61 +25343,66 @@ msgstr "Informações de destino para o grupo <%s> ausentes" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" msgstr "Location destino <%s> não encontrada" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "conjunto de mapas <%s> na locação destino <%s> - " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "Formato incorreto no arquivo de câmera para o grupo <%s>" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -25245,29 +25412,30 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Não consegui informações de projeção da locação destino" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Não foi possível criar mapa vetorial de erro <%s>" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -25382,15 +25550,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -25430,101 +25596,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "Location: %s" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "criar location" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "LOCATION destino %s, MAPSET %s:" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Verificando location <%s> mapset <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -25655,6 +25819,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -25671,6 +25845,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "Ordem polinomial de retificação (1-3)" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -25680,6 +25859,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "Solicitação inválida (%d); por favor insira 1 para %d" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "Location: %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "LOCATION destino %s, MAPSET %s:" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "Location destino <%s> não encontrada" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "conjunto de mapas <%s> na locação destino <%s> - " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -27025,6 +27224,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "projeção" @@ -28615,8 +28815,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -28940,17 +29140,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -28959,17 +29156,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -28978,17 +29172,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -28998,17 +29189,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -29017,12 +29205,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -29814,6 +30000,9 @@ msgid "Apriori Phi (roll) standard deviation" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -31322,11 +31511,15 @@ msgstr "Não foi possível selecionar dados:" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -31376,7 +31569,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -31469,16 +31662,15 @@ msgid "OGR layer <%s> not found" msgstr "Camada OGR <%s> não encontrada" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Coluna <%s> não encontrada na tabela <%s>" @@ -32407,6 +32599,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "histograma" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Nome da coluna de atributo para usar como rótulos" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Número de cópias" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -32449,6 +32677,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -32500,36 +32730,49 @@ msgstr "Entrada falhou" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Nome do mapa raster de entrada" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Tipo dos mapas de saída de direção e declividade de encosta" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Nome do mapa raster de entrada" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Tipo dos mapas de saída de direção e declividade de encosta" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Nome do mapa raster de entrada" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#, fuzzy +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "Lista separada por vírgulas de pares key=value" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: ../locale/scriptstrings/t.rast.series_to_translate.c:3 #: ../locale/scriptstrings/t.rast.aggregate_to_translate.c:3 @@ -32555,23 +32798,27 @@ msgid "series" msgstr "series" ======= #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +======= +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 +>>>>>>> osgeo-main msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" >>>>>>> osgeo-main -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Fator de sobrelevação" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: ../locale/scriptstrings/t.rast.series_to_translate.c:8 #: ../raster3d/r3.neighbors/main.c:127 ../raster/r.neighbors/main.c:239 @@ -32580,16 +32827,19 @@ msgid "Quantile to calculate for method=quantile" msgstr "Quantil a calcular para method=quantile" ======= #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +======= +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 +>>>>>>> osgeo-main #, fuzzy msgid "Do not delete temporary files" msgstr "Não consegui criar arquivo temporário" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" >>>>>>> osgeo-main -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Coordenadas do ponto de origem" @@ -32705,10 +32955,15 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" +<<<<<<< HEAD #: ../locale/scriptstrings/v.class.ml_to_translate.c:1 msgid "Classification of a vector maps based on the values in attribute tables" msgstr "" @@ -32940,6 +33195,8 @@ msgstr "" msgid "append the classification results" msgstr "" +======= +>>>>>>> osgeo-main #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -33147,6 +33404,534 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Criando %i mapas raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Não foi possível criar nova location <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Nome(s) do(s) mapa(s) vetoriais de fundo" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Nome de uma camada de saída" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Valor do raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "Mapa vetorial de saída onde os segmentos serão escritos" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Gera pontos como pontos 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Nome de uma camada de entrada" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Gera pontos como pontos 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nome(s) do(s) mapa(s) vetoriais de fundo" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Nome do mapa de orientação para exibição" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Escrevendo dados transformados para o arquivo ..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +#, fuzzy +msgid "Multiply all automatic regularization parameters by this number." +msgstr "Multiplique o resultado da densidade por este número" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +#, fuzzy +msgid "Do not apply clamping" +msgstr "Não aplicar 'snap'" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "feições simples" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Distâncias para feições 'to' ..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "feições simples" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Selecionando feições..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +#, fuzzy +msgid "Do not use automatic selection of feature classes" +msgstr "Não selecionar automaticamente quando iniciar" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Locação: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Número de pontos de interpolação" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "criar location" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Número de níveis a usar para <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Número de iterações máximas" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Percentil para calcular" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Limiar para outliers" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Limiar para outliers" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Limiar para outliers" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Número de vezes para repetir o filtro" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +#, fuzzy +msgid "Regularization parameter for treshold features" +msgstr "Peso de regularização na avaliação residual" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +#, fuzzy +msgid "Regularization parameter for hinge features" +msgstr "Parâmetro de regularização Tykhonov (afeta a suavização)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Remover centroides de área duplicadas" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Título para o novo mapa raster" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Número de quadros" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -33375,10 +34160,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "Substituir a verificação de projeção (usar a projeção do local atual)" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" "Suponha que o conjunto de dados tenha a mesma projeção da location atual" @@ -34649,6 +35439,16 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" +"Suponha que o conjunto de dados tenha a mesma projeção da location atual" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -37008,7 +37808,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "feições" @@ -37052,11 +37852,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -38292,7 +39087,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Camada número" @@ -38330,6 +39124,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -38701,7 +39506,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -38896,7 +39700,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Saída de mapa" @@ -38931,6 +39735,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Caminho para o banco de dados GRASS da locação de entrada" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -40004,11 +40817,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -40058,49 +40868,63 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Cor de fundo" +msgid "Thin species and background points" +msgstr "Número de pontos de interpolação" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Cor de fundo" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 #, fuzzy msgid "CSV file with alias and map names" msgstr "Arquivo de entrada com um nome de mapa por linha" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 #, fuzzy msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" "Formato de dados raster para escrita (diferencia maiúsculas de minúsculas, " "veja também a flag -l)" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Valor máximo na saída: %e." -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Semente para geração de número aleatório" @@ -40912,8 +41736,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -40924,6 +41757,7 @@ msgid "Group of raster layers to be classified" msgstr "Nome do mapa raster para ser reescalonado" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -40964,11 +41798,13 @@ msgid "" msgstr "Nome da coluna de atributo para usar como rótulos" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Saída de mapa" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -41267,6 +42103,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -41278,6 +42115,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -41307,6 +42145,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Nome do arquivo de saída" @@ -41679,66 +42518,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Sem mapa de saída" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "Distância da câmera (em unidades do mapa)" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -#, fuzzy -msgid "Plots to generate" -msgstr "Sem pontos para interpolar" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -42258,11 +43037,14 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Estender locação baseado no novo conjunto de dados" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" +"Suponha que o conjunto de dados tenha a mesma projeção da location atual" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -43145,6 +43927,14 @@ msgid "" "mapset." msgstr "todos em atual para atual" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Caminho para o banco de dados GRASS da locação de entrada" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -43274,12 +44064,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -43423,9 +44213,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -43468,28 +44257,44 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Estender locação baseado no novo conjunto de dados" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" +"Suponha que o conjunto de dados tenha a mesma projeção da location atual" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" +"Criar a locatin especificado pelo parâmetro \"location\" e sair. Não " +"importar os dados vetoriais." #: ../locale/scriptstrings/v.external.all_to_translate.c:1 msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "Listar as camadas disponíveis na fonte de dados e sair" @@ -43625,35 +44430,6 @@ msgstr "Nome do banco de dados de entrada" msgid "Base name for output file" msgstr "Nome do arquivo de saída" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "topologia" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "" -"Coluna da tabela de atributos com valores para interpolar (se camada > 0)" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Número de cópias" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -44315,6 +45091,10 @@ msgstr "Nome do arquivo de saída" msgid "Queries projection information spatially." msgstr "Nenhuma informação de projeção disponível" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "criar location" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -44609,7 +45389,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -44641,8 +45421,9 @@ msgid "Layer number or name." msgstr "Número ou nome da camada." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Nome da coluna de atributo para áreas de dissolução" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -45359,11 +46140,20 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" +"Criar a locatin especificado pelo parâmetro \"location\" e sair. Não " +"importar os dados vetoriais." #: ../locale/scriptstrings/r.futures.demand_to_translate.c:1 msgid "" @@ -45618,6 +46408,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -45629,6 +46420,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -45737,6 +46533,16 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" +"Suponha que o conjunto de dados tenha a mesma projeção da location atual" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -46769,8 +47575,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -46867,39 +47673,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Lista de camadas para importar" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "Ignorar os IDs de feições anteriores e comece o download neste" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -51770,8 +52585,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -51809,6 +52624,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -52217,6 +53033,13 @@ msgstr "reclassificação" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "Nome do mapa vetorial de entrada" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -52272,6 +53095,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Título do mapa vetorial" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Título do mapa vetorial" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -52311,6 +53148,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Número de cópias" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Nome do mapa raster para ser reescalonado" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Número de vezes para repetir o filtro" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -52740,8 +53609,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -53491,6 +54360,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Título do raster de saída" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Nome da nova locação a criar" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -53788,6 +54661,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Fator de escala para elevação" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -54231,10 +55108,96 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Nome do arquivo de saída" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Nome de uma camada de entrada" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Mapa de entrada contendo linhas" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Camada/tabela" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +#, fuzzy +msgid "csv file with variable and layer names" +msgstr "Arquivo de entrada com um nome de mapa por linha" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Criando %i mapas raster" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Nome do mapa raster a ser usado para <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parâmetros" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Mostra x e y (coluna e linha)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "topologia" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "" +"Coluna da tabela de atributos com valores para interpolar (se camada > 0)" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -54747,17 +55710,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -54785,23 +55738,20 @@ msgid "categorical map with zones" msgstr "Título do mapa vetorial" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nome do arquivo de saída" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -54812,9 +55762,8 @@ msgid "Default font size" msgstr "Não foi possível definir o tamanho da fonte" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -54834,14 +55783,12 @@ msgid "Create a vector point layer of outliers" msgstr "Gera pontos como pontos 3D" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "%d outliers encontrados" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -54851,14 +55798,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -54892,14 +55837,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -54911,27 +55848,23 @@ msgid "Plot format" msgstr "Formato de entrada" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Mostra rótulos de categorias" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -54979,15 +55912,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -55007,7 +55931,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Largura da borda" @@ -55019,50 +55942,41 @@ msgid "The width of the boxplots (0,1])" msgstr "Largura da linha do texto" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 #, fuzzy msgid "The linewidth of the boxplots" msgstr "Largura da linha do texto" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Nome do arquivo de saída" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -55070,111 +55984,26 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "tamanho da área" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "Bytes não correspondem ao tamanho do arquivo" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Cor da Linha" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Nome do Raster de saída" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Nome do Raster de saída" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Falha ao plotar polígono" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Mostra rótulos de categorias" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Formato da tabela" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Largura da linha do texto" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Cor do Texto" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -57145,6 +57974,14 @@ msgstr "Falha ao plotar polígono" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -57170,6 +58007,15 @@ msgstr "isolinhas" msgid "add grid lines" msgstr "Rotuladas %d linhas" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Cor do Texto" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -57266,110 +58112,110 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Título do mapa vetorial" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Número de colunas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Nome da coluna de atributo para usar como rótulos" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Nome da coluna de geometria" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Nome da coluna de atributo para usar como rótulos" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Tipo de feição" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Nome da camada de saída a usar para AZUL" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Nome do arquivo povray de saída (arquivo de campo de altura TGA)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Nome do mapa raster de saída" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Locação: %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "A unidade vertical do mapa" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "estatisticas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "tamanho da área" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 #, fuzzy msgid "Set marker size" msgstr "tamanho da área" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Cor do Texto" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy <<<<<<< HEAD msgid "Print attribut table" @@ -57565,201 +58411,201 @@ msgid "Color of dots" >>>>>>> osgeo-main msgstr "Cores" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "%d coluna" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 #, fuzzy msgid "Density" msgstr "densidade de ponto" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Inverter cores" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "Estender linhas" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Locação: %s\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "tabela de cores" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Largura da linha" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Largura da linha do texto" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "desvios padrão" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Cor da Linha" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Largura de página ilegal" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 #, fuzzy msgid "Column grouping the features in categories" msgstr "Convertendo regras de cores em categorias..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 #, fuzzy msgid "RGB column for ellipse categories" msgstr "Nome da coluna usada para categorias" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Intervalo de inteiro: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Nome do mapa de orientação para exibição" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Intervalo de inteiro: min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Nome do mapa de orientação para exibição" @@ -58114,8 +58960,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -58197,6 +59043,8 @@ msgid "" "map of a space time vector dataset" msgstr "" +<<<<<<< HEAD +======= #: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 msgid "Create a dasymetric weighting layer with Random Forest" msgstr "" @@ -59501,6 +60349,7 @@ msgid "" "Python dictionary of customized tunegrid for sklearn RandomForestRegressor" msgstr "" +>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711)) #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -60320,11 +61169,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "histograma" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -66307,6 +67151,46 @@ msgid "Aspect from r.slope.aspect" msgstr "Resultado de v.select" >>>>>>> osgeo-main +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Usa a região atual" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -66857,8 +67741,8 @@ msgid "Unable to open file '%s': %s" msgstr "Não foi possível abrir arquivo '%s':%s" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -70743,276 +71627,1262 @@ msgstr "Distância média estimada entre pontos: %.4g\n" msgid "No points in current region!" msgstr "Sem pontos na região atual!" -#: ../vector/v.lidar.edgedetection/main.c:207 -#: ../vector/v.lidar.correction/main.c:182 ../vector/v.outlier/main.c:146 -msgid "Unable to read name of database" -msgstr "Não foi possível ler o nome do banco de dados" +#: ../vector/v.lidar.edgedetection/main.c:207 +#: ../vector/v.lidar.correction/main.c:182 ../vector/v.outlier/main.c:146 +msgid "Unable to read name of database" +msgstr "Não foi possível ler o nome do banco de dados" + +#: ../vector/v.lidar.edgedetection/main.c:210 +#: ../vector/v.lidar.correction/main.c:185 ../vector/v.outlier/main.c:149 +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 +#, 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 +======= +======= +#, 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.lidar.edgedetection/main.c:210 -#: ../vector/v.lidar.correction/main.c:185 ../vector/v.outlier/main.c:149 -msgid "Unable to read name of driver" -msgstr "Não foi possível ler o nome do driver" +#: ../vector/v.segment/main.c:79 +msgid "Name of file containing segment rules" +msgstr "Nome do arquivo contendo regras de segmento" -#: ../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.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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" -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 -======= +#: ../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" @@ -73987,7 +75857,7 @@ msgstr "" "ao usar a opção <%s> ou a flag <-%c>" >>>>>>> osgeo-main -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format <<<<<<< HEAD @@ -74339,7 +76209,7 @@ msgstr "Não é possível usar z para dizimação, a entrada não é 3D" msgid "Cannot select by z range, input is not 3D" msgstr "Não é possível selecionar por intervalo z, a entrada não é 3D" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "As configurações para dizimação baseada em contagem não são válidas" @@ -75422,7 +77292,7 @@ msgstr "Tipo de componentes" msgid "Add points on nodes" msgstr "Adicionar pontos nos nós" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -75711,8 +77581,8 @@ msgid "" "Vector map <%s> cannot be overwritten because input table <%s> is linked to " "this map." msgstr "" -"O mapa vetorial <%s> não pode ser substituído porque a tabela de entrada <" -"%s> está vinculada a este mapa." +"O mapa vetorial <%s> não pode ser substituído porque a tabela de entrada " +"<%s> está vinculada a este mapa." #: ../vector/v.in.db/main.c:176 #, c-format @@ -75722,7 +77592,7 @@ msgstr "" "Mapa vetorial de saída, tabela <%s> (driver: <%s>, banco de dados: <%s>) já " "existe" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "O tipo de dados da coluna chave deve ser inteiro" @@ -75822,37 +77692,33 @@ msgstr "" "Mostra tipos/nomes das colunas da tabela para a camada especificada e sai" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Substituir parâmetro de conexão para camada definida" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Apagar conexão para camada determinada (não para a tabela)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "Escolha apenas um estilo de impressão" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "Não é possível modificar o mapa vetorial armazenado em outro mapset" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "Mapa <%s> não está conectado a um banco de dados" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "O mapa vetorial <%s> está conectado por:\n" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Conexão com banco de dados não definida" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" @@ -75860,7 +77726,7 @@ msgstr "" "camada <%d/%s> tabela <%s> no banco de dados <%s> por meio do driver <%s> " "com a chave <%s>\n" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" @@ -75868,7 +77734,7 @@ msgstr "" "camada <%d> tabela <%s> no banco de dados <%s> por meio do driver <%s> com a " "chave <%s>\n" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -75878,17 +77744,17 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "Conexão de banco de dados não definida para camada <%s>" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "Use -o para sobrescrever ligação existente para camada <%d>" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "Tabela <%s> não existe no banco de dados <%s>" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " @@ -75897,16 +77763,16 @@ msgstr "" "A tabela <%s> é agora parte do mapa vetorial <%s> e pode ser excluída ou " "sobrescrita pelos módulos do GRASS/" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Não posso dar privilégios na tabela %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "Privilégios de seleção foram concedidos na tabela" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -75948,7 +77814,7 @@ msgstr "Definido como 1 por padrão, use -c para não armazená-lo" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "Categorias" @@ -76029,39 +77895,40 @@ msgstr "Importa apenas o número de pontos determinado" msgid "Invert mask when selecting points" msgstr "Inverter máscara ao selecionar pontos" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" "Não adicione automaticamente um ID exclusivo como categoria para cada ponto" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "Criar apenas camadas e categorias solicitadas" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" "Criar a locatin especificado pelo parâmetro \"location\" e sair. Não " "importar os dados vetoriais." -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" "Não foi possível abrir o arquivo <%s> como uma nuvem de pontos LiDAR. %s" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "a flag -%c não está definido, mas a camada de ID não foi especificada" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "A camada de ID é necessária para armazenar a tabela de atributos" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " @@ -76070,37 +77937,37 @@ msgstr "" "Armazenando IDs de pontos gerados como categorias na camada <%d>, " "consequentemente, não mais do que %d pontos podem ser importados" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "Selecione a flag da região atual ou a opção espacial, não ambas" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "4 parâmetros necessários para o parâmetro 'spatial'" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "O mapa vetorial <%s> já existe e será substituído" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "Mapa vetorial <%s> já existe" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "Verificando %llu pontos..." -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "Verificando %lu pontos..." -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." @@ -76109,96 +77976,96 @@ msgstr "" "anteriormente podem ter sido distorcidas. No entanto, a importação em si não " "deve ser afetada." -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "%llu pontos importados (o limite era %llu)" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "%llu pontos importados" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "%llu pontos de entrada não eram válidos e foram filtrados" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "%llu pontos de entrada estavam fora da área selecionada" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "%llu pontos de entrada estavam fora da área especificada pela máscara" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "%llu pontos de entrada foram filtrados por número de classe" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" "%llu pontos de entrada foram filtrados fora do intervalo para coordenada z" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "%llu pontos de entrada foram ignorados no início usando o deslocamento" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" "%llu pontos de entrada foram ignorados por dizimação baseada em contagem" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "%lu pontos importados (o limite era %d)" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "%lu pontos importados" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "%lu pontos de entrada estavam fora da área selecionada" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "%lu pontos de entrada estavam fora da área especificada pela máscara" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" "%lu pontos de entrada foram filtrados fora do intervalo da coordenada z" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "%lu pontos de entrada foram ignorados no início usando deslocamento" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" "%lu pontos de entrada foram ignorados por dizimação baseada em contagem" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." @@ -76206,17 +78073,17 @@ msgstr "" "A precisão das contagens de pontos impressos pode ser limitada pela " "arquitetura do seu computador." -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "O resto dos pontos foi ignorado" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" "%llu pontos de entrada não eram válidos, use a flag -%c para filtrá-los" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -76646,6 +78513,7 @@ msgid "Profiling line map" msgstr "Mapa de linhas de perfil" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: ../vector/v.profile/main.c:248 msgid "Vector map containing profiling line" @@ -76673,6 +78541,8 @@ msgid "Failed to interpreter 'dp' parameter as an integer" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -76806,7 +78676,7 @@ msgstr "A coluna de rótulo não foi especificada, nenhum rótulo será escrito" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -77028,8 +78898,8 @@ msgid "" "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>" +"GRASS. A verificação de projeção não pode ser fornecida para a camada OGR " +"<%s>" #: ../vector/v.external/list.c:331 #, c-format @@ -77069,13 +78939,13 @@ msgstr "" 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:72 +#: ../vector/v.external/args.c:73 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:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "Formato: layer name,type,projection check,geometry" @@ -77108,7 +78978,7 @@ 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:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "Camada <%s> não disponível" @@ -77117,7 +78987,7 @@ msgstr "Camada <%s> não disponível" msgid "No layer defined" msgstr "Nenhuma camada definida" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "Não foi possível abrir a fonte de dados <%s>" @@ -77137,7 +79007,7 @@ msgstr "Não foi possível criar o arquivo '%s/%s'" msgid "Link to vector map <%s> created." msgstr "Link para o mapa vetorial <%s> criado." -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -77228,11 +79098,13 @@ msgstr "A projeção para a camada <%s> não contém um SRS válido" >>>>>>> osgeo-main #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "Reprojeta um mapa vetorial de um location para o location atual." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "Location contendo mapa vetorial de entrada" #: ../vector/v.proj/main.c:88 @@ -77267,17 +79139,27 @@ msgstr "Desativa o empacotamento para -180.180 para saída latlon" msgid "Recommended for massive point projection" msgstr "Recomendado para projeção maciça de pontos" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Os locations de entrada e saída não podem ser os mesmos" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "Nenhum mapa vetorial encontrado" #: ../vector/v.proj/main.c:256 +<<<<<<< HEAD #, c-format <<<<<<< HEAD msgid "No category for point at node %d" msgstr "Nenhuma categoria para o ponto no nó %d" ======= msgid "Vector map <%s> in location <%s> mapset <%s> not found" +======= +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" +>>>>>>> osgeo-main msgstr "Mapa vetorial <%s> em location <%s> mapset <%s> não encontrado" >>>>>>> osgeo-main @@ -77305,14 +79187,14 @@ msgid "Input vector map <%s> is empty" msgstr "O mapa vetorial de entrada <%s> está vazio" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "Mapset <%s> em location de entrada <%s> - permissão negada" >>>>>>> osgeo-main #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "Mapset <%s> em location de entrada <%s> não encontrado" #: ../vector/v.proj/main.c:517 @@ -78008,8 +79890,8 @@ msgid "" "different FID column by 'options=\"FID=\"'." msgstr "" "Valor da coluna FID inválido (%s). Os valores da coluna FID devem ser " -"inteiros. Por favor, especifique coluna FID diferente usando 'options=" -"\"FID=\"'." +"inteiros. Por favor, especifique coluna FID diferente usando " +"'options=\"FID=\"'." #: ../vector/v.out.postgis/table.c:60 #, c-format @@ -78159,8 +80041,8 @@ msgid "Invalid option skipped: %s" msgstr "Opção inválida ignorada: %s" #: ../vector/v.out.postgis/create.c:78 -#, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +#, fuzzy, c-format +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "Código EPSG definido para location atual (%s) é sobrescrito por %s" <<<<<<< HEAD @@ -78281,6 +80163,7 @@ msgstr "Fator de anisotropia" #: ../raster/r.sim/r.sim.sediment/main.c:374 #, c-format <<<<<<< HEAD +<<<<<<< HEAD msgid "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" @@ -79670,6 +81553,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Error writing <%s> file" msgstr "Erro na escrita do arquivo <%s>" ======= @@ -80098,6 +81983,10 @@ msgid "Outlier detection" msgstr "Detecção de outlier" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -83650,7 +85539,7 @@ msgstr "" "todos os atributos" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "A importação falhou" @@ -84095,12 +85984,12 @@ msgid "Cleaning output topology" msgstr "Limpando topologia de saída" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "Removendo nós livres..." #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "Removendo pontes..." @@ -84427,19 +86316,19 @@ msgid "Snapping boundaries..." msgstr "Aplicando 'snap' nas fronteiras..." #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "Quebrando polígonos..." #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Removendo duplicatas..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "Quebrando fronteiras..." @@ -84650,7 +86539,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "Camada <%s> não encontrada" @@ -84816,10 +86705,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "Memória insuficiente para %s" @@ -84860,6 +86749,7 @@ msgstr "Nome do mapa de pontos vetoriais 3D de entrada" msgid "Name of input surface raster map for cross-section" msgstr "Nome do mapa raster de superfície de entrada para seção transversal" +<<<<<<< HEAD <<<<<<< HEAD #: ../vector/v.vol.rst/main.c:256 ../vector/v.vol.rst/main.c:305 msgid "Optional inputs" @@ -84867,6 +86757,12 @@ msgstr "Entradas opcionais" #: ../vector/v.vol.rst/main.c:262 ======= +======= +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "Entradas opcionais" + +>>>>>>> osgeo-main #: ../vector/v.vol.rst/main.c:244 >>>>>>> osgeo-main msgid "Name of column containing w-values attribute to interpolate" @@ -84977,9 +86873,9 @@ msgstr "" >>>>>>> osgeo-main #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "Não foi possível criar %s" @@ -84993,7 +86889,7 @@ msgstr "Não foi possível abrir %s" msgid "Vector is not 3D" msgstr "Mapa vetorial não é 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "Não foi possível criar tabela '%s'" @@ -85108,7 +87004,6 @@ msgid "Cannot allocate memory for point" msgstr "Não é possível alocar memória para ponto" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "Não é possível inserir %lf,%lf,%lf,%lf,%lf a=%d" @@ -85142,8 +87037,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" >>>>>>> osgeo-main @@ -85891,7 +87786,7 @@ msgid "Categories already exist in layer %d" msgstr "As categorias já existem na camada %d" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "Não foi possível calcular centroide da área" @@ -86029,8 +87924,8 @@ msgstr "Erro ao gravar arquivo de configurações" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" "A fonte de dados começa com o prefixo \"PG:\", esperando o formato " "\"PostgreSQL\" (\"%s\" fornecido)" @@ -88120,17 +90015,17 @@ msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" "Erro ao ler o mapa vetorial <%s> - alguns dados podem não estar corretos" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "Ligando fronteiras (limiar = %.3e)..." #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "Limpando fronteiras nos nós..." -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "Mesclando fronteiras..." @@ -88314,7 +90209,7 @@ msgstr "Não foi possível definir a conexão de banco de dados padrão" msgid "No default DB defined" msgstr "Nenhum banco de dados padrão definido" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" @@ -88322,7 +90217,7 @@ msgstr "" "A entrada é 3D: usando valores de atributo em vez de coordenadas z para " "aproximação" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "A entrada é 3D: usando coordenadas z para aproximação" @@ -88587,42 +90482,47 @@ msgid "Field separator for print mode" msgstr "Separador de campo para modo de impressão" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Camada de ponto" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "Imprime apenas instruções SQL" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "Imprimir também totais para opção de comprimento, área ou contagem" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Esta opção requer uma coluna" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Esta opção requer duas colunas" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Esta opção requer pelo menos duas colunas" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "Esta opção requer quatro colunas" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "O parâmetro 'qcolumn' deve ser especificado para 'option=query'" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "A opção 'sides' só faz sentido para fronteiras" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "A opção 'sinuous' faz sentido apenas para linhas" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "A opção 'azimuth' faz sentido apenas para linhas" @@ -89632,6 +91532,7 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" +<<<<<<< HEAD #: ../vector/v.db.select/main.c:40 #, c-format <<<<<<< HEAD @@ -89845,6 +91746,8 @@ msgstr "tamanho da área" msgid "The option %s is not allowed with %s=%s. %s" msgstr "" +======= +>>>>>>> osgeo-main #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Imprime atributos de mapa vetorial." @@ -91801,17 +93704,17 @@ msgstr "" "GRASS GIS não é compilado com suporte a OpenMP, a computação paralela está " "desabilitada." -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "O nome do mapa vetorial de saída <%s> não é um nome de mapa válido" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "Você não está produzindo nenhum mapa raster ou vetorial como saída" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" @@ -91819,7 +93722,7 @@ msgstr "" "Ambas as opções de validação cruzada (flag -c e saída de vetor cvdev) devem " "ser especificadas" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" @@ -91827,44 +93730,44 @@ msgstr "" "A validação cruzada não pode ser calculada simultaneamente com raster de " "saída ou arquivo devi " -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "Usando anisotropia - tanto theta quanto scalex devem ser especificados" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "Opções smatt e smooth especificadas - usando constante" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "A computação irá demorar demais - sugiro diminuir npmin" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "A entrada é 2D: usando valores de atributo para aproximação" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "A entrada é 2D: usando valores de categoria para aproximação" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "%d bytes de espaço em disco para arquivos temporários." -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "Processando segmentos em paralelo..." -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "Interp_segmets falhou" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "Processando segmentos..." -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "Não foi possível escrever mapas raster - tente aumentar a resolução" @@ -92165,6 +94068,7 @@ msgstr "Mesclando linhas..." msgid "Querying vector map <%s>..." msgstr "Consultando mapa vetorial <%s>..." +<<<<<<< HEAD <<<<<<< HEAD #: ../vector/v.overlay/area_area.c:280 ../vector/v.overlay/area_area.c:365 #: ../vector/v.overlay/area_area.c:393 ../vector/v.overlay/line_area.c:387 @@ -92173,6 +94077,9 @@ msgid "Attribute not found" msgstr "Atributo não encontrado" ======= #: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +======= +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 +>>>>>>> osgeo-main msgid "Writing centroids..." msgstr "Escrevendo centroides..." >>>>>>> osgeo-main @@ -92725,164 +94632,165 @@ msgstr "Conexão de banco de dados não definida para camada <%s>" msgid "Unable to open driver <%s>" msgstr "Não foi possível abrir o driver <%s>" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "Nome:" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "Mapset:" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "Location:" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Projeção" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "Banco de Dados:" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "Título:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "Escala do mapa:" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "Nome do criador:" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "Organização:" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "Data da fonte:" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "Timestamp (primeira camada):" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "Timestamp (primeira camada): nenhum" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "Formato do mapa:" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "Camada OGR:" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "Fonte de dados OGR:" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "Tipo de feição:" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "Tabela DB:" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "Nome do DB:" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "Coluna de geometria:" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "Topologia:" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "esquema:" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "Coluna de topologia:" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "Tipo de mapa" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "nível" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "Número de pontos:" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "Número de centroides:" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "Número de linhas:" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "Número de fronteiras:" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "Número de áreas:" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "Número de ilhas:" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "Número de faces:" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "Número de kernels:" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "Número de volumes:" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "Número de buracos:" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "O mapa é 3D:" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "Sim" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "Não" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "Número de dblinks:" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "zona" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "Limiar de digitalização" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "Comentário" @@ -93068,29 +94976,57 @@ msgstr "Nenhuma feição encontrada, nada a ser exportado" msgid "An error occurred, nothing to be exported" msgstr "Ocorreu um erro, nada a ser exportado" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" +"Projeção do conjunto de dados parece não combinar com a locação atual.\n" +"\n" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" +"Projeção do conjunto de dados de entrada e locação atual parecem combinar" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" "Converte nuvens de pontos LAS LiDAR em um mapa vetorial GRASS com libLAS." -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -93166,20 +95102,20 @@ msgstr "Não limpar polígonos (operação não recomendada)" msgid "Force 2D output even if input is 3D" msgstr "Forçar a saída 2D, mesmo se a entrada for 3D" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "Alterar os nomes das colunas para caracteres minúsculos" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "Usando o driver OGR '%s/%s'" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "Usando o modo de leitura intercalada" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." @@ -93187,21 +95123,21 @@ msgstr "" "A opção <%s> será ignorada. OGR não oferece suporte para o formato " "selecionado (%s)." -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "Valor de codificação não suportado pelo driver OGR <%s>" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "Nenhuma camada OGR disponível" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "A fonte de dados <%s> (formato '%s') contém %d camadas:" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." @@ -93209,83 +95145,84 @@ msgstr "" "Foram detectadas diferentes projeções de camadas de entrada. As camadas de " "entrada devem ser importadas separadamente." -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "Nome de saída ilegal <%s>" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" "Todas as camadas OGR disponíveis serão importadas para o mapa vetorial <%s>" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 +#, fuzzy msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" "Ao criar uma nova locationl, a região atual não pode ser usada como filtro " "espacial, desabilitando" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "Erro ao definir filtro de atributo '%s'" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "Coluna de geometria <%s> não encontrada na camada OGR <%s>" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "Verificar se a camada OGR <%s> contém polígonos..." -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "Distância de divisão de fronteira em unidades de mapa: %G" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "Usando vetor temporárior <%s>" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "Coluna chave '%s' não encontrada na camada de entrada <%s>" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "A coluna chave '%s' na camada de entrada <%s> não é inteira" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "Criando tabela de atributos para camada <%s>..." -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "Nome da coluna <%s> renomeado como <%s>" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "Escrevendo coluna <%s> com inteiro 64 como inteiro 32" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" "Escrevendo coluna <%s> com tamanho de caracteres fixo igual a %d (pode ser " "truncado)" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " @@ -93294,160 +95231,160 @@ msgstr "" "Largura da coluna %s definida como 255 (não foi especificada pelo OGR), " "algumas strings podem ser truncadas!" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" " Escrevendo coluna %s com tamanho de caracteres fixo igual a %d (pode ser " "truncado)" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "Nome da coluna <%s> renomeado para <%s_%d>" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "Importando feições %lld (camada OGR <%s>)..." -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" "Não é possível inserir uma nova linha para a camada de entrada <%s>: %s" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "%d %s sem geometria na camada de entrada <%s> ignorada" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "feição" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "Não foi possível descartar a tabela: '%s'" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "Limpando polígonos..." -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "Alterando nós livres de fronteira para linhas ..." -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "Alterando pontes de fronteira para linhas..." -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "Encontrando centroides para a camada OGR <%s>..." -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "A ordem das feições na camada de entrada <%s> mudou" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "%d polígonos de entrada\n" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "%d polígonos de entrada" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "Área total: %G (%d áreas)\n" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "Área total: %G (%d áreas)" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "Área de sobreposição: %G (%d áreas)\n" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "Área de sobreposição:%G (%d áreas)" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "Área sem categoria: %G (%d áreas)\n" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "Área sem categoria: %G (%d áreas)" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "A saída contém erros topológicos:" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "Não foi possível calcular centroide para %d áreas" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "Número de fronteiras incorretas: %d" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "Número de centroides fora da área: %d" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "Número de centroides duplicados: %d" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "A entrada pode ser limpa ligandon vértices uns nos outros." -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "Intervalo estimado do limiar de 'snap': [%g, %g]" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "Tente importar novamente, ligando com %g: 'snap=%g'" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "Tente importar novamente, ligando com pelo menos %g: 'snap=%g'" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "A limpeza manual pode ser necessária." -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -93460,7 +95397,7 @@ msgstr "" "1 linha na tabela de atributos. O número de feições para essas áreas é " "armazenado como categoria na camada %d" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." @@ -93468,26 +95405,26 @@ msgstr "" "Se a sobreposição não for desejada, os dados de entrada podem ser limpos " "ligando vértices uns nos outros." -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "%d polígonos de entrada foram perdidos durante a importação." -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "%d áreas adicionais foram criadas durante a importação." -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "O limiar de 'snap' %g pode ser muito grande." -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "Tente reduzir o limiar de 'snap' ou limpar a saída manualmente." -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." @@ -93495,21 +95432,21 @@ msgstr "" "Os dados de entrada contêm feições 3D. O vetor criado é apenas 2D, desative " "a flag -2 para importar o vetor 3D." -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" "Usando leitura intercalada do estilo GDAL 2.2+ para a versão GDAL %d.%d.%d" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "xmin é maior do que xmax em parâmetros 'spatial'" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "ymin é maior do que ymax em parâmetros 'spatial'" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -93672,10 +95609,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "O mapa vetorial <%s> já existe em" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "Retificação cancelada." +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Location destino <%s> não encontrada" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "Por favor, execute i.target para o grupo." @@ -98390,6 +100337,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: ../misc/m.nviz.image/args.c:163 msgid "Name of raster map(s) for mask" @@ -98746,6 +100694,9 @@ msgstr "" ======= #: ../display/d.rast.num/main.c:209 >>>>>>> osgeo-main +======= +#: ../display/d.rast.num/main.c:212 +>>>>>>> osgeo-main #, c-format msgid "%d col" msgid_plural "%d cols" @@ -98753,7 +100704,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -98761,7 +100712,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -99811,6 +101762,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "Use o cálculo geodésico para locations longitude-latitude" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -104065,6 +106020,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Não foi possível abrir o arquivo '%s' para escrita" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Não foi possível abrir o arquivo '%s' para escrita" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -108536,7 +110508,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -108823,22 +110795,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -111570,38 +113535,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -111681,11 +113646,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -111710,103 +113675,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "Interpolando %d pontos" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "Sem pontos para interpolar" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -111818,81 +113783,81 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "A autorização falhou em <%s> ao buscar recursos" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "Não foi possível obter recursos de <{0}>. Razão:" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" @@ -111901,40 +113866,40 @@ msgstr "" "Não foi possível abrir arquivo '%s'.\n" "%s\n" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "Não é possível escrever dados no arquivo temporário" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "Não foi possível determinar a região, %s falhou" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "Definição de região: 4 pontos necessários" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "A reprojeção da região usando m.proj falhou." -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "Reprojetando raster..." -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "%s falhou" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "Não foi possível criar arquivos temporários" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " @@ -111943,34 +113908,34 @@ msgstr "" "Por favor, altere o nome de saída ou altere os nomes desses rasters:%s, o " "módulo precisa criar esses mapas temporários durante a execução." -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "A importação de WMS falhou, nada importado" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "<%s> criado." -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "Baixando dados do servidor WMS..." -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" @@ -111979,14 +113944,14 @@ msgstr "" "Não foi possível obter dados de: '%s'\n" "%s" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" @@ -111995,7 +113960,7 @@ msgstr "" "Não foi possível escrever dados no arquivo temporário.\n" "%s" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" @@ -112004,71 +113969,71 @@ msgstr "" "Não foi possível ler dados do arquivo temporário.\n" "%s" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "Erro do servidor WMS: %s" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "Erro desconhecido do servidor WMS" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" "Erro do servidor WMS: nenhuma banda(s) recebida(s). O URL do servidor está " "correto? <%s>" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "O driver %s não suporta o método Create()" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "Não foi possível abrir %s" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "A região está fora da extensão de dados do servidor." -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "A camada '%s' não está disponível com o código %s." -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" @@ -112077,12 +114042,12 @@ msgstr "" "Forma errada do parâmetro '%s' em '%s'. \n" " O parâmetro foi ignorado." -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." @@ -112090,7 +114055,7 @@ msgstr "" "O driver %s suporta apenas '%s' parâmetro em '%s'. Outros parâmetros são " "ignorados." -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" @@ -112099,73 +114064,73 @@ msgstr "" "Se o módulo não for capaz de buscar os dados nesta projeção geográfica,\n" "experimente o driver 'WMS_GRASS' ou use o WMS versão 1.1.1." -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "Não é possível abrir o driver GDAL WMS" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "Não foi possível encontrar o driver %s" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "O driver %s oferece suporte ao método CreateCopy()." -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -112218,50 +114183,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -112289,7 +114254,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -112507,7 +114472,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -112564,85 +114529,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Usar coordenadas do mapa ao invés de xyz" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Usando vetor temporárior <%s>" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Criando alguns arquivos temporários..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "Não foi possível reabrir a fonte de dados <%s>" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -112688,28 +114654,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -112766,27 +114732,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Não foi possível reabrir a fonte de dados <%s>" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -112796,7 +114762,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -112806,14 +114771,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -112821,72 +114786,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -113113,7 +115078,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -113131,64 +115096,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -113328,79 +115294,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -113512,40 +115478,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -113581,7 +115547,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -113592,35 +115558,40 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." -msgstr "" +#: ../scripts/r.unpack/r.unpack.py:143 +#, fuzzy +msgid "Overriding projection check (using current project's CRS)." +msgstr "Substituir a verificação de projeção (usar a projeção do local atual)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 +#, fuzzy msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" +"\n" +"No caso de não haver diferenças significativas nas definições de projeção, " +"use a flag -o para ignorá-las e use a definição de location atual.\n" #: ../scripts/r.unpack/r.unpack.py:249 #, python-brace-format @@ -113711,34 +115682,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -113817,319 +115788,319 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 #, fuzzy msgid "Failed to get Git version." msgstr "Falhou na criação da feição OGR" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 #, fuzzy msgid "Cannot write to working directory {}." msgstr "Não foi possível criar diretório %s" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Coluna <%s> não encontrada" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "Instalando..." -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "Lista de arquivos removidos:" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "Arquivos a serem removidos:" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -114137,60 +116108,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, fuzzy, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "Não é possível abrir driver" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -114242,29 +116213,41 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Não é possível abrir o arquivo de regra <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Coluna <%s> não encontrada na tabela <%s>" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "Erro procurando argumentos" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" +msgstr "\"*\" para todas as colunas" + #: ../scripts/g.download.location/g.download.location.py:105 msgid "Location named <{}> already exists, download canceled" msgstr "" @@ -114308,16 +116291,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -114388,41 +116361,52 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "mapa vetorial <%s> não encontrado no mapset atual" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +#, fuzzy +msgid "Column <{}> is already in the table. Skipping." +msgstr "Coluna <%s> não encontrada na tabela <%s>. Criando ..." -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." -msgstr "" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +#, fuzzy +msgid "Adding column <{}> to the table" +msgstr "Nova coluna de atributo <%s> adicionada à tabela" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "Erro procurando argumentos" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -114470,20 +116454,162 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Nome do mapset de destino" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Camada número" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Tipo de armazenamento para o mapa resultante" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Sem mapa de saída" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "Distância da câmera (em unidades do mapa)" + +#, fuzzy +#~ msgid "Plots to generate" +#~ msgstr "Sem pontos para interpolar" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Nome do Raster de saída" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Nome do Raster de saída" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Falha ao plotar polígono" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Mostra rótulos de categorias" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Formato da tabela" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Largura da linha do texto" + +#, fuzzy +#~ msgid "density" +#~ msgstr "densidade de ponto" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Título do mapa vetorial" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Necessário para use=attr" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Nome da coluna que contém dados numéricos" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Nome da coluna que contém a coordenada y" + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "O valor limiar deve ser >= 0" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Arquivo de entrada" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Gera arquivo com a direção da encosta" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Gera arquivo com a direção da encosta" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Distância até o %d vizinho mais próximo:" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Nome do mapa raster de saída" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Nome da tabela de saída" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Nome para o mapa de caminho vetorial de saída" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nome do arquivo de saída que contém o relatório" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nome do arquivo de saída que contém o relatório" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Nome do mapa raster a ser amostrado" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Formato" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Nome do mapa raster a ser amostrado" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Número de níveis a usar para componente" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Seleção invertida" + +#, fuzzy +#~ msgid "" +#~ "Number of k-fold cross-validation for grid search parameter optimization" +#~ msgstr "Executa o procedimento de validação cruzada sem aproximação raster" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Substituir parâmetro de conexão para camada definida" + +#~ msgid "Location:" +#~ msgstr "Location:" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -116246,10 +118372,6 @@ msgstr "" #~ msgstr "" #~ "Usando leitura intercalada do estilo GDAL 1.x para a versão GDAL %d.%d.%d" -#, c-format -#~ msgid "Unable to re-open data source <%s>" -#~ msgstr "Não foi possível reabrir a fonte de dados <%s>" - #, c-format #~ msgid "One of '%s' or '%s' parameters must be set" #~ msgstr "Um dos parâmetros '%s' ou '%s' deve ser definido" @@ -116318,10 +118440,6 @@ msgstr "" #~ msgid "Only TERRAIN points" #~ msgstr "Somente pontos TERRENO" -#, fuzzy -#~ msgid "Output formating" -#~ msgstr "Formato de saída" - #, fuzzy #~ msgid "Unable to create 3D raster <%s>" #~ msgstr "Não consegui criar mapa raster <%s>" @@ -116730,10 +118848,6 @@ msgstr "Tabela faltando" #~ msgstr[0] "Interpolando mapa raster <%s> ... %d linhas ..." #~ msgstr[1] "Interpolando mapa raster <%s> ... %d linhas ..." -#, fuzzy -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "não." - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Texto para representar célula sem dados" @@ -116794,8 +118908,8 @@ msgstr "Tabela faltando" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Cor para desenhar malhas, ou \"none\"" #, fuzzy @@ -117090,6 +119204,9 @@ msgid "Missing table" msgstr "Tabela faltando" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -117133,6 +119250,10 @@ msgstr "O mapa vetorial <%s> é 3D. Use opções de criação de camada específ #~ msgstr "Tabela de atributos ausente para mapa vetorial <%s>" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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 566f8d3a6f8..7d3fd9d9c54 100644 --- a/locale/po/grassmods_ro.po +++ b/locale/po/grassmods_ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2013-07-17 22:14+0200\n" "Last-Translator: Andreea Marin \n" "Language-Team: GRASS Translation Team \n" @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "Printează parametrii conexiunii curente și ieși" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "Printează parametrii conexiunii curente și ieși" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -267,7 +268,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -292,7 +293,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -303,7 +304,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -325,7 +326,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -482,6 +483,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -501,7 +503,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -520,7 +521,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -534,6 +534,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -567,7 +568,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -577,8 +578,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -593,21 +594,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Harta raster <%s> nu este găsită" @@ -616,7 +617,7 @@ msgstr "Harta raster <%s> nu este găsită" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -651,7 +652,6 @@ msgstr "Harta raster <%s> nu este găsită" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -664,7 +664,6 @@ msgstr "Harta raster <%s> nu este găsită" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -703,6 +702,7 @@ msgstr "Harta raster <%s> nu este găsită" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -724,7 +724,7 @@ msgstr "Harta raster <%s> nu este găsită" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -790,7 +790,7 @@ msgstr "Harta raster <%s> nu este găsită" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -804,7 +804,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -817,8 +817,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -833,16 +833,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -888,7 +888,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -904,7 +904,7 @@ msgstr "Imposibil de deschis harta vectorială <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -913,7 +913,7 @@ msgstr "Imposibil de deschis harta vectorială <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -943,13 +943,13 @@ msgstr "Imposibil de deschis harta vectorială <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -977,7 +977,7 @@ msgstr "Conexiunea bazei de date nu este definită pentru stratul %d" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -992,8 +992,8 @@ msgstr "Imposibil de pornit driver-ul<%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1027,10 +1027,10 @@ msgstr "Imposibil de pornit driver-ul<%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1038,7 +1038,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Imposibil de deschis baza de date <%s> cu driverl <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1068,23 +1068,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "Imposibil de copiat tabela de atribute la harta vectorială <%s>" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1166,13 +1166,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1225,6 +1225,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1285,6 +1286,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1350,14 +1357,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1407,144 +1413,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "Metadata" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1561,35 +1555,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Imposibil de creat harta raster<%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "Locația <%s> creată" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1597,55 +1589,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1725,12 +1719,10 @@ msgstr "algebra" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1768,7 +1760,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1784,7 +1776,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1834,24 +1826,18 @@ msgstr "Nume de ieșire pentru harta raster profilul curburii" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "Ieșiri" @@ -1975,7 +1961,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1985,7 +1971,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2105,7 +2090,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2134,6 +2119,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2270,7 +2256,13 @@ msgstr "<%s=%s> număr nevalid de puncte" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2279,8 +2271,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2312,7 +2304,7 @@ msgstr "Actualizează statistica hărții raster" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2368,7 +2360,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2414,7 +2405,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2467,7 +2458,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2883,7 +2874,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2971,14 +2962,16 @@ msgstr "export" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3137,7 +3130,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3445,6 +3438,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3533,17 +3535,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3564,7 +3564,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "Rezultat" @@ -3636,7 +3636,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3669,160 +3669,157 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "" +"Imposibil de obținut informații despre proiecție pentru harta de intrare" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" -msgstr "" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" +msgstr "Imposibil de obținut unitățile proiecției pentru harta de intrare" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "" +"Imposibil de obținut valorile cheie ale proiecției pentru harta de intrare" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3855,19 +3852,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3938,9 +3935,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3954,36 +3951,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4038,6 +4035,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4058,46 +4058,55 @@ msgstr "" msgid "Optional" msgstr "Opțional" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4106,82 +4115,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "Imposibil de deschis fișierul <%s>" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "est" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "vest" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "sud" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "nord" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "OOPS: rânduri schimbate din %d în %d" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "OOPS: coloane schimbate din %d în %d" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4981,7 +5002,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Atribute" @@ -5060,7 +5081,7 @@ msgstr "Imposibil de creat index" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5189,7 +5210,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5390,9 +5411,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5408,7 +5428,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5617,9 +5637,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5637,7 +5657,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5722,10 +5742,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5765,30 +5785,30 @@ msgstr "Imposibil de creat harta de ieșire" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "Proiecție" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5915,125 +5935,125 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Intrare nevalidă <%s=%s>" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Citirea datei..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Restabilește interactiv parametrii proiecției locației." -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Generarea punctelor..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Harta raster <%s> creată." @@ -6133,7 +6153,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6167,7 +6187,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6201,7 +6221,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6258,9 +6278,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Număr maxim de iterații" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6276,8 +6296,8 @@ msgstr "Număr maxim de iterații" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6287,24 +6307,55 @@ msgstr "" msgid "random" msgstr "aleatoriu" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Distribuția medie" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Deviația standard" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6356,7 +6407,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6656,7 +6707,7 @@ msgstr "Eroare în citirea datei" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6762,7 +6813,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6848,8 +6898,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "proiecția lat/lon nu este acceptată in acest moment." #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7467,7 +7518,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7476,7 +7527,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7581,7 +7632,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7605,15 +7656,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7686,7 +7737,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7736,17 +7787,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7804,6 +7852,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7942,7 +7991,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8026,7 +8075,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8085,7 +8134,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8146,7 +8195,7 @@ msgstr "Calculează statistici univariate din celule ne-nule ale hărții raster msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "Raster <%s>nepotrivire de tip" @@ -8269,7 +8318,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8408,7 +8456,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "<%s=%s> număr nevalid de puncte" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8500,8 +8548,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8510,8 +8558,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8529,7 +8577,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8909,10 +8957,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "proiecția lat/lon nu este acceptată in acest moment." #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9137,13 +9185,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9156,7 +9202,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9398,31 +9443,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9438,12 +9483,12 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +#, fuzzy +msgid "create project" msgstr "crează locație" #: ../raster/r.in.gdal/main.c:118 @@ -9458,18 +9503,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Numele hărții vectoriale de intrare (A)" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9493,10 +9538,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9526,7 +9570,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9535,210 +9579,231 @@ msgstr "" msgid "Region" msgstr "Regiune" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Harta raster <%s> există deja și va fi suprascrisă" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "Harta raster <%s> există deja" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "" +"Imposibil de obținut informații despre proiecție pentru harta de intrare" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" -msgstr "" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" +msgstr "Imposibil de obținut unitățile proiecției pentru harta de intrare" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "" +"Imposibil de obținut valorile cheie ale proiecției pentru harta de intrare" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10412,7 +10477,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10527,6 +10591,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10558,26 +10634,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10602,12 +10658,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10615,40 +10665,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10800,7 +10850,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11049,29 +11099,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11128,71 +11178,38 @@ msgstr "Fișierul <%s> a fost creat" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11235,6 +11252,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11942,7 +11992,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11956,13 +12006,16 @@ msgid "transformation" msgstr "transformare" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "Reproiectează harta vectorială de la o locație la locația curentă." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +#, fuzzy +msgid "Project (location) containing input raster map" msgstr "" +"Realizează raport cu informații despre rasterul de intrare și după aceea " +"închide" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11987,10 +12040,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -12046,12 +12097,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12068,12 +12119,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "Verifică locația <%s> mapset <%s>" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12081,15 +12132,15 @@ msgstr "Verifică locația <%s> mapset <%s>" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "Harta raster <%s> din locația <%s> , mapset <%s> nu a fost găsită" #: ../raster/r.proj/main.c:323 @@ -12107,12 +12158,13 @@ msgstr "" "Imposibil de obținut valorile cheie ale proiecției pentru harta de intrare" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "Imposibil de lucrat cu date neproiectate (locație xy)" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12193,7 +12245,7 @@ msgid "Sorting events..." msgstr "Scrierea vertecșilor..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12454,8 +12506,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12624,7 +12677,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12635,6 +12688,23 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "" +"Imposibil de obținut informații despre proiecție pentru harta de intrare" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Imposibil de obținut unitățile proiecției pentru harta de intrare" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "" +"Imposibil de obținut valorile cheie ale proiecției pentru harta de intrare" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13252,16 +13322,21 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +#, fuzzy +msgid "Cannot get projection info of current project" msgstr "" +"Imposibil de obținut informații despre proiecție pentru harta de intrare" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Imposibil de obținut unitățile proiecției pentru harta de intrare" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +#, fuzzy +msgid "Cannot get projection key values of current project" msgstr "" +"Imposibil de obținut valorile cheie ale proiecției pentru harta de intrare" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13339,7 +13414,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s=%s - trebuie să fie un număr nenegativ" @@ -13349,7 +13424,7 @@ msgstr "%s=%s - trebuie să fie un număr nenegativ" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s=%s - trebuie să fie un număr pozitiv" @@ -13439,7 +13514,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13448,7 +13523,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13760,7 +13835,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13771,19 +13846,19 @@ msgstr "" msgid "position" msgstr "poziție" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13791,15 +13866,28 @@ msgstr "" msgid "Query" msgstr "Interogare" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13808,62 +13896,70 @@ msgstr "" msgid "Advanced" msgstr "Avansat" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importă un fișier binar MAT-File(v4) la un raster GRASS." @@ -14033,9 +14129,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14381,21 +14474,21 @@ msgstr "" "Rezoluția din stratul de intrare nu se potrivește cu rezoluția regiunii " "curente!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14586,82 +14679,82 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -"Trebuie să specificați cel puțin unul dintre parametrii: <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s>, <%s> or <%s>" +"Trebuie să specificați cel puțin unul dintre parametrii: <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s>, <%s> or <%s>" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Tip raster greșit: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "Produse de elevație pentru mapset-ul <%s> din <%s>" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "Harta raster orientare <%s> completă" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "Harta raster pantă <%s> completă" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "Harta raster curbura în profil <%s> completă" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Harta raster curbura tangențială <%s> completă" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "Harta raster panta E-V <%s> completă" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "Harta raster panta N-S <%s> completă" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "Harta raster dxx <%s> completă" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "Harta raster dyy <%s> completă" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "Harta raster dxy <%s> completă" @@ -15537,33 +15630,33 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15579,61 +15672,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15657,7 +15750,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16610,11 +16702,11 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -16622,36 +16714,36 @@ msgstr "" "Program de calcul numeric pentru tranzitarea, nelimitată și neînchisă a " "apelor subterane în două dimensiuni." -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16978,7 +17070,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "Imposibil de creat fișierul temporar" @@ -17437,8 +17529,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17565,97 +17657,97 @@ msgstr "Foster (1981)" msgid "El-Swaify (1985)" msgstr "El-Swaify (1985)" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17921,11 +18013,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18129,32 +18221,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18237,8 +18329,9 @@ msgid "Units" msgstr "Unități" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "coloană" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18260,8 +18353,9 @@ msgstr "Suprafață:" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "grafice" @@ -19017,8 +19111,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -19028,28 +19122,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "Memorie insuficientă" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "Eroare de parametru" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "Nici un punct de control activ" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "Coordonate nevalide: [%s]" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "Calculează transformări de coordonate bazate pe punctele de control." @@ -19058,57 +19152,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19117,7 +19211,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19126,7 +19220,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19620,6 +19714,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19678,64 +19776,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19841,7 +19947,6 @@ msgstr "Crează în mod explicit un fișier bitmap cu valorile 3D nule." #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19854,10 +19959,8 @@ msgstr "Crează în mod explicit un fișier bitmap cu valorile 3D nule." #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19871,11 +19974,11 @@ msgstr "Crează în mod explicit un fișier bitmap cu valorile 3D nule." #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "afișare" @@ -20369,10 +20472,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20428,9 +20531,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "Tip" @@ -20490,13 +20593,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "suport" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "scripturi" @@ -20858,73 +20961,75 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "Regiunea <%s> nu a fost găsită" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "Imposibil de citit antetul hărții raster 3D <%s@%s>" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "Imposibil de setat regiunea <%s>" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "Imposibil de actualizat regiunea curentă" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" "Imposibil de modificat regiunea implicită. Mapsetul curent nu este " "." -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "Sunteți deja în Lat/Long. Utilizați parametrul -p." -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 +#, fuzzy msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" "Sunteți într-o locație simplă XY, proiectarea în Lat/Lon nu este posibilă. " "Utilizați parametrul -p." -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "Imposibil de proiectat datele în WGS84 atât timp cât locația nu conține " "parametrii de transformare a datumului. Încercați rularea g.setproj." -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "Imposibil de actualizat parametrii proiecției lat/long" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "Calcularea Lat/Long nu este posibilă în sistemul simplu XY" @@ -21168,8 +21273,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21439,154 +21544,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "Descrierea proiecției PROJ.4 " -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "Codul de proiecție EPSG" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "DatumDatum" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "Crează" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Nume pentru harta vectorială de intrare" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "Unul dintre -%c, -%c or %s=, %s= or %s= trebuie specificat" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21674,9 +21780,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Imposibil de creat fișierul <%s>" #: ../general/g.proj/create.c:21 #, c-format @@ -21684,98 +21790,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Imposibil de creat fișierul <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "Nivel" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21917,8 +22023,10 @@ msgid "Changes/reports current mapset." msgstr "" #: ../general/g.mapset/main.c:52 +#, fuzzy msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" "Crează opțional un mapset nou sau liste cu mapset-uri valabile în locația " "dată." @@ -22003,35 +22111,58 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 +#, fuzzy msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" "Afectează accesul utilizatorului la datele existente în cadrul altor mapset-" "uri din locația curentă." -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -22040,69 +22171,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "Listează toate mapset-urile valabile în ordine alfabetică" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "Printează mapset-urile în calea de căutare curentă" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "Mapset-ul <%s> nu a fost găsit" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "Mapset <%s> adăugat la calea de căutare" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "Mapset <%s> eliminat din calea de căutare" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22117,37 +22252,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22500,7 +22632,7 @@ msgstr " stddev" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23691,7 +23823,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23787,7 +23919,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23795,8 +23928,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Numele hărții vectoriale de intrare (A)" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23828,35 +23962,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Harta raster <%s> nu este găsită" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23909,61 +24044,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "Regiunea <%s> nu a fost găsită" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 #, c-format -msgid "Target location <%s> not found" +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23973,7 +24113,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23981,21 +24121,21 @@ msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Imposibil de închis harta raster <%s@%s>" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -24110,15 +24250,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24158,101 +24296,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 -#, c-format -msgid "Location: %s" -msgstr "" - #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#, fuzzy, c-format +msgid "Project (location): %s" +msgstr "crează locație" + +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "Verifică locația <%s> mapset <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "Ortorectificare anulată." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24376,6 +24512,16 @@ msgstr "Regiune N=%f S=%f E=%f V=%f" msgid "Resolution EW=%f NS=%f" msgstr "Rezoluție EV=%f NS=%f" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24394,6 +24540,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24403,6 +24554,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24774,6 +24945,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "proiecție" @@ -26361,8 +26533,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "Redimensionează" @@ -26686,17 +26858,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26705,17 +26874,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26724,17 +26890,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26744,17 +26907,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26763,12 +26923,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27589,6 +27747,9 @@ msgid "Apriori Phi (roll) standard deviation" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -28122,11 +28283,15 @@ msgstr "Imposibil de selectat data:" msgid "Unable to describe table." msgstr "Imposibil de descris tabelul." -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "Conexiune eșuată." +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28177,7 +28342,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28272,16 +28437,15 @@ msgid "OGR layer <%s> not found" msgstr "Stratul OGR <%s> nu este găsit" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Coloana <%s> nu se găsește în tabelul <%s>" @@ -28855,6 +29019,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "histogramă" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Numele coloanei de atribute folosită pentru înălțime" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Număr de puncte pentru a fi creat(e)" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28897,6 +29097,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28933,64 +29135,75 @@ msgstr "Se încarcă benzile de intrare..." #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Numele rasterului sursă pentru altitudine " + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Nume pentru harta vectorială de ieșire" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Numele rasterului sursă pentru altitudine " -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Nume pentru harta vectorială de ieșire" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Numele rasterului sursă pentru altitudine " -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Redimensionează" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Imposibil de creat fișierul temporar" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "Se încarcă benzile de intrare..." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -29069,238 +29282,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" -"Printează/setează conexiunea BD pentru o hartă vectorială la tabela de " -"atribute." - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Numele hărții vectoriale" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Număr de strat (scrie în)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "reclasificare" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "reclasificare" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -29507,6 +29496,524 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "Crearea hărții raster 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +#, fuzzy +msgid "modeling" +msgstr "model" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Desenează caseta pentru volum" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Generează puncte vectoriale ca puncte 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Numele rasterului sursă pentru altitudine " + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Generează puncte vectoriale ca puncte 3D" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Nici o hartă de ieșire" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Numele hărții raster de acoperire" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Linii vectoriale" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Linii vectoriale" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Citirea trăsăturilor..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "vizualizare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "vizualizare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Numărul punctelor de interpolare" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "crează locație" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Număr de puncte pentru a fi creat(e)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Număr maxim de iterații" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Prag" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Prag" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Prag" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Prag" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Număr de puncte pentru a fi creat(e)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Harta raster pantă <%s> completă" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Număr de rânduri" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29706,10 +30213,15 @@ msgstr "" msgid "Name for output vector map" msgstr "Nume pentru harta vectorială de ieșire" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29944,6 +30456,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31137,7 +31657,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31184,12 +31704,6 @@ msgstr "" msgid "landscape" msgstr "Landsat" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -#, fuzzy -msgid "modeling" -msgstr "model" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -32281,7 +32795,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Numar de strat (harta vectorială A)" @@ -32319,6 +32832,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Citirea hărții%s ..." + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -32682,7 +33207,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32879,7 +33403,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Intrare:" @@ -32913,6 +33437,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33959,11 +34491,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -34013,45 +34542,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Culoarea de fundal" +msgid "Thin species and background points" +msgstr "Numărul punctelor de interpolare" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Culoarea de fundal" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Imposibil de deschis fișierul de ieșire <%s>" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Rândurile/ coloanele se suprapun pentru segementare" @@ -34847,8 +35390,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34858,6 +35410,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34897,11 +35450,13 @@ msgid "" msgstr "Numele coloanei de atribute folosită pentru înălțime" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Tipul de ieșire" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35198,6 +35753,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -35209,6 +35765,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -35237,6 +35794,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -35607,64 +36165,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Nici o hartă de ieșire" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36015,11 +36515,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36885,6 +37387,14 @@ msgid "" "mapset." msgstr "Reproiectează harta vectorială de la o locație la locația curentă." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37015,12 +37525,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37167,9 +37677,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -37212,19 +37721,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -37233,7 +37752,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -37365,34 +37884,6 @@ msgstr "" msgid "Base name for output file" msgstr "Nume pentru harta vectorială de ieșire" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "topologie" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Numele coloanei de atribute folosită pentru înălțime" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Număr de puncte pentru a fi creat(e)" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -38049,6 +38540,10 @@ msgid "Queries projection information spatially." msgstr "" "Imposibil de obținut informații despre proiecție pentru harta de intrare" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "crează locație" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -38337,8 +38832,9 @@ msgid "" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Se dizolvă limitele dintre arealele adiacente un număr comun de categorii " @@ -38372,8 +38868,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Numele coloanei de atribute folosită pentru înălțime" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39085,9 +39582,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -39346,6 +39849,7 @@ msgid "image collections" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39357,6 +39861,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -39468,6 +39977,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -40492,8 +41009,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -40588,39 +41105,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Număr de puncte pentru a fi creat(e)" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -43894,8 +44420,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -43933,6 +44459,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -44346,6 +44873,13 @@ msgstr "reclasificare" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -44399,6 +44933,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Linii vectoriale" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Linii vectoriale" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -44438,6 +44986,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "Număr de iterații" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Numele hărții raster pentru culoare" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Număr de puncte pentru a fi creat(e)" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -44867,8 +45447,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -45619,6 +46199,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Numele hărții raster care conține parametrul morfometric" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -45912,6 +46496,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Nume de ieșire pentru harta raster orientare " +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -46345,10 +46933,92 @@ msgstr "Exagerarea verticală" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Numele hărții vectoriale de intrare (A)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Numele hărții vectoriale existentă (de la)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Dezactivează" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Crearea hărții raster 3D" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Numele hărții raster pentru transparență" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parametrii" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "topologie" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Numele coloanei de atribute folosită pentru înălțime" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -46857,17 +47527,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -46895,23 +47555,20 @@ msgid "categorical map with zones" msgstr "puncte vectoriale" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Nici o hartă de ieșire" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Dimensiunea (lățime, înălțime) pentru imaginea rezultată" @@ -46923,9 +47580,8 @@ msgid "Default font size" msgstr "Driver-ul implicit nu este setat " #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -46945,13 +47601,11 @@ msgid "Create a vector point layer of outliers" msgstr "Generează puncte vectoriale ca puncte 3D" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -46962,14 +47616,12 @@ msgid "Draw notches" msgstr "Modul de desenare" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -47002,14 +47654,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -47021,26 +47665,22 @@ msgid "Plot format" msgstr "Format JSON" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -47085,15 +47725,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -47113,7 +47744,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Lățimea imaginii" @@ -47124,51 +47754,42 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Lățimea liniei vectoriale" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Imposibil de deschis fișierul de ieșire <%s>" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 #, fuzzy msgid "Flier marker" msgstr "Marker imagine" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -47176,109 +47797,25 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Culoarea liniei" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Culoarea liniei vectoriale" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Nume de ieșire pentru harta raster pantă " - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Nume de ieșire pentru harta raster pantă " - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Rezoluție EV=%f NS=%f" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Modul de desenare" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Formatul hărții:" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Culoarea imaginii" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -48865,6 +49402,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -48889,6 +49434,15 @@ msgstr "Linii vectoriale" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Culoarea imaginii" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -48988,300 +49542,300 @@ msgstr "" "Redenumește o coloană din tabela de atribute conectată la o anumită hartă " "vectorială." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Linii vectoriale" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Număr de coloane" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Numele coloanei de atribute folosită pentru înălțime" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Număr de coloane" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Numele coloanei de atribute folosită pentru înălțime" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Tipul trăsăturii" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Numele stratului care va fi folosit pentru VERDE" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" "Nume pentru fișierul povray de ieșire (fișier TGA cu un câmp de altitudine )" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Prefix pentru harta raster de ieșire" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Opțiuni RST" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "statistici" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 #, fuzzy msgid "Dot marker" msgstr "Marker imagine" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Culoarea imaginii" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Culori" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "coloană" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 #, fuzzy msgid "Density" msgstr "densitate punct" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "linie" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Opțiuni RST" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Culoare" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Lățimea liniei vectoriale" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "deviații standarde" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Culoarea liniei" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -49627,8 +50181,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -49709,183 +50263,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -#, fuzzy -msgid "density" -msgstr "densitate punct" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "puncte vectoriale" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Necesar" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Numele hărții raster care conține netezirea" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Numele hărții raster care conține netezirea" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Coordonate nevalide: [%s]" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Numele hărții raster pentru elevație" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Crearea hărții raster 3D" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Prefix pentru harta raster de ieșire" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Nume pentru harta vectorială de ieșire" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Nume de ieșire pentru harta raster profilul curburii" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Nume de ieșire pentru harta raster profilul curburii" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Numele a două 2-%d hărți raster de intrare" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Format" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Numele a două 2-%d hărți raster de intrare" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Număr de rânduri" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Metoda de agregare" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -50709,11 +51086,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "histogramă" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -56323,6 +56695,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Folosește setările regiunii curente:" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -56865,8 +57277,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -57169,8 +57581,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -57350,7 +57762,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -57364,7 +57776,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -57900,7 +58312,7 @@ msgstr "Tipul componentelor" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -58192,7 +58604,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -58285,49 +58697,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -58337,33 +58745,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -58400,7 +58808,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -58477,56 +58885,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "Harta vectorială <%s> există deja și va fi scrisă peste" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -58799,127 +59214,131 @@ msgstr[2] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "Harta vectorială <%s> există" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -59404,7 +59823,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -59645,11 +60064,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -59676,7 +60095,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -59685,7 +60104,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "Imposibil de deschis sursa de date <%s>" @@ -59705,7 +60124,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -59741,12 +60160,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "Reproiectează harta vectorială de la o locație la locația curentă." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "Numele hărții vectoriale" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -59780,14 +60201,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" +msgstr "Harta raster <%s> din locația <%s> , mapset <%s> nu a fost găsită" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 #: ../vector/v.proj/main.c:526 ../vector/v.rectify/main.c:236 @@ -59801,13 +60226,13 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" +msgstr "Harta raster <%s> din locația <%s> , mapset <%s> nu a fost găsită" #: ../vector/v.proj/main.c:517 msgid "Reprojecting primitives ..." @@ -62216,7 +62641,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62847,7 +63272,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -63157,12 +63582,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -63362,19 +63787,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -63586,7 +64011,7 @@ msgstr[2] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -63744,10 +64169,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "Memorie insuficientă pentru %s" @@ -63788,6 +64213,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -63888,9 +64317,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "Imposibil de creat %s" @@ -63904,7 +64333,7 @@ msgstr "Imposibil de deschis %s" msgid "Vector is not 3D" msgstr "Vectorul nu este 3D" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "Imposibil de creat tabelul '%s'" @@ -63989,7 +64418,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -64017,8 +64445,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -64670,7 +65098,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -64806,8 +65234,8 @@ msgstr "Eroare în scrierea fișierului" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -66610,17 +67038,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -66796,13 +67224,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -67055,42 +67483,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Printează tabelele și ieși" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "Printează doar declarația SQL" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Această opțiune necesită o singură coloană" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Această opțiune necesită două coloane" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Această opțiune necesită cel puțin două coloane" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "Parametrul 'qcolumn' trebuie specificate pentru 'option=query'" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -68076,16 +68509,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Printează aytibutele hărții vectoriale." @@ -69550,66 +69973,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -69903,7 +70326,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Scrierea centroizilor..." @@ -70360,164 +70783,165 @@ msgstr "Conexiunea bazei de date nu este definită pentru stratul %d" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "Nume:" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "Mapset:" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "Locație:" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Proiecție" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "Baza de date:" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "Titlu:" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "Scara hărții:" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "Numele creatorului:" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "Organizația:" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "Sursa datelor:" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "Formatul hărții:" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "Strat OGR:" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "Topologie:" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "schema:" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "Tipul hărții" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "nivel" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "Număr de puncte:" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "Număr de centroizi:" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "Număr de linii:" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "Număr de suprafețe:" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "Număr de insule:" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "Număr de volume:" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "Număr de goluri:" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "Harta este 3D:" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "Da" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "Nu" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "zonă" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "Comentariu" @@ -70695,28 +71119,51 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "Convertește DWG/DXF în hartă vectorială GRASS" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -70783,274 +71230,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "Nici un strat OGR disponibil" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "Folosirea vectorului temporar <%s>" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -71059,51 +71506,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -71259,10 +71706,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Mapset-ul <%s> nu a fost găsit" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -75664,7 +76121,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -75673,7 +76130,7 @@ msgstr[1] "" msgstr[2] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -75681,7 +76138,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -76668,6 +77125,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -77242,6 +77703,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Imposbil de deschis fișierul <%s> pentru scriere" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Imposbil de deschis fișierul <%s> pentru scriere" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -78303,7 +78781,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -78542,22 +79020,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -80590,38 +81061,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -80701,11 +81172,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -80730,103 +81201,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -80838,336 +81309,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -81220,50 +81691,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -81291,7 +81762,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -81509,7 +81980,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -81566,85 +82037,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "Folosirea vectorului temporar <%s>" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Crează câteva fișiere temporare..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "Imposibil de deschis sursa de date <%s>" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -81690,28 +82162,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -81768,27 +82240,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Imposibil de deschis sursa de date <%s>" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -81798,7 +82270,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -81808,14 +82279,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -81823,72 +82294,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -82115,7 +82586,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -82133,64 +82604,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -82330,79 +82802,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -82514,40 +82986,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -82583,7 +83055,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -82594,34 +83066,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -82713,34 +83185,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -82819,317 +83291,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Regiunea <%s> nu a fost găsită" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -83137,60 +83609,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -83242,27 +83714,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Imposibil de creat fișierul <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Coloana <%s> nu se găsește în tabelul <%s>" + +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -83308,16 +83790,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -83388,41 +83860,49 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Harta raster <%s> nu a fost găsită în mapset-ul curent" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -83470,20 +83950,137 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "" +#~ "Printează/setează conexiunea BD pentru o hartă vectorială la tabela de " +#~ "atribute." + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Număr de strat (scrie în)" + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "reclasificare" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "reclasificare" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Nici o hartă de ieșire" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Nume de ieșire pentru harta raster pantă " + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Nume de ieșire pentru harta raster pantă " + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Rezoluție EV=%f NS=%f" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Modul de desenare" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Formatul hărții:" + +#, fuzzy +#~ msgid "density" +#~ msgstr "densitate punct" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "puncte vectoriale" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Necesar" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Numele hărții raster care conține netezirea" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Numele hărții raster care conține netezirea" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Coordonate nevalide: [%s]" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Numele hărții raster pentru elevație" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Crearea hărții raster 3D" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Prefix pentru harta raster de ieșire" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Nume pentru harta vectorială de ieșire" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Nume de ieșire pentru harta raster profilul curburii" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Nume de ieșire pentru harta raster profilul curburii" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Numele a două 2-%d hărți raster de intrare" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Format" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Numele a două 2-%d hărți raster de intrare" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Număr de rânduri" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Metoda de agregare" + +#~ msgid "Location:" +#~ msgstr "Locație:" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "Name or IP of server to be connected" #~ msgstr "Număr de puncte pentru a fi creat(e)" @@ -85267,10 +85864,6 @@ msgstr "Tip de geometrie necunoscut" #~ msgid "Unknown geometry type" #~ msgstr "Tip de geometrie necunoscut" -#, fuzzy -#~ msgid "Unable to create 3D raster <%s>" -#~ msgstr "Imposibil de creat harta raster<%s>" - #, fuzzy #~ msgid "Vertical variogram function" #~ msgstr "Exagerarea verticală" @@ -85362,9 +85955,6 @@ msgstr "Tip de geometrie necunoscut" #~ msgstr[0] "Interpolarea hărții raster <%s>... %d rânduri... " #~ msgstr[1] "Interpolarea hărții raster <%s>... %d rânduri... " -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "proiecția lat/lon nu este acceptată in acest moment." - #, fuzzy #~ msgid "Display the " #~ msgstr "Afișare" @@ -85376,6 +85966,7 @@ msgstr "Tip de geometrie necunoscut" #~ msgid "Not enough memory for adx" #~ msgstr "Memorie insuficientă pentru adx" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "<%s> not found" @@ -85385,6 +85976,8 @@ msgstr "<%s> nu a fost găsit" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Not enough memory for ady" #~ msgstr "Memorie insuficientă pentru ady" @@ -85431,6 +86024,9 @@ msgstr "<%s> nu a fost găsit" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grassmods_ru.po b/locale/po/grassmods_ru.po index 6145cbfa938..72adc202d55 100644 --- a/locale/po/grassmods_ru.po +++ b/locale/po/grassmods_ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2023-06-28 19:08+0000\n" "Last-Translator: Sergey Kazorin \n" "Language-Team: Russian =2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"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" "X-Generator: Weblate 4.16.4\n" #: ../temporal/t.connect/main.c:34 @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -267,7 +268,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -292,7 +293,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -303,7 +304,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -325,7 +326,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -482,6 +483,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -501,7 +503,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -520,7 +521,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -534,6 +534,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -567,7 +568,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -577,8 +578,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -593,21 +594,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "Растровая карта <%s> не найдена" @@ -616,7 +617,7 @@ msgstr "Растровая карта <%s> не найдена" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -651,7 +652,6 @@ msgstr "Растровая карта <%s> не найдена" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -664,7 +664,6 @@ msgstr "Растровая карта <%s> не найдена" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -703,6 +702,7 @@ msgstr "Растровая карта <%s> не найдена" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -724,7 +724,7 @@ msgstr "Растровая карта <%s> не найдена" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -790,7 +790,7 @@ msgstr "Растровая карта <%s> не найдена" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -804,7 +804,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -817,8 +817,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -833,16 +833,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -888,7 +888,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -904,7 +904,7 @@ msgstr "Не удалось открыть векторную карту <%s>" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -913,7 +913,7 @@ msgstr "Не удалось открыть векторную карту <%s>" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -943,13 +943,13 @@ msgstr "Не удалось открыть векторную карту <%s>" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -977,7 +977,7 @@ msgstr "Не определено соединение с базой данны #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -992,8 +992,8 @@ msgstr "Не удалось запустить драйвер <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1027,10 +1027,10 @@ msgstr "Не удалось запустить драйвер <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1038,7 +1038,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Не удалось открыть базу данных <%s> с помощью драйвера <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1068,23 +1068,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1166,13 +1166,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1225,6 +1225,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1285,6 +1286,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1350,14 +1357,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1407,144 +1413,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "%s= и %s= не могут использоваться совместно" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1561,35 +1555,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Не удалось создать векторную карту <%s>." -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "Растровая карта <%s> не найдена" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1597,55 +1589,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1725,12 +1719,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1768,7 +1760,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1784,7 +1776,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1834,24 +1826,18 @@ msgstr "Имя выходного растрового слоя" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1973,7 +1959,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1983,7 +1969,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2104,7 +2089,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2133,6 +2118,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2269,7 +2255,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2278,8 +2270,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2311,7 +2303,7 @@ msgstr "Обновление статистики растровой карты" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2367,7 +2359,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2412,7 +2403,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2465,7 +2456,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "Необходимо указать параметры %s= или %s=" @@ -2879,7 +2870,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2967,14 +2958,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3133,7 +3126,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3441,6 +3434,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3529,17 +3531,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3560,7 +3560,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3632,7 +3632,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3665,160 +3665,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3851,19 +3843,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Не хватает памяти" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3932,9 +3924,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3948,36 +3940,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4032,6 +4024,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4052,46 +4047,55 @@ msgstr "" msgid "Optional" msgstr "Необязательная" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4100,82 +4104,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4975,7 +4991,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5054,7 +5070,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5183,7 +5199,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5384,9 +5400,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5402,7 +5417,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5609,9 +5624,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5629,7 +5644,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5714,10 +5729,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5757,30 +5772,30 @@ msgstr "Фактор масштабирования для высот" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5903,123 +5918,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "Растровая карта <%s> не найдена" @@ -6119,7 +6134,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6153,7 +6168,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6189,7 +6204,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6245,9 +6260,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6263,8 +6278,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6274,24 +6289,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6343,7 +6389,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6643,7 +6689,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6749,7 +6795,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6835,8 +6880,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "Проекция lat/lon пока не поддерживается" #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7454,7 +7500,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7463,7 +7509,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7568,7 +7614,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7592,15 +7638,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7674,7 +7720,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7724,17 +7770,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7793,6 +7836,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7931,7 +7975,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8015,7 +8059,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8074,7 +8118,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8135,7 +8179,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8258,7 +8302,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8397,7 +8440,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8489,8 +8532,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8499,8 +8542,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8518,7 +8561,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8898,10 +8941,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "Проекция lat/lon пока не поддерживается" #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9127,13 +9170,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9146,7 +9187,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9388,31 +9428,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9428,12 +9468,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9448,18 +9487,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Имя выходного растрового слоя экспозиции склонов" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9483,10 +9522,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9516,7 +9554,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9525,210 +9563,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10399,7 +10453,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10512,6 +10565,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10543,26 +10608,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10587,12 +10632,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10600,40 +10639,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10786,7 +10825,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11034,29 +11073,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11115,71 +11154,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11222,6 +11228,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11928,7 +11967,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11942,12 +11981,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" +"Конвертировать все старые слои GRASS < Ver5.7 в текущем наборе в текущий " +"формат" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11973,10 +12014,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -12032,12 +12071,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12054,12 +12093,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12067,16 +12106,16 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" +msgstr "Растровая карта <%s> не найдена" #: ../raster/r.proj/main.c:323 msgid "Unable to get projection info of input map" @@ -12091,12 +12130,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12177,7 +12216,7 @@ msgid "Sorting events..." msgstr "Запись нового файла..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12433,8 +12472,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12600,7 +12640,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12611,6 +12651,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13227,15 +13279,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13314,7 +13366,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13324,7 +13376,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13416,7 +13468,7 @@ msgstr "Не удалось прочитать диапазон с плаваю #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13425,7 +13477,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "Не удалось создать индекс для таблицы <%s>, ключ <%s>" @@ -13737,7 +13789,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13748,19 +13800,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13768,15 +13820,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13785,62 +13850,70 @@ msgstr "" msgid "Advanced" msgstr "Дополнительно" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "Невозможно прочитать векторную карту <%s>" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -14010,9 +14083,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14358,21 +14428,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14559,80 +14629,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15509,34 +15579,33 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15552,61 +15621,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15630,7 +15699,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16584,46 +16652,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16948,7 +17016,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17410,8 +17478,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17538,97 +17606,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17893,11 +17961,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18099,32 +18167,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18207,8 +18275,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Input_options" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18230,8 +18299,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18985,8 +19055,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18996,28 +19066,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -19026,57 +19096,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19085,7 +19155,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19094,7 +19164,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19588,6 +19658,10 @@ msgstr "Не удалось прочитать диапазон трёхмерн msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19646,64 +19720,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19809,7 +19891,6 @@ msgstr "Явное создание трёхмерного файла битов #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19822,10 +19903,8 @@ msgstr "Явное создание трёхмерного файла битов #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19839,11 +19918,11 @@ msgstr "Явное создание трёхмерного файла битов #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20337,10 +20416,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20396,9 +20475,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20458,13 +20537,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20825,67 +20904,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21129,8 +21208,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21398,154 +21477,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Имя выходного растрового слоя экспозиции склонов" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21633,9 +21713,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Не удалось создать векторную карту <%s>." #: ../general/g.proj/create.c:21 #, c-format @@ -21643,98 +21723,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Не удалось создать векторную карту <%s>." #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21877,7 +21957,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21960,33 +22041,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21995,69 +22098,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22072,37 +22179,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22455,7 +22559,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23644,7 +23748,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23740,7 +23844,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23748,8 +23853,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Имя выходного растрового слоя экспозиции склонов" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23781,35 +23887,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "Растровая карта <%s> не найдена" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23862,61 +23969,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "Растровая карта <%s> не найдена" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 #, c-format -msgid "Target location <%s> not found" +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23926,7 +24038,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23934,21 +24046,21 @@ msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "Не удалось создать векторную карту <%s>." -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -24063,15 +24175,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24111,101 +24221,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24329,6 +24437,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24345,6 +24463,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24354,6 +24477,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24722,6 +24865,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Область: %s\n" @@ -26294,8 +26438,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "Изменение диапазона" @@ -26619,17 +26763,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26638,17 +26779,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26657,17 +26795,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26677,17 +26812,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26696,12 +26828,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27489,11 +27619,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27542,7 +27676,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27635,16 +27769,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "Столбец <%s> не найден в таблице <%s>" @@ -28214,6 +28347,41 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Поле атрибутивной таблицы со значениями для интерполяции" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28256,6 +28424,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28292,62 +28462,73 @@ msgstr "Input_options" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "Имя выходного растрового слоя" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "Имя выходного растрового слоя" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "Имя выходного растрового слоя" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "Имя выходного растрового слоя" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#, fuzzy +msgid "Name of output raster shadow mask" +msgstr "Имя выходного растрового слоя" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "%s: Ошибка записи временного файла" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Координаты затравки" @@ -28427,232 +28608,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "Имя входной векторной карты" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Номер слоя (в)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28855,6 +28818,512 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Имя выходного слоя" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s: значение не соотвествует спецификации" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Название исходного векторного слоя, содержащего линии" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Имя выходного растрового слоя" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Название исходного векторного слоя, содержащего линии" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Имя выходного растрового слоя" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Название растрового слоя, содержащего путь распространения" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Область: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Количество квадратов" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Инструмент: Порог" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Название растрового слоя, содержащего путь распространения" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Количество квадратов" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -29047,10 +29516,15 @@ msgstr "" msgid "Name for output vector map" msgstr "Имя выходной векторной карты" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29287,6 +29761,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30471,7 +30953,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30515,11 +30997,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31600,7 +32077,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Номер слоя" @@ -31638,6 +32114,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31993,7 +32480,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32188,7 +32674,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Input_options" @@ -32222,6 +32708,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33289,11 +33783,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33339,44 +33830,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -34162,8 +34666,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34173,6 +34686,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34211,11 +34725,13 @@ msgid "" msgstr "Поле атрибутивной таблицы со значениями для интерполяции" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Output_options" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34508,6 +35024,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34519,6 +35036,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34548,6 +35066,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34913,63 +35432,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35310,11 +35772,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36167,6 +36631,14 @@ msgstr "" "Конвертировать все старые слои GRASS < Ver5.7 в текущем наборе в текущий " "формат" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36295,12 +36767,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36440,9 +36912,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36485,19 +36956,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36506,7 +36987,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36640,32 +37121,6 @@ msgstr "" msgid "Base name for output file" msgstr "Имя выходного слоя" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Поле атрибутивной таблицы со значениями для интерполяции" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37308,6 +37763,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37596,7 +38055,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37627,8 +38086,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Поле атрибутивной таблицы со значениями для интерполяции" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38321,9 +38781,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38576,6 +39042,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39590,8 +40064,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39686,39 +40160,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Имя входной векторной карты" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42932,8 +43415,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42971,6 +43454,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43372,6 +43856,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "Имя входной векторной карты" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43425,6 +43916,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Ввод прерван" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Ввод прерван" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -43462,6 +43967,37 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Количество квадратов" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43873,8 +44409,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44603,6 +45139,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Имя выходного растрового слоя (по умолчанию: имя исходного)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44886,6 +45426,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -45313,10 +45857,88 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Имя выходного слоя" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Название исходного векторного слоя, содержащего линии" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Название растрового слоя, содержащего путь распространения" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Поле атрибутивной таблицы со значениями для интерполяции" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45809,17 +46431,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45845,23 +46457,20 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Имя выходного растрового слоя" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45871,9 +46480,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45892,13 +46500,11 @@ msgid "Create a vector point layer of outliers" msgstr "Название исходного векторного слоя, содержащего линии" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45908,14 +46514,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45948,14 +46552,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45967,26 +46563,22 @@ msgid "Plot format" msgstr "Input_options" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -46031,15 +46623,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -46057,7 +46640,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -46067,48 +46649,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -46116,105 +46689,24 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "цвет" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Имя выходного растрового слоя" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Имя выходного растрового слоя" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Префикс выходного растрового слоя (слоев)" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -47414,6 +47906,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -47437,6 +47937,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -47528,290 +48036,290 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Ввод прерван" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Название растрового слоя, содержащего путь распространения" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Название исходного векторного слоя, содержащего линии" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Название растрового слоя, содержащего путь распространения" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Название исходного векторного слоя, содержащего линии" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Имя выходного слоя используемого для ЗЕЛЁНОГО" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Несжатый файл GNS из NGA (с расширением .txt)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Префикс выходного растрового слоя (слоев)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Input_options" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "цвет" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Input_options" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Input_options" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -48156,8 +48664,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -48237,179 +48745,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Обязательная" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Поле атрибутивной таблицы со значениями для интерполяции" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Поле атрибутивной таблицы со значениями для интерполяции" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Ввод прерван" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Выходной слой экспозиции склонов (или fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Выходной слой экспозиции склонов (или fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Префикс выходного растрового слоя (слоев)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Имя выходного растрового слоя экспозиции склонов" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Имя выходного растрового слоя" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Имя выходного файла" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Имя выходного слоя используемого для ЗЕЛЁНОГО" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Имя выходного слоя используемого для ЗЕЛЁНОГО" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Количество квадратов" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -49211,11 +49546,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -54754,6 +55084,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -55289,8 +55658,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -55591,8 +55960,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -55772,7 +56141,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -55786,7 +56155,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -56320,7 +56689,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -56612,7 +56981,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -56706,49 +57075,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -56758,33 +57123,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -56821,7 +57186,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -56898,56 +57263,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "Векторная карта <%s> уже существует и будет перезаписана" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -57223,127 +57595,131 @@ msgstr[3] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -57832,7 +58208,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -58074,11 +58450,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -58105,7 +58481,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -58114,7 +58490,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -58134,7 +58510,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -58170,11 +58546,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" +"Конвертировать все старые слои GRASS < Ver5.7 в текущем наборе в текущий " +"формат" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -58209,14 +58588,18 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" +msgstr "Векторная карта <%s> не найдена" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 #: ../vector/v.proj/main.c:526 ../vector/v.rectify/main.c:236 @@ -58230,12 +58613,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -59869,7 +60252,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -60498,7 +60881,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -60811,12 +61194,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -61016,19 +61399,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -61239,7 +61622,7 @@ msgstr[3] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -61397,10 +61780,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -61441,6 +61824,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -61541,9 +61928,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -61557,7 +61944,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -61642,7 +62029,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -61670,8 +62056,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -62299,7 +62685,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -62437,8 +62823,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -64256,17 +64642,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -64442,13 +64828,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -64694,42 +65080,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -65713,16 +66103,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Выводит атрибуты векторной карты." @@ -67213,66 +67593,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -67567,7 +67947,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -68024,164 +68404,164 @@ msgstr "Соединение с базой данных не определен msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -68360,27 +68740,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -68447,274 +68850,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "Не удалось удалить таблицу: «%s»" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "Количество дубликатов центроидов: %d" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -68723,51 +69126,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -68923,10 +69326,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "Растровая карта <%s> не найдена" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -69090,7 +69503,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -69100,7 +69513,7 @@ msgstr[2] "" msgstr[3] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -69108,7 +69521,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -70094,6 +70507,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -70674,6 +71091,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Не удалось открыть файл <%s> для записи" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Не удалось открыть файл <%s> для записи" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -71251,7 +71685,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "Не удалось открыть файл «%s»" @@ -71490,22 +71924,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -73542,38 +73969,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -73653,11 +74080,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -73682,103 +74109,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -73790,336 +74217,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -74172,50 +74599,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -74243,7 +74670,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -74461,7 +74888,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -74520,85 +74947,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "Не удалось прочитать векторный слой" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -74644,28 +75072,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -74722,27 +75150,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "Не удалось открыть источник данных OGR «%s»" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -74752,7 +75180,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -74762,14 +75189,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -74777,72 +75204,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -75069,7 +75496,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -75087,64 +75514,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -75284,79 +75712,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -75468,40 +75896,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -75537,7 +75965,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -75548,34 +75976,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -75667,34 +76095,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "Информация о проекции не совпадает. Продолжение обработки…" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -75773,317 +76201,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "ZIP-файл не читается: {0}" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "Архивный файл не читается: {0}" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "Столбец <%s> не найден" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -76091,60 +76519,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -76196,27 +76624,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Не удалось открыть входной файл <%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "Столбец <%s> не найден в таблице <%s>" + +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -76262,16 +76700,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -76342,41 +76770,49 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Карта <%s> не найдена в текущем наборе" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -76424,20 +76860,91 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Номер слоя (в)" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Имя выходного растрового слоя" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Имя выходного растрового слоя" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Префикс выходного растрового слоя (слоев)" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Обязательная" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Поле атрибутивной таблицы со значениями для интерполяции" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Поле атрибутивной таблицы со значениями для интерполяции" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Ввод прерван" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Выходной слой экспозиции склонов (или fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Выходной слой экспозиции склонов (или fy)" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Префикс выходного растрового слоя (слоев)" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Имя выходного растрового слоя экспозиции склонов" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Имя выходного растрового слоя" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Имя выходного файла" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Имя выходного слоя используемого для ЗЕЛЁНОГО" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Имя выходного слоя используемого для ЗЕЛЁНОГО" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Количество квадратов" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "Upgrades the version of a space time dataset (TGRASS DB)." #~ msgstr "Имя новой базы данных" @@ -78532,9 +79039,6 @@ msgstr "Только точки TERRAIN" #~ msgid "%s=%s - illegal number of interpolation points" #~ msgstr "%s=%s - неверное количество точек интерполяции" -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "Проекция lat/lon пока не поддерживается" - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Строка символов для отображения пустых ячеек" @@ -78591,8 +79095,8 @@ msgstr "Только точки TERRAIN" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Цвет для сетки или 'none'" #, fuzzy diff --git a/locale/po/grassmods_si.po b/locale/po/grassmods_si.po index 153ec4e6829..cf371b120a6 100644 --- a/locale/po/grassmods_si.po +++ b/locale/po/grassmods_si.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_si\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-05-23 21:08+0200\n" "Last-Translator: \n" "Language-Team: Sinhala (https://www.transifex.com/grass-gis/teams/45198/" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1585,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1715,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1756,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1772,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1829,24 +1821,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1962,7 +1948,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1972,7 +1958,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2092,7 +2077,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2121,6 +2106,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2254,7 +2240,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2263,8 +2255,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2296,7 +2288,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2352,7 +2344,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2397,7 +2388,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2450,7 +2441,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2862,7 +2853,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2950,14 +2941,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3116,7 +3109,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3424,6 +3417,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3512,17 +3514,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3543,7 +3543,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3615,7 +3615,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3648,160 +3648,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3834,19 +3826,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3915,9 +3907,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3931,36 +3923,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4015,6 +4007,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4035,46 +4030,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4083,82 +4087,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4958,7 +4974,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5037,7 +5053,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5166,7 +5182,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5365,9 +5381,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5383,7 +5398,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5590,9 +5605,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5610,7 +5625,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5695,10 +5710,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5737,30 +5752,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5880,123 +5895,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6096,7 +6111,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6130,7 +6145,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6162,7 +6177,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6216,9 +6231,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6234,8 +6249,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6245,24 +6260,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6314,7 +6360,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6614,7 +6660,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6720,7 +6766,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6806,7 +6851,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7425,7 +7470,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7434,7 +7479,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7539,7 +7584,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7563,15 +7608,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7644,7 +7689,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7694,17 +7739,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7762,6 +7804,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7899,7 +7942,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7982,7 +8025,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8041,7 +8084,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8102,7 +8145,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8225,7 +8268,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8364,7 +8406,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8456,8 +8498,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8466,8 +8508,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8485,7 +8527,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8865,9 +8907,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9092,13 +9134,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9111,7 +9151,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9353,31 +9392,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9393,12 +9432,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9413,18 +9451,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9448,10 +9485,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9481,7 +9517,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9490,210 +9526,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10359,7 +10411,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10472,6 +10523,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10503,26 +10566,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10547,12 +10590,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10560,40 +10597,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10744,7 +10781,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10988,29 +11025,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11065,71 +11102,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11172,6 +11176,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11875,7 +11912,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11889,12 +11926,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11920,10 +11956,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11979,12 +12013,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12001,12 +12035,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12014,7 +12048,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12022,7 +12056,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12038,12 +12072,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12122,7 +12156,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12374,8 +12408,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12541,7 +12576,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12552,6 +12587,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13163,15 +13210,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13250,7 +13297,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13260,7 +13307,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13348,7 +13395,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13357,7 +13404,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13669,7 +13716,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13680,19 +13727,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13700,15 +13747,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13717,62 +13777,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13942,9 +14010,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14284,21 +14349,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14483,80 +14548,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15431,32 +15496,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15472,61 +15537,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15550,7 +15615,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16490,46 +16554,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16854,7 +16918,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17308,8 +17372,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17436,97 +17500,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17789,11 +17853,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17992,32 +18056,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18100,7 +18164,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18123,8 +18187,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18878,8 +18943,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18889,28 +18954,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18919,57 +18984,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18978,7 +19043,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18987,7 +19052,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19479,6 +19544,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19537,64 +19606,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19700,7 +19777,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19713,10 +19789,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19730,11 +19804,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20228,10 +20302,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20287,9 +20361,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20349,13 +20423,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20716,67 +20790,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21020,8 +21094,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21287,154 +21361,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21523,7 +21597,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21533,97 +21607,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21766,7 +21840,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21849,33 +21924,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21884,69 +21981,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21961,37 +22062,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22344,7 +22442,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23531,7 +23629,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23627,7 +23725,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23635,7 +23734,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23669,34 +23768,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23749,61 +23849,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23813,7 +23918,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23822,20 +23927,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23950,15 +24055,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23998,101 +24101,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24216,6 +24317,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24232,6 +24343,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24241,6 +24357,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24607,6 +24743,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26166,8 +26303,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26491,17 +26628,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26510,17 +26644,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26529,17 +26660,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26549,17 +26677,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26568,12 +26693,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27354,11 +27477,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27407,7 +27534,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27500,16 +27627,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28078,6 +28204,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28120,6 +28280,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28154,58 +28316,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28283,231 +28455,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28706,6 +28661,500 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +msgid "Validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28896,10 +29345,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29125,6 +29579,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30287,7 +30749,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30331,11 +30793,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31384,7 +31841,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31418,6 +31874,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31769,7 +32236,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31962,7 +32428,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -31995,6 +32461,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33000,11 +33474,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33050,44 +33521,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33852,8 +34336,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33863,6 +34356,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33900,10 +34394,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34194,6 +34690,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34205,6 +34702,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34233,6 +34731,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34592,63 +35091,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -34981,11 +35423,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35813,6 +36257,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35939,12 +36391,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36080,9 +36532,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36125,19 +36576,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36146,7 +36607,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36273,31 +36734,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36919,6 +37355,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37199,7 +37639,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37230,7 +37670,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37905,9 +38345,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38154,6 +38600,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39151,8 +39605,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39244,39 +39698,47 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 -msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgid "Name of data layers to import" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42407,8 +42869,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42446,6 +42908,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42843,6 +43306,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42892,6 +43362,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42927,6 +43409,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43329,8 +43841,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44050,6 +44562,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44329,6 +44845,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44745,10 +45265,84 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45232,17 +45826,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45266,22 +45850,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45291,9 +45872,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45310,13 +45890,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45326,14 +45904,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45366,14 +45942,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45384,26 +45952,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45447,15 +46011,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45473,7 +46028,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45483,48 +46037,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45532,101 +46077,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46799,6 +47266,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46821,6 +47296,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46910,278 +47393,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47510,8 +47993,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47591,166 +48074,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48538,11 +48861,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53289,6 +53607,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53819,8 +54176,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54121,8 +54478,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54302,7 +54659,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54316,7 +54673,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54846,7 +55203,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55136,7 +55493,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55226,49 +55583,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55278,33 +55631,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55341,7 +55694,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55418,178 +55771,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56066,7 +56419,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56304,11 +56657,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56335,7 +56688,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56344,7 +56697,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56364,7 +56717,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56400,11 +56753,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56439,13 +56792,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56460,12 +56817,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57633,7 +57990,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58256,7 +58613,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58563,12 +58920,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58768,19 +59125,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -58989,7 +59346,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59147,10 +59504,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59189,6 +59546,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59289,9 +59650,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59305,7 +59666,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59390,7 +59751,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59418,8 +59778,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -60039,7 +60399,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60173,8 +60533,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -61952,17 +62312,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62138,13 +62498,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62390,42 +62750,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63407,16 +63771,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -64842,66 +65196,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65190,7 +65544,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65647,164 +66001,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -65981,27 +66335,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -66068,274 +66445,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66344,51 +66721,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66544,10 +66921,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66711,7 +67098,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -66719,7 +67106,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66727,7 +67114,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67713,6 +68100,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68281,6 +68672,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -68844,7 +69252,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -69083,22 +69491,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71127,38 +71528,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71238,11 +71639,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71267,103 +71668,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71375,336 +71776,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -71757,50 +72158,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -71828,13 +72229,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -71891,85 +72292,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -72015,28 +72416,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -72093,27 +72494,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -72123,7 +72524,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72133,14 +72533,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72148,72 +72548,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72440,7 +72840,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72458,64 +72858,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72655,79 +73056,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -72839,40 +73240,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -72908,7 +73309,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -72919,34 +73320,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -73038,34 +73439,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73144,316 +73545,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73461,60 +73862,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73566,27 +73967,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73632,16 +74043,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73712,41 +74113,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -73794,15 +74202,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grassmods_sl.po b/locale/po/grassmods_sl.po index be7377cdfac..50521e92789 100644 --- a/locale/po/grassmods_sl.po +++ b/locale/po/grassmods_sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_sl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2005-06-10 11:15+0200\n" "Last-Translator: Miha Staut \n" "Language-Team: Slovenščina \n" @@ -87,7 +87,7 @@ msgstr "Tip objektov" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 #, fuzzy msgid "settings" @@ -131,32 +131,33 @@ msgid "Print current connection parameters and exit" msgstr "Izpiši trenutne parametre povezave in končaj" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -182,21 +183,21 @@ msgstr "Izpiši trenutne parametre povezave in končaj" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -276,7 +277,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -301,7 +302,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -312,7 +313,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -334,7 +335,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -491,6 +492,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -510,7 +512,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -529,7 +530,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -543,6 +543,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -577,7 +578,7 @@ msgstr "Ime obstoječega rastrskega sloja." #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -587,8 +588,8 @@ msgstr "Ime obstoječega rastrskega sloja." #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -603,21 +604,21 @@ msgstr "Ime obstoječega rastrskega sloja." #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, fuzzy, c-format, python-format msgid "Raster map <%s> not found" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." @@ -626,7 +627,7 @@ msgstr "Ne najdem vhodnega rastrskega sloja <%s>." #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -661,7 +662,6 @@ msgstr "Ne najdem vhodnega rastrskega sloja <%s>." #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -674,7 +674,6 @@ msgstr "Ne najdem vhodnega rastrskega sloja <%s>." #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -713,6 +712,7 @@ msgstr "Ne najdem vhodnega rastrskega sloja <%s>." #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -734,7 +734,7 @@ msgstr "Ne najdem vhodnega rastrskega sloja <%s>." #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -800,7 +800,7 @@ msgstr "Ne najdem vhodnega rastrskega sloja <%s>." #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -815,7 +815,7 @@ msgstr "Ime obstoječega rastrskega sloja." #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -828,8 +828,8 @@ msgstr "Ime obstoječega rastrskega sloja." #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, fuzzy, c-format, python-format msgid "Vector map <%s> not found" @@ -845,16 +845,16 @@ msgstr "Ime izhodnega vektorskega točkovnega sloja" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -900,7 +900,7 @@ msgstr "Ime izhodnega vektorskega točkovnega sloja" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -916,7 +916,7 @@ msgstr "Ime izhodnega rastrskega sloja" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -925,7 +925,7 @@ msgstr "Ime izhodnega rastrskega sloja" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -955,13 +955,13 @@ msgstr "Ime izhodnega rastrskega sloja" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, fuzzy, c-format, python-format @@ -989,7 +989,7 @@ msgstr "Povezava z bazo podatkov ni definirana\n" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -1004,8 +1004,8 @@ msgstr "Ne morem zagnati gonilnika '%s'." #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1039,10 +1039,10 @@ msgstr "Ne morem zagnati gonilnika '%s'." #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, fuzzy, c-format @@ -1050,7 +1050,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "Ne morem odpreti baze podatkov %s z gonilnikom %s" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1080,23 +1080,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "Ime izhodnega rastrskega sloja" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, fuzzy, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "Ime rastrskega sloja" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, fuzzy, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "Ime rastrskega sloja" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 #, fuzzy msgid "Supported formats:" msgstr "Izpiši podprte formate in končaj" @@ -1181,13 +1181,14 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" -msgstr "" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +#, fuzzy +msgid "Default region for this project updated" +msgstr "Ime izhodnega rastrskega sloja" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 #, fuzzy msgid "Region for the current mapset updated" msgstr "Ime izhodnega rastrskega sloja" @@ -1241,6 +1242,7 @@ msgstr "Ime izhodnega rastrskega sloja" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1305,6 +1307,12 @@ msgstr "Rastrski sloj, ki ga nameravate uvoziti" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1370,14 +1378,13 @@ msgstr "Rastrski sloj, ki ga nameravate uvoziti" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1430,152 +1437,140 @@ msgstr "Naslov izhodnega rastrskega sloja" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 #, fuzzy msgid "List supported formats and exit" msgstr "Izpiši podprte formate in končaj" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 #, fuzzy -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "Povozi projekcijo (uporabi projekcijo lokacije)" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 #, fuzzy -msgid "Assume that the dataset has same projection as the current location" +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 #, fuzzy msgid "Perform projection check only and exit" msgstr "Izpiši trenutne parametre povezave in končaj" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 #, fuzzy msgid "Extend region extents based on new dataset" msgstr "Razširi obseg lokacije glede na nov \"dataset\"" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 #, fuzzy msgid "List available bands including band type in dataset and exit" msgstr "Izpiši rastrske sloje v vhodni \"location\" in končaj" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, fuzzy, c-format msgid "%s= or %s= must be given" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 #, fuzzy msgid "Unable to get current working directory" msgstr "ne morem posodobiti meja" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 #, fuzzy msgid "Proceeding with import..." msgstr "Berem dig_att datoteko...\n" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, fuzzy, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "Ime izhodnega vektorskega sloja" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, fuzzy, c-format msgid "Reading band %d of %d..." msgstr "Rastrski sloj nadmorskih višin" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, fuzzy, c-format msgid "Selected band (%d) does not exist" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, fuzzy, c-format msgid "Imagery group <%s> created" msgstr "dig_att datoteka ne obstaja." @@ -1593,36 +1588,35 @@ msgstr "" msgid "No projection information available" msgstr "Izpiši etikete kategorij" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." -msgstr "" +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." +msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, fuzzy, c-format -msgid "Unable to create new location <%s>" -msgstr "Ne morem ustvariti tabele: %s" +msgid "Unable to create new project <%s>" +msgstr "Ime izhodnega rastrskega sloja" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, fuzzy, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "ne morem odpreti %s" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 #, fuzzy msgid "Unable to convert input map projection information to GRASS format." msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1631,60 +1625,62 @@ msgstr "\"Location\" vhodnega sloja" msgid "Over-riding projection check" msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 #, fuzzy msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" "Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " "\"location\"" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 #, fuzzy -msgid "Location PROJ_INFO is:\n" +msgid "Project PROJ_INFO is:\n" msgstr "ne morem odpreti %s" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 #, fuzzy -msgid "Projection of input dataset and current location appear to match" +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" "Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " "\"location\"" @@ -1771,12 +1767,10 @@ msgstr "Ime izhodne datoteke" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1820,7 +1814,7 @@ msgstr "Število željenih točk" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1838,7 +1832,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1890,24 +1884,18 @@ msgstr "Ime rastrskega sloja nadmorskih višin" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 #, fuzzy msgid "Outputs" msgstr "Izhodni sloj" @@ -2031,7 +2019,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -2041,7 +2029,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2172,7 +2159,7 @@ msgstr "Izpiši le tip podatkovnega zapisa rastrskega sloja" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2202,6 +2189,7 @@ msgstr "Ne morem izračunati centroida območja." #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2345,7 +2333,13 @@ msgstr "Število točk najbližjih točk, ki bodo upoštevane" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2355,8 +2349,8 @@ msgid "The minimum number of input raster maps is two" msgstr "Ime vhodnega rastrskega sloja" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2389,7 +2383,7 @@ msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" msgid "Statistics for <%s> updated" msgstr "Rastrski sloj za površino" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2453,7 +2447,6 @@ msgstr "Uporabiš lahko ali 'from_table' ali 'select'" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 #, fuzzy msgid "resample" msgstr "Rastrski sloj, ki ga želite rekodirati" @@ -2503,7 +2496,7 @@ msgid "Unknown method <%s>" msgstr "Nepoznan tip: %c" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, fuzzy, c-format msgid "Unable to read color table for %s" @@ -2560,7 +2553,7 @@ msgstr "Število točk najbližjih točk, ki bodo upoštevane" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, fuzzy, c-format msgid "Please specify %s= or %s=" msgstr "Vhodni rastrski sloj" @@ -3011,7 +3004,7 @@ msgstr "Rišem ..." msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, fuzzy, c-format msgid "Writing output raster map <%s>..." @@ -3099,14 +3092,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3276,7 +3271,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3610,6 +3605,15 @@ msgstr "Izhodni rastrski sloj vpadnega kota sončnih žarkov" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3698,17 +3702,15 @@ msgstr "Izhodni rastrski sloj vpadnega kota sončnih žarkov" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3729,7 +3731,7 @@ msgstr "Izhodni rastrski sloj vpadnega kota sončnih žarkov" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 #, fuzzy msgid "Output" msgstr "Izhodni sloj" @@ -3809,7 +3811,7 @@ msgstr "Lokalni (solarni) čas [ure v decimalkah]" msgid "Number of threads which will be used for parallel computing" msgstr "Število nivojev, ki bo uporabljeno za vsako komponento" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "Koeficient korak razdalje vzorčenja (0.5 do 1.5)" @@ -3843,7 +3845,7 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, fuzzy, c-format msgid "Number of threads <%d>" msgstr "" @@ -3851,161 +3853,159 @@ msgstr "" "\n" " Število točk: %d\n" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 #, fuzzy msgid "Error reading civil time zone value" msgstr "Napaka pri branju dbmscap datoteke\n" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 #, fuzzy msgid "Invalid civil time zone value" msgstr "Izpiše osnovne statistike za rastrske sloje" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 #, fuzzy msgid "Error reading time step size" msgstr "Napaka pri branju dbmscap datoteke\n" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 #, fuzzy msgid "Invalid time step size" msgstr "neveljavna regija: %s" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 #, fuzzy msgid "Error reading horizon step size" msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, fuzzy, c-format +#: ../raster/r.sun/main.c:698 +#, fuzzy msgid "Using Linke constant: %lf" msgstr "Uporabljam koordinate središča sloja\n" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, fuzzy, c-format msgid "Using Linke map <%s>" msgstr "izhodni rastrski sloj" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, fuzzy, c-format msgid "Using albedo map <%s>" msgstr "neveljavna regija: %s" -#: ../raster/r.sun/main.c:710 -#, fuzzy, c-format +#: ../raster/r.sun/main.c:714 +#, fuzzy msgid "Using slope constant: %lf" msgstr "Uporabljam koordinate središča sloja\n" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, fuzzy, c-format msgid "Using slope map <%s>" msgstr "izhodni rastrski sloj" -#: ../raster/r.sun/main.c:719 -#, fuzzy, c-format +#: ../raster/r.sun/main.c:723 +#, fuzzy msgid "Using aspect constant: %lf" msgstr "Uporabljam koordinate središča sloja\n" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, fuzzy, c-format msgid "Using aspect map <%s>" msgstr "izhodni rastrski sloj" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" -msgstr "" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" +msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" -msgstr "" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" +msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" -msgstr "" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" +msgstr "Ime izhodnega sloja" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 #, fuzzy msgid "Unable to initialize coordinate transformation" msgstr "Ne morem ustvariti tabele: %s" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -4038,19 +4038,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -4123,9 +4123,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 #, fuzzy msgid "Raster mode" msgstr "Ime rastrskega sloja" @@ -4140,36 +4140,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4224,6 +4224,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4245,51 +4248,64 @@ msgstr "" msgid "Optional" msgstr "Ime izhodnega rastrskega sloja" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 #, fuzzy msgid "Point mode" msgstr "Vpiši ime sloja" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Izhodni sloj" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" "Ime izhodnega rastrskega sloja (uporabi output=- za standardni izhod " "(stdout))" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "" +"Vključi etikete kategorij v izhod\n" +"izpis naj ne vsebuje imen kolon" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 #, fuzzy msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "EASTING in NORTHING koordinate začetne točke" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 #, fuzzy msgid "Coordinates are outside of the current region" msgstr "Uporabi trenutno regijo" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4298,87 +4314,99 @@ msgstr "Uporabi trenutno regijo" msgid "Unable to open file <%s>" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 #, fuzzy msgid "You specify a start grater than the end angle. Aborting." msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 #, fuzzy msgid "You didn't specify an angle step size. Aborting." msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 #, fuzzy msgid "Could not read bufferzone size. Aborting." msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, fuzzy, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 #, fuzzy msgid "east" msgstr "Ime rastrskega sloja" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 #, fuzzy msgid "Could not read maximum distance. Aborting." msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, fuzzy, c-format msgid "Error in %s" msgstr "Napaka: %s" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, fuzzy, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "Ne morem odpreti baze podatkov %s" @@ -5235,7 +5263,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 #, fuzzy msgid "Attributes" msgstr "Ne ustvari tabele z atributi." @@ -5321,7 +5349,7 @@ msgstr "ne morem posodobiti meja" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, fuzzy, c-format msgid "Unable to grant privileges on table <%s>" msgstr "Ne morem ti garantirati (grant) privilegijev nad tabelo %s" @@ -5460,7 +5488,7 @@ msgstr "Nisem mogel odpreti vhodne datoteke dig_att." #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5681,10 +5709,9 @@ msgid "Cannot open file %s for reading" msgstr "Ne morem odpreti cellfile za [%s]" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 #, fuzzy -msgid "GRASS LOCATION PROJ_INFO is:\n" +msgid "GRASS project PROJ_INFO is:\n" msgstr "ne morem odpreti %s" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5701,7 +5728,7 @@ msgstr "ne morem odpreti %s" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5936,9 +5963,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 #, fuzzy msgid "Transform" @@ -5958,7 +5985,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -6043,10 +6070,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -6090,31 +6117,31 @@ msgstr "Izpiše osnovne statistike za rastrske sloje" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 #, fuzzy msgid "Projection" msgstr "Rišem ..." -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -6248,133 +6275,133 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 #, fuzzy msgid "Print LAS file info and exit" msgstr "Izpiši le tip podatkovnega zapisa rastrskega sloja" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Izpiši trenutne parametre povezave in končaj" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, fuzzy, c-format msgid "File <%s> does not exist" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, fuzzy, c-format msgid "Input file <%s> does not exist" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 #, fuzzy msgid "Output map type set to CELL" msgstr "%d raster%s, %d vektor%s\n" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, fuzzy, c-format msgid "Invalid input <%s=%s>" msgstr "neveljavna regija: %s" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, fuzzy, c-format msgid "Option '%s' must be > 0.0" msgstr "ne morem odpreti %s" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 #, fuzzy msgid "Reading data..." msgstr "Rišem ..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Povozi projekcijo (uporabi projekcijo lokacije)" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 #, fuzzy msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "Povozi projekcijo (uporabi projekcijo lokacije)" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 #, fuzzy msgid "The input dataset has undefined projection" msgstr "Določena ni bila nobena vhodna datoteka." -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Zapisujem novo datoteko...\n" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 #, fuzzy msgid "Writing output raster map..." msgstr "Ime izhodnega rastrskega sloja" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 #, fuzzy msgid " points found in input file(s)" msgstr "Uporabi trenutno regijo" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "dig_att datoteka ne obstaja." @@ -6483,7 +6510,7 @@ msgstr "Uporabiš lahko ali 'from_table' ali 'select'" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, fuzzy, c-format msgid "-%c and %s= are mutually exclusive" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" @@ -6519,7 +6546,7 @@ msgstr "Naslov izhodnega rastrskega sloja" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6551,7 +6578,7 @@ msgstr "Vrednost, ki bo prirejena NULL vrednosti" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, fuzzy, c-format msgid "Error writing temporary file <%s>" msgstr "Napaka pri branju dbmscap datoteke\n" @@ -6610,9 +6637,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "Število točk najbližjih točk, ki bodo upoštevane" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6629,8 +6656,8 @@ msgstr "Število točk najbližjih točk, ki bodo upoštevane" msgid "surface" msgstr "Najmanjša vrednost plastnice" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6641,14 +6668,14 @@ msgstr "Najmanjša vrednost plastnice" msgid "random" msgstr "Tip objektov" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 #, fuzzy msgid "Generates a raster map using gaussian random number generator." msgstr "" "Izdela rastrski sloj z s stičnimi (contiguous) območji povečanimi za eno " "celico" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 #, fuzzy msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " @@ -6657,14 +6684,46 @@ msgstr "" "Izdela rastrski sloj uniformnih naključnih vrednosti, katerih rang lahko\n" "določi uporabnik." -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "Aritmetična sredina porazdelitve" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Standardni odklon" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +#, fuzzy +msgid "Seed for random number generator" +msgstr "Nepoznan tip" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 #, fuzzy @@ -6729,7 +6788,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -7042,7 +7101,7 @@ msgstr "Ime vhodnega rastrskega sloja" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -7159,7 +7218,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 #, fuzzy msgid "geomorphology" @@ -7257,7 +7315,7 @@ msgstr "" #: ../raster/r.param.scale/main.c:39 #, fuzzy -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "Tip zapisa kolone ni podprt" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7931,7 +7989,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "ne najdem 3Dview datoteke <%s>" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 #, fuzzy msgid "No raster map name found in input file" msgstr "Vhodni rastrski sloj" @@ -7942,7 +8000,7 @@ msgid "Only one raster map name found in input file" msgstr "Vhodni rastrski sloj" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 #, fuzzy msgid "Raster map not found" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." @@ -8061,7 +8119,7 @@ msgid "longitude" msgstr "Rastrski sloj nadmorskih višin" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -8089,17 +8147,17 @@ msgstr "Izhodni rastrski sloj" msgid "Longitude output" msgstr "Rastrski sloj nadmorskih višin" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 #, fuzzy msgid "Unable to get projection info of current location" msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 #, fuzzy msgid "Unable to get projection units of current location" msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 #, fuzzy msgid "Unable to get projection key values of current location" msgstr "Ime izhodnega sloja" @@ -8181,7 +8239,7 @@ msgstr "Uporabi pokrovne vrednosti iz etiket pokrovnega sloja" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -8234,17 +8292,15 @@ msgid "Output raster map required" msgstr "Naslov izhodnega rastrskega sloja" #: ../raster/r.random.surface/init.c:138 -#, fuzzy, c-format +#, fuzzy msgid "Distance value (%d): %lf must be >= 0.0" msgstr "navedena morata biti 2 sloja" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -8307,6 +8363,7 @@ msgstr "Berem dig_att datoteko...\n" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 #, fuzzy msgid "regression" @@ -8453,7 +8510,7 @@ msgstr "uvožena bo SURFER (Golden Software) ascii grid datoteka" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, fuzzy, c-format msgid "Unable to open temporary file <%s>" @@ -8546,7 +8603,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, fuzzy, c-format msgid "Raster map <%s> created." @@ -8610,7 +8667,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, fuzzy, c-format msgid "3D raster map <%s> not found" @@ -8676,7 +8733,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, fuzzy, c-format msgid "Raster <%s> type mismatch" msgstr "dig_att datoteka ne obstaja." @@ -8808,7 +8865,6 @@ msgid "Calculating flow directions..." msgstr "Izračunavam sence iz DMR..." #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8959,7 +9015,7 @@ msgstr "Uporabi filter le na podatkih z vrednostjo nič (zero)" msgid "<%d> is not valid number of threads." msgstr "Število točk najbližjih točk, ki bodo upoštevane" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 #, fuzzy msgid "Raster map too small for the size of the filter" msgstr "Ime rastrskega sloja iz katerega kopirati barvno paleto" @@ -9059,8 +9115,8 @@ msgstr "Delež sloja, ki ga ohranjati v spominu računalnika" msgid "Pth percentile of the values" msgstr "Enote za naklon" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -9069,8 +9125,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 #, fuzzy msgid "In scan mode, print using shell script style" @@ -9089,7 +9145,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 #, fuzzy msgid "Invalid zrange" msgstr "neveljavna regija: %s" @@ -9483,9 +9539,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, fuzzy, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "Tip zapisa kolone ni podprt" #: ../raster/r.solute.transport/main.c:259 @@ -9721,13 +9777,12 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, fuzzy, c-format +#, fuzzy msgid "Root Mean Square (RMS) = %.5lf" msgstr "Uporabi trenutno regijo" @@ -9740,7 +9795,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -10003,31 +10057,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, fuzzy, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, fuzzy, c-format msgid "Either %s= or %s=/%s= required" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, fuzzy, c-format msgid "Both %s= and %s= required" msgstr "ne morem odpreti %s" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 #, fuzzy msgid "At least one filter must be finite" msgstr "navedena morata biti 2 sloja" @@ -10044,13 +10098,12 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 #, fuzzy -msgid "create location" +msgid "create project" msgstr "lokacija baze podatkov" #: ../raster/r.in.gdal/main.c:118 @@ -10068,20 +10121,19 @@ msgstr "Rastrski sloj, ki ga nameravate uvoziti" msgid "Band(s) to select (default is all bands)" msgstr "Izbrani pas (privzeto: vsi pasovi)" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 #, fuzzy -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "Ime izhodnega rastrskega sloja" #: ../raster/r.in.gdal/main.c:143 #, fuzzy -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" "Ime lokacije (location) iz katere naj povzamem projekcijo za GCP " "transformacijo" @@ -10109,10 +10161,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "Ime rastrskega sloja nadmorskih višin" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "Ime nove lokacije (location), ki bo ustvarjena" #: ../raster/r.in.gdal/main.c:195 @@ -10146,7 +10198,7 @@ msgstr "Spisek vrednosti deljenih z vejico: npr. 1.4,3.8,13" msgid "GDAL dataset open options" msgstr "Rastrski sloj, ki ga nameravate uvoziti" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -10156,222 +10208,240 @@ msgstr "Rastrski sloj, ki ga nameravate uvoziti" msgid "Region" msgstr "Berem dig datoteko...\n" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 #, fuzzy msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "Y koordinata oziroma geografska širina" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "Ohrani števila za imena pasov namesto imena barv" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 #, fuzzy msgid "Limit import to the current region" msgstr "Uporabi trenutno regijo" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 #, fuzzy msgid "Print number of bands and exit" msgstr "izpiši tabele in končaj" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, fuzzy, c-format msgid "No raster bands found in <%s>" msgstr "Vhodni rastrski sloj" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, fuzzy, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "Ime izhodnega vektorskega sloja" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, fuzzy, c-format msgid "Raster map <%s> already exists" msgstr "dig_att datoteka ne obstaja." -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 #, fuzzy msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "Vhodni sloj vsebuje linije." -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, fuzzy, c-format msgid "Importing %d raster bands..." msgstr "izhodni rastrski sloj" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 #, fuzzy msgid "Unable to open the map names output text file" msgstr "Nisem mogel odpreti vhodne datoteke dig_att." -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, fuzzy, c-format msgid "Unable to get raster band number %d" msgstr "Ime rastrskega sloja" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, fuzzy, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "Ne morem odpreti baze podatkov %s" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 #, fuzzy msgid "Re-projecting GCPs table:" msgstr "Zapisujem novo datoteko...\n" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, fuzzy, c-format msgid "* Input projection for GCP table: %s" msgstr "Ime izhodnega rastrskega sloja smeri toka" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, fuzzy, c-format msgid "* Output projection for GCP table: %s" msgstr "Ime izhodnega rastrskega sloja smeri toka" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "\"Location\" vhodnega sloja" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 #, fuzzy msgid "Unable to translate projection key values of input GCPs" msgstr "Ime izhodnega sloja" -#: ../raster/r.in.gdal/main.c:1137 +#: ../raster/r.in.gdal/main.c:1134 #, fuzzy -msgid "Unable to get projection info of target location" +msgid "Unable to get CRS info of target project" msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.in.gdal/main.c:1140 +#: ../raster/r.in.gdal/main.c:1136 #, fuzzy -msgid "Unable to get projection units of target location" +msgid "Unable to get CRS units of target project" msgstr "\"Location\" vhodnega sloja" -#: ../raster/r.in.gdal/main.c:1143 +#: ../raster/r.in.gdal/main.c:1138 #, fuzzy -msgid "Unable to get projection key values of target location" +msgid "Unable to get CRS key values of target project" msgstr "Ime izhodnega sloja" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, fuzzy, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "ne najdem 3Dview datoteke <%s>" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 #, fuzzy msgid "not found" msgstr "Ne najdem rastrskega sloja <%s>" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, fuzzy, c-format msgid "Importing raster map <%s>..." msgstr "izhodni rastrski sloj" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 #, fuzzy msgid "Invalid row" msgstr "neveljavna regija: %s" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, fuzzy, c-format msgid "Unable to read row %d" msgstr "ne morem odpreti razpona za datoteko %s" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, fuzzy, c-format msgid "Unable to open file <%s>: %s." msgstr "Ne morem odpreti cellfile za [%s]" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "\"Location\" vhodnega sloja" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 #, fuzzy msgid "rclist out of memory" @@ -11078,7 +11148,7 @@ msgid "Number of intermediate images to produce" msgstr "Željeno število vmesnih slojev" #: ../raster/r.surf.fractal/main.c:75 -#, fuzzy, c-format +#, fuzzy msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "Fraktalna dimenzija površine (2 < D < 3)" @@ -11209,6 +11279,18 @@ msgstr " Število vrstic\n" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -11241,27 +11323,6 @@ msgstr "Vhodni rastrski sloj(i)" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -#, fuzzy -msgid "Seed for random number generator" -msgstr "Nepoznan tip" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -11287,12 +11348,6 @@ msgstr "Število nivojev, ki bo uporabljeno za vsako komponento" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -11300,8 +11355,8 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, fuzzy, c-format msgid "Number of threads: %d" msgstr "" @@ -11309,36 +11364,36 @@ msgstr "" "\n" " Število točk: %d\n" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 #, fuzzy msgid "You are not outputting any raster or site files" msgstr "Ime izhodnega vektorskega sloja" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 #, fuzzy msgid "Input failed" msgstr "Vhodni sloj" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 #, fuzzy msgid "Cannot write raster maps" msgstr "Ne morem odpreti baze podatkov %s" @@ -11502,7 +11557,7 @@ msgstr "" msgid "Time-series output" msgstr "Prepiši izhod" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 #, fuzzy msgid "You are not outputting any raster maps" msgstr "Ime izhodnega vektorskega sloja" @@ -11779,30 +11834,30 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 #, fuzzy msgid "Weights must be positive" msgstr "Velikost okolice (neighbourhood)" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, fuzzy, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "Berem dig_att datoteko...\n" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, fuzzy, c-format msgid "Unable to open input raster <%s>" msgstr "ne morem odpreti <%s>" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11861,7 +11916,7 @@ msgstr "ne morem odpreti %s" msgid "Option %s must be an integer, <%s> provided" msgstr "Velikost okolice (neighbourhood)" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 #, fuzzy msgid "" "Produces a raster surface map of uniform random deviates with defined range." @@ -11869,115 +11924,115 @@ msgstr "" "Izdela rastrski sloj uniformnih naključnih vrednosti, katerih rang lahko\n" "določi uporabnik." -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "Najmanjša naključna vrednost" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "Največja naključna vrednost" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 #, fuzzy msgid "Create an integer raster map" msgstr "izhodni rastrski sloj" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 +#: ../raster/r.flow/mem.c:40 +#, fuzzy, c-format +msgid "Unable to write segment file for %s" +msgstr "Vrednost, ki bo prirejena NULL vrednosti" + +#: ../raster/r.flow/precomp.c:47 +#, fuzzy +msgid "Precomputing e/w distances..." +msgstr "Sloji za izračun med-razrednih razdalj" + +#: ../raster/r.flow/precomp.c:49 +#, fuzzy +msgid "Precomputing quantization tolerances..." +msgstr "Kopiranje tabele ni bilo uspešno" + +#: ../raster/r.flow/precomp.c:52 +msgid "Precomputing inverted elevations..." +msgstr "" + +#: ../raster/r.flow/precomp.c:56 +msgid "Precomputing interpolated border elevations..." +msgstr "" + +#: ../raster/r.flow/precomp.c:62 +#, fuzzy +msgid "Precomputing re-oriented aspects..." +msgstr "Sloji za izračun med-razrednih razdalj" + +#: ../raster/r.flow/precomp.c:66 +#, fuzzy +msgid "Precomputing aspects..." +msgstr "Sloji za izračun med-razrednih razdalj" + +#: ../raster/r.flow/precomp.c:109 +#, c-format +msgid "" +"Resolution too unbalanced:\n" +"atan2(%f deg, %f deg) =%f < %f tolerance\n" +"please resample input map" +msgstr "" + +#: ../raster/r.flow/precomp.c:114 +#, c-format +msgid "Resolution too unbalanced (%f x %f); please resample input map" +msgstr "" + +#: ../raster/r.flow/flow_io.c:89 #, fuzzy msgid "Elevation raster map resolution differs from current region resolution" msgstr "Resolucija vzdolž linije (privzeta = trenutna resolucija regije)" -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 #: ../raster/r.buffer/read_map.c:51 #, fuzzy, c-format msgid "Reading input raster map <%s>..." msgstr "Berem dig_att datoteko...\n" -#: ../raster/r.flow/io.c:107 +#: ../raster/r.flow/flow_io.c:107 #, fuzzy msgid "Resolution of aspect file differs from current region resolution" msgstr "Resolucija vzdolž linije (privzeta = trenutna resolucija regije)" -#: ../raster/r.flow/io.c:124 +#: ../raster/r.flow/flow_io.c:124 msgid "Reading input files: barrier" msgstr "" -#: ../raster/r.flow/io.c:152 +#: ../raster/r.flow/flow_io.c:152 #, fuzzy, c-format msgid "Cannot create segment file %s" msgstr "Ne morem ustvariti tabele: %s" -#: ../raster/r.flow/io.c:157 +#: ../raster/r.flow/flow_io.c:157 #, fuzzy, c-format msgid "Cannot format segment file %s" msgstr "Ne morem odpreti baze podatkov %s" -#: ../raster/r.flow/io.c:163 +#: ../raster/r.flow/flow_io.c:163 #, fuzzy, c-format msgid "Cannot open segment file %s" msgstr "ne morem odpreti razpona za datoteko %s" -#: ../raster/r.flow/mem.c:40 -#, fuzzy, c-format -msgid "Unable to write segment file for %s" -msgstr "Vrednost, ki bo prirejena NULL vrednosti" - -#: ../raster/r.flow/precomp.c:47 -#, fuzzy -msgid "Precomputing e/w distances..." -msgstr "Sloji za izračun med-razrednih razdalj" - -#: ../raster/r.flow/precomp.c:49 -#, fuzzy -msgid "Precomputing quantization tolerances..." -msgstr "Kopiranje tabele ni bilo uspešno" - -#: ../raster/r.flow/precomp.c:52 -msgid "Precomputing inverted elevations..." -msgstr "" - -#: ../raster/r.flow/precomp.c:56 -msgid "Precomputing interpolated border elevations..." -msgstr "" - -#: ../raster/r.flow/precomp.c:62 -#, fuzzy -msgid "Precomputing re-oriented aspects..." -msgstr "Sloji za izračun med-razrednih razdalj" - -#: ../raster/r.flow/precomp.c:66 -#, fuzzy -msgid "Precomputing aspects..." -msgstr "Sloji za izračun med-razrednih razdalj" - -#: ../raster/r.flow/precomp.c:109 -#, c-format -msgid "" -"Resolution too unbalanced:\n" -"atan2(%f deg, %f deg) =%f < %f tolerance\n" -"please resample input map" -msgstr "" - -#: ../raster/r.flow/precomp.c:114 -#, c-format -msgid "Resolution too unbalanced (%f x %f); please resample input map" -msgstr "" - #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 #, fuzzy @@ -12743,7 +12798,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "Ne morem ustvariti tabele: %s" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -12759,15 +12814,14 @@ msgstr "Število točk najbližjih točk, ki bodo upoštevane" #: ../raster/r.proj/main.c:150 #, fuzzy -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" "Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " "\"location\"" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 #, fuzzy -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "\"Location\" vhodnega sloja" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -12797,10 +12851,9 @@ msgstr "Uporabi nastavitve trenutne regije" msgid "Name of input raster map to re-project" msgstr "Ime vhodnega rastrskega sloja" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "Pot do GRASS baze podatkov (izpiše se ob zagonu programa)" #: ../raster/r.proj/main.c:174 @@ -12863,13 +12916,13 @@ msgstr "Izpiše vrednosti v stilu lupinskega skripta" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 #, fuzzy -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "Vhodni sloj: lokacije pravih depresij" #: ../raster/r.proj/main.c:268 @@ -12889,12 +12942,12 @@ msgstr "Ime izhodnega sloja" #: ../raster/r.proj/main.c:289 #, fuzzy, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "ne najdem 3Dview datoteke <%s>" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, fuzzy, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "Vhodni rastrski sloj" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12902,7 +12955,7 @@ msgstr "Vhodni rastrski sloj" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, fuzzy, c-format, python-format msgid "Required parameter <%s> not set" @@ -12910,7 +12963,7 @@ msgstr "ne najdem 3Dview datoteke <%s>" #: ../raster/r.proj/main.c:315 #, fuzzy, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "Ime rastrskega sloja" #: ../raster/r.proj/main.c:323 @@ -12929,12 +12982,13 @@ msgid "Unable to get projection key values of input map" msgstr "Ime izhodnega sloja" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" -msgstr "" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" +msgstr "Ne morem ustvariti tabele: %s" #: ../raster/r.proj/main.c:379 #, fuzzy, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "ne najdem 3Dview datoteke <%s>" #: ../raster/r.proj/main.c:524 @@ -13018,7 +13072,7 @@ msgid "Sorting events..." msgstr "Zapiši vmesne točke v liniji." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -13282,8 +13336,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -13455,7 +13510,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -13466,6 +13521,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "\"Location\" vhodnega sloja" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "\"Location\" vhodnega sloja" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Ime izhodnega sloja" + #: ../raster/r.sunmask/main.c:122 #, fuzzy msgid "" @@ -14150,17 +14220,17 @@ msgstr "" #: ../raster/r.sunhours/main.c:221 #, fuzzy -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "\"Location\" vhodnega sloja" #: ../raster/r.sunhours/main.c:224 #, fuzzy -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "\"Location\" vhodnega sloja" #: ../raster/r.sunhours/main.c:228 #, fuzzy -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "Ime izhodnega sloja" #: ../raster/r.sunhours/main.c:367 @@ -14255,7 +14325,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -14265,7 +14335,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -14362,7 +14432,7 @@ msgstr "Ne morem odpreti baze podatkov %s" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, fuzzy, c-format msgid "Unable to create table: '%s'" msgstr "Ne morem odpreti cellfile za [%s]" @@ -14371,7 +14441,7 @@ msgstr "Ne morem odpreti cellfile za [%s]" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, fuzzy, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "ne morem odpreti <%s>" @@ -14724,7 +14794,7 @@ msgstr "" "\n" " Število točk: %d\n" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -14736,20 +14806,20 @@ msgstr "" msgid "position" msgstr "Ne najdem vhodne datoteke %s\n" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 #, fuzzy msgid "Queries raster maps on their category values and category labels." msgstr "Poizveduje po vrednostih in etiketah rastrskih slojev." -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Ime obstoječega rastrskega sloja(ev) za poizvedovanje" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Koordinate poizvedovanja" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -14758,16 +14828,29 @@ msgstr "Koordinate poizvedovanja" msgid "Query" msgstr "Tiho" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 #, fuzzy msgid "Name of vector points map for query" msgstr "Ime vhodnega rastrskega sloja" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -14776,65 +14859,75 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 #, fuzzy msgid "Output header row" msgstr "Ime izhodnega rastrskega sloja" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 #, fuzzy msgid "Show the category labels of the grid cell(s)" msgstr "Pokaže etiketo v mreži celic" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Izvozi \"integer\" vrednosti kategorije, ne pa vrednosti celic" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 #, fuzzy msgid "Show the category for vector points map" msgstr "Ime vhodnega rastrskega sloja" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, fuzzy, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "Ime izhodnega vektorskega sloja" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, fuzzy, c-format msgid "Unable to read category file for <%s>" msgstr "ne morem prebrati regije <%s> v <%s>" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +#, fuzzy +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "Ne morem izračunati centroida območja." + +#: ../raster/r.what/main.c:352 #, fuzzy, c-format msgid "Unable to read vector map <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, fuzzy, c-format msgid "%s %s is outside your current region" msgstr "Uporabi trenutno regijo" +#: ../raster/r.what/main.c:624 +#, fuzzy +msgid "Failed to initialize pretty JSON string." +msgstr "Ne morem izračunati centroida območja." + #: ../raster/r.in.mat/main.c:97 #, fuzzy msgid "Imports a binary MAT-File(v4) to a GRASS raster." @@ -15016,9 +15109,6 @@ msgstr "Izpiši sumo vrednosti za razrede" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -15394,21 +15484,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "Resolucija vzdolž linije (privzeta = trenutna resolucija regije)" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -15616,80 +15706,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "Anizotropni kot (v stopinjah)" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, fuzzy, c-format msgid "Wrong raster type: %s" msgstr "Nepoznan tip: %c" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, fuzzy, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, fuzzy, c-format msgid "Aspect raster map <%s> complete" msgstr "ne najdem 3Dview datoteke <%s>" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, fuzzy, c-format msgid "Slope raster map <%s> complete" msgstr "ne najdem 3Dview datoteke <%s>" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, fuzzy, c-format msgid "Profile curve raster map <%s> complete" msgstr "Ime izhodnega gonilnika" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, fuzzy, c-format msgid "Tangential curve raster map <%s> complete" msgstr "Ne morem odpreti baze podatkov %s" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, fuzzy, c-format msgid "E-W slope raster map <%s> complete" msgstr "ne najdem 3Dview datoteke <%s>" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, fuzzy, c-format msgid "N-S slope raster map <%s> complete" msgstr "ne najdem 3Dview datoteke <%s>" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, fuzzy, c-format msgid "Dxx raster map <%s> complete" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, fuzzy, c-format msgid "Dyy raster map <%s> complete" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, fuzzy, c-format msgid "Dxy raster map <%s> complete" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." @@ -16592,32 +16682,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -16633,61 +16723,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -16711,7 +16801,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -17792,46 +17881,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, fuzzy, c-format msgid "Calculation time: %g" msgstr "Izračunavam sence iz DMR..." -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, fuzzy, c-format msgid "Maximum difference between this and last increment: %g" msgstr "Največja razdalja med točkami in enotami karte." -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 #, fuzzy msgid "Unable to create and solve the linear equation system" msgstr "Ime rastrskega sloja" @@ -18186,7 +18275,7 @@ msgstr "Ustvari točke vzdolž vhodnih linij." #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 #, fuzzy msgid "Unable to create temporary vector map" msgstr "Ime izhodnega rastrskega sloja" @@ -18685,8 +18774,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -18827,98 +18916,98 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 #, fuzzy msgid "Use only valid points" msgstr "Zapisujem novo datoteko...\n" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, fuzzy, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, fuzzy, c-format msgid "Unable to read LAS header of <%s>" msgstr "ne morem odpreti razpona za datoteko %s" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, fuzzy, c-format msgid "Unknown filter option <%s>" msgstr "Nepoznan tip" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, fuzzy, c-format msgid "Invalid %s" msgstr "neveljavna regija: %s" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, fuzzy, c-format msgid "Pass #%d (of %d)..." msgstr "Ustvari točke vzdolž vhodnih linij." -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, fuzzy, c-format msgid "%lu points found in input file(s)" msgstr "Uporabi trenutno regijo" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, fuzzy, c-format msgid "%lu input points were invalid and filtered out" msgstr "Y koordinata oziroma geografska širina" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, fuzzy, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "naloženih je bilo %d točk\n" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, fuzzy, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "Uporabi trenutno regijo" @@ -19208,11 +19297,11 @@ msgstr "ne morem odpreti 3Dview datoteke <%s> v <%s>" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -19436,32 +19525,32 @@ msgstr "Velikost okolice (neighbourhood)" msgid "Neighborhood size must be odd" msgstr "Velikost okolice (neighbourhood)" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, fuzzy, c-format msgid "Computing %s weights..." msgstr "Kopiranje tabele ni bilo uspešno" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, fuzzy, c-format msgid "Opening selection map <%s>" msgstr "Zapisujem novo datoteko...\n" @@ -19555,7 +19644,7 @@ msgstr "" #: ../misc/m.measure/main.c:56 #, fuzzy -msgid "Default: location map units" +msgid "Default: project map units" msgstr "Največja razdalja med točkami in enotami karte." #: ../misc/m.measure/main.c:60 @@ -19581,8 +19670,9 @@ msgstr "Območje\n" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -20408,8 +20498,8 @@ msgid "Not enough points, %d are required" msgstr "Koordinate poizvedovanja" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, fuzzy, c-format msgid "Error conducting transform (%d)" msgstr "Izpiši etikete kategorij" @@ -20419,29 +20509,29 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 #, fuzzy msgid "No active control points" msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, fuzzy, c-format msgid "Invalid coordinates: [%s]" msgstr "neveljavna regija: %s" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -20450,65 +20540,65 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 #, fuzzy msgid "point index" msgstr "Rišem ..." #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 #, fuzzy msgid "source coordinates" msgstr "Uporabljam koordinate središča sloja\n" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 #, fuzzy msgid "destination coordinates" msgstr "X koordinata oziroma geografska dolžina" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 #, fuzzy msgid "forward coordinates (destination)" msgstr "Izpiši vrednosti po koordinatah v mreži" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 #, fuzzy msgid "reverse coordinates (source)" msgstr "Izpiši vrednosti po koordinatah v mreži" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 #, fuzzy msgid "reverse coordinates difference (source)" msgstr "Izpiši vrednosti po koordinatah v mreži" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 #, fuzzy msgid "forward error (destination)" msgstr "Nič je nadmorska višina" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 #, fuzzy msgid "Display summary information" msgstr "Izpiši informacije o vhodnem rastrskem sloju in končaj" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 #, fuzzy msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "Ne najdem vhodne datoteke %s\n" @@ -20519,7 +20609,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "Izpiši vrednosti po koordinatah v mreži" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -20529,7 +20619,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "Uporabljam koordinate središča sloja\n" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -21080,6 +21170,11 @@ msgstr "Ne morem odpreti baze podatkov %s" msgid "Error while reading history file" msgstr "Ime vhodnega rastrskega sloja" +#: ../raster3d/r3.in.lidar/projection.c:39 +#, fuzzy +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "ne morem odpreti %s" + #: ../raster3d/r3.in.lidar/filters.c:26 #, fuzzy, c-format msgid "Invalid range <%s> for option %s" @@ -21145,70 +21240,79 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#, fuzzy +msgid "Override projection check (use current projects's CRS)" +msgstr "Povozi projekcijo (uporabi projekcijo lokacije)" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, fuzzy, c-format msgid "Unable to create 3D raster map <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 #, fuzzy msgid "Preparing the maps..." msgstr "Berem dig_att datoteko...\n" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 #, fuzzy msgid "Reading points..." msgstr "Berem dig datoteko...\n" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 #, fuzzy msgid "Computing proportional count map..." msgstr "Ime datoteke s filtrom" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 #, fuzzy msgid "Computing proportional sum map..." msgstr "Kopiranje tabele ni bilo uspešno" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 #, fuzzy msgid "Computing mean map..." msgstr "Kopiranje tabele ni bilo uspešno" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 #, fuzzy msgid "Closing the maps..." msgstr "osnovni rastrski sloj" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, fuzzy, c-format msgid "%lu input points were not valid and filtered out" msgstr "Y koordinata oziroma geografska širina" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, fuzzy, c-format msgid "%lu input points were filtered out by return number" msgstr "naloženih je bilo %d točk\n" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, fuzzy, c-format msgid "%lu input points were filtered out by class number" msgstr "naloženih je bilo %d točk\n" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, fuzzy, c-format msgid "%lu input points had intensity out of range" msgstr "naloženih je bilo %d točk\n" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, fuzzy, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "Y koordinata oziroma geografska širina" @@ -21325,7 +21429,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -21338,10 +21441,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -21355,11 +21456,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -21908,10 +22009,10 @@ msgstr "Nisem uspel odpreti vhodne datoteke." #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -21972,9 +22073,9 @@ msgstr "ne najdem 3Dview datoteke <%s>" msgid "command line interface with GUI startup screen" msgstr "ne najdem 3Dview datoteke <%s>" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 #, fuzzy msgid "Type" msgstr "Nepoznan tip" @@ -22036,14 +22137,14 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 #, fuzzy msgid "support" msgstr "Ime izhodne datoteke" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 #, fuzzy msgid "scripts" @@ -22448,70 +22549,70 @@ msgstr "Prilagodi trenutno regijo z vhodnemu rastrskemu sloju" msgid "Save current region settings in named region file" msgstr "Določi trenutno regijo iz imenovane regije (named region)" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, fuzzy, c-format, python-format msgid "Region <%s> not found" msgstr "ne najdem regije <%s>" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, fuzzy, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "Ne morem odpreti baze podatkov %s" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 #, fuzzy msgid "Unable to get map bounding box" msgstr "Ne morem najti vhodne datoteke <%s>\n" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, fuzzy, c-format msgid "Unable to set region <%s>" msgstr "Ne morem vstaviti nove vrstice: %s" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 #, fuzzy msgid "Unable to update current region" msgstr "ne morem posodobiti meja" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 #, fuzzy msgid "Unable to update lat/long projection parameters" msgstr "ne morem posodobiti meja" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -22780,8 +22881,8 @@ msgstr "Izpiši podprte formate in končaj" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -23067,167 +23168,167 @@ msgstr "Tip zapisa kolone ni podprt" msgid "Unable to open init file <%s>" msgstr "ne morem odpreti <%s>" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 +#: ../general/g.proj/main.c:75 #, fuzzy -msgid "Can also be used to create new GRASS locations." +msgid "Can also be used to create new GRASS projects." msgstr "Ne morem ustvariti tabele: %s" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 #, fuzzy msgid "Print projection information in shell script style" msgstr "Izpiše vrednosti v stilu lupinskega skripta" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 #, fuzzy msgid "Specification" msgstr "Ime datoteke z rezultatom klasifikacije" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 #, fuzzy msgid "Name of georeferenced data file to read projection information from" msgstr "" "Ime lokacije (location) iz katere naj povzamem projekcijo za GCP " "transformacijo" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 #, fuzzy msgid "Name of ASCII file containing a WKT projection description" msgstr "Ne najdem vhodne datoteke %s\n" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 #, fuzzy msgid "PROJ.4 projection description" msgstr "Ne najdem vhodne datoteke %s\n" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 #, fuzzy msgid "EPSG projection code" msgstr "Interpolacijska metoda, ki jo želite uporabiti" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 #, fuzzy msgid "Index number of datum transform parameters" msgstr "Ime rastrskega sloja s podatki o glajenju" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 +#: ../general/g.proj/main.c:216 #, fuzzy -msgid "Modify current location projection files" +msgid "Modify current project's projection files" msgstr "Ne morem ustvariti tabele: %s" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 #, fuzzy msgid "Create" msgstr "Korelacija" -#: ../general/g.proj/main.c:223 +#: ../general/g.proj/main.c:224 #, fuzzy -msgid "Name of new location to create" +msgid "Name of new project (location) to create" msgstr "Ime nove lokacije (location), ki bo ustvarjena" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, fuzzy, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "Uporabiš lahko ali 'from_table' ali 'select'" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -23322,7 +23423,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, fuzzy, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "Ne morem ustvariti tabele: %s" #: ../general/g.proj/create.c:21 @@ -23332,99 +23433,99 @@ msgstr "Ne morem ustvariti tabele: %s" #: ../general/g.proj/create.c:25 #, fuzzy, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "Ne morem ustvariti tabele: %s" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 #, fuzzy msgid "Projection information updated" msgstr "Izpiši etikete kategorij" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 #, fuzzy msgid "Text of the message to be printed" msgstr "Ime rastrskega sloja, ki bo reklasificiran" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 #, fuzzy msgid "Unable to parse input message" msgstr "\"Mapset\" vhodnega rastrskega sloja" @@ -23580,7 +23681,8 @@ msgstr "Uporabi nastavitve trenutne regije" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -23675,37 +23777,61 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "Izpiši trenutne parametre povezave in končaj" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +#, fuzzy +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "Ime izhodnega rastrskega sloja" + +#: ../general/g.mapsets/list.c:22 +#, fuzzy +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "Ne morem izračunati centroida območja." + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 #, fuzzy msgid "Available mapsets:" msgstr "Izpiši podprte formate in končaj" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 #, fuzzy msgid "Accessible mapsets:" msgstr "Izpiši podprte formate in končaj" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 #, fuzzy msgid "Modifies/prints the user's current mapset search path." msgstr "Izpiši trenutne parametre povezave in končaj" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 #, fuzzy msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "Ime obstoječega rastrskega sloja(ev) za poizvedovanje" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -23715,72 +23841,77 @@ msgstr "Ime obstoječega rastrskega sloja(ev) za poizvedovanje" msgid "Operation to be performed" msgstr "ne najdem regije <%s>" -#: ../general/g.mapsets/main.c:86 +#: ../general/g.mapsets/main.c:112 #, fuzzy -msgid "Field separator for printing (-l and -p flags)" +msgid "Output format for printing (-l and -p flags)" msgstr "izpiši znak razmejitve med polji" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 #, fuzzy msgid "List all available mapsets in alphabetical order" msgstr "Izpiši podprte formate in končaj" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 #, fuzzy msgid "Print mapsets in current search path" msgstr "Izpiši trenutne parametre povezave in končaj" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, fuzzy, c-format msgid "Unknown operation '%s'" msgstr "Nepoznan tip" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Vnesi pogoje v enem od naslednjih formatov:\n" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, fuzzy, c-format msgid "Option <%s> ignored" msgstr "ne morem odpreti %s" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, fuzzy, c-format msgid "Mapset <%s> not found" msgstr "Ne najdem rastrskega sloja <%s>" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, fuzzy, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "Izpiši trenutne parametre povezave in končaj" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, fuzzy, c-format msgid "Mapset <%s> already in the path" msgstr "dig_att datoteka ne obstaja." -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 #, fuzzy msgid "Unable to open SEARCH_PATH for write" msgstr "Ne morem odpreti cellfile za [%s]" @@ -23797,37 +23928,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 -#, c-format +#: ../general/g.mkfontcap/main.c:98 +#, fuzzy, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" -msgstr "" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" +msgstr "Ime izhodnega vektorskega sloja" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, fuzzy, c-format msgid "Cannot open %s for writing: %s" msgstr "Ne morem odpreti baze podatkov %s" @@ -24192,7 +24320,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -25439,7 +25567,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -25540,9 +25668,10 @@ msgid "No group '%s' in current mapset" msgstr "Ime izhodnega rastrskega sloja" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr "ne najdem 3Dview datoteke <%s>" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." @@ -25550,7 +25679,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 #, fuzzy -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "Ime izhodnega rastrskega sloja" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -25589,35 +25718,36 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, fuzzy, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "ne najdem regije <%s>" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, fuzzy, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "ne najdem 3Dview datoteke <%s>" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "ne najdem 3Dview datoteke <%s>" + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 #, fuzzy msgid "permission denied\n" msgstr "Ne najdem vhodne datoteke %s\n" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 #, fuzzy msgid "not found\n" msgstr "Ne najdem rastrskega sloja <%s>" @@ -25674,65 +25804,70 @@ msgstr "Ime rastrskega sloja" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, fuzzy, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" msgstr "ne najdem regije <%s>" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "ne najdem 3Dview datoteke <%s>" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 #, fuzzy msgid "Poorly placed image to photo control points" msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 #, fuzzy msgid "Poorly placed image to target control points" msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 #, fuzzy msgid "Local x,y,z coordinates to target east,north,height" msgstr "Izpiši vrednosti po koordinatah v mreži" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 #, fuzzy msgid "Target east,north,height coordinates to local x,y,z" msgstr "Uporabljam koordinate središča sloja\n" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, fuzzy, c-format msgid "Can not read reference points for group <%s>" msgstr "Ne morem prebrati informacije polja" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, fuzzy, c-format msgid "Bad format in camera file for group <%s>" msgstr "ne morem prebrati regije <%s> v <%s>" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, fuzzy, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "ne morem prebrati regije <%s> v <%s>" @@ -25743,7 +25878,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 #, fuzzy -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "Ime rastrskega sloja" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -25753,22 +25888,22 @@ msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, fuzzy, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "Ne morem ustvariti tabele: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 #, fuzzy -msgid "Target locations with XY (unreferenced) are not supported" +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "Tip zapisa kolone ni podprt" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 #, fuzzy -msgid "Target locations with lon/lat are not supported" +msgid "Target projects (locations) with lon/lat are not supported" msgstr "Tip zapisa kolone ni podprt" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, fuzzy, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "ne najdem 3Dview datoteke <%s>" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -25893,15 +26028,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, fuzzy, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "Berem dig datoteko...\n" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, fuzzy, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "ne najdem 3Dview datoteke <%s>" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -25942,33 +26075,32 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 #, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "Določi trenutno regijo iz imenovane regije (named region)" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 #, fuzzy msgid "Rectify all raster maps in group" msgstr "Rekodira rastrske sloje" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, fuzzy, c-format msgid "Group <%s> not found" msgstr "ne najdem regije <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, fuzzy, c-format -msgid "Location: %s" -msgstr "ne morem odpreti %s" +msgid "Project (location): %s" +msgstr "lokacija baze podatkov" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, fuzzy, c-format msgid "Mapset: %s" @@ -25976,72 +26108,71 @@ msgstr "" "polje: %d\n" "kategorija: %d\n" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, fuzzy, c-format msgid "Could not read REF file for group <%s>" msgstr "ne morem prebrati regije <%s> v <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, fuzzy, c-format msgid "Extension <%s> is illegal" msgstr "Ime izhodnega rastrskega sloja" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 #, fuzzy msgid "The following raster map already exists in" msgstr "dig_att datoteka ne obstaja." -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr "ne najdem 3Dview datoteke <%s>" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, fuzzy, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "Rastrski sloj kateremu naj se regija prilagodi" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -26179,6 +26310,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, fuzzy, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "Berem dig datoteko...\n" + +#: ../imagery/i.rectify/rectify.c:45 +#, fuzzy, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "ne najdem 3Dview datoteke <%s>" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -26195,6 +26336,12 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +#, fuzzy +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "Določi trenutno regijo iz imenovane regije (named region)" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -26204,6 +26351,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, fuzzy, c-format +msgid "Location: %s" +msgstr "ne morem odpreti %s" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, fuzzy, c-format +msgid "Target location <%s> not found" +msgstr "ne najdem regije <%s>" + +#: ../imagery/i.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "ne najdem 3Dview datoteke <%s>" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -26605,6 +26772,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Ne najdem vhodne datoteke %s\n" @@ -28312,8 +28480,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -28658,17 +28826,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -28677,17 +28842,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -28696,17 +28858,15 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, fuzzy, c-format +#, fuzzy msgid "* Standard deviation: %.2lf" msgstr "Standardni odklon" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -28716,17 +28876,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -28736,12 +28893,10 @@ msgid "Maximum temperature:" msgstr "Tip objektov" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -29597,12 +29752,16 @@ msgstr "ne morem odpreti <%s>" msgid "Unable to describe table." msgstr "Ne morem opisati tabele" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 #, fuzzy msgid "Connection failed." msgstr "Korelacija" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 #, fuzzy msgid "Unable parse MySQL embedded database name" @@ -29661,7 +29820,7 @@ msgstr "Ne morem ustvariti tabele: %s" msgid "Unable to commit transaction:" msgstr "Ne morem ustvariti tabele: %s" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 #, fuzzy @@ -29770,16 +29929,15 @@ msgid "OGR layer <%s> not found" msgstr "Ne najdem rastrskega sloja <%s>" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, fuzzy, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "ne najdem regije <%s>" @@ -30426,6 +30584,43 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +#, fuzzy +msgid "histogram" +msgstr "Zapisujem novo datoteko...\n" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "Število željenih točk" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 #, fuzzy msgid "Merges several space time datasets into a single space time dataset." @@ -30471,6 +30666,8 @@ msgstr "Vhodni sloj" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 #, fuzzy @@ -30509,66 +30706,78 @@ msgstr "Vhodni sloj" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Ime izhodnega rastrskega sloja" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Ime vhodnega rastrskega sloja" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Ime izhodnega rastrskega sloja" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Ime vhodnega rastrskega sloja" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Ime izhodnega rastrskega sloja" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#, fuzzy +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "Najmanjši naklon (v procentih) za katerega bo ekspozicija še računana" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Ime datoteke s filtrom" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Faktor previšanja" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 #, fuzzy msgid "Set computational region to maximum image extent" msgstr "Določi regijo tako, da bo enaka temu rastrskemu sloju" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 #, fuzzy msgid "Rescale input bands" msgstr "Berem dig datoteko...\n" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Y koordinata oziroma geografska širina" @@ -30656,246 +30865,15 @@ msgstr "Ime obstoječega rastrskega sloja" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 #, fuzzy msgid "input" msgstr "Vhodni sloj" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -#, fuzzy -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "Izpiši trenutne parametre povezave in končaj" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -#, fuzzy -msgid "Name of input vector map" -msgstr "Ime vhodnega rastrskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Ime vhodnega rastrskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Ime izhodnega vektorskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -#, fuzzy -msgid "layer number/name for the training layer" -msgstr "Ime izhodnega vektorskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -#, fuzzy -msgid "layer number/name for the ML results" -msgstr "Ime izhodnega vektorskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -#, fuzzy -msgid "Data with statistics in npy format." -msgstr "Vhodni sloj" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -#, fuzzy -msgid "Numpy array with vector cats." -msgstr "%d točk je bilo zapisanih na izhodno datoteko\n" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Ime rastrskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr " Število kolon\n" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -#, fuzzy -msgid "Export to numpy files" -msgstr "Ime izhodne datoteke" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Tip zapisa izhodnega rastrskega sloja" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -#, fuzzy -msgid "Test different classification methods" -msgstr "Ime datoteke z rezultatom klasifikacije" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Ime obstoječega rastrskega sloja s plastnicami" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -31105,6 +31083,535 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "izhodni rastrski sloj" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Ime izhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +#, fuzzy +msgid "Location of an alternate set of environmental variables." +msgstr "Zglajeni koti" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Izhodni rastrski sloj" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Ime izhodne datoteke" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +#, fuzzy +msgid "Directory where outputs will be written." +msgstr "Ime izhodnega vektorskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Ime vhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Ime izhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Ime vhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Ime vhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Zapisujem novo datoteko...\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Izpiši informacije o vhodnem rastrskem sloju in končaj" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +#, fuzzy +msgid "Disable quadratic features" +msgstr "Zapiši vmesne točke v liniji." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Zapiši vmesne točke v liniji." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Zapiši vmesne točke v liniji." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "Izračunavam sence iz DMR..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "ne morem odpreti %s" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Ne najdem vhodne datoteke %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Enote za naklon" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +#, fuzzy +msgid "Test presence locations" +msgstr "Ime izhodnega vektorskega točkovnega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "Število točk najbližjih točk, ki bodo upoštevane" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Faktor spremembe z-vrednosti (v metre)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Enote razdalje" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Enote razdalje" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Enote razdalje" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "Število ponovitev filtracije" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +#, fuzzy +msgid "Regularization parameter for categorical features" +msgstr "Ime izhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +#, fuzzy +msgid "Default prevalence of the species" +msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Ne morem izračunati centroida območja." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Naslov novega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Število željenih točk" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +#, fuzzy +msgid "Show the Maxent user interface" +msgstr "Varianca" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 #, fuzzy msgid "Imports SRTM HGT files into raster map." @@ -31320,10 +31827,16 @@ msgstr "" msgid "Name for output vector map" msgstr "Ime vhodnega rastrskega sloja" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +#, fuzzy +msgid "Override projection check (use current location's projection)" +msgstr "Povozi projekcijo (uporabi projekcijo lokacije)" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 #, fuzzy msgid "Assume that the dataset has the same projection as the current location" msgstr "\"Location\" vhodnega sloja" @@ -31583,6 +32096,15 @@ msgstr "Vhodni rastrski sloj" msgid "Default: taken from input file internals" msgstr "Naslov izhodnega rastrskega sloja" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "\"Location\" vhodnega sloja" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 #, fuzzy @@ -32865,7 +33387,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 #, fuzzy msgid "features" msgstr "Zapiši vmesne točke v liniji." @@ -32913,11 +33435,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -34056,7 +34573,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Ne ustvari tabele z atributi." @@ -34095,6 +34611,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Ime izhodnega rastrskega sloja" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -34486,7 +35014,6 @@ msgstr "Število točk najbližjih točk, ki bodo upoštevane" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -34689,7 +35216,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Vhodni sloj" @@ -34726,6 +35253,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "Pot do GRASS baze podatkov (izpiše se ob zagonu programa)" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -35823,11 +36359,8 @@ msgstr "Ime izhodnega rastrskega sloja" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -35880,47 +36413,61 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +#, fuzzy +msgid "Thin species and background points" +msgstr "Število točk najbližjih točk, ki bodo upoštevane" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 #, fuzzy msgid "CSV file with alias and map names" msgstr "Vhodni sloj vsebuje linije." -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 #, fuzzy msgid "Automatically adapt resolution" msgstr "Naslov izhodnega rastrskega sloja" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Ime izhodne datoteke" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "Ne najdem vhodne datoteke %s\n" @@ -36773,8 +37320,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -36785,6 +37341,7 @@ msgid "Group of raster layers to be classified" msgstr "Rastrski sloj, ki ga želite reklasificirati" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -36827,11 +37384,13 @@ msgid "" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Izhodni sloj" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -37144,6 +37703,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -37155,6 +37715,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -37184,6 +37745,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr " vrednost barva\n" @@ -37576,70 +38138,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -#, fuzzy -msgid "Vector input of stream network created by r.stream.extract" -msgstr "Ime novega rastrskega sloja" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Ime izhodnega rastrskega sloja" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -#, fuzzy -msgid "Flow accumulation raster" -msgstr "Pokrovni rastrski sloj" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -#, fuzzy -msgid "Flow accumulation units" -msgstr "lokacija baze podatkov" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -#, fuzzy -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "Faktor preobrazbe iz višinskih enot karte v metre" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -#, fuzzy -msgid "Averaging distance [map units]" -msgstr "%s:linija %d:%s\n" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -#, fuzzy -msgid "Plots to generate" -msgstr "Število željenih točk" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -38004,11 +38502,14 @@ msgid "" msgstr "dig_att datoteka ne obstaja." #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Razširi obseg lokacije glede na nov \"dataset\"" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +#, fuzzy +msgid "Assume that the dataset has same projection as the current location" +msgstr "\"Location\" vhodnega sloja" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 #, fuzzy msgid "URL or name of input netcdf-file (\"-\" = stdin)" @@ -38925,6 +39426,15 @@ msgstr "" "Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " "\"location\"" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +#, fuzzy +msgid "Location containing input raster map" +msgstr "\"Location\" vhodnega sloja" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "Pot do GRASS baze podatkov (izpiše se ob zagonu programa)" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -39067,7 +39577,7 @@ msgid "WFS standard" msgstr "Standardni odklon" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 #, fuzzy msgid "Maximum number of features to download" msgstr "" @@ -39076,7 +39586,7 @@ msgstr "" " Število točk: %d\n" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -39229,9 +39739,8 @@ msgstr "Ne najdem vhodne datoteke %s\n" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 #, fuzzy @@ -39280,10 +39789,9 @@ msgid "Path to the extraction directory" msgstr "Ime datoteke s filtrom" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 @@ -39291,11 +39799,25 @@ msgstr "" msgid "Set the current region from the last map that was imported" msgstr "Prilagodi trenutno regijo z vhodnemu rastrskemu sloju" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Razširi obseg lokacije glede na nov \"dataset\"" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +#, fuzzy +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "\"Location\" vhodnega sloja" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 +#, fuzzy msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." -msgstr "" +msgstr "Ustvari/Spremeni barvno paleto rastrskega sloja." #: ../locale/scriptstrings/v.external.all_to_translate.c:1 #, fuzzy @@ -39303,7 +39825,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "Izpiši rastrske sloje v vhodni \"location\" in končaj" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 #, fuzzy msgid "List available layers in data source and exit" msgstr "Izpiši rastrske sloje v vhodni \"location\" in končaj" @@ -39446,34 +39968,6 @@ msgstr "Vpiši ime baze podatkov" msgid "Base name for output file" msgstr "Ime izhodne datoteke" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "Ime izhodne datoteke" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Vhodni sloj vsebuje linije." - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "Število željenih točk" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 #, fuzzy msgid "Creates a local relief model from elevation map." @@ -40174,6 +40668,11 @@ msgstr "Ime izhodne datoteke" msgid "Queries projection information spatially." msgstr "Izpiši etikete kategorij" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +#, fuzzy +msgid "create location" +msgstr "lokacija baze podatkov" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -40476,7 +40975,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -40509,7 +41008,7 @@ msgstr "Ne ustvari tabele z atributi." #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 #, fuzzy -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -41267,9 +41766,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "Ime rastrskega sloja" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -41556,6 +42061,15 @@ msgstr "Resolucija izhodnega sloja" msgid "Estimate resolution only" msgstr "Ime izhodnega rastrskega sloja" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +#, fuzzy +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "\"Location\" vhodnega sloja" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -42617,8 +43131,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -42717,39 +43231,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Rastrski sloj, ki ga nameravate uvoziti" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -46180,8 +46703,8 @@ msgstr "Izbere pisavo v kateri bo tekst zapisan na grafičnem monitorju" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 #, fuzzy msgid "monitors" msgstr "Spisek vrednosti plastnic" @@ -46223,6 +46746,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 #, fuzzy msgid "Redraws the content of currently selected monitor." msgstr "Prilagodi trenutno regijo z vhodnemu rastrskemu sloju" @@ -46657,6 +47181,14 @@ msgstr "Ime datoteke z rezultatom klasifikacije" msgid "multiple" msgstr "Faktor množenja za ascii podatke" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +#, fuzzy +msgid "Name of input vector map" +msgstr "Ime vhodnega rastrskega sloja" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -46713,6 +47245,20 @@ msgstr "" msgid "Register empty maps" msgstr "Vhodni rastrski sloj" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Ne najdem vhodnega vektorja <%s>" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Ne najdem vhodnega vektorja <%s>" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -46755,6 +47301,38 @@ msgstr "Vhodni rastrski sloj" msgid "Number of tiles in y direction" msgstr "Ime izhodne datoteke" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "Rastrski sloj, ki ga želite reklasificirati" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Število ponovitev filtracije" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -47204,8 +47782,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -47991,6 +48569,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Naslov izhodnega rastrskega sloja" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "Ime nove lokacije (location), ki bo ustvarjena" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -48299,6 +48881,10 @@ msgstr "Vhodni rastrski sloj" msgid "Offset factor for input" msgstr "Uporabljam koordinate središča sloja\n" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 #, fuzzy msgid "Adjacent downstream segment category" @@ -48755,10 +49341,97 @@ msgstr "Faktor previšanja" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr " vrednost barva\n" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Vhodni rastrski sloj" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "" +"polje: %d\n" +"kategorija: %d\n" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +#, fuzzy +msgid "csv file with variable and layer names" +msgstr "Vhodni sloj vsebuje linije." + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Ime vhodnega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "Ime obstoječega rastrskega sloja" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Zglajeni koti" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "Izpiši le razpon vrednosti" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "Ime izhodne datoteke" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Vhodni sloj vsebuje linije." + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 #, fuzzy msgid "Step of binning (in degrees)" @@ -49294,17 +49967,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -49332,23 +49995,20 @@ msgid "categorical map with zones" msgstr "Ne najdem vhodnega vektorja <%s>" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Vhodni rastrski sloj" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 #, fuzzy msgid "Dimensions (width,height) of the figure in inches" msgstr "Ime izhodnega sloja" @@ -49360,9 +50020,8 @@ msgid "Default font size" msgstr "Največja razdalja med točkami in enotami karte." #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -49382,14 +50041,12 @@ msgid "Create a vector point layer of outliers" msgstr "Ime vhodnega rastrskega sloja" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 #, fuzzy msgid "Include outliers" msgstr "Ne najdem rastrskega sloja <%s>" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -49400,14 +50057,12 @@ msgid "Draw notches" msgstr "Dolžina: %f\n" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -49441,14 +50096,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -49460,27 +50107,23 @@ msgid "Plot format" msgstr "Vhodni sloj" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Vpiši ime sloja" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -49528,15 +50171,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -49556,7 +50190,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -49566,51 +50199,42 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Ne najdem vhodnega vektorja <%s>" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "Spisek vrednosti plastnic" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 #, fuzzy msgid "Whisker and cap linewidth" msgstr "Ne najdem vhodnega vektorja <%s>" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -49618,114 +50242,27 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 #, fuzzy msgid "Flier size" msgstr "ime tabele" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 #, fuzzy msgid "Set the flier size" msgstr "ime tabele" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr " nv barva\n" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr " privzeta barva\n" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Izpiši rastrske sloje v vhodni \"location\" in končaj" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Resolucija izhodnega sloja" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Dolžina: %f\n" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "ime tabele" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Izhodni sloj" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -#, fuzzy -msgid "limit value axis" -msgstr "Spisek vrednosti deljenih z vejico: npr. 1.4,3.8,13" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -#, fuzzy -msgid "The width of the boxplots" -msgstr "Spisek vrednosti plastnic" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr " privzeta barva\n" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -51017,6 +51554,14 @@ msgstr "Ime izhodnega rastrskega sloja" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -51041,6 +51586,15 @@ msgstr "Zapisujem novo datoteko...\n" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr " privzeta barva\n" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -51144,315 +51698,315 @@ msgid "" "layer in a scatterplot." msgstr "Nisem mogel odpreti vhodne datoteke dig_att." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr " Število kolon\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr " Število kolon\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Tip objektov" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Ime izhodne datoteke, ki bo vsebovala poročilo" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Ime izhodne datoteke, ki bo vsebovala poročilo" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Resolucija izhodnega sloja" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "ne morem odpreti %s" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 #, fuzzy msgid "The title of the plot" msgstr "Vrednost za vzhodni rob" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 #, fuzzy msgid "Marker size" msgstr "Območje\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 #, fuzzy msgid "Set marker size" msgstr "Območje\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr " nv barva\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "ne najdem regije <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 #, fuzzy msgid "Density" msgstr "Rišem ..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 #, fuzzy msgid "Density plot color map" msgstr "Ime vhodnega rastrskega sloja" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Nič je nadmorska višina" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 #, fuzzy msgid "Trendline" msgstr "Zapisujem novo datoteko...\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "ne morem odpreti %s" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Ime datoteke s filtrom" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Spisek vrednosti plastnic" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 #, fuzzy msgid "Line style trendline" msgstr " nv barva\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Spisek vrednosti plastnic" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 #, fuzzy msgid "standard deviations" msgstr "Standardni odklon" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr " nv barva\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 #, fuzzy msgid "Ellipse edge style" msgstr "Izpiše vrednosti v stilu lupinskega skripta" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 #, fuzzy msgid "Line style of the ellipse" msgstr "Spisek vrednosti plastnic" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Spisek vrednosti plastnic" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 #, fuzzy msgid "Column grouping the features in categories" msgstr "Uporabljam koordinate središča sloja\n" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 #, fuzzy msgid "RGB column for ellipse categories" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 #, fuzzy msgid "legend for ellipses" msgstr "Zapiši vmesne točke v liniji." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Rišem ..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Rišem ..." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" @@ -51814,8 +52368,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -51901,186 +52455,6 @@ msgstr "" "Izračuna univariatne statistične parametre za ne NULL celice rastrskega " "sloja." -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -#, fuzzy -msgid "density" -msgstr "Rišem ..." - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Ne najdem vhodnega vektorja <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "tiho" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Ime rastrskega sloja, ki vsebuje podatke o strošku premikanja" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Ime rastrskega sloja, ki vsebuje podatke o strošku premikanja" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Vhodni sloj" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Ime izhodnega rastrskega sloja" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -#, fuzzy -msgid "Optional inputs" -msgstr "Ime izhodnega rastrskega sloja" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Ime datoteke z rezultatom klasifikacije" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Največja možna razdalja od točk (v metrih)." - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Resolucija izhodnega sloja" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Ime izhodne tabele" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Ime izhodnega vektorskega točkovnega sloja" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Ime izhodne datoteke, ki bo vsebovala poročilo" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Ime izhodne datoteke, ki bo vsebovala poročilo" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -#, fuzzy -msgid "Format: 1,2,3" -msgstr "Izhodni sloj" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Število točk najbližjih točk, ki bodo upoštevane" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Nič je nadmorska višina" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -52951,12 +53325,6 @@ msgstr "ne morem odpreti %s" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -#, fuzzy -msgid "histogram" -msgstr "Zapisujem novo datoteko...\n" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -58494,6 +58862,47 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "Izhodni sloj" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +#, fuzzy +msgid "Download whole tiles" +msgstr "ne morem odpreti razpona za datoteko %s" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Uporabi trenutno regijo" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 #, fuzzy msgid "Extracts a subset of a space time 3D raster dataset." @@ -59093,8 +59502,8 @@ msgid "Unable to open file '%s': %s" msgstr "Ne morem odpreti cellfile za [%s]" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, fuzzy, c-format msgid "" "Required parameter <%s> not set:\n" @@ -59432,8 +59841,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -59629,7 +60038,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, fuzzy, c-format msgid "Invalid zrange <%s>" @@ -59643,7 +60052,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -60217,7 +60626,7 @@ msgstr "Ime datoteke s filtrom" msgid "Add points on nodes" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -60535,7 +60944,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 #, fuzzy msgid "Data type of key column must be integer" msgstr "Ne najdem vhodnega vektorja <%s>" @@ -60633,52 +61042,47 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -#, fuzzy -msgid "Overwrite connection parameter for certain layer" -msgstr "Izpiši trenutne parametre povezave in končaj" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 #, fuzzy msgid "Unable to modify vector map stored in other mapset" msgstr "Preoblikuje rastrski sloj v vektorskega." -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, fuzzy, c-format msgid "Map <%s> is not connected to a database" msgstr "Izpiši vse tabele za dano bazo podatkov." -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, fuzzy, c-format msgid "Vector map <%s> is connected by:\n" msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 #, fuzzy msgid "Database connection not defined" msgstr "Povezava z bazo podatkov ni definirana\n" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -60688,33 +61092,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "Povezava z bazo podatkov ni definirana\n" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" -msgstr "" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" +msgstr "Ne morem odpreti baze podatkov %s" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "Ne morem ti garantirati (grant) privilegijev nad tabelo %s" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -60753,7 +61157,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 #, fuzzy msgid "Categories" msgstr "%-5d kategorij linij prebranih\n" @@ -60843,181 +61247,181 @@ msgstr "Število točk najbližjih točk, ki bodo upoštevane" msgid "Invert mask when selecting points" msgstr "Vhodni sloj vsebuje linije." -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 #, fuzzy msgid "Create only requested layers and categories" msgstr "Naslov izhodnega rastrskega sloja" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, fuzzy, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 #, fuzzy msgid "ID layer is required to store attribute table" msgstr "Ne ustvari tabele z atributi." -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, fuzzy, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "Ne ustvari tabele z atributi." -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, fuzzy, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "Ime izhodnega vektorskega sloja" -#: ../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 +#: ../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 #, fuzzy, c-format, python-format msgid "Vector map <%s> already exists" msgstr "dig_att datoteka ne obstaja." -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, fuzzy, c-format msgid "Scanning %llu points..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, fuzzy, c-format msgid "Scanning %lu points..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, fuzzy, c-format msgid "%llu points imported (limit was %llu)" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, fuzzy, c-format msgid "%llu points imported" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, fuzzy, c-format msgid "%llu input points were not valid and filtered out" msgstr "Y koordinata oziroma geografska širina" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, fuzzy, c-format msgid "%llu input points were outside of the selected area" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, fuzzy, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, fuzzy, c-format msgid "%llu input points were filtered out by return number" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, fuzzy, c-format msgid "%llu input points were filtered out by class number" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, fuzzy, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, fuzzy, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, fuzzy, c-format msgid "%lu points imported (limit was %d)" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, fuzzy, c-format msgid "%lu points imported" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, fuzzy, c-format msgid "%lu input points were outside of the selected area" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, fuzzy, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, fuzzy, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, fuzzy, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, fuzzy, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "naloženih je bilo %d točk\n" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 #, fuzzy msgid "The rest of points was ignored" msgstr "Koordinate poizvedovanja" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, fuzzy, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "Y koordinata oziroma geografska širina" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -61527,7 +61931,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, fuzzy, c-format, python-format msgid "Column <%s> not found" @@ -61781,12 +62185,12 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "Naslov izhodnega rastrskega sloja" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 #, fuzzy msgid "List available layers including feature type in data source and exit" msgstr "Izpiši rastrske sloje v vhodni \"location\" in končaj" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -61814,7 +62218,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, fuzzy, c-format msgid "Layer <%s> not available" msgstr "Ime rastrskega sloja" @@ -61824,7 +62228,7 @@ msgstr "Ime rastrskega sloja" msgid "No layer defined" msgstr "Določena ni bila nobena vhodna datoteka." -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, fuzzy, c-format msgid "Unable to open data source <%s>" msgstr "Ime izhodnega rastrskega sloja" @@ -61844,7 +62248,7 @@ msgstr "Ne morem odpreti cellfile za [%s]" msgid "Link to vector map <%s> created." msgstr "dig_att datoteka ne obstaja." -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, fuzzy, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -61882,14 +62286,14 @@ msgstr "Rastrski sloj kateremu naj se regija prilagodi" #: ../vector/v.proj/main.c:78 #, fuzzy -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " "\"location\"" #: ../vector/v.proj/main.c:84 #, fuzzy -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "\"Location\" vhodnega sloja" #: ../vector/v.proj/main.c:88 @@ -61929,6 +62333,11 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "Ime izhodne datoteke" +#: ../vector/v.proj/main.c:179 +#, fuzzy +msgid "Input and output projects can not be the same" +msgstr "Vhodni sloj: lokacije pravih depresij" + #: ../vector/v.proj/main.c:242 #, fuzzy msgid "No vector maps found" @@ -61936,7 +62345,7 @@ msgstr "Binarna rastrska datoteka, ki jo nameravate uvoziti" #: ../vector/v.proj/main.c:256 #, fuzzy, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "Ime rastrskega sloja" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -61951,13 +62360,13 @@ msgid "Input vector map <%s> is empty" msgstr "Ne najdem vhodnega vektorja <%s>" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" +msgstr "ne najdem 3Dview datoteke <%s>" #: ../vector/v.proj/main.c:371 #, fuzzy, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "ne najdem 3Dview datoteke <%s>" #: ../vector/v.proj/main.c:517 @@ -62532,7 +62941,7 @@ msgstr "neveljavna regija: %s" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -63216,7 +63625,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 #, fuzzy msgid "Import failed" msgstr "Vhodni sloj" @@ -63556,13 +63965,13 @@ msgid "Cleaning output topology" msgstr "Zapisujem novo datoteko...\n" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 #, fuzzy msgid "Removing dangles..." msgstr "Ne morem izračunati centroida območja." #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 #, fuzzy msgid "Removing bridges..." msgstr "Ne morem izračunati centroida območja." @@ -63779,7 +64188,7 @@ msgid "Snapping boundaries..." msgstr "Rišem ..." #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 #, fuzzy msgid "Breaking polygons..." msgstr "Zapisujem novo datoteko...\n" @@ -63787,13 +64196,13 @@ msgstr "Zapisujem novo datoteko...\n" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 #, fuzzy msgid "Removing duplicates..." msgstr "Zapisujem novo datoteko...\n" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 #, fuzzy msgid "Breaking boundaries..." msgstr "Zapisujem novo datoteko...\n" @@ -64025,7 +64434,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, fuzzy, c-format msgid "Layer <%s> not found" msgstr "Ne najdem rastrskega sloja <%s>" @@ -64198,10 +64607,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, fuzzy, c-format msgid "Not enough memory for %s" msgstr "Ime rastrskega sloja" @@ -64246,6 +64655,11 @@ msgstr "Ime vhodnega rastrskega sloja" msgid "Name of input surface raster map for cross-section" msgstr "Ime rastrskega sloja s podatki o glajenju" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +#, fuzzy +msgid "Optional inputs" +msgstr "Ime izhodnega rastrskega sloja" + #: ../vector/v.vol.rst/main.c:244 #, fuzzy msgid "Name of column containing w-values attribute to interpolate" @@ -64365,9 +64779,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, fuzzy, c-format msgid "Unable to create %s" msgstr "Ne morem odpreti cellfile za [%s]" @@ -64382,7 +64796,7 @@ msgstr "Ne morem odpreti cellfile za [%s]" msgid "Vector is not 3D" msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, fuzzy, c-format msgid "Unable to create table '%s'" msgstr "Ne morem odpreti cellfile za [%s]" @@ -64478,7 +64892,6 @@ msgid "Cannot allocate memory for point" msgstr "Ne morem izračunati centroida območja." #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -64507,8 +64920,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -65179,7 +65592,7 @@ msgid "Categories already exist in layer %d" msgstr "%d kategorij naloženih iz tabele\n" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 #, fuzzy msgid "Unable to calculate area centroid" msgstr "Ne morem izračunati centroida območja." @@ -65336,8 +65749,8 @@ msgstr "Napaka pri branju dbmscap datoteke\n" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -67256,18 +67669,18 @@ msgstr "Zapisujem novo datoteko...\n" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, fuzzy, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "Rišem ..." #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 #, fuzzy msgid "Cleaning boundaries at nodes..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 #, fuzzy msgid "Merging boundaries..." msgstr "Zapisujem novo datoteko...\n" @@ -67459,13 +67872,13 @@ msgstr "Ne morem ustvariti tabele: %s" msgid "No default DB defined" msgstr "Določena ni bila nobena vhodna datoteka." -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -67729,42 +68142,47 @@ msgstr "izpiši znak razmejitve med polji" #: ../vector/v.to.db/parse.c:127 #, fuzzy +msgid "Print header" +msgstr "Vpiši ime sloja" + +#: ../vector/v.to.db/parse.c:132 +#, fuzzy msgid "Only print SQL statements" msgstr "datoteka z SQL stavkom" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -68846,16 +69264,6 @@ msgstr "Izračunavam sence iz DMR..." msgid "Writing shortest paths..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 #, fuzzy msgid "Prints vector map attributes." @@ -70385,71 +70793,71 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, fuzzy, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "navedena morata biti 2 sloja" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 #, fuzzy msgid "You are not outputting any raster or vector maps" msgstr "Ime izhodnega vektorskega sloja" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 #, fuzzy msgid "Input is 2D: using attribute values for approximation" msgstr "Faktor spremembe z-vrednosti (v metre)" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 #, fuzzy msgid "Input is 2D: using category values for approximation" msgstr "Faktor spremembe z-vrednosti (v metre)" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 #, fuzzy msgid "Processing segments in parallel..." msgstr "Ustvari točke vzdolž vhodnih linij." -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 #, fuzzy msgid "Processing segments..." msgstr "Ustvari točke vzdolž vhodnih linij." -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 #, fuzzy msgid "Unable to write raster maps - try to increase resolution" msgstr "Ime rastrskega sloja" @@ -70769,7 +71177,7 @@ msgstr "Zapisujem novo datoteko...\n" msgid "Querying vector map <%s>..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 #, fuzzy msgid "Writing centroids..." msgstr "Zapiši vmesne točke v liniji." @@ -71258,188 +71666,188 @@ msgstr "Povezava z bazo podatkov ni definirana\n" msgid "Unable to open driver <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 +#: ../vector/v.info/print.c:306 #, fuzzy -msgid "Location:" -msgstr "ne morem odpreti %s" +msgid "Project:" +msgstr "Rišem ..." -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 #, fuzzy msgid "Database:" msgstr "ime baze podatkov" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 #, fuzzy msgid "Name of creator:" msgstr "Ime rastrskega sloja" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 #, fuzzy msgid "Map format:" msgstr "Izhodni sloj" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 #, fuzzy msgid "OGR layer:" msgstr "Vpiši ime sloja" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 #, fuzzy msgid "OGR datasource:" msgstr "ime baze podatkov" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 #, fuzzy msgid "Feature type:" msgstr "Tip objektov" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 #, fuzzy msgid "DB table:" msgstr "Ime datoteke s filtrom" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 #, fuzzy msgid "Geometry column:" msgstr " Število kolon\n" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 #, fuzzy msgid "Topology:" msgstr "Rastrski sloj, ki ga nameravate uvoziti" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 #, fuzzy msgid "Topology column:" msgstr "ne najdem regije <%s>" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 #, fuzzy msgid "Type of map" msgstr "Ime datoteke s filtrom" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 #, fuzzy msgid "level" msgstr "Ime rastrskega sloja" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 #, fuzzy msgid "Number of points:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 #, fuzzy msgid "Number of centroids:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 #, fuzzy msgid "Number of lines:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 #, fuzzy msgid "Number of boundaries:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 #, fuzzy msgid "Number of areas:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 #, fuzzy msgid "Number of islands:" msgstr " Število kolon\n" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 #, fuzzy msgid "Number of faces:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 #, fuzzy msgid "Number of kernels:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 #, fuzzy msgid "Number of volumes:" msgstr " Število kolon\n" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 #, fuzzy msgid "Number of holes:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 #, fuzzy msgid "Number of dblinks:" msgstr " Število vrstic\n" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -71638,28 +72046,57 @@ msgstr "%-5d mrtvih kategorij točk preskočenih\n" msgid "An error occurred, nothing to be exported" msgstr "%-5d mrtvih kategorij točk preskočenih\n" +#: ../vector/v.in.pdal/projection.c:30 +#, fuzzy +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" +"Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " +"\"location\"" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" +"Transformira projekcijo rastrskega sloja iz ene \"location\" v trenutno " +"\"location\"" + #: ../vector/v.in.pdal/main.cpp:132 #, fuzzy msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "Uvozi binarno rastrsko datoteko v GRASS-ov rastrski sloj." -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -71734,239 +72171,239 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "Izpiši v \"integer\" obliki" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 #, fuzzy msgid "No OGR layers available" msgstr "Ime rastrskega sloja" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, fuzzy, c-format msgid "Illegal output name <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, fuzzy, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "Vektorski sloj končnih točk" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, fuzzy, c-format msgid "Error setting attribute filter '%s'" msgstr "Nisem uspel odpreti vhodne datoteke." -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, fuzzy, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "ne najdem regije <%s>" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, fuzzy, c-format msgid "Boundary splitting distance in map units: %G" msgstr "Največja razdalja med točkami in enotami karte." -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, fuzzy, c-format msgid "Using temporary vector <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, fuzzy, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "ne najdem regije <%s>" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, fuzzy, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "Tip zapisa kolone ni podprt" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, fuzzy, c-format msgid "Creating attribute table for layer <%s>..." msgstr "Ne najdem rastrskega sloja <%s>" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, fuzzy, c-format msgid "Column name <%s> renamed to <%s>" msgstr "ne najdem regije <%s>" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, fuzzy, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "ne najdem regije <%s>" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, fuzzy, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, fuzzy, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "Ne morem vstaviti nove vrstice: %s" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, fuzzy, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "%-5d mrtvih kategorij točk preskočenih\n" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 #, fuzzy msgid "feature" msgstr "Tip objektov" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, fuzzy, c-format msgid "Unable to drop table: '%s'" msgstr "Ime izhodnega rastrskega sloja" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 #, fuzzy msgid "Cleaning polygons" msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 #, fuzzy msgid "Changing boundary dangles to lines..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 #, fuzzy msgid "Changing boundary bridges to lines..." msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, fuzzy, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "Izračunavam sence iz DMR..." -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, fuzzy, c-format msgid "The order of features in input layer <%s> has changed" msgstr "Tip zapisa kolone ni podprt" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, fuzzy, c-format msgid "Total area: %G (%d areas)\n" msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, fuzzy, c-format msgid "Total area: %G (%d areas)" msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, fuzzy, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, fuzzy, c-format msgid "Overlapping area: %G (%d areas)" msgstr "Zapisujem novo datoteko...\n" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, fuzzy, c-format msgid "Area without category: %G (%d areas)\n" msgstr "%-5d mrtvih kategorij točk preskočenih\n" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, fuzzy, c-format msgid "Area without category: %G (%d areas)" msgstr "%-5d mrtvih kategorij točk preskočenih\n" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, fuzzy, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "Ne morem izračunati centroida območja." -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, fuzzy, c-format msgid "Number of incorrect boundaries: %d" msgstr "" @@ -71974,42 +72411,42 @@ msgstr "" "\n" " Število točk: %d\n" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, fuzzy, c-format msgid "Number of centroids outside area: %d" msgstr " Število vrstic\n" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, fuzzy, c-format msgid "Number of duplicate centroids: %d" msgstr " Število vrstic\n" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -72018,51 +72455,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, fuzzy, c-format msgid "The snapping threshold %g might be too large." msgstr "Rišem ..." -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -72233,10 +72670,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "dig_att datoteka ne obstaja." +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr "ne najdem 3Dview datoteke <%s>" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "ne najdem regije <%s>" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -72413,7 +72860,7 @@ msgstr "Ime izhodnega vektorskega sloja" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, fuzzy, c-format msgid "%d col" msgid_plural "%d cols" @@ -72421,7 +72868,7 @@ msgstr[0] " nv barva\n" msgstr[1] " nv barva\n" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -72429,7 +72876,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -73487,6 +73934,10 @@ msgstr "Berem dig datoteko...\n" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -74105,6 +74556,24 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +#, fuzzy +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "Nobena grafična naprava ni izbrana" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Ne morem odpreti cellfile za [%s]" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Ne morem odpreti cellfile za [%s]" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -74726,7 +75195,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, fuzzy, c-format, python-format msgid "Unable to open file '%s'" msgstr "Ne morem odpreti cellfile za [%s]" @@ -74979,23 +75448,15 @@ msgstr "ne najdem 3Dview datoteke <%s>" msgid "Input DSN <%s> not found or not readable" msgstr "ne najdem regije <%s>" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -#, fuzzy -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "Nobena grafična naprava ni izbrana" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, fuzzy, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -85086,39 +85547,39 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, fuzzy, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "Ime datoteke z referenčnimi razredi" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 #, fuzzy msgid "Key column must be of type integer or string" msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -85201,12 +85662,12 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 #, fuzzy msgid "Computing tiling..." msgstr "Kopiranje tabele ni bilo uspešno" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -85233,106 +85694,106 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 #, fuzzy msgid "Restoring user mask (MASK)..." msgstr "Berem dig_att datoteko...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, fuzzy, python-format msgid "Processing %d map holes" msgstr "Ustvari točke vzdolž vhodnih linij." #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, fuzzy, python-format msgid "Interpolating %d points" msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 #, fuzzy msgid "No points to interpolate" msgstr "Število željenih točk" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, fuzzy, python-format msgid "Failed to fill hole %s" msgstr "Nisem uspel odpreti vhodne datoteke." -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, fuzzy, python-format msgid "Using %s bspline interpolation" msgstr "Število točk najbližjih točk, ki bodo upoštevane" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 #, fuzzy msgid "Patching fill data into NULL areas..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, fuzzy, python-format msgid "Filled raster map is: %s" msgstr "Berem dig_att datoteko...\n" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -85344,349 +85805,349 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 #, fuzzy msgid "Importing raster map into GRASS..." msgstr "izhodni rastrski sloj" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 #, fuzzy msgid "JPEG format does not support transparency" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, fuzzy, python-format msgid "Invalid EPSG code %d" msgstr "neveljavna regija: %s" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 #, fuzzy msgid "Unable to get projection info" msgstr "Ne morem ustvariti tabele: %s" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 #, fuzzy msgid "Maxcols must be greater than 100" msgstr "navedena morata biti 2 sloja" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 #, fuzzy msgid "Maxrows must be greater than 100" msgstr "navedena morata biti 2 sloja" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, fuzzy, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "Ne morem izbrati (select) podatkov iz tabele" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, fuzzy, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 #, fuzzy msgid "Unable to write data into tempfile" msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, fuzzy, python-format msgid "Unable to determine region, %s failed" msgstr "Ne morem vstaviti nove vrstice: %s" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 #, fuzzy msgid "Region definition: 4 points required" msgstr "Koordinate poizvedovanja" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 #, fuzzy msgid "Reprojecting raster..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, fuzzy, python-format msgid "%s failed" msgstr "Vhodni sloj" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 #, fuzzy msgid "Unable to create temporary files" msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 #, fuzzy msgid "WMS import failed, nothing imported" msgstr "Uporabi trenutno regijo" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, fuzzy, python-format msgid "<%s> created." msgstr "ne morem odpreti %s" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, fuzzy, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "Ne morem izbrati (select) podatkov iz tabele" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, fuzzy, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, fuzzy, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "Ime rastrskega sloja" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, fuzzy, python-format msgid "WMS server error: %s" msgstr "%d napak med posodabljanjem\n" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, fuzzy, python-format msgid "Driver %s does not supports Create() method" msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, fuzzy, python-format msgid "Unable to open %s " msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, fuzzy, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "ne morem odpreti <%s>" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, fuzzy, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "Ne najdem rastrskega sloja <%s>" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, fuzzy, python-format msgid "Layer '%s' is not available with %s code." msgstr "Ime rastrskega sloja" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, fuzzy, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 #, fuzzy msgid "Unable to open GDAL WMS driver" msgstr "ne morem posodobiti meja" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, fuzzy, python-format msgid "Unable to find %s driver" msgstr "ne morem odpreti <%s>" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 #, fuzzy msgid "Unable to parse XML file" msgstr "ne morem posodobiti meja" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, fuzzy, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 #, fuzzy msgid "Root node was not found." msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -85740,53 +86201,53 @@ msgstr "%-5d mrtvih kategorij točk preskočenih\n" msgid "Imported <%s> vector map <%s>." msgstr "%d točk je bilo zapisanih na izhodno datoteko\n" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, fuzzy, python-format msgid "File '%s' or '%s' not found" msgstr "Ne najdem rastrskega sloja <%s>" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, fuzzy, python-format msgid "Extracting '%s'..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 #, fuzzy msgid "Unable to unzip file." msgstr "Ime izhodne datoteke" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 #, fuzzy msgid "Converting input file to BIL..." msgstr "Rišem ..." -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 #, fuzzy msgid "Unable to import data" msgstr "ne morem odpreti <%s>" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -85814,13 +86275,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, fuzzy, python-format msgid "Converting %d place names..." msgstr "Zapisujem novo datoteko...\n" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 #, fuzzy msgid "Forcing ..." msgstr "Rišem ..." @@ -85878,87 +86339,87 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, fuzzy, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "ne morem odpreti <%s>" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "Uporabljam koordinate središča sloja\n" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, fuzzy, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, fuzzy, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "ne morem odpreti <%s>" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, fuzzy, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 #, fuzzy msgid "Unable to get reprojected map extent" msgstr "Ne morem ustvariti tabele: %s" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 #, fuzzy -msgid "Unable to reproject to source location" +msgid "Unable to reproject to source project" msgstr "\"Location\" vhodnega sloja" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, fuzzy, python-format msgid "Reprojecting <%s>..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, fuzzy, python-format msgid "Unable to to reproject raster <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, fuzzy, python-format msgid "The reprojected raster <%s> is empty" msgstr "Ne najdem vhodnega vektorja <%s>" @@ -86008,28 +86469,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, fuzzy, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "Nisem mogel odpreti vhodne datoteke dig_att." -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, fuzzy, python-format msgid "Column <%s> not found in table" msgstr "ne najdem regije <%s>" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, fuzzy, python-format msgid "Column <%s> would be deleted." msgstr "Ne najdem vhodnega rastrskega sloja <%s>." -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 #, fuzzy msgid "Cannot continue (problem deleting column)" msgstr "Ne morem uporabiti skupaj možnosti 'from_table' in 'select'" @@ -86090,27 +86551,27 @@ msgstr "Uporabljam koordinate središča sloja\n" msgid "Unable to import <%s>" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, fuzzy, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "Ne morem ustvariti tabele: %s" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, fuzzy, python-format msgid "Importing <%s> ..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, fuzzy, python-format msgid "Unable to import OGR datasource <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, fuzzy, python-format msgid "option <%s>: <%s> exists." msgstr "ne najdem regije <%s>" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, fuzzy, python-format msgid "Unable to to reproject vector <%s>" msgstr "Ime izhodnega rastrskega sloja" @@ -86120,7 +86581,6 @@ msgstr "Ime izhodnega rastrskega sloja" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, fuzzy, python-format msgid "Vector map <%s> not found in current mapset" msgstr "Ne najdem vhodnega vektorja <%s>" @@ -86130,14 +86590,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, fuzzy, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -86145,76 +86605,76 @@ msgid "" msgstr "Nisem mogel odpreti vhodne datoteke dig_att." #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, fuzzy, python-format msgid "Processing input data (%d categories)..." msgstr "Izračunavam sence iz DMR..." -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 #, fuzzy msgid "Updating the database ..." msgstr "Rišem ..." -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, fuzzy, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 #, fuzzy msgid "An error occurred while converting vector to raster" msgstr "%-5d mrtvih kategorij točk preskočenih\n" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 #, fuzzy msgid "No categories found in raster map" msgstr "Binarna rastrska datoteka, ki jo nameravate uvoziti" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 #, fuzzy msgid "Use -c flag to update values in this column." msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -86449,7 +86909,7 @@ msgstr "ne morem odpreti %s" msgid "Input file <%s> not found" msgstr "ne najdem 3Dview datoteke <%s>" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 #, fuzzy msgid "Importing data..." msgstr "Rišem ..." @@ -86469,66 +86929,67 @@ msgstr "Zapisujem novo datoteko...\n" msgid "An error occurred on creating \"%s\", please check" msgstr "%-5d mrtvih kategorij točk preskočenih\n" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, fuzzy, python-format msgid "Mosaicing %d images..." msgstr "Ne morem izračunati centroida območja." -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, fuzzy, python-format msgid "Done. Raster map <%s> created." msgstr "dig_att datoteka ne obstaja." #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 #, fuzzy msgid "Invalid maximum number of features" msgstr "Število točk najbližjih točk, ki bodo upoštevane" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 #, fuzzy msgid "Retrieving data..." msgstr "Rišem ..." -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, fuzzy, python-format msgid "Vector map <%s> imported from WFS." msgstr "Ne najdem vhodnega vektorja <%s>" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 #, fuzzy msgid "WFS import failed" msgstr "Vhodni sloj" @@ -86679,84 +87140,84 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 #, fuzzy msgid "cleaning up temp files" msgstr "Vrednost, ki bo prirejena NULL vrednosti" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 #, fuzzy msgid "Calculating Brovey transformation..." msgstr "Izračunavam sence iz DMR..." -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 #, fuzzy msgid "Transforming to IHS color space..." msgstr "Rišem ..." -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 #, fuzzy msgid "Input has no data. Check region settings." msgstr "Prilagodi trenutno regijo z vhodnemu rastrskemu sloju" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 #, fuzzy msgid "Performing inverse PCA ..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -86872,44 +87333,44 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 #, fuzzy msgid "MASK already exists and will be overwritten" msgstr "Ime izhodnega vektorskega sloja" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, fuzzy, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 #, fuzzy msgid "Creating inverted raster MASK..." msgstr "izhodni rastrski sloj" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 #, fuzzy msgid "Inverted raster MASK created" msgstr "dig_att datoteka ne obstaja." -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 #, fuzzy msgid "Raster MASK created" msgstr "dig_att datoteka ne obstaja." -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -86945,7 +87406,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "Ime izhodnega vektorskega sloja" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -86956,35 +87417,35 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 +#: ../scripts/r.unpack/r.unpack.py:143 #, fuzzy -msgid "Overriding projection check (using current location's projection)." +msgid "Overriding projection check (using current project's CRS)." msgstr "Povozi projekcijo (uporabi projekcijo lokacije)" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -87083,35 +87544,35 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 #, fuzzy msgid "Projection information does not match. Proceeding..." msgstr "Izpiši etikete kategorij" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, fuzzy, python-format msgid "Coping table <%s> as table <%s>" msgstr "ne najdem regije <%s>" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, fuzzy, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "Ime izhodne datoteke" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, fuzzy, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, fuzzy, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, fuzzy, python-format msgid "Vector map <%s> successfully unpacked" msgstr "dig_att datoteka ne obstaja." @@ -87200,336 +87661,336 @@ msgstr "Ne najdem vhodne datoteke %s\n" msgid "No metadata available for module '{}':" msgstr "Izpiše vrednosti v stilu lupinskega skripta" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 #, fuzzy msgid "Failed to get Git version." msgstr "ne morem posodobiti meja" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 #, fuzzy msgid "Cannot write to working directory {}." msgstr "Ne morem ustvariti indeksa" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 #, fuzzy msgid "No extension (toolbox) installed" msgstr "Ime nove lokacije (location), ki bo ustvarjena" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 #, fuzzy msgid "No extension (module) installed" msgstr "Ime nove lokacije (location), ki bo ustvarjena" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 #, fuzzy msgid "List of available extensions (toolboxes):" msgstr "Izpiši podprte formate in končaj" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 #, fuzzy msgid "List of available extensions (modules):" msgstr "Izpiši podprte formate in končaj" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 #, fuzzy msgid "Unable to fetch addons metadata file" msgstr "Ne morem izbrati (select) podatkov iz tabele" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, fuzzy, python-format msgid "Unable to fetch '%s'" msgstr "Ne morem izpisati baz podatkov." -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 #, fuzzy msgid "$GISBASE not defined" msgstr "ime tabele" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, fuzzy, python-format msgid "Installing toolbox <%s>..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 #, fuzzy msgid "Nothing to install" msgstr "Ničesar nisem našel.\n" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 #, fuzzy msgid "Updating extensions metadata file..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 #, fuzzy msgid "Updating extension modules metadata file..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 #, fuzzy msgid "Unable to read addons metadata file from the remote server" msgstr "Ime rastrskega sloja" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, fuzzy, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "Ime rastrskega sloja" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, fuzzy, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "ne morem odpreti <%s>" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, fuzzy, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "Izpiše vrednosti v stilu lupinskega skripta" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, fuzzy, python-format msgid "GRASS Addons <%s> not found" msgstr "ne najdem regije <%s>" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, fuzzy, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "Vhodna datoteka je prenosljiva.\n" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "ne najdem regije <%s>" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 #, fuzzy msgid "Path to the source code:" msgstr "Ime datoteke s filtrom" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 #, fuzzy msgid "To compile run:" msgstr "Nepoznan tip" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 #, fuzzy msgid "Compiling..." msgstr "Rišem ..." -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 #, fuzzy msgid "Installing..." msgstr "lokacija baze podatkov" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 #, fuzzy msgid "List of removed files:" msgstr "Spisek vrednosti plastnic" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 #, fuzzy msgid "Files to be removed:" msgstr "Rastrski sloj, ki ga nameravate uvoziti" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 #, fuzzy msgid "Updating addons metadata file..." msgstr "Zapisujem novo datoteko...\n" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, fuzzy, python-format msgid "Extension <%s> successfully uninstalled." msgstr "Ime izhodnega rastrskega sloja" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, fuzzy, python-format msgid "Extension <%s> not found" msgstr "ne najdem regije <%s>" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -87537,60 +87998,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, fuzzy, python-format msgid "Unable to create '%s': %s" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, fuzzy, python-format msgid "Manual page for <%s> updated" msgstr "Rastrski sloj za površino" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, fuzzy, python-format msgid "Unable to read manual page: %s" msgstr "ne morem odpreti <%s>" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, fuzzy, python-format msgid "Unable for write manual page: %s" msgstr "Ne morem odpreti cellfile za [%s]" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, fuzzy, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "ne morem odpreti %s" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -87645,27 +88106,39 @@ msgstr "neveljavna regija: %s" msgid "Building topology for vector map <%s> failed" msgstr "Berem dig_att datoteko...\n" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "Ne morem odpreti cellfile za [%s]" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, fuzzy, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "ne najdem regije <%s>" + +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" msgstr "ne morem odpreti razpona za datoteko %s" -#: ../scripts/v.db.join/v.db.join.py:191 -#, fuzzy, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:224 +#, fuzzy, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "Berem dig_att datoteko...\n" -#: ../scripts/v.db.join/v.db.join.py:197 -#, fuzzy, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +#, fuzzy +msgid "Error filling columns {}" msgstr "ne morem odpreti razpona za datoteko %s" #: ../scripts/g.download.location/g.download.location.py:105 @@ -87713,16 +88186,6 @@ msgstr "Kopiranje tabele ni bilo uspešno" msgid "Path to the location now <{path}>" msgstr "Ne morem ustvariti tabele: %s" -#: ../scripts/d.redraw/d.redraw.py:53 -#, fuzzy, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "Ne morem odpreti cellfile za [%s]" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, fuzzy, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "Ne morem odpreti cellfile za [%s]" - #: ../scripts/r.plane/r.plane.py:84 #, fuzzy msgid "Input coordinates seems to be invalid" @@ -87805,41 +88268,52 @@ msgstr "ne najdem 3Dview datoteke <%s>" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "Ne najdem vhodnega vektorja <%s>" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, fuzzy, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +#, fuzzy +msgid "Column <{}> is already in the table. Skipping." msgstr "ne najdem regije <%s>" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, fuzzy, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +#, fuzzy +msgid "Adding column <{}> to the table" msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, fuzzy, python-format -msgid "Unable to add column <%s>." -msgstr "Ne morem odpreti cellfile za [%s]" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +#, fuzzy +msgid "Error adding columns {}" +msgstr "ne morem odpreti razpona za datoteko %s" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 #, fuzzy msgid "xy-locations are not supported" msgstr "Tip zapisa kolone ni podprt" @@ -87891,22 +88365,240 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 #, fuzzy msgid "Latitude-longitude locations are not supported" msgstr "Tip zapisa kolone ni podprt" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, fuzzy, python-format msgid "Generating output raster map <%s>..." msgstr "Ime izhodnega rastrskega sloja" +<<<<<<< HEAD <<<<<<< HEAD ======= +#, fuzzy, c-format +#~ msgid "Unable to create new location <%s>" +#~ msgstr "Ne morem ustvariti tabele: %s" + +#, fuzzy +#~ msgid "" +#~ "Classification of a vector maps based on the values in attribute tables" +#~ msgstr "Izpiši trenutne parametre povezave in končaj" + +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Ime vhodnega rastrskega sloja" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Ime izhodnega vektorskega sloja" + +#, fuzzy +#~ msgid "layer number/name for the training layer" +#~ msgstr "Ime izhodnega vektorskega sloja" + +#, fuzzy +#~ msgid "layer number/name for the ML results" +#~ msgstr "Ime izhodnega vektorskega sloja" + +#, fuzzy +#~ msgid "Data with statistics in npy format." +#~ msgstr "Vhodni sloj" + +#, fuzzy +#~ msgid "Numpy array with vector cats." +#~ msgstr "%d točk je bilo zapisanih na izhodno datoteko\n" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Ime rastrskega sloja" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr " Število kolon\n" + +#, fuzzy +#~ msgid "Export to numpy files" +#~ msgstr "Ime izhodne datoteke" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Tip zapisa izhodnega rastrskega sloja" + +#, fuzzy +#~ msgid "Test different classification methods" +#~ msgstr "Ime datoteke z rezultatom klasifikacije" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "Ime obstoječega rastrskega sloja s plastnicami" + +#, fuzzy +#~ msgid "Vector input of stream network created by r.stream.extract" +#~ msgstr "Ime novega rastrskega sloja" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Ime izhodnega rastrskega sloja" + +#, fuzzy +#~ msgid "Flow accumulation raster" +#~ msgstr "Pokrovni rastrski sloj" + +#, fuzzy +#~ msgid "Flow accumulation units" +#~ msgstr "lokacija baze podatkov" + +#, fuzzy +#~ msgid "Multiplier to convert flow accumulation to your chosen unit" +#~ msgstr "Faktor preobrazbe iz višinskih enot karte v metre" + +#, fuzzy +#~ msgid "Averaging distance [map units]" +#~ msgstr "%s:linija %d:%s\n" + +#, fuzzy +#~ msgid "Plots to generate" +#~ msgstr "Število željenih točk" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Izpiši rastrske sloje v vhodni \"location\" in končaj" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Resolucija izhodnega sloja" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Dolžina: %f\n" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "ime tabele" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Izhodni sloj" + +#, fuzzy +#~ msgid "limit value axis" +#~ msgstr "Spisek vrednosti deljenih z vejico: npr. 1.4,3.8,13" + +#, fuzzy +#~ msgid "The width of the boxplots" +#~ msgstr "Spisek vrednosti plastnic" + +#, fuzzy +#~ msgid "density" +#~ msgstr "Rišem ..." + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Ne najdem vhodnega vektorja <%s>" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "tiho" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Ime rastrskega sloja, ki vsebuje podatke o strošku premikanja" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Ime rastrskega sloja, ki vsebuje podatke o strošku premikanja" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Vhodni sloj" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Ime izhodnega rastrskega sloja" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Ime datoteke z rezultatom klasifikacije" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Največja možna razdalja od točk (v metrih)." + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Resolucija izhodnega sloja" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Ime izhodne tabele" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Ime izhodnega vektorskega točkovnega sloja" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Ime izhodne datoteke, ki bo vsebovala poročilo" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Ime izhodne datoteke, ki bo vsebovala poročilo" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" + +#, fuzzy +#~ msgid "Format: 1,2,3" +#~ msgstr "Izhodni sloj" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Ime rastrskega sloja, ki bo uporabljen za <%s>" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Število točk najbližjih točk, ki bodo upoštevane" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Nič je nadmorska višina" + +#, fuzzy +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Izpiši trenutne parametre povezave in končaj" + +#, fuzzy +#~ msgid "Location:" +#~ msgstr "ne morem odpreti %s" + +#, fuzzy, python-format +#~ msgid "Unable to open file '%s' for reading. Details: %s" +#~ msgstr "Ne morem odpreti cellfile za [%s]" + +#, fuzzy, python-format +#~ msgid "Unable to open file '%s' for writing. Details: %s" +#~ msgstr "Ne morem odpreti cellfile za [%s]" + +#, fuzzy, python-format +#~ msgid "Unable to add column <%s>." +#~ msgstr "Ne morem odpreti cellfile za [%s]" + +======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= #: ../scripts/r.fillnulls/r.fillnulls.py:161 msgid "A user raster mask (MASK) is present. Saving it..." msgstr "" @@ -89787,6 +90479,10 @@ msgstr "" #~ msgstr "%-5d mrtvih kategorij točk preskočenih\n" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Creates a raster map from LAS LiDAR points using univariate statistics " @@ -89855,10 +90551,6 @@ msgstr "" #~ msgid "print log file to file?" #~ msgstr "Ime izhodnega vektorskega sloja" -#, fuzzy -#~ msgid "Prevalence of presence points" -#~ msgstr "Ime sloja, ki bo uporabljen za odtenek (HUE)" - #, fuzzy #~ msgid "Output buffer map" #~ msgstr "Izhodni sloj" diff --git a/locale/po/grassmods_ta.po b/locale/po/grassmods_ta.po index 3690d93fb6a..b87fec27153 100644 --- a/locale/po/grassmods_ta.po +++ b/locale/po/grassmods_ta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_ta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2018-01-06 11:31+0100\n" "Last-Translator: Arun Balaji , 2017\n" "Language-Team: Tamil (https://www.transifex.com/grass-gis/teams/45198/ta/)\n" @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -264,7 +265,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -289,7 +290,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -300,7 +301,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -322,7 +323,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -479,6 +480,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -498,7 +500,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -517,7 +518,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -531,6 +531,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -564,7 +565,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -574,8 +575,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -590,21 +591,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -613,7 +614,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -648,7 +649,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -661,7 +661,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -700,6 +699,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -721,7 +721,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -787,7 +787,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -801,7 +801,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -814,8 +814,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -830,16 +830,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -885,7 +885,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -901,7 +901,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -910,7 +910,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -940,13 +940,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -974,7 +974,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -989,8 +989,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1024,10 +1024,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1035,7 +1035,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1065,23 +1065,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1163,13 +1163,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1222,6 +1222,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1282,6 +1283,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1347,14 +1354,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1404,144 +1410,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1558,35 +1552,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1594,55 +1586,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1722,12 +1716,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1765,7 +1757,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1781,7 +1773,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1830,24 +1822,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1963,7 +1949,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1973,7 +1959,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2093,7 +2078,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2122,6 +2107,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2255,7 +2241,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2264,8 +2256,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2297,7 +2289,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2353,7 +2345,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2398,7 +2389,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2451,7 +2442,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2863,7 +2854,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2951,14 +2942,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3117,7 +3110,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3425,6 +3418,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3513,17 +3515,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3544,7 +3544,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "வெளியீடு" @@ -3616,7 +3616,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3649,160 +3649,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3835,19 +3827,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3916,9 +3908,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3932,36 +3924,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4016,6 +4008,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4036,46 +4031,56 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "வெளியீடு அலகுகள்" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4084,82 +4089,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4959,7 +4976,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5038,7 +5055,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5167,7 +5184,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5366,9 +5383,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5384,7 +5400,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5592,9 +5608,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5612,7 +5628,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5697,10 +5713,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5739,30 +5755,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5883,123 +5899,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6099,7 +6115,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6133,7 +6149,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6165,7 +6181,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6219,9 +6235,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6237,8 +6253,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6248,24 +6264,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6317,7 +6364,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6617,7 +6664,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6723,7 +6770,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6809,7 +6855,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7428,7 +7474,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7437,7 +7483,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7542,7 +7588,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7566,15 +7612,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7647,7 +7693,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7697,17 +7743,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7765,6 +7808,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7902,7 +7946,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7985,7 +8029,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8044,7 +8088,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8105,7 +8149,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8228,7 +8272,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8367,7 +8410,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8459,8 +8502,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8469,8 +8512,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8488,7 +8531,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8868,9 +8911,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9095,13 +9138,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9114,7 +9155,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9356,31 +9396,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9396,12 +9436,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9416,18 +9455,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9451,10 +9489,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9484,7 +9521,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9493,210 +9530,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10362,7 +10415,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10475,6 +10527,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10506,26 +10570,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10550,12 +10594,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10563,40 +10601,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10747,7 +10785,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10991,29 +11029,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11068,71 +11106,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11175,6 +11180,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11878,7 +11916,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11892,12 +11930,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11923,10 +11960,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11982,12 +12017,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12004,12 +12039,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12017,7 +12052,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12025,7 +12060,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12041,12 +12076,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12125,7 +12160,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12378,8 +12413,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12545,7 +12581,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12556,6 +12592,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13167,15 +13215,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13254,7 +13302,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13264,7 +13312,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13352,7 +13400,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13361,7 +13409,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13673,7 +13721,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13684,19 +13732,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13704,15 +13752,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13721,62 +13782,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13946,9 +14015,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14288,21 +14354,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14487,80 +14553,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15435,32 +15501,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15476,61 +15542,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15554,7 +15620,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16494,46 +16559,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16858,7 +16923,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17312,8 +17377,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17440,97 +17505,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17793,11 +17858,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17996,32 +18061,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18104,7 +18169,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18127,8 +18192,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18882,8 +18948,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18893,28 +18959,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18923,57 +18989,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18982,7 +19048,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18991,7 +19057,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19483,6 +19549,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19541,64 +19611,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19704,7 +19782,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19717,10 +19794,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19734,11 +19809,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20232,10 +20307,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20291,9 +20366,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20353,13 +20428,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20720,67 +20795,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21024,8 +21099,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21291,154 +21366,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21527,7 +21602,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21537,97 +21612,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21770,7 +21845,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21853,33 +21929,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21888,69 +21986,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21965,37 +22067,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22348,7 +22447,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23535,7 +23634,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23631,7 +23730,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23639,7 +23739,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23672,35 +23772,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "குழு காணவில்லை" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23753,61 +23854,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23817,7 +23923,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23826,20 +23932,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23954,15 +24060,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24002,101 +24106,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24220,6 +24322,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24236,6 +24348,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24245,6 +24362,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24611,6 +24748,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26171,8 +26309,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26496,17 +26634,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26515,17 +26650,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26534,17 +26666,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26554,17 +26683,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26573,12 +26699,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27360,11 +27484,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27413,7 +27541,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27506,16 +27634,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28084,6 +28211,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28126,6 +28287,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28161,58 +28324,68 @@ msgid "Input bands" msgstr "உள்ளீடு" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28290,231 +28463,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28713,6 +28669,503 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr " முறை கேடான வரி வேண்டுகோள்" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "ஒருங்கிணைப்பு" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "செல்களின் எண்ணிக்கை" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28903,10 +29356,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29132,6 +29590,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30296,7 +30762,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30340,11 +30806,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31394,7 +31855,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31428,6 +31888,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31779,7 +32250,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31972,7 +32442,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "உள்ளீடு" @@ -32006,6 +32476,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33014,11 +33492,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33064,44 +33539,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33867,8 +34355,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33878,6 +34375,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33915,11 +34413,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "வெளியீடு" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34211,6 +34711,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34222,6 +34723,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34250,6 +34752,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34610,63 +35113,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35001,11 +35447,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35837,6 +36285,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35963,12 +36419,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36105,9 +36561,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36150,19 +36605,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36171,7 +36636,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36298,32 +36763,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "நீரியல்" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36946,6 +37385,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37226,7 +37669,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37257,7 +37700,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37933,9 +38376,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38182,6 +38631,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39180,8 +39637,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39273,39 +39730,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "செல்களின் எண்ணிக்கை" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42441,8 +42907,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42480,6 +42946,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42877,6 +43344,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42926,6 +43400,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "உள்ளீடு" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "வெளியீடு" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42961,6 +43449,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43364,8 +43882,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44087,6 +44605,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44368,6 +44890,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44784,10 +45310,85 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "நீரியல்" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45273,17 +45874,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45309,22 +45900,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45334,9 +45922,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45354,13 +45941,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45370,14 +45955,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45410,14 +45993,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45428,26 +46003,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45491,15 +46062,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45517,7 +46079,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45527,48 +46088,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45576,101 +46128,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46845,6 +47319,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -46868,6 +47350,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46958,278 +47448,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47558,8 +48048,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47639,167 +48129,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "உள்ளீடு" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48589,11 +48918,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -54016,6 +54340,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -54547,8 +54910,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54849,8 +55212,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -55030,7 +55393,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -55044,7 +55407,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -55574,7 +55937,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55864,7 +56227,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55954,49 +56317,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -56006,33 +56365,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -56069,7 +56428,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -56146,178 +56505,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56794,7 +57153,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -57032,11 +57391,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -57063,7 +57422,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -57072,7 +57431,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -57092,7 +57451,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -57128,11 +57487,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -57167,13 +57526,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -57188,12 +57551,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -58361,7 +58724,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58984,7 +59347,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -59291,12 +59654,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -59496,19 +59859,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -59717,7 +60080,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59875,10 +60238,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59917,6 +60280,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -60017,9 +60384,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -60033,7 +60400,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -60118,7 +60485,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -60146,8 +60512,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -60767,7 +61133,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60901,8 +61267,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -62680,17 +63046,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62866,13 +63232,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -63118,42 +63484,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -64135,16 +64505,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -65570,66 +65930,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65918,7 +66278,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -66375,164 +66735,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -66709,27 +67069,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -66796,274 +67179,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -67072,51 +67455,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -67272,10 +67655,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "குழு காணவில்லை" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -67439,7 +67832,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -67447,7 +67840,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -67455,7 +67848,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -68441,6 +68834,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -69009,6 +69406,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -69580,7 +69994,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -69819,22 +70233,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71863,38 +72270,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71974,11 +72381,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -72003,103 +72410,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -72111,336 +72518,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -72493,50 +72900,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -72564,7 +72971,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -72782,7 +73189,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -72839,85 +73246,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -72963,28 +73370,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -73041,27 +73448,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -73071,7 +73478,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -73081,14 +73487,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -73096,72 +73502,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -73388,7 +73794,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -73406,64 +73812,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -73603,79 +74010,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -73787,40 +74194,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -73856,7 +74263,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -73867,34 +74274,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -73986,34 +74393,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -74092,316 +74499,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -74409,60 +74816,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -74514,27 +74921,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -74580,16 +74997,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -74660,41 +75067,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -74742,20 +75156,27 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "உள்ளீடு" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "JSON output" #~ msgstr "வெளியீடு" diff --git a/locale/po/grassmods_th.po b/locale/po/grassmods_th.po index f7d8944158e..e7ca7b860c7 100644 --- a/locale/po/grassmods_th.po +++ b/locale/po/grassmods_th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_th\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2008-01-05 15:19+0700\n" "Last-Translator: man \n" "Language-Team: Thai \n" @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -264,7 +265,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -289,7 +290,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -300,7 +301,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -322,7 +323,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -479,6 +480,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -498,7 +500,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -517,7 +518,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -531,6 +531,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -564,7 +565,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -574,8 +575,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -590,21 +591,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -613,7 +614,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -648,7 +649,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -661,7 +661,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -700,6 +699,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -721,7 +721,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -787,7 +787,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -801,7 +801,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -814,8 +814,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -830,16 +830,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -885,7 +885,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -901,7 +901,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -910,7 +910,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -940,13 +940,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -974,7 +974,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -989,8 +989,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1024,10 +1024,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1035,7 +1035,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1065,23 +1065,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1163,13 +1163,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1222,6 +1222,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1282,6 +1283,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1347,14 +1354,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1404,144 +1410,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1558,35 +1552,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "นำเข้า ล้มเหลว" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1594,55 +1586,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1722,12 +1716,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1765,7 +1757,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1781,7 +1773,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1831,24 +1823,18 @@ msgstr "ชื่อของแผนที่เชิงภาพผลลั #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1969,7 +1955,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1979,7 +1965,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2100,7 +2085,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2129,6 +2114,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2262,7 +2248,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2271,8 +2263,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2304,7 +2296,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2360,7 +2352,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2405,7 +2396,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2458,7 +2449,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2869,7 +2860,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2957,14 +2948,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3123,7 +3116,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3431,6 +3424,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3519,17 +3521,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3550,7 +3550,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3622,7 +3622,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3655,160 +3655,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3841,19 +3833,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3922,9 +3914,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3938,36 +3930,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4022,6 +4014,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4042,46 +4037,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4090,82 +4094,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4965,7 +4981,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5044,7 +5060,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5173,7 +5189,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5372,9 +5388,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5390,7 +5405,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5597,9 +5612,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5617,7 +5632,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5702,10 +5717,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5745,30 +5760,30 @@ msgstr "Scale factor สำหรับ ค่าความสูง" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5891,123 +5906,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6107,7 +6122,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6141,7 +6156,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6171,7 +6186,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6224,9 +6239,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6242,8 +6257,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6253,24 +6268,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6322,7 +6368,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6622,7 +6668,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6728,7 +6774,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6814,8 +6859,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "แลต/ลอง projection ยังใช้ไม่ได้ในตอนนี้" #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7433,7 +7479,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7442,7 +7488,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7547,7 +7593,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7571,15 +7617,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7652,7 +7698,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7702,17 +7748,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7770,6 +7813,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7908,7 +7952,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7991,7 +8035,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8050,7 +8094,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8111,7 +8155,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8234,7 +8278,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8373,7 +8416,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8465,8 +8508,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8475,8 +8518,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8494,7 +8537,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8874,10 +8917,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "แลต/ลอง projection ยังใช้ไม่ได้ในตอนนี้" #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9100,13 +9143,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9119,7 +9160,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9361,31 +9401,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9401,12 +9441,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9421,18 +9460,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9456,10 +9495,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9489,7 +9527,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9498,210 +9536,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10366,7 +10420,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10479,6 +10532,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10510,26 +10575,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10554,12 +10599,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10567,40 +10606,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10750,7 +10789,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10993,29 +11032,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11068,71 +11107,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11175,6 +11181,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11878,7 +11917,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11892,12 +11931,12 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "แปลง แผนที่เชิงเส้นทั้งหมดของ GRASS < Ver5.7 ในชุดแผนที่ที่ใช้งานไปเป็น รูปแบบปัจจุบัน" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11923,10 +11962,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11982,12 +12019,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12004,12 +12041,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12017,7 +12054,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12025,7 +12062,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12041,12 +12078,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12126,7 +12163,7 @@ msgid "Sorting events..." msgstr "กำลังเขียน ไฟล์ใหม่" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12382,8 +12419,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12549,7 +12587,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12560,6 +12598,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13171,15 +13221,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13258,7 +13308,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13268,7 +13318,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13354,7 +13404,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13363,7 +13413,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13675,7 +13725,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13686,19 +13736,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13706,15 +13756,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13723,62 +13786,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13948,9 +14019,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14289,21 +14357,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14487,80 +14555,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15435,31 +15503,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" +msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15475,61 +15544,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15553,7 +15622,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16492,46 +16560,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16856,7 +16924,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17307,8 +17375,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17435,97 +17503,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17788,11 +17856,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17991,32 +18059,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18099,8 +18167,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Input_options" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18122,8 +18191,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18877,8 +18947,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18888,28 +18958,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18918,57 +18988,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18977,7 +19047,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18986,7 +19056,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19478,6 +19548,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19536,64 +19610,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19699,7 +19781,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19712,10 +19793,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19729,11 +19808,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20227,10 +20306,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20286,9 +20365,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20348,13 +20427,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20715,67 +20794,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21019,8 +21098,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21286,154 +21365,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21522,7 +21602,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21531,98 +21611,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "นำเข้า ล้มเหลว" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21765,7 +21845,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21848,33 +21929,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21883,69 +21986,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21960,37 +22067,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22343,7 +22447,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23530,7 +23634,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23626,7 +23730,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23634,8 +23739,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23668,34 +23774,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23748,61 +23855,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23812,7 +23924,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23821,20 +23933,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23949,15 +24061,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23997,101 +24107,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24215,6 +24323,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24231,6 +24349,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24240,6 +24363,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24605,6 +24748,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "ตำแหน่ง: %s\n" @@ -26175,8 +26319,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26500,17 +26644,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26519,17 +26660,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26538,17 +26676,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26558,17 +26693,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26577,12 +26709,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27369,11 +27499,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27422,7 +27556,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27515,16 +27649,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28094,6 +28227,41 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28136,6 +28304,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28172,62 +28342,73 @@ msgstr "Input_options" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#, fuzzy +msgid "Name of output raster shadow mask" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "%s: ข้อผิดพลาดขณะเขียน ไฟล์ชั่วคราว" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "ค่าพิกัดจุด Seed" @@ -28307,232 +28488,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "จำนวนชั้นข้อมูล" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28735,6 +28698,512 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "ชื่อของชั้นข้อมูลที่จะส่งออก" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s:ค่าที่กำหนด ไม่ถูกต้อง" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "ชื่อของแผนเชิงเส้นนำเข้า ที่มีเส้น" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "ชื่อของแผนเชิงเส้นนำเข้า ที่มีเส้น" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "ชื่อของ แผนที่เชิงภาพ spread path" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "ตำแหน่ง: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "จำนวนของ quadrats" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "เครื่องมือ: Threshold" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "ชื่อของ แผนที่เชิงภาพ spread path" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "จำนวนของ quadrats" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28927,10 +29396,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29167,6 +29641,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30350,7 +30832,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30394,11 +30876,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31476,7 +31953,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "จำนวนชั้นข้อมูล" @@ -31513,6 +31989,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31868,7 +32355,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32062,7 +32548,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Input_options" @@ -32096,6 +32582,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33145,11 +33639,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33195,44 +33686,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -34017,8 +34521,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34028,6 +34541,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34066,11 +34580,13 @@ msgid "" msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Output_options" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34363,6 +34879,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34374,6 +34891,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34403,6 +34921,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34768,63 +35287,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35165,11 +35627,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36014,6 +36478,14 @@ msgid "" "mapset." msgstr "แปลง แผนที่เชิงเส้นทั้งหมดของ GRASS < Ver5.7 ในชุดแผนที่ที่ใช้งานไปเป็น รูปแบบปัจจุบัน" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36142,12 +36614,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36286,9 +36758,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36331,19 +36802,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36352,7 +36833,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36484,32 +36965,6 @@ msgstr "" msgid "Base name for output file" msgstr "ชื่อของชั้นข้อมูลที่จะส่งออก" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37149,6 +37604,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37435,7 +37894,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37466,8 +37925,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38158,9 +38618,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38413,6 +38879,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39425,8 +39899,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39521,39 +39995,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42760,8 +43243,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42799,6 +43282,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43200,6 +43684,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43253,6 +43744,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "นำเข้า ล้มเหลว" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "นำเข้า ล้มเหลว" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -43289,6 +43794,37 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "จำนวนของ quadrats" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43700,8 +44236,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44428,6 +44964,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "แผนที่เชิงภาพผลลัพธ์ (ค่าตั้งต้น: input tile)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44710,6 +45250,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -45137,10 +45681,88 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "ชื่อของชั้นข้อมูลที่จะส่งออก" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "ชื่อของแผนเชิงเส้นนำเข้า ที่มีเส้น" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "ชื่อของ แผนที่เชิงภาพ spread path" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45631,17 +46253,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45667,23 +46279,20 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45693,9 +46302,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45714,13 +46322,11 @@ msgid "Create a vector point layer of outliers" msgstr "ชื่อของแผนเชิงเส้นนำเข้า ที่มีเส้น" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45730,14 +46336,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45770,14 +46374,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45789,26 +46385,22 @@ msgid "Plot format" msgstr "Input_options" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45853,15 +46445,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45879,7 +46462,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45889,48 +46471,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45938,104 +46511,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "คำนำหน้า สำหรับ แผนที่เชิงภาพ ผลลัพธ์" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -47234,6 +47726,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -47257,6 +47757,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -47348,289 +47856,289 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "นำเข้า ล้มเหลว" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "ชื่อของ แผนที่เชิงภาพ spread path" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "ชื่อของแผนเชิงเส้นนำเข้า ที่มีเส้น" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "ชื่อของ แผนที่เชิงภาพ spread path" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "ชื่อของแผนเชิงเส้นนำเข้า ที่มีเส้น" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "ชื่อของชั้นข้อมูลผลลัพธ์ที่ใช้สำหรับ เขียว" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "ไฟล์ GNS ไม่ได้บีบอัด จาก NGA (ด้วยนามสกุล .txt)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "คำนำหน้า สำหรับ แผนที่เชิงภาพ ผลลัพธ์" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Input_options" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Input_options" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Input_options" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47974,8 +48482,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -48055,178 +48563,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "นำเข้า ล้มเหลว" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "ไฟล์ผลลัพธ์ แผนที่ aspect ( หรือ fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "ไฟล์ผลลัพธ์ แผนที่ aspect ( หรือ fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "คำนำหน้า สำหรับ แผนที่เชิงภาพ ผลลัพธ์" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "ชื่อของไฟล์ผลลัพธ์" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "ชื่อของชั้นข้อมูลผลลัพธ์ที่ใช้สำหรับ เขียว" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "ชื่อของชั้นข้อมูลผลลัพธ์ที่ใช้สำหรับ เขียว" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "จำนวนของ quadrats" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -49028,11 +49364,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -53887,6 +54218,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -54422,8 +54792,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54724,8 +55094,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54905,7 +55275,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54919,7 +55289,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -55447,7 +55817,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55737,7 +56107,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55826,49 +56196,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55878,33 +56244,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55941,7 +56307,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -56018,178 +56384,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56660,7 +57026,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56896,11 +57262,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56927,7 +57293,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56936,7 +57302,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56956,7 +57322,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56992,11 +57358,12 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "แปลง แผนที่เชิงเส้นทั้งหมดของ GRASS < Ver5.7 ในชุดแผนที่ที่ใช้งานไปเป็น รูปแบบปัจจุบัน" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -57031,13 +57398,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -57052,12 +57423,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -58631,7 +59002,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -59253,7 +59624,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -59557,12 +59928,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -59762,19 +60133,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -59982,7 +60353,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -60140,10 +60511,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -60182,6 +60553,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -60282,9 +60657,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -60298,7 +60673,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -60383,7 +60758,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -60411,8 +60785,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -61031,7 +61405,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -61163,8 +61537,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -62925,17 +63299,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -63111,13 +63485,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -63363,42 +63737,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -64380,16 +64758,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -65783,66 +66151,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -66128,7 +66496,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -66585,164 +66953,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -66918,27 +67286,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -67005,274 +67396,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -67281,51 +67672,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -67481,10 +67872,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -67648,14 +68049,14 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -67663,7 +68064,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -68649,6 +69050,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -69211,6 +69616,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "นำเข้า ล้มเหลว" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "นำเข้า ล้มเหลว" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -69771,7 +70193,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -70010,22 +70432,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -72050,38 +72465,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -72161,11 +72576,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -72190,103 +72605,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -72298,336 +72713,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -72680,50 +73095,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -72751,7 +73166,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -72969,7 +73384,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -73026,85 +73441,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -73150,28 +73565,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -73228,27 +73643,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -73258,7 +73673,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -73268,14 +73682,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -73283,72 +73697,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -73575,7 +73989,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -73593,64 +74007,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -73790,79 +74205,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -73974,40 +74389,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -74043,7 +74458,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -74054,34 +74469,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -74173,34 +74588,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -74279,316 +74694,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -74596,60 +75011,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -74701,27 +75116,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -74767,16 +75192,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -74847,41 +75262,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -74929,20 +75351,87 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "จำนวนชั้นข้อมูล" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "คำนำหน้า สำหรับ แผนที่เชิงภาพ ผลลัพธ์" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Column ตารางรายละเอียด ด้วยค่าที่จะใช้ interpolate" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "นำเข้า ล้มเหลว" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "ไฟล์ผลลัพธ์ แผนที่ aspect ( หรือ fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "ไฟล์ผลลัพธ์ แผนที่ aspect ( หรือ fy)" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "คำนำหน้า สำหรับ แผนที่เชิงภาพ ผลลัพธ์" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "ชื่อของแผนที่เชิงภาพผลลัพธ์" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "ชื่อของไฟล์ผลลัพธ์" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "ชื่อของชั้นข้อมูลผลลัพธ์ที่ใช้สำหรับ เขียว" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "ชื่อของชั้นข้อมูลผลลัพธ์ที่ใช้สำหรับ เขียว" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "จำนวนของ quadrats" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "Upgrades the version of a space time dataset (TGRASS DB)." #~ msgstr "ชื่อของฐานข้อมูลใหม่" @@ -77012,9 +77501,6 @@ msgstr "TERRAIN points เท่านั้น" #~ msgid "%s=%s - illegal number of interpolation points" #~ msgstr "%s=%s - จำนวนจุดที่ใช้ทำ interpolation ไม่ถูกต้อง" -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "แลต/ลอง projection ยังใช้ไม่ได้ในตอนนี้" - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "ตัวอักษร ที่ใช้แทน no data cell" @@ -77067,8 +77553,8 @@ msgstr "TERRAIN points เท่านั้น" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "สีสำหรับวาดกริด, หรือ \"none\"" #, fuzzy diff --git a/locale/po/grassmods_tr.po b/locale/po/grassmods_tr.po index 7ca13d42687..9699d2c5a2d 100644 --- a/locale/po/grassmods_tr.po +++ b/locale/po/grassmods_tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_tr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2008-11-16 01:15+0200\n" "Last-Translator: Osman Yalçın YILMAZ \n" "Language-Team: Türkçe \n" @@ -89,7 +89,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -129,32 +129,33 @@ msgid "Print current connection parameters and exit" msgstr "Geçerli bağlantı parametrelerini yaz ve çık" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -180,21 +181,21 @@ msgstr "Geçerli bağlantı parametrelerini yaz ve çık" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "Yazdır" @@ -266,7 +267,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -291,7 +292,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -302,7 +303,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -324,7 +325,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -481,6 +482,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -500,7 +502,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -519,7 +520,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -533,6 +533,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -566,7 +567,7 @@ msgstr "İlk raster modülüm" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -576,8 +577,8 @@ msgstr "İlk raster modülüm" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -592,21 +593,21 @@ msgstr "İlk raster modülüm" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "<%s> raster haritası bulunamadı" @@ -615,7 +616,7 @@ msgstr "<%s> raster haritası bulunamadı" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -650,7 +651,6 @@ msgstr "<%s> raster haritası bulunamadı" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -663,7 +663,6 @@ msgstr "<%s> raster haritası bulunamadı" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -702,6 +701,7 @@ msgstr "<%s> raster haritası bulunamadı" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -723,7 +723,7 @@ msgstr "<%s> raster haritası bulunamadı" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -789,7 +789,7 @@ msgstr "<%s> raster haritası bulunamadı" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -803,7 +803,7 @@ msgstr "İlk vektör modülüm" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -816,8 +816,8 @@ msgstr "İlk vektör modülüm" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -832,16 +832,16 @@ msgstr "Önceden belirlenen vektör açma katmanı ayarlanamıyor" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -887,7 +887,7 @@ msgstr "Önceden belirlenen vektör açma katmanı ayarlanamıyor" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -903,7 +903,7 @@ msgstr "<%s> vektör haritası açılamıyor" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -912,7 +912,7 @@ msgstr "<%s> vektör haritası açılamıyor" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -942,13 +942,13 @@ msgstr "<%s> vektör haritası açılamıyor" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -976,7 +976,7 @@ msgstr "%d katmanının veritabanı bağlantısı belirlenmedi" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -991,8 +991,8 @@ msgstr "Sürücü başlatılamıyor<%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1026,10 +1026,10 @@ msgstr "Sürücü başlatılamıyor<%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1037,7 +1037,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "<%s> sürücüsüyle <%s> veritabanı açılamıyor" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1067,23 +1067,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "<%s> için gri renk tablosu ayarlanıyor (8 bit, tam aralık)" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "<%s> için gri renk tablosu ayarlanıyor (16 bit, tam aralık)" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1165,13 +1165,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1224,6 +1224,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1284,6 +1285,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1349,14 +1356,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1406,144 +1412,132 @@ msgstr "Sonuç haritanın başlığı" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "Desteklenen biçimleri yaz ve çık" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "Seçilen (%d) bandı yok" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1560,35 +1554,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "<%s> raster haritası oluşturulamıyor" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" +#, fuzzy, c-format +msgid "Project <%s> created" msgstr "< %s> Mevkisi oluşturuldu" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1596,55 +1588,59 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +#, fuzzy +msgid "Project PROJ_INFO is:\n" msgstr "Mevki: PROJ_INFO:\n" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "Veri takımı PROJ_INFO su:\n" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +#, fuzzy +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "Girdi veri takımı ve geçerli mevkinin projeksiyonu eşleşiyor" #: ../raster/r.quantile/main.c:94 @@ -1724,12 +1720,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1767,7 +1761,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1783,7 +1777,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1833,24 +1827,18 @@ msgstr "Çıktı kesik kıvrıklığı raster haritasının adı" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1972,7 +1960,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1982,7 +1970,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2103,7 +2090,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2132,6 +2119,7 @@ msgstr "Dizge için hafıza ayrılamıyor" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2265,7 +2253,13 @@ msgstr "<%s=%s> geçersiz sayıda nokta" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2274,8 +2268,8 @@ msgid "The minimum number of input raster maps is two" msgstr "Girdi haritaları en küçük sayısı ikidir" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "Tamamlanan yüzde..." @@ -2307,7 +2301,7 @@ msgstr "Raster harita istatistiklerini güncelle" msgid "Statistics for <%s> updated" msgstr "<%s>'nin istatistikleri güncellendi" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2363,7 +2357,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2410,7 +2403,7 @@ msgid "Unknown method <%s>" msgstr "<%s> bilinmeyen metod" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2463,7 +2456,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2875,7 +2868,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2963,14 +2956,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3129,7 +3124,7 @@ msgid "List of cell values to be set to NULL" msgstr "BOŞ değer olarak atanacak hücre değerleri listesi" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3437,6 +3432,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3525,17 +3529,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3556,7 +3558,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3628,7 +3630,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3661,160 +3663,155 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "Geçerli mevkinin projeksiyon bilgisi alınamıyor" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "Geçerli mevkinin projeksiyon birimleri alınamadı" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "Geçerli proje için projeksiyon anahtar değerler elde edilemedi" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3847,19 +3844,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "Hafıza almadı" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3929,9 +3926,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3945,36 +3942,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4029,6 +4026,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4049,46 +4049,57 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "Çıktı biçimi" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "Çıktıda kategori değerlerini içer" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4097,82 +4108,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "<%s> dosyası açılamıyor." -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "Geçerli mevkinin projeksiyon bilgisi alınamıyor" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "Geçerli mevkinin projeksiyon birimleri alınamadı" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "Geçerli proje için projeksiyon anahtar değerler elde edilemedi" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4974,7 +4997,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "Öznitelikler" @@ -5053,7 +5076,7 @@ msgstr "İndeks oluşturulamıyor" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "<%s> tablosu üzerindeki yetkiler onaylanmadı" @@ -5182,7 +5205,7 @@ msgstr "Yeniden kodlama kurallarını içeren dosya" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5381,9 +5404,9 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +#, fuzzy +msgid "GRASS project PROJ_INFO is:\n" msgstr "GRASS MEVKİSİ PROJ_INFO su:\n" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5399,7 +5422,7 @@ msgstr "İçe aktarılacak veri takımı PROJ_INFO su:\n" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5611,9 +5634,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5631,7 +5654,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5716,10 +5739,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5760,30 +5783,30 @@ msgstr "Yükselti için ölçek faktörü" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5910,126 +5933,126 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "Kabuk betiği stilinde yazdır" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "Geçersiz girdi <%s=%s>" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "Veri okunuyor..." -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 #, fuzzy -msgid "Reprojecting the input to the location projection" +msgid "Reprojecting the input to the project's CRS" msgstr "Mevki'nin projeksiyon ayarlarını etkileşimli olarak sıfırla." -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 #, fuzzy msgid "Scanning points..." msgstr "Veri taranıyor..." -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "<%s> raster haritası zaten mevcut" @@ -6129,7 +6152,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6163,7 +6186,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6195,7 +6218,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "<%s> geçici dosyasını yazmada hata" @@ -6249,9 +6272,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6267,8 +6290,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6278,24 +6301,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "Standart sapma" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6347,7 +6401,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6647,7 +6701,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6753,7 +6807,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6839,7 +6892,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7458,7 +7511,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7467,7 +7520,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "Raster harita bulunamadı" @@ -7572,7 +7625,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7596,15 +7649,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7677,7 +7730,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7727,17 +7780,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7795,6 +7845,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7933,7 +7984,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8016,7 +8067,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8075,7 +8126,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8136,7 +8187,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "<%s> raster tipi uyumsuz" @@ -8259,7 +8310,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8398,7 +8448,7 @@ msgstr "Sadece sıfır değerli verilere filtre uygula" msgid "<%d> is not valid number of threads." msgstr "<%s=%s> geçersiz sayıda nokta" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8490,8 +8540,8 @@ msgstr "Hafızada tutulacak harita oranı" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8500,8 +8550,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8519,7 +8569,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8899,9 +8949,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" "%s tarafından Enlem/Boylam mevkisi desteklenmiyor. Lütfen önce haritayı " "yeniden projeksiyonlandırın." @@ -9128,13 +9178,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9147,7 +9195,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9389,31 +9436,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9429,13 +9476,13 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" -msgstr "" +#, fuzzy +msgid "create project" +msgstr "Kaynak projeksiyon" #: ../raster/r.in.gdal/main.c:118 msgid "Imports raster data into a GRASS raster map using GDAL library." @@ -9449,18 +9496,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Görüntü hedef mevkisi adı" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9484,10 +9531,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "oluşturulacak yeni mevki adı" #: ../raster/r.in.gdal/main.c:195 @@ -9517,7 +9564,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9526,210 +9573,229 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "<%s> raster haritası zaten mevcut ve üzerine yazılacak" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "<%s> raster haritası zaten mevcut" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "nokta dosyasındaki %d YKN <%s> için kopyalanıyor" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "YKN tablosu yeniden projeksiyonlandırılıyor:" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +#, fuzzy +msgid "Unable to get CRS info of target project" msgstr "Hedef mevkinin projeksiyon bilgisi alınamıyor" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +#, fuzzy +msgid "Unable to get CRS units of target project" msgstr "Hedef mevkinin projeksiyon birimleri alınamadı" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +#, fuzzy +msgid "Unable to get CRS key values of target project" msgstr "Hedef mevkinin projeksiyon anahtar değerler elde edilemedi" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 -#, c-format -msgid "Mapset <%s> in target location <%s> - " +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 +#, fuzzy, c-format +msgid "Mapset <%s> in target project <%s> - " msgstr "<%s> harita takımı <%s> hedef mevkisinde - " -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "erişim engellendi" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "bulunamadı" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10397,7 +10463,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10510,6 +10575,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10541,26 +10618,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10585,12 +10642,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10598,40 +10649,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "Girdi hatalı" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "Raster haritalar yazılamıyor" @@ -10782,7 +10833,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11026,29 +11077,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11103,71 +11154,38 @@ msgstr "<%s> dosyası oluşturuldu" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "En küçük rasgele değer" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "En büyük rasgele değer" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "<%s> girdi raster haritası okunuyor..." - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "%s parça dosyası oluşturulamıyor" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "%s parça dosyası açılamıyor" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11210,6 +11228,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "<%s> girdi raster haritası okunuyor..." + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "%s parça dosyası oluşturulamıyor" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "%s parça dosyası açılamıyor" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11913,7 +11964,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11927,13 +11978,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "Eski GRASS sürümündeki vektör haritaları içe aktarır." #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "Girdi vektör haritasının mevkisi" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11958,11 +12010,10 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "Yeniden projeksiyonlanacak girdi raster harita adı" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" -msgstr "" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" +msgstr "GRASS veritabanı dosya adlarını yazdır" #: ../raster/r.proj/main.c:174 msgid "Name for output raster map (default: same as 'input')" @@ -12017,12 +12068,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12038,13 +12089,13 @@ msgid "Unable to get projection key values of output raster map" msgstr "Çıktı raster haritasının projeksiyon anahtar değerleri alınamıyor" #: ../raster/r.proj/main.c:289 -#, c-format -msgid "Mapset <%s> in input location <%s> - %s" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - %s" msgstr "<%s> - %s girdi mevkisindeki <%s> harita takımı" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 -#, c-format -msgid "Checking location <%s> mapset <%s>" +#, fuzzy, c-format +msgid "Checking project <%s> mapset <%s>" msgstr "<%s> mevkisi <%s> harita takımı kontrol ediliyor" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12052,15 +12103,15 @@ msgstr "<%s> mevkisi <%s> harita takımı kontrol ediliyor" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" msgstr "İstenen <%s> parametresi ayarlanamadı" #: ../raster/r.proj/main.c:315 -#, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +#, fuzzy, c-format +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "<%s> mevkisi <%s>harita takımındaki <%s> raster haritası bulunamadı" #: ../raster/r.proj/main.c:323 @@ -12076,12 +12127,13 @@ msgid "Unable to get projection key values of input map" msgstr "Girdi haritanın projeksiyon anahtar değerleri alınamıyor" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +#, fuzzy +msgid "Unable to work with unprojected data (xy project)" msgstr "Projeksiyonsuz veri (xy konumu) ile çalışılamıyor" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12163,7 +12215,7 @@ msgid "Sorting events..." msgstr "Noktalar içe aktarılıyor..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12422,8 +12474,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12591,7 +12644,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12602,6 +12655,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "Hedef mevkinin projeksiyon bilgisi alınamıyor" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "Hedef mevkinin projeksiyon birimleri alınamadı" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "Hedef mevkinin projeksiyon anahtar değerler elde edilemedi" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13213,16 +13281,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "Geçerli mevkinin projeksiyon bilgisi alınamıyor" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "Geçerli mevkinin projeksiyon birimleri alınamadı" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "Geçerli proje için projeksiyon anahtar değerler elde edilemedi" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13300,7 +13371,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "%s = %s -- negatif olmayan sayı olmalıdır" @@ -13310,7 +13381,7 @@ msgstr "%s = %s -- negatif olmayan sayı olmalıdır" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "%s = %s -- pozitif sayı olmalıdır" @@ -13398,7 +13469,7 @@ msgstr "<%s> raster haritasının kayar nokta aralığı okunamıyor" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "Tablo oluşturulamıyor: '%s'" @@ -13407,7 +13478,7 @@ msgstr "Tablo oluşturulamıyor: '%s'" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13719,7 +13790,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13730,19 +13801,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "Sorgulanacak raster harita(lar)ın adı" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "Sorgulanacak koordinatlar" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13750,15 +13821,28 @@ msgstr "Sorgulanacak koordinatlar" msgid "Query" msgstr "Sorgu" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13767,62 +13851,70 @@ msgstr "" msgid "Advanced" msgstr "Gelişmiş" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "Hücre değerleri değil, çıktı tamsayı kategori değerleri, " -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "<%s> için kategori dosyası okunamıyor" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "İkili MAT-File(v4) GRASS raster harita katmanına dönüştür." @@ -13992,9 +14084,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14334,21 +14423,21 @@ msgstr "Düzgünleştirme değerleri negatif veya BOŞ olmamalı" msgid "Input map resolution differs from current region resolution!" msgstr "Girdi harita çözünürlüğü geçerli bölge çözünürlüğünden farklı!" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14533,80 +14622,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "Yanlış raster tipi: %s" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "<%s> deki <%s> harita takımı için yükselti ürünleri" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "<%s> bakı raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "<%s> eğim raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "<%s> kesit kıvrıklığı raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "<%s> D-B eğim raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "<%s> K-G eğim raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "<%s> Dxx raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "<%s> Dyy raster haritası tamamlandı" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "<%s> Dxy raster haritası tamamlandı" @@ -15491,32 +15580,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15532,61 +15621,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15610,7 +15699,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16550,46 +16638,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16914,7 +17002,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17368,8 +17456,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17496,97 +17584,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17849,11 +17937,11 @@ msgstr "<%s> dosyası etiket yazmak için açılamıyor" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18052,32 +18140,32 @@ msgstr "Komşuluk boyutu pozitif olmalı" msgid "Neighborhood size must be odd" msgstr "Komşuluk boyutu tek sayı olmalı" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18160,8 +18248,9 @@ msgid "Units" msgstr "Birimler" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Girdi_seçenekleri" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18183,8 +18272,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18938,8 +19028,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18949,28 +19039,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "Parametre hatası" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "Aktif kontrol noktası yok" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "Kontrol noktalarına dayalı olarak koordinat dönüşümü hesaplar." @@ -18979,57 +19069,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "Özet bilgisini göster" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19038,7 +19128,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19047,7 +19137,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19539,6 +19629,10 @@ msgstr "" msgid "Error while reading history file" msgstr "Geçmiş dosyası okunurken hata" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "GRASS MEVKİSİ PROJ_INFO su:\n" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19597,64 +19691,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19760,7 +19862,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19773,10 +19874,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19790,11 +19889,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "Görüntü" @@ -20288,10 +20387,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20347,9 +20446,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20409,13 +20508,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20779,67 +20878,68 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "Geçerli bölgeyi isimlendirilmiş bölge olarak kaydet" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "<%s> bölgesi bulunamadı " -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "<%s@%s> 3B raster haritası üstbilgisi okunamıyor" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "<%s> bölgesi ayarlanamıyor" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "Geçerli bçölge güncellenemiyor" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "Zaten enlem/boylam dasınız. Onun yerine -p bayrağını kullanın." -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 +#, fuzzy msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." -msgstr "" +msgstr "Zaten enlem/boylam dasınız. Onun yerine -p bayrağını kullanın." -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "Enlem/Boylam parametreleri güncellenemedi" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21083,8 +21183,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21356,154 +21456,156 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "GRASS projeksiyon bilgisi dosyalarını yazdırır ve düzenler" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "Datum bilgisini kontrol et ve dönüşüm parametrelerini yazdır" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "Projeksiyon bilgilerini PROJ.4 biçiminde yazdır" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "Projeksiyon bilgilerini WKT biçiminde yazdır" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "EPSG projeksiyon kodu" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" -msgstr "" +#: ../general/g.proj/main.c:216 +#, fuzzy +msgid "Modify current project's projection files" +msgstr "Projeksiyon dosyaları oluşturulamıyor: %s" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" msgstr "Oluşturulacak yeni mevkinin adı" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "Projeksiyon dosyası kayıp" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21592,9 +21694,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "Projeksiyon dosyaları oluşturulamıyor: %s" #: ../general/g.proj/create.c:21 #, c-format @@ -21602,98 +21704,98 @@ msgid "Unable to create projection files: %s" msgstr "Projeksiyon dosyaları oluşturulamıyor: %s" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "<%s> dosyası oluşturulamıyor" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "Yazdırılacak mesaj metni" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21836,7 +21938,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21919,33 +22022,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21954,69 +22079,74 @@ msgstr "" msgid "Operation to be performed" msgstr "Yapılacak işlem" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "Şu biçimlerden birine göre kural girin:" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "<%s> harita takımı bulunamadı" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "<%s> harita takımı arama yoluna eklendi" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22031,37 +22161,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22418,7 +22545,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23605,7 +23732,7 @@ msgstr "Dönüştürme başarılı" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23700,17 +23827,19 @@ msgid "No group '%s' in current mapset" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 -#, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" -msgstr "" +#, fuzzy, c-format +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" +msgstr " <%s> grubu [%s] mevkisi, [%s] harita takımına hedeflendi" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Görüntü hedef mevkisi adı" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23742,35 +23871,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "<%s> girdi harita takımı <%s> mevkisinde bulunamadı" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" -msgstr "" - -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 -#, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#, fuzzy, c-format +msgid "Mapset [%s] in target project (location) [%s] - %s " +msgstr "<%s> harita takımı <%s> hedef mevkisinde - " + +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23823,61 +23953,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 -#, c-format -msgid "Target location <%s> not found" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) <%s> not found" +msgstr "<%s> girdi harita takımı <%s> mevkisinde bulunamadı" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, fuzzy, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "<%s> harita takımı <%s> hedef mevkisinde - " + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23887,30 +24022,32 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "Hedef mevkinin projeksiyon bilgisi alınamıyor" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr " %s Yazıtipi dizinine erişilemiyor: %s" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +#, fuzzy +msgid "Target projects (locations) with lon/lat are not supported" +msgstr "Projeksiyon bilgisi güncellenemeyecek" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 -#, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 +#, fuzzy, c-format +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" +msgstr " <%s> grubu [%s] mevkisi, [%s] harita takımına hedeflendi" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 #: ../imagery/i.rectify/readcell.c:63 @@ -24024,15 +24161,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24072,101 +24207,100 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 +#, fuzzy msgid "" -"Use current region settings in target location (def.=calculate smallest area)" -msgstr "" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" +msgstr "Geçerli bölgeyi isimlendirilmiş bölge olarak kaydet" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "Grubtaki tüm raster haritaları uyumlandır" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "<%s> grubu bulunamadı" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "<%s> grubu hiç raster harita içermiyor. i.group'u çalıştır" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 -#, c-format -msgid "target LOCATION %s, MAPSET %s:" -msgstr "" +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 +#, fuzzy, c-format +msgid "target project (location) %s, mapset %s:" +msgstr " <%s> grubu [%s] mevkisi, [%s] harita takımına hedeflendi" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24290,6 +24424,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24306,6 +24450,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24315,6 +24464,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "<%s> harita takımı <%s> hedef mevkisinde - " + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24681,6 +24850,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Çözünürlük" @@ -26265,8 +26435,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26590,17 +26760,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26609,17 +26776,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26628,17 +26792,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26648,17 +26809,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26667,12 +26825,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27464,6 +27620,9 @@ msgid "Apriori Phi (roll) standard deviation" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -28848,11 +29007,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28901,7 +29064,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28996,16 +29159,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "<%s> sütunu <%s> tablosunda bulunamıyor" @@ -29579,6 +29741,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Veri içeren Öznitelik sütunları" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "oluşturulacak nokta sayısı" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -29621,6 +29819,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -29657,64 +29857,75 @@ msgstr "Girdi hatalı" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "Çıktı raster haritasının adı" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "Çakıştırılacak nokta vektör haritasının adı" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "Çıktı raster haritasının adı" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "Çakıştırılacak nokta vektör haritasının adı" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "Çıktı raster haritasının adı" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #, fuzzy msgid "Name of Sentinel metadata json file" msgstr "Veritabanı dosyasının adı" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "Düşey ölçekleme faktörü" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "Geçici dosyalar oluşturulamıyor." -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Kaynak noktası koordinatları" @@ -29797,237 +30008,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "Vektör haritanın adı" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Katman numarası" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -#, fuzzy -msgid "Numpy array with columns names." -msgstr "Çok fazla sütun adı" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -#, fuzzy -msgid "number of jobs to use during the domain exploration" -msgstr "Yeni bölgedeki sütun sayısı" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "Sonuç harita depolama türü" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -#, fuzzy -msgid "append the classification results" -msgstr "Sınıflandırma sonuçlarını içeren raster haritanın adı" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -30236,6 +30224,527 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +#, fuzzy +msgid "Create and train a Maxent model" +msgstr "3B vektör harita oluştur" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +#, fuzzy +msgid "Sample file presence locations" +msgstr "Görüntü hedef mevkisi adı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +#, fuzzy +msgid "Sample file with background locations" +msgstr "Artalan vektör harita(lar)ın adı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Çıktı katmanı adı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "Raster değer" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "3B nokta olarak vektör noktaları üret" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Girdi katmanı adı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "3B nokta olarak vektör noktaları üret" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Artalan vektör harita(lar)ın adı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Görüntülenecek raster harita adı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +#, fuzzy +msgid "Write response curve data to file" +msgstr "Dönüştürülen veri dosyaya yazılıyor..." + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "Alan objelerinin köşelerini düzgünleştir" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "Vektör çizgiler" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +#, fuzzy +msgid "Use product features" +msgstr "Vektör çizgiler" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +#, fuzzy +msgid "Use jackknife validation" +msgstr "gösterim" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Mevki: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "Kullanılan işlemci zamanı yüzdesi" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "<%s> için kullanılacak katman sayısı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "En büyük iterasyon sayısı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Araç: Eşik" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +#, fuzzy +msgid "Threshold for product and threshold features" +msgstr "Sınırlar için yapışma eşiği" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +#, fuzzy +msgid "Threshold for quadratic feature" +msgstr "Sınırlar için yapışma eşiği" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "Sınırlar için yapışma eşiği" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "oluşturulacak nokta sayısı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +#, fuzzy +msgid "Keep duplicate presence records." +msgstr "Tekrarlı alan merkezlerini sil" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Yeni raster harita için başlık" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Sıklık sayısı" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -30431,10 +30940,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -30677,6 +31191,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31885,7 +32407,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31929,11 +32451,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -33041,7 +33558,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Katman numarası" @@ -33079,6 +33595,18 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +#, fuzzy +msgid "Retain mapset name" +msgstr "Harita adı <%s> e ayarlandı" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -33450,7 +33978,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -33643,7 +34170,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Çıktı harita" @@ -33679,6 +34206,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -34733,11 +35268,8 @@ msgstr "Yapılandırma dosyası" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -34787,45 +35319,59 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 #, fuzzy -msgid "Background SWD file" -msgstr "Arkaplan rengi" +msgid "Thin species and background points" +msgstr "Enterpolasyon nokta sayısı" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +#, fuzzy +msgid "Background SWD file" +msgstr "Arkaplan rengi" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "Girdi dosyasındaki veri değerleri sütun numarası" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "noktalar oluşturuluyor..." @@ -35632,8 +36178,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -35644,6 +36199,7 @@ msgid "Group of raster layers to be classified" msgstr "oluşturulacak raster harita tipi" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -35685,11 +36241,13 @@ msgid "" msgstr "Etiket için kullanılacak öznitelik sütunu adı" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Çıktı harita" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35992,6 +36550,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -36003,6 +36562,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -36032,6 +36592,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "Etiket dosyası" @@ -36403,64 +36964,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "Çıktı raster haritasının adı" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36814,11 +37317,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "Mevki sınırlarını yeni verinin sınırlarına göre genişlet " +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -37697,6 +38202,14 @@ msgid "" "mapset." msgstr "Eski GRASS sürümündeki vektör haritaları içe aktarır." +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37826,12 +38339,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37978,9 +38491,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -38023,19 +38535,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "Mevki sınırlarını yeni verinin sınırlarına göre genişlet " + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -38044,7 +38567,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -38180,33 +38703,6 @@ msgstr "Girdi veritabanı adı" msgid "Base name for output file" msgstr "Çıktı dosya adı" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Veri içeren Öznitelik sütunları" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "oluşturulacak nokta sayısı" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -38871,6 +39367,10 @@ msgstr "Çıktı SVG dosyasının adı" msgid "Queries projection information spatially." msgstr "Projeksiyon bilgilerini WKT biçiminde yazdır" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -39165,7 +39665,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -39196,8 +39696,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "'sorgu' seçeneği için kullanılacak öznitelik sütunu adı" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39917,9 +40418,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -40179,6 +40686,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -41211,8 +41726,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -41308,39 +41823,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "İçeri aktarılacak katmanların listesi" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -44626,8 +45150,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -44665,6 +45189,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -45077,6 +45602,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -45130,6 +45662,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Vektör çizgiler" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Vektör çizgiler" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -45170,6 +45716,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "İterasyon sayısı" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "oluşturulacak raster harita tipi" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "oluşturulacak nokta sayısı" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -45599,8 +46177,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -46348,6 +46926,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Çıktı raster harita (varsayılan: girdi)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "oluşturulacak yeni mevki adı" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -46641,6 +47223,10 @@ msgstr "" msgid "Offset factor for input" msgstr "Yükselti için ölçek faktörü" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -47081,10 +47667,93 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "Etiket dosyası" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Girdi katmanı adı" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Düzenlenecek vektör haritanın adı" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "Edilgenleştir" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "3B raster harita oluşturuluyor" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "<%s> için kullanılacak raster harita adı" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "Parametreler" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "x ve y yazdır (sütun ve satır)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Veri içeren Öznitelik sütunları" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -47593,17 +48262,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -47631,24 +48290,21 @@ msgid "categorical map with zones" msgstr "Vektör noktalar" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Çıktı dosya adı" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 #, fuzzy msgid "Plot dimensions (width,height)" msgstr "Ekran boyutlarını göster (genişlik, yükseklik)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -47659,9 +48315,8 @@ msgid "Default font size" msgstr "Varsayılan sürücü ayarlanmadı" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -47681,13 +48336,11 @@ msgid "Create a vector point layer of outliers" msgstr "3B nokta olarak vektör noktaları üret" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -47698,14 +48351,12 @@ msgid "Draw notches" msgstr "Çizim modu" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -47739,14 +48390,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -47758,27 +48401,23 @@ msgid "Plot format" msgstr "Tablo biçimi" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "Kategori etiketlerini yazdır" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -47827,15 +48466,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -47855,7 +48485,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 #, fuzzy msgid "Boxplot width" msgstr "Sınır genişliği" @@ -47866,52 +48495,43 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 #, fuzzy msgid "boxplot linewidth" msgstr "Vektör çizgi genişliği" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "yazıtipi dosyası yolu" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 #, fuzzy msgid "Color of the boxlot median line" msgstr "Metin ve eksenlerin rengi" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 #, fuzzy msgid "Color of median" msgstr "Y verisinin rengi" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -47919,110 +48539,25 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "Çizgi rengi" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 #, fuzzy msgid "Set the flier color" msgstr "Metin rengini ayarla" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Çıktı raster haritasının adı" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Çıktı raster haritasının adı" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Çözünürlük" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -#, fuzzy -msgid "Draw notch" -msgstr "Çizim modu" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "Kategori etiketlerini yazdır" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "Tablo biçimi" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "Metin rengi" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -49256,6 +49791,14 @@ msgstr "Sonucu sırala" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -49281,6 +49824,15 @@ msgstr "Vektör çizgiler" msgid "add grid lines" msgstr "Geçersiz grid boyutu <%s>" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "Metin rengi" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -49380,304 +49932,304 @@ msgstr "" "Verilen vektör haritaya bağlı öznitelik tablosundaki sütunu yeniden " "adlandırır" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Vektör çizgiler" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Sütun sayısı" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Etiket için kullanılacak öznitelik sütunu adı" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Sütun sayısı" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Etiket için kullanılacak öznitelik sütunu adı" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "Obje tipi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Çıktı raster haritasının adı" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Çıktı dosya adı (uzantısını eklemeyin)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Çıktı raster harita(lar) için ön ek" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Girdi_seçenekleri" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "Metin rengi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 #, fuzzy msgid "Color of dots" msgstr "Y verisinin rengi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Sütunlar" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "Renkleri tersine çevir" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Girdi_seçenekleri" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 #, fuzzy msgid "Color trendline" msgstr "Renk" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 #, fuzzy msgid "Color of the trendline" msgstr "Metin ve eksenlerin rengi" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "Vektör çizgi genişliği" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 #, fuzzy msgid "Line width of the trendline" msgstr "Çizgi genişliği sütunu belirlenemedi." -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "Çizgi rengi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 #, fuzzy msgid "Color of the ellipse" msgstr "Metin ve eksenlerin rengi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 #, fuzzy msgid "Ellipse edge width" msgstr "Uygun olmayan sayfa genişliği" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 #, fuzzy msgid "Width of the ellipse edge" msgstr "Yüzdelik listesi" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "Tamsayı aralığı: en küçük, en büyük" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 #, fuzzy msgid "Set the X axis range to be displayed" msgstr "Görüntülenecek raster harita adı" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "Tamsayı aralığı: en küçük, en büyük" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 #, fuzzy msgid "Set the Y axis range to be displayed" msgstr "Görüntülenecek raster harita adı" @@ -50031,8 +50583,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -50114,184 +50666,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "Vektör noktalar" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -#, fuzzy -msgid "Required inputs" -msgstr "Girdiler okunuyor..." - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Veri içeren Öznitelik sütunları" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "x koordinatı içeren sütun adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -#, fuzzy -msgid "Format: All values must be >0" -msgstr "Eşik değeri >=0 olmalı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Girdi dosya biçimi" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Çıktı bakı haritası (veya fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Çıktı bakı haritası (veya fy)" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "Uzaklık zonları" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Çıktı raster harita(lar) için ön ek" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "Çıktı tablo adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Çıktı raster haritasının adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Çıktı kesik kıvrıklığı raster haritasının adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Çıktı dosya adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Görüntülenecek raster harita adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Görüntülenecek raster harita adı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "<%s> için kullanılacak katman sayısı" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -#, fuzzy -msgid "Feature selection and tuning" -msgstr "Hiç obje seçilmedi, hiçbirşey düzenlenmeyecek" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -51114,11 +51488,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -56136,6 +56505,46 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +#, fuzzy +msgid "Set to original computational region" +msgstr "Geçerli bölgeyi kullan" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -56683,8 +57092,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -56985,8 +57394,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -57166,7 +57575,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -57180,7 +57589,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -57710,7 +58119,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -58003,7 +58412,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "Anahtar sütun veri tipi tamsayı olmalıdır" @@ -58093,49 +58502,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "Belirli bir katmanın bağlantı parametrelerinin üzerine yaz" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "Belirli bir katmanın bağlantısını sil (tabloyu değil)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "Başka bir harita takımındaki vektör harita değiştirilemez" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "Veritabanı bağlantısı belirlenmemiş" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -58145,33 +58550,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 -#, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +#: ../vector/v.db.connect/main.c:270 +#, fuzzy, c-format +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "<%d> katmanının mevcut linkinin üzerine yazmak için -o kullan" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "<%s> tablosu <%s> veritabanında yok" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "%s tablosu üzerindeki yetkiler onaylanmadı" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -58208,7 +58613,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -58285,56 +58690,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "'spatial' parametresi için 4 parametre gerekli" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "<%s> vektör haritası zaten mevcut ve üzerine yazılacak" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -58604,127 +59016,131 @@ msgstr[1] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -59202,7 +59618,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -59440,11 +59856,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -59471,7 +59887,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "<%s> katmanı mevcut değil" @@ -59480,7 +59896,7 @@ msgstr "<%s> katmanı mevcut değil" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "<%s> veri kaynağı açılamıyor" @@ -59500,7 +59916,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -59536,11 +59952,13 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "Eski GRASS sürümündeki vektör haritaları içe aktarır." #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +#, fuzzy +msgid "Project (location) containing input vector map" msgstr "Girdi vektör haritasının mevkisi" #: ../vector/v.proj/main.c:88 @@ -59575,13 +59993,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 -#, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +#, fuzzy, c-format +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "<%s> vektör haritası <%s> mevkisi <%s> harita takımında bulunamadı" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -59595,13 +60017,13 @@ msgid "Input vector map <%s> is empty" msgstr "" #: ../vector/v.proj/main.c:368 -#, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" -msgstr "" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> - permission denied" +msgstr "<%s> - %s girdi mevkisindeki <%s> harita takımı" #: ../vector/v.proj/main.c:371 -#, c-format -msgid "Mapset <%s> in input location <%s> not found" +#, fuzzy, c-format +msgid "Mapset <%s> in input project <%s> not found" msgstr "<%s> girdi harita takımı <%s> mevkisinde bulunamadı" #: ../vector/v.proj/main.c:517 @@ -62184,7 +62606,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62808,7 +63230,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -63115,12 +63537,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -63320,19 +63742,19 @@ msgid "Snapping boundaries..." msgstr "Sınırlara yapışılıyor..." #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "Çift olanlar siliniyor..." #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "Sınırlar kırılıyor..." @@ -63541,7 +63963,7 @@ msgstr[1] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -63699,10 +64121,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -63741,6 +64163,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -63841,9 +64267,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -63857,7 +64283,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "Vektör 3B değil" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -63942,7 +64368,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -63970,8 +64395,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -64604,7 +65029,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "Alan merkezi hesaplanamadı" @@ -64738,8 +65163,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -66520,17 +66945,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "<%s> vektör haritasını okumada hata - bazı veriler doğru olmayabilir" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "Düğümlerdeki sınırlar temizleniyor..." -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -66706,13 +67131,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -66960,42 +67385,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "Nokta katmanı" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "Bu seçim tek sütun gerektirir" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "Bu seçim iki sütun gerektirir" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "Bu seçim en azından iki sütun gerektirir" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -67977,16 +68407,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "Vektör harita özniteliklerini yazdırır." @@ -69414,66 +69834,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -69762,7 +70182,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "<%s> vektör haritası sorgulanıyor..." -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "Alan merkezleri yazılıyor..." @@ -70220,164 +70640,165 @@ msgstr "%d katmanının veritabanı bağlantısı belirlenmedi" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" -msgstr "" +#: ../vector/v.info/print.c:306 +#, fuzzy +msgid "Project:" +msgstr "Projeksiyonlandırılıyor..." -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -70554,27 +70975,51 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +#, fuzzy +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "Girdi veri takımı ve geçerli mevkinin projeksiyonu eşleşiyor" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -70641,274 +71086,274 @@ msgstr "Poligonları temizlemeyin (tavsiye edilmez)" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "Sütun adlarını küçük harfli karakterlere dönüştür" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "%d girdi poligon" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -70917,51 +71362,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -71117,10 +71562,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, fuzzy, c-format +msgid "target project %s, mapset %s:" +msgstr " <%s> grubu [%s] mevkisi, [%s] harita takımına hedeflendi" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "<%s> harita takımı bulunamadı" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -71284,7 +71739,7 @@ msgstr "yazıtipi dosyası yolu" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -71292,7 +71747,7 @@ msgstr[0] "" msgstr[1] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -71300,7 +71755,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -72296,6 +72751,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -76720,6 +77179,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "<%s> dosyası yazma için açılamıyor" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "<%s> dosyası yazma için açılamıyor" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -76866,6 +77342,7 @@ msgid "Unable to open color rule" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -76877,6 +77354,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -77426,7 +77908,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -77665,22 +78147,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -79713,38 +80188,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -79824,11 +80299,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -79853,103 +80328,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -79961,336 +80436,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -80343,50 +80818,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -80414,7 +80889,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -80632,7 +81107,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -80689,85 +81164,86 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "xyz koordinatları yerine harita koordinatlarını kullan" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "<%s> için destek dosyaları oluşturuluyor..." -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 -#, python-format -msgid "Importing <%s> to temporary location..." -msgstr "" +#: ../scripts/r.import/r.import.py:275 +#, fuzzy, python-format +msgid "Importing <%s> to temporary project..." +msgstr "Bazı geçici dosyalar oluşturuluyor..." -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" -msgstr "" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +#, fuzzy +msgid "Unable to reproject to source project" +msgstr "Hedef mevkinin projeksiyon bilgisi alınamıyor" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -80813,28 +81289,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -80891,27 +81367,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "'%s' OGR veri kaynağı açılamıyor" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -80921,7 +81397,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -80931,14 +81406,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -80946,72 +81421,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -81238,7 +81713,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -81256,64 +81731,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -81453,79 +81929,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -81637,40 +82113,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -81706,7 +82182,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -81717,34 +82193,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -81836,34 +82312,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -81942,317 +82418,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "<%s> bölgesi bulunamadı " -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -82260,60 +82736,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -82365,27 +82841,38 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "<%s> kural dosyası açılamıyor" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" -msgstr "" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, fuzzy, python-brace-format +msgid "Column <{column}> not found in table <{table}>" +msgstr "<%s> sütunu <%s> tablosunda bulunamıyor" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +#, fuzzy +msgid "Error creating columns <{}>" +msgstr "%s rengini yorumlamada hata" + +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -82431,16 +82918,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -82511,41 +82988,49 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "<%s> raster haritasıgeçerli harita takımında bulunamadı" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -82593,20 +83078,150 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "Name of training vector map" +#~ msgstr "Vektör haritanın adı" + +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Katman numarası" + +#, fuzzy +#~ msgid "Numpy array with columns names." +#~ msgstr "Çok fazla sütun adı" + +#, fuzzy +#~ msgid "number of jobs to use during the domain exploration" +#~ msgstr "Yeni bölgedeki sütun sayısı" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "Sonuç harita depolama türü" + +#, fuzzy +#~ msgid "append the classification results" +#~ msgstr "Sınıflandırma sonuçlarını içeren raster haritanın adı" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "Çıktı raster haritasının adı" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Çıktı raster haritasının adı" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Çıktı raster haritasının adı" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Çözünürlük" + +#, fuzzy +#~ msgid "Draw notch" +#~ msgstr "Çizim modu" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "Kategori etiketlerini yazdır" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "Tablo biçimi" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "Vektör noktalar" + +#, fuzzy +#~ msgid "Required inputs" +#~ msgstr "Girdiler okunuyor..." + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Veri içeren Öznitelik sütunları" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "x koordinatı içeren sütun adı" + +#, fuzzy +#~ msgid "Format: All values must be >0" +#~ msgstr "Eşik değeri >=0 olmalı" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Girdi dosya biçimi" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Çıktı bakı haritası (veya fy)" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Çıktı bakı haritası (veya fy)" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "Uzaklık zonları" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Çıktı raster harita(lar) için ön ek" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "Çıktı tablo adı" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Çıktı raster haritasının adı" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Çıktı kesik kıvrıklığı raster haritasının adı" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Çıktı dosya adı" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Görüntülenecek raster harita adı" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Görüntülenecek raster harita adı" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "<%s> için kullanılacak katman sayısı" + +#, fuzzy +#~ msgid "Feature selection and tuning" +#~ msgstr "Hiç obje seçilmedi, hiçbirşey düzenlenmeyecek" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "Belirli bir katmanın bağlantı parametrelerinin üzerine yaz" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -84426,14 +85041,6 @@ msgstr "Kategorisiz alan merkezi" #~ msgid "Unknown geometry type" #~ msgstr "Bilinmeyen geometri tipi" -#, fuzzy -#~ msgid "Output formating" -#~ msgstr "Çıktı biçimi" - -#, fuzzy -#~ msgid "Unable to create 2D raster <%s>" -#~ msgstr "<%s> raster haritası oluşturulamıyor" - #, fuzzy #~ msgid "Unable to create 3D raster <%s>" #~ msgstr "<%s> raster haritası oluşturulamıyor" @@ -84761,8 +85368,8 @@ msgstr "Kategorisiz alan merkezi" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "grid rengi veya \"none\"" #, fuzzy @@ -84825,6 +85432,7 @@ msgstr "Kategorisiz alan merkezi" #~ msgid "Unable to guess site_list format" #~ msgstr "Nokta_listasi biçimini tahminde hata" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "<%s> not found" @@ -84846,6 +85454,8 @@ msgstr "Sütun sayısı farklı" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "%d sites written." #~ msgstr "%d nokta yazıldı" @@ -84938,6 +85548,9 @@ msgstr "Sütun sayısı farklı" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grassmods_uk.po b/locale/po/grassmods_uk.po index e9c213d3971..1bd2155d556 100644 --- a/locale/po/grassmods_uk.po +++ b/locale/po/grassmods_uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-05-23 21:08+0200\n" "Last-Translator: \n" "Language-Team: Ukrainian (https://www.transifex.com/grass-gis/teams/45198/" @@ -16,8 +16,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" +"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" #: ../temporal/t.connect/main.c:34 #: ../locale/scriptstrings/t.merge_to_translate.c:2 @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -264,7 +265,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -289,7 +290,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -300,7 +301,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -322,7 +323,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -479,6 +480,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -498,7 +500,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -517,7 +518,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -531,6 +531,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -564,7 +565,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -574,8 +575,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -590,21 +591,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -613,7 +614,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -648,7 +649,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -661,7 +661,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -700,6 +699,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -721,7 +721,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -787,7 +787,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -801,7 +801,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -814,8 +814,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -830,16 +830,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -885,7 +885,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -901,7 +901,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -910,7 +910,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -940,13 +940,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -974,7 +974,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -989,8 +989,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1024,10 +1024,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1035,7 +1035,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1065,23 +1065,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1163,13 +1163,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1222,6 +1222,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1282,6 +1283,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1347,14 +1354,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1404,144 +1410,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1558,35 +1552,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1594,55 +1586,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1722,12 +1716,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1765,7 +1757,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1781,7 +1773,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1830,24 +1822,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1963,7 +1949,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1973,7 +1959,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2093,7 +2078,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2122,6 +2107,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2255,7 +2241,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2264,8 +2256,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2297,7 +2289,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2353,7 +2345,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2398,7 +2389,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2451,7 +2442,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2865,7 +2856,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2953,14 +2944,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3119,7 +3112,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3427,6 +3420,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3515,17 +3517,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3546,7 +3546,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3618,7 +3618,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3651,160 +3651,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3837,19 +3829,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3918,9 +3910,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3934,36 +3926,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4018,6 +4010,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4038,46 +4033,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4086,82 +4090,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4961,7 +4977,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5040,7 +5056,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5169,7 +5185,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5368,9 +5384,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5386,7 +5401,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5593,9 +5608,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5613,7 +5628,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5698,10 +5713,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5740,30 +5755,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5883,123 +5898,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6099,7 +6114,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6133,7 +6148,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6169,7 +6184,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6225,9 +6240,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6243,8 +6258,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6254,24 +6269,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6323,7 +6369,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6623,7 +6669,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6729,7 +6775,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6815,7 +6860,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7434,7 +7479,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7443,7 +7488,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7548,7 +7593,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7572,15 +7617,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7653,7 +7698,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7703,17 +7748,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7771,6 +7813,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7908,7 +7951,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7991,7 +8034,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8050,7 +8093,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8111,7 +8154,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8234,7 +8277,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8373,7 +8415,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8465,8 +8507,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8475,8 +8517,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8494,7 +8536,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8874,9 +8916,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9103,13 +9145,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9122,7 +9162,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9364,31 +9403,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9404,12 +9443,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9424,18 +9462,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9459,10 +9496,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9492,7 +9528,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9501,210 +9537,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10372,7 +10424,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10485,6 +10536,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10516,26 +10579,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10560,12 +10603,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10573,40 +10610,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10759,7 +10796,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11005,29 +11042,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11086,71 +11123,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11193,6 +11197,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11896,7 +11933,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11910,12 +11947,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11941,10 +11977,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -12000,12 +12034,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12022,12 +12056,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12035,7 +12069,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12043,7 +12077,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12059,12 +12093,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12143,7 +12177,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12395,8 +12429,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12562,7 +12597,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12573,6 +12608,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13184,15 +13231,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13271,7 +13318,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13281,7 +13328,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13373,7 +13420,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13382,7 +13429,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13694,7 +13741,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13705,19 +13752,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13725,15 +13772,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13742,62 +13802,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13967,9 +14035,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14311,21 +14376,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14512,80 +14577,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15460,34 +15525,33 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15503,61 +15567,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15581,7 +15645,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16523,46 +16586,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16887,7 +16950,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17347,8 +17410,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17475,97 +17538,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17828,11 +17891,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18031,32 +18094,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18139,7 +18202,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18162,8 +18225,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18917,8 +18981,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18928,28 +18992,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18958,57 +19022,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19017,7 +19081,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19026,7 +19090,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19518,6 +19582,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19576,64 +19644,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19739,7 +19815,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19752,10 +19827,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19769,11 +19842,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20267,10 +20340,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20326,9 +20399,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20388,13 +20461,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20755,67 +20828,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21059,8 +21132,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21326,154 +21399,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21562,7 +21635,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21572,97 +21645,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21805,7 +21878,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21888,33 +21962,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21923,69 +22019,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -22000,37 +22100,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22383,7 +22480,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23570,7 +23667,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23666,7 +23763,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23674,7 +23772,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23708,34 +23806,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23788,61 +23887,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23852,7 +23956,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23861,20 +23965,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23989,15 +24093,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24037,101 +24139,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24255,6 +24355,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24271,6 +24381,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24280,6 +24395,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24648,6 +24783,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26207,8 +26343,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26532,17 +26668,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26551,17 +26684,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26570,17 +26700,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26590,17 +26717,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26609,12 +26733,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27395,11 +27517,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27448,7 +27574,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27541,16 +27667,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28119,6 +28244,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28161,6 +28320,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28195,58 +28356,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28324,231 +28495,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28747,6 +28701,500 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +msgid "Validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28937,10 +29385,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29166,6 +29619,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30328,7 +30789,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30372,11 +30833,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31425,7 +31881,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31459,6 +31914,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31810,7 +32276,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32003,7 +32468,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -32036,6 +32501,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33041,11 +33514,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33091,44 +33561,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33893,8 +34376,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33904,6 +34396,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33941,10 +34434,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34235,6 +34730,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34246,6 +34742,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34274,6 +34771,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34633,63 +35131,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35022,11 +35463,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35854,6 +36297,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35980,12 +36431,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36121,9 +36572,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36166,19 +36616,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36187,7 +36647,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36314,31 +36774,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36960,6 +37395,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37240,7 +37679,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37271,7 +37710,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37946,9 +38385,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38195,6 +38640,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39192,8 +39645,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39285,39 +39738,47 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 -msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgid "Name of data layers to import" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42448,8 +42909,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42487,6 +42948,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42884,6 +43346,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42933,6 +43402,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42968,6 +43449,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43370,8 +43881,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44091,6 +44602,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44370,6 +44885,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44786,10 +45305,84 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45273,17 +45866,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45307,22 +45890,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45332,9 +45912,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45351,13 +45930,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45367,14 +45944,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45407,14 +45982,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45425,26 +45992,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45488,15 +46051,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45514,7 +46068,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45524,48 +46077,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45573,101 +46117,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46840,6 +47306,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46862,6 +47336,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46951,278 +47433,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47551,8 +48033,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47632,166 +48114,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48579,11 +48901,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53330,6 +53647,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53860,8 +54216,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54162,8 +54518,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54343,7 +54699,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54357,7 +54713,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54891,7 +55247,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55181,7 +55537,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55273,49 +55629,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55325,33 +55677,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55388,7 +55740,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55465,178 +55817,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56125,7 +56477,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56367,11 +56719,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56398,7 +56750,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56407,7 +56759,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56427,7 +56779,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56463,11 +56815,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56502,13 +56854,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56523,12 +56879,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57736,7 +58092,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58361,7 +58717,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58674,12 +59030,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58879,19 +59235,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -59102,7 +59458,7 @@ msgstr[3] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59260,10 +59616,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59302,6 +59658,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59402,9 +59762,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59418,7 +59778,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59503,7 +59863,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59531,8 +59890,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -60158,7 +60517,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60296,8 +60655,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -62109,17 +62468,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62295,13 +62654,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62547,42 +62906,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63564,16 +63927,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -65063,66 +65416,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65417,7 +65770,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65874,164 +66227,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -66210,27 +66563,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -66297,274 +66673,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66573,51 +66949,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66773,10 +67149,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66940,7 +67326,7 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" @@ -66950,7 +67336,7 @@ msgstr[2] "" msgstr[3] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66958,7 +67344,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67944,6 +68330,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68524,6 +68914,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -69093,7 +69500,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -69332,22 +69739,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71384,38 +71784,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71495,11 +71895,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71524,103 +71924,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71632,336 +72032,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -72014,50 +72414,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -72085,13 +72485,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -72148,85 +72548,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -72272,28 +72672,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -72350,27 +72750,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -72380,7 +72780,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72390,14 +72789,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72405,72 +72804,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72697,7 +73096,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72715,64 +73114,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72912,79 +73312,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -73096,40 +73496,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -73165,7 +73565,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -73176,34 +73576,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -73295,34 +73695,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73401,316 +73801,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73718,60 +74118,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73823,27 +74223,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73889,16 +74299,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73969,41 +74369,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -74051,15 +74458,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grassmods_vi.po b/locale/po/grassmods_vi.po index 235c31ef2c6..8f81e13004c 100644 --- a/locale/po/grassmods_vi.po +++ b/locale/po/grassmods_vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_vi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2010-08-27 14:37+0700\n" "Last-Translator: \n" "Language-Team: Vietnamese \n" @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -264,7 +265,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -289,7 +290,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -300,7 +301,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -322,7 +323,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -479,6 +480,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -498,7 +500,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -517,7 +518,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -531,6 +531,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -564,7 +565,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -574,8 +575,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -590,21 +591,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -613,7 +614,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -648,7 +649,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -661,7 +661,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -700,6 +699,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -721,7 +721,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -787,7 +787,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -801,7 +801,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -814,8 +814,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -830,16 +830,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -885,7 +885,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -901,7 +901,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -910,7 +910,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -940,13 +940,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -974,7 +974,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -989,8 +989,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1024,10 +1024,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1035,7 +1035,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1065,23 +1065,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1163,13 +1163,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1222,6 +1222,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1282,6 +1283,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1347,14 +1354,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1404,144 +1410,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1558,35 +1552,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "Tập tin đầu vào" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1594,55 +1586,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1722,12 +1716,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1765,7 +1757,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1781,7 +1773,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1831,24 +1823,18 @@ msgstr "Tên của bản đồ raster đầu ra" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1969,7 +1955,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1979,7 +1965,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2100,7 +2085,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2129,6 +2114,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2262,7 +2248,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2271,8 +2263,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2304,7 +2296,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2360,7 +2352,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2405,7 +2396,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2458,7 +2449,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2869,7 +2860,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2957,14 +2948,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3123,7 +3116,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3431,6 +3424,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3519,17 +3521,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3550,7 +3550,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3622,7 +3622,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3655,160 +3655,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3841,19 +3833,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3922,9 +3914,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3938,36 +3930,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4022,6 +4014,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4042,46 +4037,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4090,82 +4094,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4965,7 +4981,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5044,7 +5060,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5173,7 +5189,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5372,9 +5388,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5390,7 +5405,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5597,9 +5612,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5617,7 +5632,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5702,10 +5717,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5745,30 +5760,30 @@ msgstr "Hệ số tỷ lệ cho độ cao" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5891,123 +5906,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6107,7 +6122,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6141,7 +6156,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6171,7 +6186,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6224,9 +6239,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6242,8 +6257,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6253,24 +6268,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6322,7 +6368,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6622,7 +6668,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6728,7 +6774,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6814,8 +6859,9 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" -msgstr "" +#, fuzzy +msgid "Lat/Long projects are not supported by this module" +msgstr "Hiện nay phép chiếu vĩ/kinh độ không được hỗ trợ." #: ../raster/r.colors.out/raster3d_main.c:48 msgid "Exports the color table associated with a 3D raster map." @@ -7433,7 +7479,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7442,7 +7488,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7547,7 +7593,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7571,15 +7617,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7652,7 +7698,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7702,17 +7748,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7770,6 +7813,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7908,7 +7952,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7991,7 +8035,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8050,7 +8094,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8111,7 +8155,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8234,7 +8278,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8373,7 +8416,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8465,8 +8508,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8475,8 +8518,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8494,7 +8537,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8874,10 +8917,10 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 -#, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." -msgstr "" +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 +#, fuzzy, c-format +msgid "Lat/Long project is not supported by %s. Please reproject map first." +msgstr "Hiện nay phép chiếu vĩ/kinh độ không được hỗ trợ." #: ../raster/r.solute.transport/main.c:259 msgid "The direct LU solver do not work with sparse matrices" @@ -9100,13 +9143,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9119,7 +9160,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9361,31 +9401,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9401,12 +9441,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9421,18 +9460,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "Tên của bản đồ raster hướng đầu ra" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9456,10 +9495,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9489,7 +9527,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9498,210 +9536,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10366,7 +10420,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10479,6 +10532,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10510,26 +10575,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10554,12 +10599,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10567,40 +10606,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10750,7 +10789,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10993,29 +11032,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11068,71 +11107,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11175,6 +11181,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11878,7 +11917,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11892,12 +11931,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" +"đổi tất cả các bản đồ vector GRASS kiểu cũ < 5.7 trong bộ bản đồ hiện tại " +"thành định dạng hiện tại" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11923,10 +11964,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11982,12 +12021,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12004,12 +12043,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12017,7 +12056,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12025,7 +12064,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12041,12 +12080,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12126,7 +12165,7 @@ msgid "Sorting events..." msgstr "Đang ghi tập tin mới..." #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12382,8 +12421,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12549,7 +12589,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12560,6 +12600,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13171,15 +13223,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13258,7 +13310,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13268,7 +13320,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13354,7 +13406,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13363,7 +13415,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13675,7 +13727,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13686,19 +13738,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13706,15 +13758,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13723,62 +13788,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13948,9 +14021,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14289,21 +14359,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14487,80 +14557,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15435,31 +15505,32 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" +msgstr[1] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15475,61 +15546,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15553,7 +15624,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16492,46 +16562,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16856,7 +16926,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17307,8 +17377,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17435,97 +17505,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17788,11 +17858,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17991,32 +18061,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18099,8 +18169,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "Tùy_chọn_đầu_vào" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18122,8 +18193,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18877,8 +18949,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18888,28 +18960,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18918,57 +18990,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18977,7 +19049,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18986,7 +19058,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19478,6 +19550,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19536,64 +19612,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19699,7 +19783,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19712,10 +19795,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19729,11 +19810,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20227,10 +20308,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20286,9 +20367,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20348,13 +20429,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20715,67 +20796,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21019,8 +21100,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21286,154 +21367,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "Tên của bản đồ raster hướng đầu ra" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21522,7 +21604,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21531,98 +21613,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "Tập tin đầu vào" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21765,7 +21847,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21848,33 +21931,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21883,69 +21988,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21960,37 +22069,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22343,7 +22449,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23530,7 +23636,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23626,7 +23732,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23634,8 +23741,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "Tên của bản đồ raster hướng đầu ra" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23668,34 +23776,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23748,61 +23857,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23812,7 +23926,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23821,20 +23935,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23949,15 +24063,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23997,101 +24109,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24215,6 +24325,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24231,6 +24351,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24240,6 +24365,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24605,6 +24750,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "Vị trí: %s\n" @@ -26176,8 +26322,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26501,17 +26647,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26520,17 +26663,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26539,17 +26679,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26559,17 +26696,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26578,12 +26712,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27370,11 +27502,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27423,7 +27559,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27516,16 +27652,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28095,6 +28230,41 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28137,6 +28307,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28173,62 +28345,73 @@ msgstr "Tùy_chọn_đầu_vào" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "Tên của bản đồ raster đầu ra" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 #, fuzzy -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "Tên của bản đồ raster đầu ra" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "Tên của bản đồ raster đầu ra" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "Tên của bản đồ raster đầu ra" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#, fuzzy +msgid "Name of output raster shadow mask" +msgstr "Tên của bản đồ raster đầu ra" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "%s: Lỗi khi đang ghi tập tin tạm" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "Tọa độ điểm 'gieo'" @@ -28308,232 +28491,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "Lớp số (to)" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28736,6 +28701,512 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "Tên của lớp đầu ra" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "%s: giá trị chỉ định không hợp lệ" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "Tên của bản đồ vec-tơ đầu vào chứa các đường" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "Tên của bản đồ raster đầu ra" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "Tên của bản đồ vec-tơ đầu vào chứa các đường" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "Tên của bản đồ raster đầu ra" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "Tên của bản đồ raster đường dẫn phát tán" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "Vị trí: %s\n" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "Số mẫu ô vuông" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "Công cụ: Ngưỡng" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "Tên của bản đồ raster đường dẫn phát tán" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "Số mẫu ô vuông" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28928,10 +29399,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29168,6 +29644,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30351,7 +30835,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30395,11 +30879,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31477,7 +31956,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "Lớp số" @@ -31514,6 +31992,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31869,7 +32358,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -32063,7 +32551,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "Tùy_chọn_đầu_vào" @@ -32097,6 +32585,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -33168,11 +33664,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33218,44 +33711,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -34040,8 +34546,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -34051,6 +34566,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -34089,11 +34605,13 @@ msgid "" msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "Tùy_chọn_Đầu_ra" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34386,6 +34904,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34397,6 +34916,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34426,6 +34946,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34791,63 +35312,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -35188,11 +35652,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -36039,6 +36505,14 @@ msgstr "" "đổi tất cả các bản đồ vector GRASS kiểu cũ < 5.7 trong bộ bản đồ hiện tại " "thành định dạng hiện tại" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -36167,12 +36641,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36311,9 +36785,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36356,19 +36829,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36377,7 +36860,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36509,32 +36992,6 @@ msgstr "" msgid "Base name for output file" msgstr "Tên của lớp đầu ra" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -37176,6 +37633,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37463,7 +37924,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37494,8 +37955,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -38186,9 +38648,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38441,6 +38909,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39453,8 +39929,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39549,39 +40025,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "Tên của bản đồ raster hướng đầu ra" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42794,8 +43279,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42833,6 +43318,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -43234,6 +43720,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -43287,6 +43780,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "Tập tin đầu vào" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "Tập tin đầu vào" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -43323,6 +43830,37 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "Số mẫu ô vuông" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43734,8 +44272,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44462,6 +45000,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "Bản đồ raster đầu ra (mặc định: tiêu đề đầu vào)" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44744,6 +45286,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -45171,10 +45717,88 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "Tên của lớp đầu ra" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "Tên của bản đồ vec-tơ đầu vào chứa các đường" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "Tên của bản đồ raster đường dẫn phát tán" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45664,17 +46288,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45700,23 +46314,20 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "Tên của bản đồ raster đầu ra" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45726,9 +46337,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45747,13 +46357,11 @@ msgid "Create a vector point layer of outliers" msgstr "Tên của bản đồ vec-tơ đầu vào chứa các đường" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45763,14 +46371,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45803,14 +46409,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45822,26 +46420,22 @@ msgid "Plot format" msgstr "Tùy_chọn_đầu_vào" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45886,15 +46480,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45912,7 +46497,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45922,48 +46506,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45971,104 +46546,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "Tên của bản đồ raster đầu ra" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "Tên của bản đồ raster đầu ra" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "Tiền tố dùng cho (các) bản đồ raster đầu ra" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -47267,6 +47761,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -47290,6 +47792,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -47381,289 +47891,289 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "Tập tin đầu vào" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "Tên của bản đồ raster đường dẫn phát tán" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "Tên của bản đồ vec-tơ đầu vào chứa các đường" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "Tên của bản đồ raster đường dẫn phát tán" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "Tên của bản đồ vec-tơ đầu vào chứa các đường" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "Tên của lớp đầu ra dùng làm LỤC" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "Tập tin GNS không nén từ NGA (với đuôi mở rộng .txt)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "Tiền tố dùng cho (các) bản đồ raster đầu ra" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "Tùy_chọn_đầu_vào" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "Tùy_chọn_đầu_vào" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "Tùy_chọn_đầu_vào" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -48007,8 +48517,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -48088,178 +48598,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "Tập tin đầu vào" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "Bản đồ hướng (hay fy) đầu ra" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "Bản đồ hướng (hay fy) đầu ra" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "Tiền tố dùng cho (các) bản đồ raster đầu ra" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "Tên của bản đồ raster hướng đầu ra" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "Tên của bản đồ raster đầu ra" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "Tên cho tập tin đầu ra" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "Tên của lớp đầu ra dùng làm LỤC" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "Tên của lớp đầu ra dùng làm LỤC" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "Số mẫu ô vuông" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -49061,11 +49399,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -53921,6 +54254,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -54456,8 +54828,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54758,8 +55130,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54939,7 +55311,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54953,7 +55325,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -55481,7 +55853,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55771,7 +56143,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55860,49 +56232,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55912,33 +56280,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55975,7 +56343,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -56052,178 +56420,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56694,7 +57062,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56930,11 +57298,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56961,7 +57329,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56970,7 +57338,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56990,7 +57358,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -57026,11 +57394,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" +"đổi tất cả các bản đồ vector GRASS kiểu cũ < 5.7 trong bộ bản đồ hiện tại " +"thành định dạng hiện tại" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -57065,13 +57436,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -57086,12 +57461,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -58665,7 +59040,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -59287,7 +59662,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -59591,12 +59966,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -59796,19 +60171,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -60016,7 +60391,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -60174,10 +60549,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -60216,6 +60591,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -60316,9 +60695,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -60332,7 +60711,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -60417,7 +60796,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -60445,8 +60823,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -61065,7 +61443,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -61197,8 +61575,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -62959,17 +63337,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -63145,13 +63523,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -63397,42 +63775,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -64414,16 +64796,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -65817,66 +66189,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -66162,7 +66534,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -66619,164 +66991,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -66952,27 +67324,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -67039,274 +67434,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -67315,51 +67710,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -67515,10 +67910,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -67682,14 +68087,14 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -67697,7 +68102,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -68683,6 +69088,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -69245,6 +69654,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "Tập tin đầu vào" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "Tập tin đầu vào" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -69805,7 +70231,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -70044,22 +70470,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -72084,38 +72503,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -72195,11 +72614,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -72224,103 +72643,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -72332,336 +72751,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -72714,50 +73133,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -72785,7 +73204,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -73003,7 +73422,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -73060,85 +73479,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -73184,28 +73603,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -73262,27 +73681,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -73292,7 +73711,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -73302,14 +73720,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -73317,72 +73735,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -73609,7 +74027,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -73627,64 +74045,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -73824,79 +74243,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -74008,40 +74427,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -74077,7 +74496,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -74088,34 +74507,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -74207,34 +74626,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -74313,316 +74732,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -74630,60 +75049,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -74735,27 +75154,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -74801,16 +75230,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -74881,41 +75300,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -74963,20 +75389,87 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "Lớp số (to)" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "Tên của bản đồ raster đầu ra" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "Tên của bản đồ raster đầu ra" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "Tiền tố dùng cho (các) bản đồ raster đầu ra" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "Cột trong bảng thuộc tính chứa giá trị cần nội suy" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "Tập tin đầu vào" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "Bản đồ hướng (hay fy) đầu ra" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "Bản đồ hướng (hay fy) đầu ra" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "Tiền tố dùng cho (các) bản đồ raster đầu ra" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "Tên của bản đồ raster hướng đầu ra" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "Tên của bản đồ raster đầu ra" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "Tên cho tập tin đầu ra" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "Tên của lớp đầu ra dùng làm LỤC" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "Tên của lớp đầu ra dùng làm LỤC" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "Số mẫu ô vuông" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "Upgrades the version of a space time dataset (TGRASS DB)." #~ msgstr "Tên của CSDL mới" @@ -77061,9 +77554,6 @@ msgstr "Chỉ các điểm TERRAIN (địa hình)" #~ msgid "%s=%s - illegal number of interpolation points" #~ msgstr "%s=%s - số lượng điểm nội suy không hợp lệ" -#~ msgid "lat/lon projection not supported at this time." -#~ msgstr "Hiện nay phép chiếu vĩ/kinh độ không được hỗ trợ." - #, fuzzy #~ msgid "String to represent no data cell" #~ msgstr "Chuỗi ký tự đại diện cho ô không có giá trị" @@ -77121,8 +77611,8 @@ msgstr "Chỉ các điểm TERRAIN (địa hình)" #, fuzzy #~ msgid "" -#~ "Color in GRASS format for showing unknown information (? symbol) or \"none" -#~ "\" not showing" +#~ "Color in GRASS format for showing unknown information (? symbol) or " +#~ "\"none\" not showing" #~ msgstr "Màu dùng để vẽ lưới, hoặc \"none\"" #, fuzzy diff --git a/locale/po/grassmods_zh.po b/locale/po/grassmods_zh.po index 1bbe5c5811d..160518efb99 100644 --- a/locale/po/grassmods_zh.po +++ b/locale/po/grassmods_zh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grassmods_zh\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2015-03-07 10:48-0600\n" "Last-Translator: Shulin Yang \n" "Language-Team: Simplified Chinese \n" @@ -86,7 +86,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -126,32 +126,33 @@ msgid "Print current connection parameters and exit" msgstr "打印当前的连接参数并退出" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -177,21 +178,21 @@ msgstr "打印当前的连接参数并退出" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -288,7 +289,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -299,7 +300,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -321,7 +322,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -478,6 +479,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -497,7 +499,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -516,7 +517,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -530,6 +530,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -563,7 +564,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -573,8 +574,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -589,21 +590,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -612,7 +613,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -647,7 +648,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -660,7 +660,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -699,6 +698,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -720,7 +720,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -786,7 +786,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -800,7 +800,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -813,8 +813,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -829,16 +829,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -884,7 +884,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -900,7 +900,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -909,7 +909,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -939,13 +939,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -973,7 +973,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -988,8 +988,8 @@ msgstr "无法启动驱动 <%s>" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1023,10 +1023,10 @@ msgstr "无法启动驱动 <%s>" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1034,7 +1034,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "无法由驱动<%s>打开数据库 <%s>" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1064,23 +1064,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1162,13 +1162,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1221,6 +1221,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1281,6 +1282,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1346,14 +1353,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1403,144 +1409,132 @@ msgstr "结果栅格图的标题" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1557,35 +1551,34 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 +#, fuzzy msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "不能将输入地图的投影转换为 GRASS 格式，无法创建新的区域。" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 -#, c-format -msgid "Unable to create new location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create new project <%s>" +msgstr "无法创建表 <%s>" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 -#, c-format -msgid "Location <%s> created" -msgstr "" +#, fuzzy, c-format +msgid "Project <%s> created" +msgstr "未找到3D栅格图<%s>" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1593,55 +1586,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1721,12 +1716,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1764,7 +1757,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1780,7 +1773,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1830,24 +1823,18 @@ msgstr "输入栅格图的名称" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1977,7 +1964,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1987,7 +1974,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2107,7 +2093,7 @@ msgstr "打印栅格历史信息" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2136,6 +2122,7 @@ msgstr "无法为字符串分配内存" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2271,7 +2258,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2280,8 +2273,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2313,7 +2306,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2369,7 +2362,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2414,7 +2406,7 @@ msgid "Unknown method <%s>" msgstr "未知的方法 <%s>" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2467,7 +2459,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2878,7 +2870,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "错误，ct == pres_cell" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2966,14 +2958,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3132,7 +3126,7 @@ msgid "List of cell values to be set to NULL" msgstr "列出的像元值被设置为空值" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3440,6 +3434,15 @@ msgstr "输出入射角度的栅格图(只用于mode 1)" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3528,17 +3531,15 @@ msgstr "输出入射角度的栅格图(只用于mode 1)" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3559,7 +3560,7 @@ msgstr "输出入射角度的栅格图(只用于mode 1)" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "输出" @@ -3632,7 +3633,7 @@ msgstr "本地(太阳)时间(只用于mode 1)[十进制时间]" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "采样距离增量系数(0.5-1.5)" @@ -3665,160 +3666,155 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +#, fuzzy +msgid "Can't get projection info of current project" msgstr "无法获得当前区域的投影信息" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +#, fuzzy +msgid "Can't get projection units of current project" msgstr "无法获得当前区域的投影单位" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +#, fuzzy +msgid "Can't get projection key values of current project" msgstr "无法获得当前区域的投影参数" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3851,19 +3847,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3933,9 +3929,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3949,36 +3945,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4033,6 +4029,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4053,46 +4052,57 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +#, fuzzy +msgid "Output format used for point mode" +msgstr "输出的格式" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "输出文件的名称(output=-用于标准输出)" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +#, fuzzy +msgid "Include horizon distance in the output" +msgstr "在输出中包含类别标签" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4101,82 +4111,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "无法获得当前区域的投影信息" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "无法获得当前区域的投影单位" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "无法获得当前区域的投影参数" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4976,7 +4998,7 @@ msgstr "使用栅格值作为类别，而不使用独立值(只对栅格单元)" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5055,7 +5077,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "无法在表%s上授予权限" @@ -5184,7 +5206,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5383,9 +5405,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5401,7 +5422,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5613,9 +5634,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5633,7 +5654,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5718,10 +5739,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5761,30 +5782,30 @@ msgstr "高程的比例因子" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5907,124 +5928,124 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 #, fuzzy msgid "Print data file extent in shell script style and then exit" msgstr "以shell脚本的样式输出统计值" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, fuzzy, c-format msgid "Raster map <%s> created. " msgstr "未找到3D栅格图<%s>" @@ -6124,7 +6145,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6158,7 +6179,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6188,7 +6209,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6241,9 +6262,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6259,8 +6280,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6270,24 +6291,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "分布均值" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "标准偏差" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6339,7 +6391,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6639,7 +6691,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6745,7 +6797,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6831,7 +6882,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7450,7 +7501,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7459,7 +7510,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7564,7 +7615,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7588,15 +7639,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7669,7 +7720,7 @@ msgstr "叠加值从叠加地图的类别标签中提取" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7719,17 +7770,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7787,6 +7835,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7925,7 +7974,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -8008,7 +8057,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8067,7 +8116,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8128,7 +8177,7 @@ msgstr "计算栅格地图中非空像元的一元统计值" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8251,7 +8300,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8390,7 +8438,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8482,8 +8530,8 @@ msgstr "载入内存的地图的百分比" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8492,8 +8540,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8511,7 +8559,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8891,9 +8939,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9117,13 +9165,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9136,7 +9182,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9378,31 +9423,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9418,12 +9463,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9438,18 +9482,18 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" -msgstr "" +#, fuzzy +msgid "Name of GCPs target project (location)" +msgstr "输入栅格图的名称" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9473,10 +9517,10 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +#, fuzzy +msgid "Name for new project (location) to create" msgstr "将要创建的新区域的名称" #: ../raster/r.in.gdal/main.c:195 @@ -9506,7 +9550,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9515,210 +9559,228 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "使用波段数，而不使用波段的颜色名称" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +#, fuzzy +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "不能将输入地图的投影转换为 GRASS 格式，无法创建新的区域。" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +#, fuzzy +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "不能将输入地图的投影转换为 GRASS 格式，无法创建新的区域。" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10385,7 +10447,6 @@ msgid "Number of intermediate images to produce" msgstr "产生的中间影像的数量" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10498,6 +10559,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10529,26 +10602,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10573,12 +10626,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10586,40 +10633,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "输入失败" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10769,7 +10816,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -11012,29 +11059,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11087,71 +11134,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "最小随机值" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "最大随机值" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11194,6 +11208,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11897,7 +11944,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11911,13 +11958,14 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "将栅格图转化为矢量图层。" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input raster map" +msgstr "设置区域以匹配这个栅格图" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 #: ../raster/r.proj/main.c:166 @@ -11942,10 +11990,9 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +#, fuzzy +msgid "Path to GRASS database of input project" msgstr "输入区域的GRASS数据库路径" #: ../raster/r.proj/main.c:174 @@ -12001,12 +12048,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -12023,12 +12070,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12036,7 +12083,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12044,7 +12091,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12060,12 +12107,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12145,7 +12192,7 @@ msgid "Sorting events..." msgstr "写入新文件...\n" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12401,8 +12448,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12570,7 +12618,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12581,6 +12629,21 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +#, fuzzy +msgid "Unable to get projection info of current project" +msgstr "无法获得当前区域的投影信息" + +#: ../raster/r.sunmask/g_solposition.c:105 +#, fuzzy +msgid "Unable to get projection units of current project" +msgstr "无法获得当前区域的投影单位" + +#: ../raster/r.sunmask/g_solposition.c:109 +#, fuzzy +msgid "Unable to get projection key values of current project" +msgstr "无法获得当前区域的投影参数" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13192,16 +13255,19 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection info of current project" +msgstr "无法获得当前区域的投影信息" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection units of current project" +msgstr "无法获得当前区域的投影单位" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" -msgstr "" +#, fuzzy +msgid "Cannot get projection key values of current project" +msgstr "无法获得当前区域的投影参数" #: ../raster/r.sunhours/main.c:367 msgid "Calculating solar elevation and azimuth..." @@ -13279,7 +13345,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13289,7 +13355,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13375,7 +13441,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13384,7 +13450,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "无法为表 <%s>创建索引" @@ -13696,7 +13762,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13707,19 +13773,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "要查询的栅格图的名称" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "要查询的坐标" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13727,15 +13793,28 @@ msgstr "要查询的坐标" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "点的缓存的大小" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13744,62 +13823,70 @@ msgstr "点的缓存的大小" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "输出整型的类别值，而不是像元值" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "开启缓存报告" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13969,9 +14056,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14310,21 +14394,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14508,80 +14592,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15460,31 +15544,31 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15500,61 +15584,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15578,7 +15662,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16517,46 +16600,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16881,7 +16964,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17332,8 +17415,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17460,97 +17543,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17813,11 +17896,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -18018,32 +18101,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18126,8 +18209,9 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" -msgstr "" +#, fuzzy +msgid "Default: project map units" +msgstr "字段类型不支持" #: ../misc/m.measure/main.c:60 msgid "Shell script style" @@ -18149,8 +18233,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18904,8 +18989,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18915,28 +19000,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18945,57 +19030,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -19004,7 +19089,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -19013,7 +19098,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19505,6 +19590,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19563,64 +19652,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19726,7 +19823,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19739,10 +19835,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19756,11 +19850,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20254,10 +20348,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20313,9 +20407,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20375,13 +20469,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20742,68 +20836,69 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 +#, fuzzy msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" "无法使用 WGS84 来输出，因为该区域不包含基准面转换参数。尝试运行 g.setproj。" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21047,8 +21142,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21315,154 +21410,155 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" -msgstr "" +#: ../general/g.proj/main.c:224 +#, fuzzy +msgid "Name of new project (location) to create" +msgstr "将要创建的新区域的名称" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, fuzzy, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "必须指定'from_table'或'select'选项。" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21550,9 +21646,9 @@ msgid "" msgstr "" #: ../general/g.proj/create.c:18 -#, c-format -msgid "Unable to create location <%s>: %s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>: %s" +msgstr "无法创建表 <%s>" #: ../general/g.proj/create.c:21 #, c-format @@ -21560,98 +21656,98 @@ msgid "Unable to create projection files: %s" msgstr "" #: ../general/g.proj/create.c:25 -#, c-format -msgid "Unable to create location <%s>" -msgstr "" +#, fuzzy, c-format +msgid "Unable to create project <%s>" +msgstr "无法创建表 <%s>" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21794,7 +21890,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21877,33 +21974,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21912,69 +22031,74 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +#, fuzzy +msgid "Separator is part of the format." +msgstr "使用以下任意一种格式输入一个规则：\n" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21989,37 +22113,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22372,7 +22493,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23559,7 +23680,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23655,7 +23776,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23663,8 +23785,9 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" -msgstr "" +#, fuzzy +msgid "Name of the target project (location)" +msgstr "输入栅格图的名称" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 msgid "Name of the target mapset" @@ -23696,35 +23819,36 @@ msgid "Please select a target for group [%s] first" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 -#, c-format -msgid "Target location [%s] not found\n" -msgstr "" +#, fuzzy, c-format +msgid "Target project (location) [%s] not found\n" +msgstr "未找到3D栅格图<%s>" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23777,61 +23901,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23841,29 +23970,30 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" -msgstr "" +#, fuzzy +msgid "Name of target project (location) for ortho-rectification" +msgstr "无法获得当前区域的投影信息" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 msgid "Name of target mapset for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 -#, c-format -msgid "Unable to access target location/mapset %s/%s" -msgstr "" +#, fuzzy, c-format +msgid "Unable to access target project/mapset %s/%s" +msgstr "无法创建表 <%s>" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23978,15 +24108,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -24026,101 +24154,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24244,6 +24370,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24260,6 +24396,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24269,6 +24410,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24634,6 +24795,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 #, fuzzy msgid "prediction" msgstr "位置名称" @@ -26207,8 +26369,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26532,17 +26694,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26551,17 +26710,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26570,17 +26726,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26590,17 +26743,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26609,12 +26759,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27416,6 +27564,9 @@ msgid "Apriori Phi (roll) standard deviation" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -28730,11 +28881,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -28783,7 +28938,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -28876,16 +29031,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -29455,6 +29609,42 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +#, fuzzy +msgid "Attribute column to create histogram from" +msgstr "用来创建标签的属性字段的名称" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +#, fuzzy +msgid "Number of bins in histogram" +msgstr "打印的份数" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -29497,6 +29687,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -29533,63 +29725,74 @@ msgstr "输入失败" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 #, fuzzy +msgid "Name of output raster cloud and shadow mask" +msgstr "输出的3d栅格地图名称" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#, fuzzy msgid "Name of output vector cloud mask" msgstr "输出的坡向图和坡度图的类型" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 #, fuzzy msgid "Name of output raster cloud mask" msgstr "输入栅格图的名称" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 #, fuzzy msgid "Name of output vector shadow mask" msgstr "输出的坡向图和坡度图的类型" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 #, fuzzy msgid "Name of output raster shadow mask" msgstr "输出的3d栅格地图名称" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 msgid "Name of the image metadata file (MTD_TL.xml)" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 #, fuzzy msgid "Rescale factor" msgstr "垂直比例因子" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 #, fuzzy msgid "Do not delete temporary files" msgstr "尝试读取dbmscap文件失败\n" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 #, fuzzy msgid "Compute only the cloud mask" msgstr "地图北向格网坐标" @@ -29671,234 +29874,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -#, fuzzy -msgid "Name of training vector map" -msgstr "矢量文件读取错误" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -#, fuzzy -msgid "layer name or number to use for data" -msgstr "图层 %d" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -#, fuzzy -msgid "Export the classify results to raster maps" -msgstr "转换后的栅格图的存储类型" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -30102,6 +30085,520 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +#, fuzzy +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "输出图层的名称" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +#, fuzzy +msgid "Nodata values" +msgstr "栅格值" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +#, fuzzy +msgid "Create a vector point layer from the sample predictions" +msgstr "将矢量点作为3D点生成" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +#, fuzzy +msgid "Name of sample prediction layer" +msgstr "输入图层的名称" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +#, fuzzy +msgid "Create a vector point layer with predictions at background points" +msgstr "将矢量点作为3D点生成" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +#, fuzzy +msgid "Name of background prediction layer" +msgstr "输入图层的名称" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +#, fuzzy +msgid "Name of raster prediction layer" +msgstr "输入栅格图的名称" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +#, fuzzy +msgid "Disable linear features" +msgstr "显示线条要素的方向" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +#, fuzzy +msgid "Disable quadratic features" +msgstr "显示要素的顶点" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +#, fuzzy +msgid "Disable product features" +msgstr "显示要素的几何形状" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +#, fuzzy +msgid "Disable hinge features" +msgstr "显示要素的几何形状" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +#, fuzzy +msgid "Validation" +msgstr "位置名称" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +#, fuzzy +msgid "Percentage of random test points" +msgstr "插值点的数量" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +#, fuzzy +msgid "Number of replicates in cross-validation" +msgstr "将要使用的等级数<%s>" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +#, fuzzy +msgid "Maximum iterations optimization" +msgstr "点间的最大距离： %f" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +#, fuzzy +msgid "Convergence threshold" +msgstr "用来定义一个“平面”的曲率容限" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +#, fuzzy +msgid "Threshold for hinge feature" +msgstr "显示线条要素的方向" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +#, fuzzy +msgid "Number of samples at which hinge features start being used." +msgstr "重复过滤的次数" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +#, fuzzy +msgid "Use a random seed" +msgstr "新的栅格图的标题" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +#, fuzzy +msgid "Number of processor threads to use." +msgstr "行数" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -30308,10 +30805,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -30551,6 +31053,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -31755,7 +32265,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -31799,11 +32309,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -32920,7 +33425,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 #, fuzzy msgid "Layer number or name" msgstr "图层 %d" @@ -32958,6 +33462,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -33322,7 +33837,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -33516,7 +34030,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 #, fuzzy msgid "Input map" msgstr "输出图" @@ -33551,6 +34065,15 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +#, fuzzy +msgid "Path to database, use path option instead" +msgstr "输入区域的GRASS数据库路径" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -34603,11 +35126,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -34654,45 +35174,59 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +#, fuzzy +msgid "Thin species and background points" +msgstr "插值点的数量" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 #, fuzzy msgid "nodata value in output files" msgstr "输出的最大值：%e" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 #, fuzzy msgid "Seed for generating random points" msgstr "行/列叠置用于分割" @@ -35494,8 +36028,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -35506,6 +36049,7 @@ msgid "Group of raster layers to be classified" msgstr "将要调整的栅格地图的名称" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -35545,11 +36089,13 @@ msgid "" msgstr "含有符号旋转角度的属性字段名称" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 #, fuzzy msgid "Output Map" msgstr "输出图" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -35845,6 +36391,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -35856,6 +36403,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -35885,6 +36433,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 #, fuzzy msgid "Load model from file" msgstr "输出文件的名称" @@ -36260,64 +36809,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -#, fuzzy -msgid "Vector output stream" -msgstr "没有输出地图" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -36667,11 +37158,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "基于新的数据集扩展区域的范围" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -37535,6 +38028,14 @@ msgid "" "mapset." msgstr "将栅格图转化为矢量图层。" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "输入区域的GRASS数据库路径" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -37664,12 +38165,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -37812,9 +38313,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -37857,19 +38357,30 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +#, fuzzy +msgid "Extend project extents based on new dataset" +msgstr "基于新的数据集扩展区域的范围" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -37878,7 +38389,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -38012,34 +38523,6 @@ msgstr "输入的数据库名称" msgid "Base name for output file" msgstr "输出文件的名称" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -#, fuzzy -msgid "geology" -msgstr "水文学" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -#, fuzzy -msgid "Attribute column containing azimuth" -msgstr "用于邻近分析的属性字段的名称 (如果图层数>0)" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -#, fuzzy -msgid "Number of bins in histogram" -msgstr "打印的份数" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -38693,6 +39176,10 @@ msgstr "输出文件的名称" msgid "Queries projection information spatially." msgstr "无法获得当前区域的投影信息" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 #, fuzzy msgid "Logical operator for coordinates" @@ -38991,7 +39478,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -39022,8 +39509,9 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" -msgstr "" +#, fuzzy +msgid "Name of attribute column used to dissolve features" +msgstr "用来创建标签的属性字段的名称" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 #, fuzzy @@ -39731,9 +40219,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -39988,6 +40482,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -41024,8 +41526,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -41121,39 +41623,48 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 +#, fuzzy +msgid "Name of data layers to import" +msgstr "输入图层的名称" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 msgid "Specify alternate spatial reference system (example: EPSG:4326)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -44390,8 +44901,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -44429,6 +44940,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -44842,6 +45354,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -44896,6 +45415,20 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +#, fuzzy +msgid "Input vector layer" +msgstr "输入文件" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +#, fuzzy +msgid "Output vector layer" +msgstr "输入文件" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 #, fuzzy msgid "Converts a raster map into vector tiles." @@ -44936,6 +45469,38 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "打印的份数" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +#, fuzzy +msgid "Group of raster layers used for prediction" +msgstr "将要调整的栅格地图的名称" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +#, fuzzy +msgid "Number of pixels to pass to the prediction method" +msgstr "重复过滤的次数" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -45367,8 +45932,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -46105,6 +46670,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "输出栅格文件的标题" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "将要创建的新区域的名称" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 #, fuzzy msgid "Name for region instead of current region" @@ -46395,6 +46964,10 @@ msgstr "" msgid "Offset factor for input" msgstr "高程的比例因子" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -46834,10 +47407,94 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +#, fuzzy +msgid "Lambda model file" +msgstr "输出文件的名称" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +#, fuzzy +msgid "Names of the input raster layers" +msgstr "输入图层的名称" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +#, fuzzy +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "包含线的输入地图" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +#, fuzzy +msgid "variable names" +msgstr "输入的表的名称" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +#, fuzzy +msgid "Prediction raster layer" +msgstr "高程栅格图的名称" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +#, fuzzy +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "栅格地图的名称 <%s>" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +#, fuzzy +msgid "parameters" +msgstr "平滑参数" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +#, fuzzy +msgid "Print Maxent command" +msgstr "打印x和y(列和行)" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +#, fuzzy +msgid "geology" +msgstr "水文学" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +#, fuzzy +msgid "Attribute column containing azimuth" +msgstr "用于邻近分析的属性字段的名称 (如果图层数>0)" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -47333,17 +47990,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -47371,23 +48018,20 @@ msgid "categorical map with zones" msgstr "矢量地图<%s>非3D" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 #, fuzzy msgid "Name of output image file" msgstr "输出文件的名称" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -47397,9 +48041,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -47418,13 +48061,11 @@ msgid "Create a vector point layer of outliers" msgstr "将矢量点作为3D点生成" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -47434,14 +48075,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 #, fuzzy msgid "Range (value > 0)" @@ -47475,14 +48114,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -47494,27 +48125,23 @@ msgid "Plot format" msgstr "输出的格式" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 #, fuzzy msgid "Rotate labels" msgstr "打印类别标签" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 #, fuzzy @@ -47561,15 +48188,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -47589,7 +48207,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -47599,49 +48216,40 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 #, fuzzy msgid "width of the boxplot median line" msgstr "输出文件的名称" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -47649,116 +48257,24 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 #, fuzzy msgid "Flier color" msgstr "要素颜色" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -#, fuzzy -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" -"#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" -"输出栅格图的名称\n" -"#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" -"输出栅格文件的名称" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -#, fuzzy -msgid "input space-time raster dataset" -msgstr "" -"#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" -"输出栅格图的名称\n" -"#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" -"输出栅格文件的名称" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -#, fuzzy -msgid "Resolution of plot" -msgstr "输出栅格图的名称" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -#, fuzzy -msgid "Font size of labels" -msgstr "打印类别标签" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -#, fuzzy -msgid "Date format" -msgstr "输出的格式" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -#, fuzzy -msgid "Boxplot color" -msgstr "文本颜色" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -48990,6 +49506,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 #, fuzzy msgid "Boxplot text labels" @@ -49013,6 +49537,15 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +#, fuzzy +msgid "Boxplot color" +msgstr "文本颜色" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -49106,297 +49639,297 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 #, fuzzy msgid "input vector layer" msgstr "输入文件" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 #, fuzzy msgid "Name of x column" msgstr "列数" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 #, fuzzy msgid "Name of the column with x values" msgstr "用于平滑参数的属性字段的名称" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 #, fuzzy msgid "Name of y column" msgstr "列数" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 #, fuzzy msgid "Name of the column with y values" msgstr "用于平滑参数的属性字段的名称" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 #, fuzzy msgid "Plot type" msgstr "要素类型" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 #, fuzzy msgid "Name of the output file (extension decides format)" msgstr "输出的蓝色图层的名称" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 #, fuzzy msgid "" "Name of the output file. The format is determined by the file extension." msgstr "输出的povray文件名(TGA高程文件)" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 #, fuzzy msgid "Resolution of plot in dpi's" msgstr "输出栅格图的名称" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 #, fuzzy msgid "Plot title" msgstr "字段类型不支持" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 #, fuzzy msgid "Aesthetics" msgstr "统计" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 #, fuzzy msgid "Dot color" msgstr "文本颜色" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 #, fuzzy msgid "RGB column" msgstr "列" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 #, fuzzy msgid "Reverse color map" msgstr "要素颜色" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 #, fuzzy msgid "Plot trendline" msgstr "字段类型不支持" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 #, fuzzy msgid "trendline width" msgstr "线宽" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 #, fuzzy msgid "Ellipse color" msgstr "文本颜色" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 #, fuzzy msgid "X axis range (min,max)" msgstr "整数范围：min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 #, fuzzy msgid "Y axis range (min,max)" msgstr "整数范围：min,max" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -49747,8 +50280,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -49828,185 +50361,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -#, fuzzy -msgid "Vector with spatial units" -msgstr "矢量地图<%s>非3D" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -#, fuzzy -msgid "Name of the column containing unique ID of spatial units" -msgstr "含有线宽的数量属性字段名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -#, fuzzy -msgid "Name of the column containing response variable" -msgstr "含有线宽的数量属性字段名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -#, fuzzy -msgid "Input raster 1" -msgstr "输入文件" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -#, fuzzy -msgid "Input raster 2 (optional)" -msgstr "输出栅格文件的标题" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -#, fuzzy -msgid "Input distance raster (optional)" -msgstr "高程栅格图的名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -#, fuzzy -msgid "Distance to zones of interest" -msgstr "缓冲区距离" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -#, fuzzy -msgid "Spatial resolution of output weighting layer" -msgstr "输出栅格图的名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -#, fuzzy -msgid "Output weighting layer name" -msgstr "输出的表名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -#, fuzzy -msgid "Name for output vector gridded spatial units" -msgstr "" -"#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" -"输出栅格图的名称\n" -"#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" -"输出栅格文件的名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -#, fuzzy -msgid "Name for output plot of model feature importances" -msgstr "输入栅格图的名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -#, fuzzy -msgid "Name for output file with log of the random forest run" -msgstr "输出文件的名称" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -#, fuzzy -msgid "Categories of basemap A to be used" -msgstr "栅格地图的名称 <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -#, fuzzy -msgid "Categories of basemap B to be used" -msgstr "栅格地图的名称 <%s>" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -#, fuzzy -msgid "Number of cores to be used for the parallel process" -msgstr "每部分的等级数" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -50813,11 +51167,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 #, fuzzy msgid "Attribute column value to be plotted" @@ -55467,291 +55816,331 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" -#: ../locale/scriptstrings/t.create_to_translate.c:1 -msgid "Creates a space time dataset." -msgstr "" - -#: ../locale/scriptstrings/t.create_to_translate.c:4 -msgid "create" -msgstr "" - -#: ../locale/scriptstrings/t.create_to_translate.c:6 -msgid "Type of the output space time dataset" ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:1 -msgid "Provides supervised support vector machine classification" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:4 -msgid "R" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:5 -msgid "classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:6 -#, fuzzy -msgid "Vector map with areas to be classified" -msgstr "被重新分类的基础图" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:7 -msgid "Vector map containing all areas and relevant attributes" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:8 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:10 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:13 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:15 -msgid "Vector input" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:9 -msgid "Layer of the segments map where attributes are stored" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:11 -msgid "Vector map with training areas" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:12 -msgid "Vector map with training areas and relevant attributes" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:14 -msgid "Layer of the training map where attributes are stored" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:16 -msgid "File containing statistics of all segments" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:17 -#, fuzzy -msgid "File containing relevant attributes for all areas" -msgstr "无法选择类别 = %d 的属性" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:18 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:21 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:27 -#, fuzzy -msgid "Text input" -msgstr "字符编码" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:19 -msgid "File containing statistics of training segments" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:20 -msgid "File containing relevant attributes for training areas" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:22 -msgid "Size of subsample per class to be used for training" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:23 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:25 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:38 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:41 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:43 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:45 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:47 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:74 -msgid "Model tuning" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:24 -msgid "Size of sample per class to be used for hyperparameter tuning" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:26 -#, fuzzy -msgid "Field separator in input text files" -msgstr "无法打开输入的dig_att文件。" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:28 -#, fuzzy -msgid "Raster map with segments" -msgstr "用来对齐的栅格图" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:29 -#, fuzzy -msgid "Input raster map containing all segments" -msgstr "输出栅格文件的标题" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:30 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:33 -#, fuzzy -msgid "Raster maps" -msgstr "结果图" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:31 +#: ../locale/scriptstrings/t.create_to_translate.c:1 +msgid "Creates a space time dataset." +msgstr "" + +#: ../locale/scriptstrings/t.create_to_translate.c:4 +msgid "create" +msgstr "" + +#: ../locale/scriptstrings/t.create_to_translate.c:6 +msgid "Type of the output space time dataset" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:1 +msgid "Provides supervised support vector machine classification" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:4 +msgid "R" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:5 +msgid "classifiers" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:6 +#, fuzzy +msgid "Vector map with areas to be classified" +msgstr "被重新分类的基础图" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:7 +msgid "Vector map containing all areas and relevant attributes" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:8 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:10 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:13 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:15 +msgid "Vector input" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:9 +msgid "Layer of the segments map where attributes are stored" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:11 +msgid "Vector map with training areas" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:12 +msgid "Vector map with training areas and relevant attributes" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:14 +msgid "Layer of the training map where attributes are stored" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:16 +msgid "File containing statistics of all segments" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:17 +#, fuzzy +msgid "File containing relevant attributes for all areas" +msgstr "无法选择类别 = %d 的属性" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:18 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:21 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:27 +#, fuzzy +msgid "Text input" +msgstr "字符编码" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:19 +msgid "File containing statistics of training segments" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:20 +msgid "File containing relevant attributes for training areas" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:22 +msgid "Size of subsample per class to be used for training" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:23 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:25 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:38 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:41 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:43 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:45 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:47 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:74 +msgid "Model tuning" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:24 +msgid "Size of sample per class to be used for hyperparameter tuning" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:26 +#, fuzzy +msgid "Field separator in input text files" +msgstr "无法打开输入的dig_att文件。" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:28 +#, fuzzy +msgid "Raster map with segments" +msgstr "用来对齐的栅格图" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:29 +#, fuzzy +msgid "Input raster map containing all segments" +msgstr "输出栅格文件的标题" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:30 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:33 +#, fuzzy +msgid "Raster maps" +msgstr "结果图" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:31 +msgid "" +"Prefix for raster maps (one per weighting mode) with classes attributed to " +"pixels" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:32 +msgid "" +"Output raster maps (one per weighting mode) in which all pixels are " +"reclassed to the class attributed to the segment they belong to" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:34 +#, fuzzy +msgid "Name of attribute column containing training classification" +msgstr "用于邻近分析的属性字段的名称 (如果图层数>0)" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:35 +msgid "Prefix of column with final classification" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:36 +msgid "Prefix of column with probability of classification" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:37 +msgid "Perform feature selection to a maximum of max_features" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:39 +msgid "Classifiers to use" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:40 +#, fuzzy +msgid "Number of folds to use for cross-validation" +msgstr "将要使用的等级数<%s>" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:42 +msgid "Number of different partitions to use for cross-validation" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:44 +#, fuzzy +msgid "Number of levels to test for each tuning parameter" +msgstr "每部分的等级数" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:46 +msgid "Python dictionary of customized tunegrids" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:48 +msgid "Type of weighting to use" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:49 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:51 +msgid "Voting" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:50 +msgid "Metric to use for weighting" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:52 +msgid "File where to save model(s)" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:53 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:55 +msgid "Save/Load models" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:54 +#, fuzzy +msgid "Name of file containing an existing model" +msgstr "包含回路(back-path)东向信息的栅格地图的名称" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:56 +msgid "File for saving results of all classifiers" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:57 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:59 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:61 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:63 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:65 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:67 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:70 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:72 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:76 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:78 +#, fuzzy +msgid "Optional output" +msgstr "没有输出地图" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:58 +msgid "File for saving relative importance of used variables" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:60 +msgid "File for saving accuracy measures of classifiers" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:62 +msgid "File for saving details about the classifier module runs" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:64 +msgid "PNG file for saving box-whisker plot of classifier performance" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:66 +msgid "File containing R script" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:69 +msgid "Only write results to text file, do not update vector map" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:71 +#, fuzzy +msgid "Include individual classifier results in output" +msgstr "在输出中包含类别标签" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:73 +msgid "Normalize (center and scale) data before analysis" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:75 +msgid "Only tune and train model, do not predict" +msgstr "" + +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:77 +msgid "Include class probabilities in classification results" +msgstr "" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:6 +#, fuzzy +msgid "Elevation raster" +msgstr "高程起点" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:8 +msgid "land cover: rast or int: 0=bare soil; 1=grass; 2=shrub; 3=tree; 4=conif" +msgstr "" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:10 +msgid "soil: rast or int: 1=sand; 2=loam; 3=clay" +msgstr "" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:12 +msgid "Sub-basins to become HRUs" +msgstr "" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:14 +msgid "HRUs" +msgstr "" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:16 +msgid "Slope [unitless]: r.slope.aspect format=percent zscale=0.01" +msgstr "" + +#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:17 +msgid "Aspect from r.slope.aspect" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 msgid "" -"Prefix for raster maps (one per weighting mode) with classes attributed to " -"pixels" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." msgstr "" -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:32 -msgid "" -"Output raster maps (one per weighting mode) in which all pixels are " -"reclassed to the class attributed to the segment they belong to" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" msgstr "" -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:34 -#, fuzzy -msgid "Name of attribute column containing training classification" -msgstr "用于邻近分析的属性字段的名称 (如果图层数>0)" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:35 -msgid "Prefix of column with final classification" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" msgstr "" -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:36 -msgid "Prefix of column with probability of classification" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:37 -msgid "Perform feature selection to a maximum of max_features" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" msgstr "" -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:39 -msgid "Classifiers to use" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" msgstr "" -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:40 -#, fuzzy -msgid "Number of folds to use for cross-validation" -msgstr "将要使用的等级数<%s>" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:42 -msgid "Number of different partitions to use for cross-validation" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:44 -#, fuzzy -msgid "Number of levels to test for each tuning parameter" -msgstr "每部分的等级数" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:46 -msgid "Python dictionary of customized tunegrids" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:48 -msgid "Type of weighting to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:49 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:51 -msgid "Voting" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:50 -msgid "Metric to use for weighting" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:52 -msgid "File where to save model(s)" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:53 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:55 -msgid "Save/Load models" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:54 -#, fuzzy -msgid "Name of file containing an existing model" -msgstr "包含回路(back-path)东向信息的栅格地图的名称" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:56 -msgid "File for saving results of all classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:57 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:59 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:61 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:63 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:65 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:67 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:70 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:72 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:76 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:78 -#, fuzzy -msgid "Optional output" -msgstr "没有输出地图" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:58 -msgid "File for saving relative importance of used variables" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:60 -msgid "File for saving accuracy measures of classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:62 -msgid "File for saving details about the classifier module runs" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:64 -msgid "PNG file for saving box-whisker plot of classifier performance" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:66 -msgid "File containing R script" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:69 -msgid "Only write results to text file, do not update vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:71 -#, fuzzy -msgid "Include individual classifier results in output" -msgstr "在输出中包含类别标签" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:73 -msgid "Normalize (center and scale) data before analysis" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:75 -msgid "Only tune and train model, do not predict" -msgstr "" - -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:77 -msgid "Include class probabilities in classification results" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" msgstr "" -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:6 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 #, fuzzy -msgid "Elevation raster" -msgstr "高程起点" - -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:8 -msgid "land cover: rast or int: 0=bare soil; 1=grass; 2=shrub; 3=tree; 4=conif" -msgstr "" - -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:10 -msgid "soil: rast or int: 1=sand; 2=loam; 3=clay" -msgstr "" - -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:12 -msgid "Sub-basins to become HRUs" -msgstr "" - -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:14 -msgid "HRUs" -msgstr "" - -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:16 -msgid "Slope [unitless]: r.slope.aspect format=percent zscale=0.01" -msgstr "" +msgid "Set to original computational region" +msgstr "使用当前的区域" -#: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:17 -msgid "Aspect from r.slope.aspect" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." msgstr "" #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 @@ -56296,8 +56685,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -56598,8 +56987,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -56779,7 +57168,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -56793,7 +57182,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -57321,7 +57710,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -57611,7 +58000,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -57700,49 +58089,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "打印指定图层的字段类型/名称并退出" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "覆盖指定图层的连接参数" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "删除指定图层的连接 (不删除表)" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "数据库连接未定义" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -57752,33 +58137,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "无法为表%s授予权限" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -57815,7 +58200,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -57892,56 +58277,63 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -58208,127 +58600,131 @@ msgstr[0] "" #: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385 #: ../scripts/v.db.addtable/v.db.addtable.py:137 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -58799,7 +59195,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -59035,11 +59431,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -59066,7 +59462,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -59075,7 +59471,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -59095,7 +59491,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -59131,12 +59527,14 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "将栅格图转化为矢量图层。" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" -msgstr "" +#, fuzzy +msgid "Project (location) containing input vector map" +msgstr "矢量文件读取错误" #: ../vector/v.proj/main.c:88 msgid "Mapset containing input vector map" @@ -59170,13 +59568,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -59191,12 +59593,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -61459,7 +61861,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -62081,7 +62483,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -62385,12 +62787,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -62590,19 +62992,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -62810,7 +63212,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -62968,10 +63370,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -63010,6 +63412,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -63110,9 +63516,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -63126,7 +63532,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -63211,7 +63617,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -63239,8 +63644,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -63859,7 +64264,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -63991,8 +64396,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -65753,17 +66158,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -65939,13 +66344,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -66191,42 +66596,47 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +#, fuzzy +msgid "Print header" +msgstr "打印表并退出" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "该选项需要一个字段" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "'sides' 选项只用于边界" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -67208,16 +67618,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -68612,66 +69012,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "内插片断失败" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -68957,7 +69357,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -69414,164 +69814,164 @@ msgstr "数据库连接未定义" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -69747,27 +70147,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -69834,274 +70257,274 @@ msgstr "不清理多边形 (不推荐)" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -70110,51 +70533,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -70310,10 +70733,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, fuzzy, c-format +msgid "Target project <%s> not found" +msgstr "未找到3D栅格图<%s>" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -70477,14 +70910,14 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -70492,7 +70925,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -71479,6 +71912,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -72043,6 +72480,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, fuzzy, c-format +msgid "Unable to open file '%s' for reading." +msgstr "无法打开输入文件<%s>" + +#: ../display/d.redraw/main.c:100 +#, fuzzy, c-format +msgid "Unable to open file '%s' for writing." +msgstr "无法打开输入文件<%s>" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -75962,7 +76416,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -76201,22 +76655,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -78245,38 +78692,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -78356,11 +78803,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -78385,103 +78832,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -78493,336 +78940,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -78875,50 +79322,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -78946,7 +79393,7 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" @@ -79164,7 +79611,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -79221,85 +79668,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 -#, python-format -msgid "Coordinate reference system not available for current location <%s>" -msgstr "" +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 +#, fuzzy, python-format +msgid "Coordinate reference system not available for current project <%s>" +msgstr "使用地图坐标而不是 xyz 坐标" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 -#, python-format -msgid "Creating temporary location for <%s>..." -msgstr "" +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 +#, fuzzy, python-format +msgid "Creating temporary project for <%s>..." +msgstr "无法打开临时标签文件 <%s>" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -79345,28 +79792,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -79423,27 +79870,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 -#, python-format -msgid "Unable to create location from OGR datasource <%s>" -msgstr "" +#: ../scripts/v.import/v.import.py:289 +#, fuzzy, python-format +msgid "Unable to create project from OGR datasource <%s>" +msgstr "无法为表 <%s>创建索引" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -79453,7 +79900,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -79463,14 +79909,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -79478,72 +79924,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -79770,7 +80216,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -79788,64 +80234,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -79985,79 +80432,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -80169,40 +80616,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -80238,7 +80685,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -80249,34 +80696,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -80368,34 +80815,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -80474,317 +80921,317 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 #, fuzzy msgid "Extension <{}> not found" msgstr "字段 <%s> 未找到" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -80792,60 +81239,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -80897,27 +81344,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, fuzzy, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "无法打开输入文件<%s>" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -80963,16 +81420,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -81043,41 +81490,49 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +#, fuzzy +msgid "Vector map <{}> not found in current mapset" +msgstr "字段 <%s> 未找到" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -81125,20 +81580,130 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#, fuzzy +#~ msgid "layer name or number to use for data" +#~ msgstr "图层 %d" + +#, fuzzy +#~ msgid "Export the classify results to raster maps" +#~ msgstr "转换后的栅格图的存储类型" + +#, fuzzy +#~ msgid "Vector output stream" +#~ msgstr "没有输出地图" + +#, fuzzy +#~ msgid "Draws the boxplot of the raster maps of a space-time raster dataset" +#~ msgstr "" +#~ "#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" +#~ "输出栅格图的名称\n" +#~ "#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" +#~ "输出栅格文件的名称" + +#, fuzzy +#~ msgid "input space-time raster dataset" +#~ msgstr "" +#~ "#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" +#~ "输出栅格图的名称\n" +#~ "#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" +#~ "输出栅格文件的名称" + +#, fuzzy +#~ msgid "Resolution of plot" +#~ msgstr "输出栅格图的名称" + +#, fuzzy +#~ msgid "Font size of labels" +#~ msgstr "打印类别标签" + +#, fuzzy +#~ msgid "Date format" +#~ msgstr "输出的格式" + +#, fuzzy +#~ msgid "Vector with spatial units" +#~ msgstr "矢量地图<%s>非3D" + +#, fuzzy +#~ msgid "Name of the column containing unique ID of spatial units" +#~ msgstr "含有线宽的数量属性字段名称" + +#, fuzzy +#~ msgid "Name of the column containing response variable" +#~ msgstr "含有线宽的数量属性字段名称" + +#, fuzzy +#~ msgid "Input raster 1" +#~ msgstr "输入文件" + +#, fuzzy +#~ msgid "Input raster 2 (optional)" +#~ msgstr "输出栅格文件的标题" + +#, fuzzy +#~ msgid "Input distance raster (optional)" +#~ msgstr "高程栅格图的名称" + +#, fuzzy +#~ msgid "Distance to zones of interest" +#~ msgstr "缓冲区距离" + +#, fuzzy +#~ msgid "Spatial resolution of output weighting layer" +#~ msgstr "输出栅格图的名称" + +#, fuzzy +#~ msgid "Output weighting layer name" +#~ msgstr "输出的表名称" + +#, fuzzy +#~ msgid "Name for output vector gridded spatial units" +#~ msgstr "" +#~ "#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" +#~ "输出栅格图的名称\n" +#~ "#-#-#-#-# grassmods_zh.po (grassmods_zh) #-#-#-#-#\n" +#~ "输出栅格文件的名称" + +#, fuzzy +#~ msgid "Name for output plot of model feature importances" +#~ msgstr "输入栅格图的名称" + +#, fuzzy +#~ msgid "Name for output file with log of the random forest run" +#~ msgstr "输出文件的名称" + +#, fuzzy +#~ msgid "Categories of basemap A to be used" +#~ msgstr "栅格地图的名称 <%s>" + +#, fuzzy +#~ msgid "Categories of basemap B to be used" +#~ msgstr "栅格地图的名称 <%s>" + +#, fuzzy +#~ msgid "Number of cores to be used for the parallel process" +#~ msgstr "每部分的等级数" + +#~ msgid "Overwrite connection parameter for certain layer" +#~ msgstr "覆盖指定图层的连接参数" + +>>>>>>> osgeo-main #, fuzzy #~ msgid "" #~ "Type of raster map to be created / Storage type for resultant raster map" @@ -82871,10 +83436,6 @@ msgstr "" #~ msgid "Only 'terrain' points output vector map" #~ msgstr "起始点矢量图" -#, fuzzy -#~ msgid "Output formating" -#~ msgstr "输出的格式" - #, fuzzy #~ msgid "Error writing cell (%d,%d,%d) with value %f, nrows = %d" #~ msgstr "尝试读取dbmscap文件失败\n" diff --git a/locale/po/grassmods_zh_CN.po b/locale/po/grassmods_zh_CN.po index 5974d688575..b3cd693bb3b 100644 --- a/locale/po/grassmods_zh_CN.po +++ b/locale/po/grassmods_zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_zh_CN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-01-25 08:23+0000\n" "Last-Translator: \n" "Language-Team: Chinese (China) (https://www.transifex.com/grass-gis/" @@ -87,7 +87,7 @@ msgstr "" #: ../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:64 ../display/d.fontlist/main.c:46 +#: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46 #: ../display/d.colorlist/main.c:35 ../display/d.font/main.c:46 msgid "settings" msgstr "" @@ -127,32 +127,33 @@ msgid "Print current connection parameters and exit" msgstr "" #: ../temporal/t.connect/main.c:43 ../raster/r.external/main.c:96 -#: ../raster/r.external/main.c:136 ../raster/r.out.gdal/main.c:142 +#: ../raster/r.external/main.c:135 ../raster/r.out.gdal/main.c:142 #: ../raster/r.external.out/main.c:272 ../raster/r.external.out/main.c:283 -#: ../raster/r.in.gdal/main.c:239 ../raster/r.in.gdal/main.c:273 +#: ../raster/r.in.gdal/main.c:238 ../raster/r.in.gdal/main.c:272 #: ../raster/r.colors/edit_colors.c:163 ../raster/r.colors/edit_colors.c:171 #: ../raster/r.proj/main.c:209 ../raster/r.proj/main.c:219 #: ../raster/r.proj/main.c:225 ../raster/r.sunmask/main.c:233 -#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:123 -#: ../raster/r.what/main.c:131 ../raster/r.what/main.c:145 -#: ../raster/r.what/main.c:150 ../raster/r.what/main.c:155 -#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:171 -#: ../general/g.region/main.c:86 ../general/g.region/main.c:92 -#: ../general/g.region/main.c:97 ../general/g.region/main.c:103 -#: ../general/g.region/main.c:108 ../general/g.region/main.c:113 -#: ../general/g.region/main.c:119 ../general/g.region/main.c:127 -#: ../general/g.region/main.c:132 ../general/g.region/main.c:138 -#: ../general/g.region/main.c:143 ../general/g.region/main.c:149 -#: ../general/g.list/main.c:102 ../general/g.list/main.c:114 -#: ../general/g.list/main.c:136 ../general/g.list/main.c:142 -#: ../general/g.list/main.c:147 ../general/g.list/main.c:152 -#: ../general/g.proj/main.c:82 ../general/g.proj/main.c:88 -#: ../general/g.proj/main.c:94 ../general/g.proj/main.c:100 -#: ../general/g.proj/main.c:106 ../general/g.proj/main.c:118 -#: ../general/g.proj/main.c:123 ../general/g.proj/main.c:179 -#: ../general/g.mapset/main.c:77 ../general/g.mapset/main.c:83 -#: ../general/g.mapsets/main.c:88 ../general/g.mapsets/main.c:94 -#: ../general/g.mapsets/main.c:100 ../imagery/i.signatures/main.c:130 +#: ../raster/r.sunmask/main.c:239 ../raster/r.what/main.c:133 +#: ../raster/r.what/main.c:141 ../raster/r.what/main.c:152 +#: ../raster/r.what/main.c:166 ../raster/r.what/main.c:171 +#: ../raster/r.what/main.c:176 ../raster/r.what/main.c:182 +#: ../raster/r.what/main.c:192 ../general/g.region/main.c:86 +#: ../general/g.region/main.c:92 ../general/g.region/main.c:97 +#: ../general/g.region/main.c:103 ../general/g.region/main.c:108 +#: ../general/g.region/main.c:113 ../general/g.region/main.c:119 +#: ../general/g.region/main.c:127 ../general/g.region/main.c:132 +#: ../general/g.region/main.c:138 ../general/g.region/main.c:143 +#: ../general/g.region/main.c:149 ../general/g.list/main.c:102 +#: ../general/g.list/main.c:114 ../general/g.list/main.c:136 +#: ../general/g.list/main.c:142 ../general/g.list/main.c:147 +#: ../general/g.list/main.c:152 ../general/g.proj/main.c:83 +#: ../general/g.proj/main.c:89 ../general/g.proj/main.c:95 +#: ../general/g.proj/main.c:101 ../general/g.proj/main.c:107 +#: ../general/g.proj/main.c:119 ../general/g.proj/main.c:124 +#: ../general/g.proj/main.c:180 ../general/g.mapset/main.c:77 +#: ../general/g.mapset/main.c:83 ../general/g.mapsets/main.c:117 +#: ../general/g.mapsets/main.c:121 ../general/g.mapsets/main.c:127 +#: ../general/g.mapsets/main.c:133 ../imagery/i.signatures/main.c:130 #: ../imagery/i.signatures/main.c:136 ../imagery/i.signatures/main.c:168 #: ../imagery/i.group/main.c:85 ../imagery/i.group/main.c:90 #: ../imagery/i.group/main.c:95 ../db/db.connect/main.c:52 @@ -178,21 +179,21 @@ msgstr "" #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34 #: ../vector/v.db.connect/main.c:83 ../vector/v.db.connect/main.c:88 #: ../vector/v.db.connect/main.c:96 ../vector/v.db.connect/main.c:102 -#: ../vector/v.external/args.c:60 ../vector/v.external/args.c:67 -#: ../vector/v.external/args.c:76 ../vector/v.what/main.c:94 +#: ../vector/v.external/args.c:61 ../vector/v.external/args.c:68 +#: ../vector/v.external/args.c:77 ../vector/v.what/main.c:94 #: ../vector/v.what/main.c:99 ../vector/v.what/main.c:104 #: ../vector/v.what/main.c:109 ../vector/v.what/main.c:115 #: ../vector/v.external.out/args.c:68 ../vector/v.external.out/args.c:81 #: ../vector/v.external.out/args.c:87 ../vector/v.vect.stats/main.c:229 #: ../vector/v.vect.stats/main.c:236 ../vector/v.to.db/parse.c:117 #: ../vector/v.to.db/parse.c:122 ../vector/v.to.db/parse.c:128 -#: ../vector/v.to.db/parse.c:134 ../vector/v.colors/main.c:132 -#: ../vector/v.colors/main.c:140 ../vector/v.info/parse.c:21 -#: ../vector/v.info/parse.c:27 ../vector/v.info/parse.c:32 -#: ../vector/v.info/parse.c:38 ../vector/v.info/parse.c:43 -#: ../vector/v.in.ogr/main.c:351 ../vector/v.in.ogr/main.c:358 -#: ../display/d.mon/main.c:118 ../display/d.mon/main.c:124 -#: ../display/d.mon/main.c:130 +#: ../vector/v.to.db/parse.c:133 ../vector/v.to.db/parse.c:139 +#: ../vector/v.colors/main.c:132 ../vector/v.colors/main.c:140 +#: ../vector/v.info/parse.c:21 ../vector/v.info/parse.c:27 +#: ../vector/v.info/parse.c:32 ../vector/v.info/parse.c:38 +#: ../vector/v.info/parse.c:43 ../vector/v.in.ogr/main.c:351 +#: ../vector/v.in.ogr/main.c:358 ../display/d.mon/main.c:118 +#: ../display/d.mon/main.c:124 ../display/d.mon/main.c:130 msgid "Print" msgstr "" @@ -264,7 +265,7 @@ msgstr "" #: ../raster/r.to.vect/main.c:74 ../raster/r.recode/main.c:47 #: ../raster/r.basins.fill/main.c:52 ../raster/r.to.rast3elev/main.c:375 #: ../raster/r.in.pdal/main.cpp:88 ../raster/r.stats.quantile/main.c:565 -#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:36 +#: ../raster/r.thin/main.c:55 ../raster/r.surf.gauss/main.c:38 #: ../raster/r.his/main.c:66 ../raster/r.spread/main.c:102 #: ../raster/r.topmodel/main.c:48 ../raster/r.param.scale/interface.c:52 #: ../raster/r.colors.out/raster_main.c:43 ../raster/r.out.ascii/main.c:53 @@ -289,7 +290,7 @@ msgstr "" #: ../raster/r.surf.contour/main.c:59 ../raster/r.out.mpeg/main.c:102 #: ../raster/r.fill.dir/main.c:87 ../raster/r.composite/main.c:70 #: ../raster/r.series/main.c:151 ../raster/r.out.ppm/main.c:52 -#: ../raster/r.surf.random/main.c:80 ../raster/r.flow/main.c:414 +#: ../raster/r.surf.random/main.c:83 ../raster/r.flow/main.c:414 #: ../raster/r.spreadpath/main.c:77 ../raster/r.geomorphon/main.c:115 #: ../raster/r.water.outlet/main.c:58 ../raster/r.mode/main.c:53 #: ../raster/r.coin/main.c:65 ../raster/r.colors/edit_colors.c:82 @@ -300,7 +301,7 @@ msgstr "" #: ../raster/r.surf.area/main.c:75 ../raster/r.sunhours/main.c:70 #: ../raster/r.relief/main.c:104 ../raster/r.contour/main.c:87 #: ../raster/r.out.ppm3/main.c:57 ../raster/r.fill.stats/main.c:765 -#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:100 +#: ../raster/r.topidx/main.c:37 ../raster/r.what/main.c:110 #: ../raster/r.in.mat/main.c:95 ../raster/r.stats/main.c:103 #: ../raster/r.timestamp/main.c:37 ../raster/r.surf.idw/main.c:101 #: ../raster/r.resamp.rst/main.c:144 ../raster/r.buffer/main.c:65 @@ -322,7 +323,7 @@ msgstr "" #: ../raster/r.li/r.li.pielou/pielou.c:46 #: ../raster/r.li/r.li.patchnum/main.c:50 ../raster/r.rescale.eq/main.c:53 #: ../raster/r.object.geometry/main.c:67 ../raster/r.out.gridatb/main.c:66 -#: ../raster/r.gwflow/main.c:222 ../raster/r.random/main.c:53 +#: ../raster/r.gwflow/main.c:221 ../raster/r.random/main.c:53 #: ../raster/r.carve/main.c:70 ../raster/r.path/main.c:146 #: ../raster/r.stream.extract/main.c:76 ../raster/r.texture/main.c:99 #: ../raster/r.profile/main.c:51 ../raster/r.regression.multi/main.c:129 @@ -479,6 +480,7 @@ msgstr "" #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:3 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:4 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:2 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:2 #: ../locale/scriptstrings/r.shalstab_to_translate.c:2 #: ../locale/scriptstrings/r.subdayprecip.design_to_translate.c:2 #: ../locale/scriptstrings/v.rast.move_to_translate.c:5 @@ -498,7 +500,6 @@ msgstr "" #: ../locale/scriptstrings/t.rast.to.vect_to_translate.c:4 #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:4 #: ../locale/scriptstrings/r.boxplot_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:3 #: ../locale/scriptstrings/r.category.trim_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:2 #: ../locale/scriptstrings/r.random.weight_to_translate.c:2 @@ -517,7 +518,6 @@ msgstr "" #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:2 #: ../locale/scriptstrings/r.shade_to_translate.c:2 #: ../locale/scriptstrings/r.green.biomassfor.legal_to_translate.c:2 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:2 #: ../locale/scriptstrings/r.lake.series_to_translate.c:2 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:2 #: ../locale/scriptstrings/i.spectral_to_translate.c:4 @@ -531,6 +531,7 @@ msgstr "" #: ../locale/scriptstrings/r.flowfill_to_translate.c:2 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:4 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:4 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:3 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:2 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:2 #: ../locale/scriptstrings/r.roughness.vector_to_translate.c:2 @@ -564,7 +565,7 @@ msgstr "" #: ../raster/r.spread/main.c:455 ../raster/r.spread/main.c:458 #: ../raster/r.spread/main.c:461 ../raster/r.compress/main.c:124 #: ../raster/r.compress/main.c:318 ../raster/r.tile/main.c:84 -#: ../raster/r.univar/r.univar_main.c:298 ../raster/r.walk/main.c:467 +#: ../raster/r.univar/r.univar_main.c:301 ../raster/r.walk/main.c:467 #: ../raster/r.walk/main.c:495 ../raster/r.walk/main.c:500 #: ../raster/r.walk/main.c:872 ../raster/r.reclass/main.c:80 #: ../raster/r.distance/parse.c:70 ../raster/r.distance/parse.c:79 @@ -574,8 +575,8 @@ msgstr "" #: ../raster/r.sim/simlib/output.c:415 ../raster/r.sim/simlib/output.c:457 #: ../raster/r.sim/simlib/output.c:473 ../raster/r.sim/simlib/output.c:494 #: ../raster/r.sim/simlib/output.c:535 ../raster/r.sim/simlib/output.c:574 -#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/io.c:67 -#: ../raster/r.flow/io.c:245 ../raster/r.geomorphon/memory.c:47 +#: ../raster/r.sim/simlib/output.c:738 ../raster/r.flow/flow_io.c:67 +#: ../raster/r.flow/flow_io.c:245 ../raster/r.geomorphon/memory.c:47 #: ../raster/r.coin/main.c:119 ../raster/r.coin/main.c:121 #: ../raster/r.colors/edit_colors.c:505 ../raster/r.ros/main.c:362 #: ../raster/r.ros/main.c:373 ../raster/r.ros/main.c:377 @@ -590,21 +591,21 @@ msgstr "" #: ../raster/r.kappa/stats.c:31 ../raster/r.kappa/stats.c:36 #: ../raster/r.kappa/main.c:179 ../raster/r.cross/main.c:101 #: ../misc/m.nviz.image/surface.c:50 ../misc/m.nviz.image/surface.c:107 -#: ../general/g.region/main.c:449 ../general/g.region/main.c:819 -#: ../general/g.region/main.c:828 -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:218 +#: ../general/g.region/main.c:450 ../general/g.region/main.c:820 +#: ../general/g.region/main.c:829 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:219 #: ../imagery/i.gensig/parse.c:38 ../imagery/i.svm.train/main.c:260 #: ../imagery/i.segment/parse_args.c:198 ../imagery/i.pca/main.c:132 #: ../imagery/i.gensigset/parse.c:45 ../vector/v.vol.rst/main.c:604 #: ../vector/v.colors/main.c:317 ../scripts/d.polar/d.polar.py:57 #: ../scripts/r.fillnulls/r.fillnulls.py:159 ../scripts/r.grow/r.grow.py:117 #: ../scripts/r.buffer.lowmem/r.buffer.lowmem.py:87 -#: ../scripts/v.rast.stats/v.rast.stats.py:160 ../scripts/r.mask/r.mask.py:137 +#: ../scripts/v.rast.stats/v.rast.stats.py:161 ../scripts/r.mask/r.mask.py:138 #: ../scripts/r.pack/r.pack.py:70 ../scripts/d.correlate/d.correlate.py:46 #: ../scripts/d.rast.leg/d.rast.leg.py:95 #: ../scripts/d.rast.leg/d.rast.leg.py:99 ../scripts/r.rgb/r.rgb.py:55 #: ../scripts/r.reclass.area/r.reclass.area.py:101 -#: ../scripts/r.reclass.area/r.reclass.area.py:225 +#: ../scripts/r.reclass.area/r.reclass.area.py:226 #, c-format, python-format msgid "Raster map <%s> not found" msgstr "" @@ -613,7 +614,7 @@ msgstr "" #: ../raster/r.random/main.c:55 ../misc/m.nviz.script/main.c:71 #: ../misc/m.nviz.image/main.c:52 #: ../locale/scriptstrings/v.clip_to_translate.c:2 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:2 +#: ../locale/scriptstrings/v.histogram_to_translate.c:2 #: ../locale/scriptstrings/v.db.pyupdate_to_translate.c:2 #: ../locale/scriptstrings/t.vect.export_to_translate.c:4 #: ../locale/scriptstrings/v.in.osm_to_translate.c:3 @@ -648,7 +649,6 @@ msgstr "" #: ../locale/scriptstrings/v.db.droprow_to_translate.c:2 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:2 #: ../locale/scriptstrings/i.ann.maskrcnn.train_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:2 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:2 #: ../locale/scriptstrings/r.centroids_to_translate.c:5 #: ../locale/scriptstrings/v.db.update_to_translate.c:2 @@ -661,7 +661,6 @@ msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:2 #: ../locale/scriptstrings/v.external.all_to_translate.c:2 #: ../locale/scriptstrings/v.in.geopaparazzi_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:3 #: ../locale/scriptstrings/v.report_to_translate.c:2 #: ../locale/scriptstrings/v.area.weigh_to_translate.c:2 #: ../locale/scriptstrings/v.centerline_to_translate.c:2 @@ -700,6 +699,7 @@ msgstr "" #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:2 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:2 #: ../locale/scriptstrings/t.vect.extract_to_translate.c:4 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:2 #: ../locale/scriptstrings/v.explode_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:2 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:2 @@ -721,7 +721,7 @@ msgstr "" #: ../locale/scriptstrings/v.civil_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:3 #: ../locale/scriptstrings/v.db.droptable_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.db.renamecolumn_to_translate.c:2 #: ../locale/scriptstrings/v.krige_to_translate.c:2 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:4 @@ -787,7 +787,7 @@ msgstr "" #: ../vector/v.lidar.correction/main.c:70 ../vector/v.mkgrid/main.c:74 #: ../vector/v.overlay/main.c:62 ../vector/v.type/main.c:38 #: ../vector/v.net/main.c:46 ../vector/v.info/main.c:37 -#: ../vector/v.info/print.c:403 ../vector/v.split/main.c:53 +#: ../vector/v.info/print.c:404 ../vector/v.split/main.c:53 #: ../vector/v.out.ascii/main.c:48 ../vector/v.in.pdal/main.cpp:128 #: ../vector/v.in.ogr/main.c:210 ../vector/v.rectify/main.c:67 #: ../vector/v.select/main.c:50 ../display/d.legend.vect/main.c:50 @@ -801,7 +801,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:76 ../raster/r.cost/main.c:357 #: ../raster/r.walk/main.c:460 ../raster/r.carve/main.c:153 -#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:504 +#: ../misc/m.nviz.image/vector.c:82 ../general/g.region/main.c:505 #: ../vector/v.lidar.edgedetection/main.c:181 ../vector/v.profile/main.c:371 #: ../vector/v.profile/main.c:375 ../vector/v.lidar.growing/main.c:121 #: ../vector/v.vect.stats/main.c:280 ../vector/v.vect.stats/main.c:288 @@ -814,8 +814,8 @@ msgstr "" #: ../vector/v.surf.bspline/main.c:336 ../vector/v.clean/test/topocheck.c:62 #: ../vector/v.colors/main.c:252 ../vector/v.edit/main.c:161 #: ../vector/v.lidar.correction/main.c:158 ../display/d.extract/main.c:96 -#: ../scripts/v.dissolve/v.dissolve.py:583 ../scripts/v.report/v.report.py:83 -#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:159 +#: ../scripts/v.dissolve/v.dissolve.py:585 ../scripts/v.report/v.report.py:83 +#: ../scripts/v.pack/v.pack.py:60 ../scripts/r.mask/r.mask.py:160 #: ../scripts/v.db.univar/v.db.univar.py:79 #, c-format, python-format msgid "Vector map <%s> not found" @@ -830,16 +830,16 @@ msgstr "" #: ../raster/r.cost/main.c:666 ../raster/r.drain/main.c:277 #: ../raster/r.walk/main.c:760 ../raster/r.walk/main.c:827 #: ../raster/r.region/main.c:172 ../raster/r.sim/simlib/observation_points.c:40 -#: ../raster/r.what/main.c:251 ../raster/r.random/support.c:66 +#: ../raster/r.what/main.c:272 ../raster/r.random/support.c:66 #: ../raster/r.carve/main.c:157 ../raster/r.path/main.c:294 #: ../misc/m.nviz.image/vector.c:288 ../raster3d/r3.flow/main.c:397 -#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:514 +#: ../general/manage/lister/vector.c:32 ../general/g.region/main.c:515 #: ../vector/v.net.salesman/main.c:251 ../vector/v.decimate/main.c:267 #: ../vector/v.generalize/main.c:324 ../vector/v.kernel/main.c:326 #: ../vector/v.kernel/main.c:339 ../vector/v.net.components/main.c:144 #: ../vector/v.lidar.edgedetection/main.c:187 #: ../vector/v.net.visibility/main.c:70 ../vector/v.net.visibility/main.c:79 -#: ../vector/v.db.connect/main.c:153 ../vector/v.net.distance/main.c:193 +#: ../vector/v.db.connect/main.c:148 ../vector/v.net.distance/main.c:193 #: ../vector/v.segment/main.c:107 ../vector/v.label.sa/labels.c:58 #: ../vector/v.to.rast/support.c:97 ../vector/v.to.rast/support.c:267 #: ../vector/v.to.rast/support.c:495 ../vector/v.to.rast/vect2rast.c:39 @@ -885,7 +885,7 @@ msgstr "" #: ../vector/v.edit/main.c:176 ../vector/v.edit/main.c:251 #: ../vector/v.fill.holes/main.c:73 ../vector/v.neighbors/main.c:206 #: ../vector/v.to.rast3/main.c:74 ../vector/v.out.ogr/main.c:141 -#: ../vector/v.surf.rst/main.c:578 ../vector/v.surf.rst/main.c:684 +#: ../vector/v.surf.rst/main.c:581 ../vector/v.surf.rst/main.c:687 #: ../vector/v.net.connectivity/main.c:128 #: ../vector/v.lidar.correction/main.c:162 ../vector/v.overlay/main.c:196 #: ../vector/v.type/main.c:128 ../vector/v.net/main.c:67 @@ -901,7 +901,7 @@ msgstr "" #: ../doc/vector/v.example/main.c:101 ../raster/r.to.vect/main.c:159 #: ../raster/r.drain/main.c:204 ../raster/r.resamp.bspline/main.c:484 #: ../raster/r.sim/simlib/output.c:49 ../raster/r.sim/simlib/output.c:56 -#: ../raster/r.flow/io.c:181 ../raster/r.contour/main.c:155 +#: ../raster/r.flow/flow_io.c:181 ../raster/r.contour/main.c:155 #: ../raster/r.volume/main.c:159 ../raster/r.random/random.c:58 #: ../raster/r.carve/vect.c:30 ../raster/r.path/main.c:234 #: ../raster/r.stream.extract/close.c:38 ../raster3d/r3.flow/main.c:382 @@ -910,7 +910,7 @@ msgstr "" #: ../vector/v.net.components/main.c:150 #: ../vector/v.lidar.edgedetection/main.c:255 #: ../vector/v.net.visibility/main.c:74 ../vector/v.in.db/main.c:150 -#: ../vector/v.in.lidar/main.c:565 ../vector/v.net.distance/main.c:199 +#: ../vector/v.in.lidar/main.c:566 ../vector/v.net.distance/main.c:199 #: ../vector/v.segment/main.c:113 ../vector/v.external/main.c:178 #: ../vector/v.proj/main.c:489 ../vector/v.net.timetable/main.c:351 #: ../vector/v.sample/main.c:159 ../vector/v.to.3d/main.c:86 @@ -940,13 +940,13 @@ msgstr "" #: ../vector/v.net.spanningtree/main.c:105 ../vector/v.delaunay/main.c:126 #: ../vector/v.net.allpairs/main.c:135 ../vector/v.transform/main.c:266 #: ../vector/v.edit/main.c:107 ../vector/v.edit/main.c:124 -#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:622 -#: ../vector/v.surf.rst/main.c:626 ../vector/v.surf.rst/main.c:806 +#: ../vector/v.fill.holes/main.c:87 ../vector/v.surf.rst/main.c:625 +#: ../vector/v.surf.rst/main.c:629 ../vector/v.surf.rst/main.c:809 #: ../vector/v.net.connectivity/main.c:134 #: ../vector/v.lidar.correction/main.c:218 #: ../vector/v.lidar.correction/main.c:224 ../vector/v.mkgrid/main.c:281 #: ../vector/v.overlay/main.c:230 ../vector/v.split/main.c:176 -#: ../vector/v.in.pdal/main.cpp:439 ../vector/v.in.ogr/main.c:869 +#: ../vector/v.in.pdal/main.cpp:440 ../vector/v.in.ogr/main.c:870 #: ../vector/v.rectify/main.c:217 ../vector/v.select/main.c:159 #: ../display/d.extract/main.c:104 ../scripts/v.what.strds/v.what.strds.py:232 #, c-format, python-format @@ -974,7 +974,7 @@ msgstr "" #: ../db/db.columns/main.c:47 ../db/db.dropdb/main.c:39 #: ../db/db.databases/main.c:47 ../db/db.describe/main.c:51 #: ../db/db.tables/main.c:45 ../db/db.select/main.c:74 -#: ../vector/v.db.connect/main.c:221 ../vector/v.db.connect/main.c:290 +#: ../vector/v.db.connect/main.c:216 ../vector/v.db.connect/main.c:285 #: ../vector/v.out.vtk/writeVTK.c:640 ../vector/v.profile/main.c:434 #: ../vector/v.profile/main.c:600 ../vector/v.out.svg/main.c:152 #: ../vector/v.edit/select.c:502 ../display/d.vect.thematic/main.c:295 @@ -989,8 +989,8 @@ msgstr "" #: ../raster3d/r3.flow/main.c:46 ../ps/ps.map/catval.c:53 #: ../ps/ps.map/catval.c:115 ../ps/ps.map/catval.c:182 #: ../vector/v.net.components/main.c:177 ../vector/v.in.db/main.c:162 -#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:229 -#: ../vector/v.db.connect/main.c:339 ../vector/v.net.distance/main.c:280 +#: ../vector/v.in.db/main.c:307 ../vector/v.db.connect/main.c:224 +#: ../vector/v.db.connect/main.c:334 ../vector/v.net.distance/main.c:280 #: ../vector/v.label.sa/labels.c:78 ../vector/v.out.vtk/writeVTK.c:645 #: ../vector/v.to.rast/support.c:105 ../vector/v.to.rast/support.c:277 #: ../vector/v.to.rast/support.c:506 ../vector/v.to.rast/vect2rast.c:58 @@ -1024,10 +1024,10 @@ msgstr "" #: ../vector/v.class/main.c:114 ../vector/v.label/main.c:277 #: ../vector/v.edit/select.c:509 ../vector/v.neighbors/main.c:224 #: ../vector/v.to.rast3/main.c:86 ../vector/v.out.ogr/main.c:717 -#: ../vector/v.surf.rst/main.c:643 ../vector/v.mkgrid/main.c:294 +#: ../vector/v.surf.rst/main.c:646 ../vector/v.mkgrid/main.c:294 #: ../vector/v.overlay/main.c:255 ../vector/v.overlay/main.c:439 -#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1162 -#: ../vector/v.in.ogr/main.c:1211 ../vector/v.select/copy_tabs.c:79 +#: ../vector/v.info/print.c:159 ../vector/v.in.ogr/main.c:1163 +#: ../vector/v.in.ogr/main.c:1212 ../vector/v.select/copy_tabs.c:79 #: ../display/d.vect.chart/plot.c:41 ../display/d.vect.thematic/plot1.c:113 #: ../display/d.vect/shape.c:47 ../display/d.vect/attr.c:43 #, c-format @@ -1035,7 +1035,7 @@ msgid "Unable to open database <%s> by driver <%s>" msgstr "" #: ../doc/vector/v.example/main.c:143 ../db/db.columns/main.c:58 -#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:234 +#: ../db/db.describe/main.c:62 ../vector/v.db.connect/main.c:229 #: ../vector/v.out.vtk/writeVTK.c:651 ../vector/v.out.postgis/table.c:41 #: ../vector/v.reclass/main.c:189 ../vector/v.in.ascii/main.c:446 #: ../vector/v.extract/main.c:233 ../vector/v.profile/main.c:447 @@ -1065,23 +1065,23 @@ msgid "Unable to copy attribute table to vector map <%s>" msgstr "" #: ../raster/r.external/colors.c:177 ../raster/r.external/colors.c:233 -#: ../raster/r.in.gdal/main.c:1734 ../raster/r.in.gdal/main.c:1790 +#: ../raster/r.in.gdal/main.c:1729 ../raster/r.in.gdal/main.c:1785 msgid "Inconsistent color rules in RAT" msgstr "" -#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1849 +#: ../raster/r.external/colors.c:292 ../raster/r.in.gdal/main.c:1844 #, c-format msgid "Setting grey color table for <%s> (8bit, full range)" msgstr "" -#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1864 +#: ../raster/r.external/colors.c:307 ../raster/r.in.gdal/main.c:1859 #, c-format msgid "Setting grey color table for <%s> (16bit, image range)" msgstr "" -#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:304 +#: ../raster/r.external/list.c:23 ../raster/r.in.gdal/main.c:303 #: ../vector/v.external/list.c:95 ../vector/v.external.out/list.c:102 -#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:430 +#: ../vector/v.out.ogr/list.c:86 ../vector/v.in.ogr/main.c:431 msgid "Supported formats:" msgstr "" @@ -1163,13 +1163,13 @@ msgstr "" msgid "Applying vertical flip" msgstr "" -#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1087 -#: ../vector/v.in.ogr/main.c:1975 -msgid "Default region for this location updated" +#: ../raster/r.external/window.c:94 ../raster/r.in.gdal/main.c:1085 +#: ../vector/v.in.ogr/main.c:1976 +msgid "Default region for this project updated" msgstr "" -#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1090 -#: ../vector/v.in.ogr/main.c:1978 +#: ../raster/r.external/window.c:97 ../raster/r.in.gdal/main.c:1088 +#: ../vector/v.in.ogr/main.c:1979 msgid "Region for the current mapset updated" msgstr "" @@ -1222,6 +1222,7 @@ msgstr "" #: ../locale/scriptstrings/m.crawl.thredds_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:3 #: ../locale/scriptstrings/v.import_to_translate.c:3 +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:4 #: ../vector/v.in.db/main.c:52 ../vector/v.in.lidar/main.c:135 #: ../vector/v.external/main.c:52 ../vector/v.proj/main.c:76 #: ../vector/v.in.ascii/main.c:68 ../vector/v.in.dwg/main.c:83 @@ -1282,6 +1283,12 @@ msgstr "" #: ../imagery/i.atcorr/main.cpp:504 ../imagery/i.atcorr/main.cpp:509 #: ../imagery/i.atcorr/main.cpp:515 ../imagery/i.atcorr/main.cpp:542 #: ../imagery/i.atcorr/main.cpp:548 ../imagery/i.atcorr/main.cpp:554 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:15 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:18 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:21 #: ../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 @@ -1347,14 +1354,13 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.label_to_translate.c:16 #: ../locale/scriptstrings/r.boxplot_to_translate.c:8 #: ../locale/scriptstrings/r.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:8 #: ../locale/scriptstrings/t.remove_to_translate.c:6 #: ../locale/scriptstrings/t.remove_to_translate.c:9 #: ../locale/scriptstrings/t.remove_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 #: ../locale/scriptstrings/r.exdet_to_translate.c:8 #: ../locale/scriptstrings/r.exdet_to_translate.c:11 #: ../locale/scriptstrings/r.exdet_to_translate.c:14 @@ -1404,144 +1410,132 @@ msgstr "" #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:112 #: ../imagery/i.landsat.toar/main.c:121 ../imagery/i.landsat.toar/main.c:130 #: ../imagery/i.landsat.toar/main.c:138 ../imagery/i.landsat.toar/main.c:147 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 #: ../locale/scriptstrings/r.import_to_translate.c:23 msgid "Metadata" msgstr "" #: ../raster/r.external/main.c:95 ../raster/r.external.out/main.c:271 -#: ../raster/r.in.gdal/main.c:238 ../vector/v.external/args.c:59 +#: ../raster/r.in.gdal/main.c:237 ../vector/v.external/args.c:60 #: ../vector/v.external.out/args.c:67 msgid "List supported formats and exit" msgstr "" -#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:396 -#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:303 -#: ../raster3d/r3.in.lidar/main.c:290 -#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 -#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 -#: ../locale/scriptstrings/v.unpack_to_translate.c:9 -#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 -#: ../locale/scriptstrings/r.unpack_to_translate.c:8 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 -#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +#: ../raster/r.external/main.c:101 ../raster/r.in.pdal/main.cpp:396 +#: ../raster/r.in.gdal/main.c:216 ../raster/r.in.lidar/main.c:303 #: ../locale/scriptstrings/r.import_to_translate.c:29 #: ../locale/scriptstrings/v.import_to_translate.c:27 #: ../vector/v.in.lidar/main.c:322 ../vector/v.external/args.c:49 #: ../vector/v.in.pdal/main.cpp:225 ../vector/v.in.ogr/main.c:380 -msgid "Override projection check (use current location's projection)" +msgid "Override projection check (use current project's CRS)" msgstr "" -#: ../raster/r.external/main.c:104 ../raster/r.in.pdal/main.cpp:398 -#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.lidar/main.c:305 -#: ../raster3d/r3.in.lidar/main.c:292 -#: ../locale/scriptstrings/v.unpack_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 -#: ../locale/scriptstrings/r.unpack_to_translate.c:9 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 -#: ../vector/v.in.lidar/main.c:324 ../vector/v.in.pdal/main.cpp:227 -msgid "Assume that the dataset has same projection as the current location" +#: ../raster/r.external/main.c:102 ../raster/r.in.pdal/main.cpp:398 +#: ../raster/r.in.gdal/main.c:217 ../raster/r.in.lidar/main.c:305 +#: ../raster3d/r3.in.lidar/main.c:292 ../vector/v.in.lidar/main.c:324 +#: ../vector/v.external/args.c:51 ../vector/v.in.pdal/main.cpp:227 +msgid "" +"Assume that the dataset has the same coordinate reference system as the " +"current project" msgstr "" -#: ../raster/r.external/main.c:108 ../raster/r.in.gdal/main.c:224 -#: ../vector/v.external/args.c:55 ../vector/v.in.ogr/main.c:386 +#: ../raster/r.external/main.c:107 ../raster/r.in.gdal/main.c:223 +#: ../vector/v.external/args.c:56 ../vector/v.in.ogr/main.c:387 msgid "Perform projection check only and exit" msgstr "" -#: ../raster/r.external/main.c:113 ../raster/r.in.gdal/main.c:231 -#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:397 +#: ../raster/r.external/main.c:112 ../raster/r.in.gdal/main.c:230 +#: ../vector/v.in.lidar/main.c:304 ../vector/v.in.ogr/main.c:398 msgid "Extend region extents based on new dataset" msgstr "" -#: ../raster/r.external/main.c:115 ../raster/r.in.gdal/main.c:233 -#: ../vector/v.in.ogr/main.c:399 +#: ../raster/r.external/main.c:114 ../raster/r.in.gdal/main.c:232 +#: ../vector/v.in.ogr/main.c:400 msgid "Also updates the default region if in the PERMANENT mapset" msgstr "" -#: ../raster/r.external/main.c:119 ../raster/r.in.gdal/main.c:249 +#: ../raster/r.external/main.c:118 ../raster/r.in.gdal/main.c:248 #: ../raster/r.region/main.c:65 msgid "Auto-adjustment for lat/lon" msgstr "" -#: ../raster/r.external/main.c:121 ../raster/r.in.gdal/main.c:251 +#: ../raster/r.external/main.c:120 ../raster/r.in.gdal/main.c:250 #: ../raster/r.region/main.c:67 msgid "Attempt to fix small precision errors in resolution and extents" msgstr "" -#: ../raster/r.external/main.c:125 +#: ../raster/r.external/main.c:124 msgid "Flip horizontally" msgstr "" -#: ../raster/r.external/main.c:129 +#: ../raster/r.external/main.c:128 msgid "Flip vertically" msgstr "" -#: ../raster/r.external/main.c:134 +#: ../raster/r.external/main.c:133 msgid "List available bands including band type in dataset and exit" msgstr "" -#: ../raster/r.external/main.c:135 +#: ../raster/r.external/main.c:134 msgid "Format: band number,type,projection check" msgstr "" -#: ../raster/r.external/main.c:141 +#: ../raster/r.external/main.c:140 msgid "Read data range from metadata" msgstr "" -#: ../raster/r.external/main.c:143 +#: ../raster/r.external/main.c:142 msgid "WARNING: metadata are sometimes approximations with wrong data range" msgstr "" -#: ../raster/r.external/main.c:147 +#: ../raster/r.external/main.c:146 msgid "Create fast link without data range" msgstr "" -#: ../raster/r.external/main.c:149 +#: ../raster/r.external/main.c:148 msgid "WARNING: some modules do not work correctly without known data range" msgstr "" -#: ../raster/r.external/main.c:179 +#: ../raster/r.external/main.c:178 #, c-format msgid "%s= or %s= must be given" msgstr "" -#: ../raster/r.external/main.c:183 ../raster/r.series.interp/main.c:132 +#: ../raster/r.external/main.c:182 ../raster/r.series.interp/main.c:132 #: ../raster/r.series.interp/main.c:136 ../raster/r.series.interp/main.c:148 #: ../raster/r.series.interp/main.c:152 ../raster/r.buildvrt/main.c:108 #: ../raster/r.series.accumulate/main.c:207 ../raster/r.mapcalc/main.c:138 -#: ../raster/r.series/main.c:239 ../vector/v.colors/main.c:222 +#: ../raster/r.series/main.c:242 ../vector/v.colors/main.c:222 #, c-format msgid "%s= and %s= are mutually exclusive" msgstr "" -#: ../raster/r.external/main.c:191 ../display/d.mon/start.c:88 +#: ../raster/r.external/main.c:190 ../display/d.mon/start.c:88 msgid "Unable to get current working directory" msgstr "" -#: ../raster/r.external/main.c:228 +#: ../raster/r.external/main.c:227 msgid "Proceeding with import..." msgstr "" -#: ../raster/r.external/main.c:233 +#: ../raster/r.external/main.c:232 #, c-format msgid "Imagery group <%s> already exists and will be overwritten." msgstr "" -#: ../raster/r.external/main.c:244 +#: ../raster/r.external/main.c:243 #, c-format msgid "Reading band %d of %d..." msgstr "" -#: ../raster/r.external/main.c:248 ../raster/r.in.gdal/main.c:743 +#: ../raster/r.external/main.c:247 ../raster/r.in.gdal/main.c:742 #, c-format msgid "Selected band (%d) does not exist" msgstr "" -#: ../raster/r.external/main.c:281 +#: ../raster/r.external/main.c:280 #, c-format msgid "Imagery group <%s> created" msgstr "" @@ -1558,35 +1552,33 @@ msgstr "" msgid "No projection information available" msgstr "" -#: ../raster/r.external/proj.c:133 ../raster/r.in.gdal/main.c:981 -#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.lidar/main.c:515 -#: ../vector/v.external/proj.c:166 ../vector/v.in.ogr/proj.c:300 +#: ../raster/r.external/proj.c:134 msgid "" -"Unable to convert input map projection to GRASS format; cannot create new " -"location." +"Unable to convert input map coordinate reference system to GRASS format; " +"cannot create new project." msgstr "" -#: ../raster/r.external/proj.c:139 ../raster/r.in.gdal/main.c:1037 -#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:521 +#: ../raster/r.external/proj.c:140 ../raster/r.in.gdal/main.c:1035 +#: ../raster/r.in.gdal/proj.c:139 ../vector/v.in.lidar/main.c:522 #: ../vector/v.external/proj.c:172 ../vector/v.in.ogr/proj.c:306 #, c-format -msgid "Unable to create new location <%s>" +msgid "Unable to create new project <%s>" msgstr "" -#: ../raster/r.external/proj.c:141 ../raster/r.in.gdal/main.c:1043 +#: ../raster/r.external/proj.c:142 ../raster/r.in.gdal/main.c:1041 #: ../raster/r.in.gdal/proj.c:141 ../general/g.proj/create.c:16 -#: ../vector/v.in.lidar/main.c:524 ../vector/v.external/proj.c:174 +#: ../vector/v.in.lidar/main.c:525 ../vector/v.external/proj.c:174 #: ../vector/v.in.ogr/proj.c:308 #, c-format -msgid "Location <%s> created" +msgid "Project <%s> created" msgstr "" -#: ../raster/r.external/proj.c:164 ../raster/r.in.gdal/proj.c:164 +#: ../raster/r.external/proj.c:165 ../raster/r.in.gdal/proj.c:164 #: ../vector/v.external/proj.c:197 ../vector/v.in.ogr/proj.c:331 msgid "Unable to convert input map projection information to GRASS format." msgstr "" -#: ../raster/r.external/proj.c:191 ../raster/r.in.gdal/proj.c:192 +#: ../raster/r.external/proj.c:192 ../raster/r.in.gdal/proj.c:192 #: ../raster/r.in.lidar/projection.c:126 #: ../raster3d/r3.in.lidar/projection.c:127 #: ../vector/v.in.lidar/projection.c:124 ../vector/v.external/proj.c:228 @@ -1594,55 +1586,57 @@ msgstr "" msgid "Over-riding projection check" msgstr "" -#: ../raster/r.external/proj.c:198 ../raster/r.in.pdal/projection.c:30 -#: ../raster/r.in.gdal/proj.c:199 ../raster/r.in.lidar/projection.c:32 +#: ../raster/r.external/proj.c:200 ../raster/r.in.pdal/projection.c:30 +#: ../raster/r.in.gdal/proj.c:200 ../raster/r.in.lidar/projection.c:32 #: ../raster3d/r3.in.lidar/projection.c:33 ../vector/v.in.lidar/projection.c:30 -#: ../vector/v.external/proj.c:235 ../vector/v.in.pdal/projection.c:30 -#: ../vector/v.in.ogr/proj.c:367 +#: ../vector/v.external/proj.c:236 ../vector/v.in.ogr/proj.c:368 msgid "" -"Projection of dataset does not appear to match current location.\n" +"Coordinate reference system of dataset does not appear to match current " +"project.\n" "\n" msgstr "" -#: ../raster/r.external/proj.c:205 ../raster/r.external/proj.c:214 -#: ../raster/r.in.gdal/proj.c:206 ../raster/r.in.gdal/proj.c:215 -#: ../vector/v.external/proj.c:242 ../vector/v.external/proj.c:251 -#: ../vector/v.in.ogr/proj.c:374 ../vector/v.in.ogr/proj.c:383 -msgid "Location PROJ_INFO is:\n" +#: ../raster/r.external/proj.c:207 ../raster/r.external/proj.c:216 +#: ../raster/r.in.gdal/proj.c:207 ../raster/r.in.gdal/proj.c:216 +#: ../vector/v.external/proj.c:243 ../vector/v.external/proj.c:252 +#: ../vector/v.in.ogr/proj.c:375 ../vector/v.in.ogr/proj.c:384 +msgid "Project PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:234 ../raster/r.external/proj.c:241 -#: ../raster/r.in.gdal/proj.c:235 ../raster/r.in.gdal/proj.c:242 -#: ../vector/v.external/proj.c:271 ../vector/v.external/proj.c:278 -#: ../vector/v.in.ogr/proj.c:403 ../vector/v.in.ogr/proj.c:410 +#: ../raster/r.external/proj.c:236 ../raster/r.external/proj.c:243 +#: ../raster/r.in.gdal/proj.c:236 ../raster/r.in.gdal/proj.c:243 +#: ../vector/v.external/proj.c:272 ../vector/v.external/proj.c:279 +#: ../vector/v.in.ogr/proj.c:404 ../vector/v.in.ogr/proj.c:411 msgid "Dataset PROJ_INFO is:\n" msgstr "" -#: ../raster/r.external/proj.c:321 ../raster/r.in.pdal/projection.c:87 -#: ../raster/r.in.gdal/proj.c:322 ../raster/r.in.lidar/projection.c:89 -#: ../raster3d/r3.in.lidar/projection.c:90 ../vector/v.in.lidar/projection.c:87 -#: ../vector/v.external/proj.c:358 ../vector/v.in.pdal/projection.c:87 -#: ../vector/v.in.ogr/proj.c:490 +#: ../raster/r.external/proj.c:324 ../raster/r.in.pdal/projection.c:87 +#: ../raster/r.in.lidar/projection.c:89 ../raster3d/r3.in.lidar/projection.c:90 +#: ../vector/v.in.lidar/projection.c:87 ../vector/v.external/proj.c:360 +#: ../vector/v.in.pdal/projection.c:87 ../vector/v.in.ogr/proj.c:492 #, c-format msgid "" "\n" -"In case of no significant differences in the projection definitions, use the " -"-o flag to ignore them and use current location definition.\n" +"In case of no significant differences in the coordinate reference system " +"definitions, use the -o flag to ignore them and use current project " +"definition.\n" msgstr "" -#: ../raster/r.external/proj.c:325 ../raster/r.in.gdal/proj.c:326 -#: ../vector/v.external/proj.c:362 ../vector/v.in.ogr/proj.c:494 +#: ../raster/r.external/proj.c:328 ../raster/r.in.gdal/proj.c:327 +#: ../vector/v.external/proj.c:364 ../vector/v.in.ogr/proj.c:496 msgid "" -"Consider generating a new location from the input dataset using the " -"'location' parameter.\n" +"Consider generating a new project from the input dataset using the 'project' " +"parameter.\n" msgstr "" -#: ../raster/r.external/proj.c:345 ../raster/r.in.pdal/projection.c:134 -#: ../raster/r.in.gdal/proj.c:346 ../raster/r.in.lidar/projection.c:135 -#: ../raster3d/r3.in.lidar/projection.c:136 -#: ../vector/v.in.lidar/projection.c:133 ../vector/v.external/proj.c:382 -#: ../vector/v.in.pdal/projection.c:134 ../vector/v.in.ogr/proj.c:514 -msgid "Projection of input dataset and current location appear to match" +#: ../raster/r.external/proj.c:348 ../raster/r.in.pdal/projection.c:134 +#: ../raster/r.in.gdal/proj.c:347 ../raster/r.in.lidar/projection.c:136 +#: ../raster3d/r3.in.lidar/projection.c:137 +#: ../vector/v.in.lidar/projection.c:134 ../vector/v.external/proj.c:384 +#: ../vector/v.in.ogr/proj.c:516 +msgid "" +"Coordinate reference system of input dataset and current project appear to " +"match" msgstr "" #: ../raster/r.quantile/main.c:94 @@ -1722,12 +1716,10 @@ msgstr "" #: ../locale/scriptstrings/r.zonal.classes_to_translate.c:3 #: ../locale/scriptstrings/d.correlate_to_translate.c:3 #: ../locale/scriptstrings/t.rast.univar_to_translate.c:3 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:4 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:6 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:3 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:3 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:3 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:6 #: ../locale/scriptstrings/v.stats_to_translate.c:3 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:3 @@ -1765,7 +1757,7 @@ msgstr "" #: ../raster/r.quantile/main.c:331 ../raster/r.stats.quantile/main.c:605 #: ../raster/r.univar/r3.univar_main.c:42 ../raster/r.univar/r.univar_main.c:78 -#: ../raster/r.what/main.c:128 ../raster/r.stats/main.c:115 +#: ../raster/r.what/main.c:138 ../raster/r.stats/main.c:115 #: ../db/db.select/main.c:239 #: ../locale/scriptstrings/v.neighborhoodmatrix_to_translate.c:6 #: ../locale/scriptstrings/i.oif_to_translate.c:5 @@ -1781,7 +1773,7 @@ msgstr "" #: ../raster/r.quantile/main.c:346 ../raster/r.stats.quantile/main.c:368 #: ../raster/r.regression.line/main.c:77 #: ../raster/r.univar/r3.univar_main.c:128 -#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:179 +#: ../raster/r.univar/r.univar_main.c:174 ../raster/r.what/main.c:200 #: ../raster/r.stats/main.c:226 ../raster/r.object.geometry/main.c:97 #: ../raster/r.regression.multi/main.c:171 ../db/db.select/main.c:140 #: ../vector/v.db.select/main.c:186 @@ -1830,24 +1822,18 @@ msgstr "" #: ../raster/r.watershed/front/main.c:178 #: ../raster/r.watershed/front/main.c:185 #: ../raster/r.watershed/front/main.c:192 -#: ../raster/r.watershed/front/main.c:199 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:30 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:32 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:34 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:36 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:38 -#: ../vector/v.vol.rst/main.c:274 ../vector/v.vol.rst/main.c:281 -#: ../vector/v.vol.rst/main.c:344 ../vector/v.vol.rst/main.c:350 -#: ../vector/v.vol.rst/main.c:357 ../vector/v.vol.rst/main.c:364 -#: ../vector/v.vol.rst/main.c:371 ../vector/v.vol.rst/main.c:378 -#: ../vector/v.vol.rst/main.c:385 ../vector/v.vol.rst/main.c:391 -#: ../vector/v.surf.bspline/main.c:131 ../vector/v.surf.bspline/main.c:136 -#: ../vector/v.surf.rst/main.c:175 ../vector/v.surf.rst/main.c:201 -#: ../vector/v.surf.rst/main.c:207 ../vector/v.surf.rst/main.c:213 -#: ../vector/v.surf.rst/main.c:219 ../vector/v.surf.rst/main.c:226 -#: ../vector/v.surf.rst/main.c:232 ../vector/v.surf.rst/main.c:238 -#: ../vector/v.surf.rst/main.c:245 ../vector/v.surf.rst/main.c:252 -#: ../vector/v.surf.rst/main.c:259 +#: ../raster/r.watershed/front/main.c:199 ../vector/v.vol.rst/main.c:274 +#: ../vector/v.vol.rst/main.c:281 ../vector/v.vol.rst/main.c:344 +#: ../vector/v.vol.rst/main.c:350 ../vector/v.vol.rst/main.c:357 +#: ../vector/v.vol.rst/main.c:364 ../vector/v.vol.rst/main.c:371 +#: ../vector/v.vol.rst/main.c:378 ../vector/v.vol.rst/main.c:385 +#: ../vector/v.vol.rst/main.c:391 ../vector/v.surf.bspline/main.c:131 +#: ../vector/v.surf.bspline/main.c:136 ../vector/v.surf.rst/main.c:175 +#: ../vector/v.surf.rst/main.c:201 ../vector/v.surf.rst/main.c:207 +#: ../vector/v.surf.rst/main.c:213 ../vector/v.surf.rst/main.c:219 +#: ../vector/v.surf.rst/main.c:226 ../vector/v.surf.rst/main.c:232 +#: ../vector/v.surf.rst/main.c:238 ../vector/v.surf.rst/main.c:245 +#: ../vector/v.surf.rst/main.c:252 ../vector/v.surf.rst/main.c:259 msgid "Outputs" msgstr "" @@ -1963,7 +1949,7 @@ msgstr "" #: ../raster/r.sim/r.sim.water/main.c:113 ../raster/r.fill.dir/main.c:88 #: ../raster/r.flow/main.c:415 ../raster/r.water.outlet/main.c:59 #: ../raster/r.topidx/main.c:38 ../raster/r.watershed/front/main.c:76 -#: ../raster/r.gwflow/main.c:224 ../raster/r.carve/main.c:71 +#: ../raster/r.gwflow/main.c:223 ../raster/r.carve/main.c:71 #: ../raster/r.path/main.c:147 ../raster/r.stream.extract/main.c:77 #: ../raster/r.usler/main.c:53 ../raster/r.lake/main.c:153 #: ../raster3d/r3.flow/main.c:175 ../raster3d/r3.gwflow/main.c:169 @@ -1973,7 +1959,6 @@ msgstr "" #: ../locale/scriptstrings/r.richdem.flowaccumulation_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:5 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:4 #: ../locale/scriptstrings/r.hydro.flatten_to_translate.c:4 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:4 #: ../locale/scriptstrings/r.drain_to_translate.c:3 @@ -2093,7 +2078,7 @@ msgstr "" msgid "Flags -%c and -%c/%c/%c are mutually exclusive" msgstr "" -#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:638 +#: ../raster/r.info/main.c:348 ../raster/r.info/main.c:639 #: ../raster3d/r3.info/main.c:139 ../raster3d/r3.info/main.c:146 #: ../raster3d/r3.info/main.c:151 ../raster3d/r3.info/main.c:156 #: ../raster3d/r3.info/main.c:163 ../raster3d/r3.info/main.c:168 @@ -2122,6 +2107,7 @@ msgstr "" #: ../locale/scriptstrings/v.report_to_translate.c:3 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:3 #: ../locale/scriptstrings/v.concave.hull_to_translate.c:3 +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:3 #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:4 #: ../locale/scriptstrings/v.rast.move_to_translate.c:4 #: ../locale/scriptstrings/v.clean.ogr_to_translate.c:6 @@ -2255,7 +2241,13 @@ msgstr "" msgid "GRASS is compiled without OpenMP support. Ignoring threads setting." msgstr "" -#: ../raster/r.patch/main.c:117 +#: ../raster/r.patch/main.c:117 ../raster/r.sun/main.c:595 +#: ../raster/r.univar/r.univar_main.c:192 ../raster/r.mfilter/main.c:136 +#: ../raster/r.resamp.interp/main.c:136 ../raster/r.resamp.filter/main.c:498 +#: ../raster/r.sim/r.sim.sediment/main.c:384 +#: ../raster/r.sim/r.sim.water/main.c:411 ../raster/r.series/main.c:231 +#: ../raster/r.slope.aspect/main.c:309 ../raster/r.neighbors/main.c:314 +#: ../vector/v.surf.rst/main.c:433 msgid "Parallel processing disabled due to active MASK." msgstr "" @@ -2264,8 +2256,8 @@ msgid "The minimum number of input raster maps is two" msgstr "" #: ../raster/r.patch/main.c:205 ../raster/r.series.interp/main.c:377 -#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:505 -#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:574 +#: ../raster/r.series.accumulate/main.c:319 ../raster/r.series/main.c:508 +#: ../raster/r.relief/main.c:291 ../raster/r.slope.aspect/main.c:577 msgid "Percent complete..." msgstr "" @@ -2297,7 +2289,7 @@ msgstr "" msgid "Statistics for <%s> updated" msgstr "" -#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:101 +#: ../raster/r.what.color/main.c:89 ../raster/r.what/main.c:111 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:6 #: ../locale/scriptstrings/v.strds.stats_to_translate.c:6 #: ../locale/scriptstrings/v.rast.stats_to_translate.c:8 @@ -2353,7 +2345,6 @@ msgstr "" #: ../raster/r.resamp.stats/main.c:257 ../raster/r.resamp.interp/main.c:86 #: ../raster/r.resamp.bspline/main.c:79 ../raster/r.resamp.filter/main.c:423 #: ../raster/r.resamp.rst/main.c:145 ../raster/r.resample/main.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:6 msgid "resample" msgstr "" @@ -2398,7 +2389,7 @@ msgid "Unknown method <%s>" msgstr "" #: ../raster/r.resamp.stats/main.c:394 ../raster/r.tile/main.c:205 -#: ../raster/r.resamp.interp/main.c:471 ../raster/r.resamp.filter/main.c:686 +#: ../raster/r.resamp.interp/main.c:474 ../raster/r.resamp.filter/main.c:689 #: ../raster/r.mode/main.c:142 #, c-format msgid "Unable to read color table for %s" @@ -2451,7 +2442,7 @@ msgstr "" #: ../raster/r.series.interp/main.c:140 ../raster/r.series.interp/main.c:156 #: ../raster/r.buildvrt/main.c:112 ../raster/r.series.accumulate/main.c:211 -#: ../raster/r.series/main.c:243 +#: ../raster/r.series/main.c:246 #, c-format msgid "Please specify %s= or %s=" msgstr "" @@ -2862,7 +2853,7 @@ msgstr "" msgid "Error, ct == pres_cell" msgstr "" -#: ../raster/r.cost/main.c:1262 ../raster/r.flow/io.c:210 +#: ../raster/r.cost/main.c:1262 ../raster/r.flow/flow_io.c:210 #: ../raster/r.buffer/write_map.c:43 #, c-format msgid "Writing output raster map <%s>..." @@ -2950,14 +2941,16 @@ msgstr "" #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:9 #: ../locale/scriptstrings/i.pysptools.unmix_to_translate.c:11 #: ../locale/scriptstrings/db.out.ogr_to_translate.c:4 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 #: ../locale/scriptstrings/d.out.file_to_translate.c:4 #: ../locale/scriptstrings/r.out.xyz_to_translate.c:4 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:20 #: ../vector/v.out.vtk/main.c:47 ../vector/v.out.pov/main.c:48 #: ../vector/v.out.postgis/main.c:46 ../vector/v.out.lidar/main.c:466 #: ../vector/v.external.out/main.c:44 ../vector/v.out.svg/main.c:78 @@ -3116,7 +3109,7 @@ msgid "List of cell values to be set to NULL" msgstr "" #: ../raster/r.null/main.c:75 ../raster/r.null/main.c:83 -#: ../general/g.proj/main.c:214 +#: ../general/g.proj/main.c:215 #: ../locale/scriptstrings/r.null.all_to_translate.c:19 #: ../locale/scriptstrings/r.null.all_to_translate.c:21 msgid "Modify" @@ -3424,6 +3417,15 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:31 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:33 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:35 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:37 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:24 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:27 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:30 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:33 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:36 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:39 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:42 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:45 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:14 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:17 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:22 @@ -3512,17 +3514,15 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:10 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:13 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:9 #: ../locale/scriptstrings/v.profile.points_to_translate.c:19 #: ../locale/scriptstrings/v.profile.points_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:10 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 #: ../locale/scriptstrings/r.exdet_to_translate.c:17 #: ../locale/scriptstrings/r.exdet_to_translate.c:19 #: ../locale/scriptstrings/i.spectral_to_translate.c:11 @@ -3543,7 +3543,7 @@ msgstr "" #: ../vector/v.profile/main.c:232 ../vector/v.out.ascii/args.c:35 #: ../vector/v.out.ascii/args.c:81 ../vector/v.in.ogr/main.c:260 #: ../vector/v.in.ogr/main.c:315 ../vector/v.in.ogr/main.c:365 -#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:412 +#: ../vector/v.in.ogr/main.c:372 ../vector/v.in.ogr/main.c:413 msgid "Output" msgstr "" @@ -3615,7 +3615,7 @@ msgstr "" msgid "Number of threads which will be used for parallel computing" msgstr "" -#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:292 +#: ../raster/r.sun/main.c:522 ../raster/r.horizon/main.c:298 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:31 msgid "Sampling distance step coefficient (0.5-1.5)" msgstr "" @@ -3648,160 +3648,152 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set to <%d>" msgstr "" -#: ../raster/r.sun/main.c:594 +#: ../raster/r.sun/main.c:598 #, c-format msgid "Number of threads <%d>" msgstr "" -#: ../raster/r.sun/main.c:601 +#: ../raster/r.sun/main.c:605 msgid "You must give the longitude raster if you use civil time" msgstr "" -#: ../raster/r.sun/main.c:604 +#: ../raster/r.sun/main.c:608 msgid "Error reading civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:607 +#: ../raster/r.sun/main.c:611 msgid "Invalid civil time zone value" msgstr "" -#: ../raster/r.sun/main.c:632 +#: ../raster/r.sun/main.c:636 msgid "insol_time and incidout are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:637 +#: ../raster/r.sun/main.c:641 msgid "Error reading time step size" msgstr "" -#: ../raster/r.sun/main.c:639 +#: ../raster/r.sun/main.c:643 msgid "Invalid time step size" msgstr "" -#: ../raster/r.sun/main.c:643 +#: ../raster/r.sun/main.c:647 msgid "Error reading horizon step size" msgstr "" -#: ../raster/r.sun/main.c:648 +#: ../raster/r.sun/main.c:652 msgid "The horizon step size must be greater than 0." msgstr "" -#: ../raster/r.sun/main.c:651 +#: ../raster/r.sun/main.c:655 msgid "" "If you use the horizon option you must also set the 'horizonstep' parameter." msgstr "" -#: ../raster/r.sun/main.c:658 +#: ../raster/r.sun/main.c:662 msgid "Time and insol_time are incompatible options" msgstr "" -#: ../raster/r.sun/main.c:660 +#: ../raster/r.sun/main.c:664 msgid "" "Mode 1: instantaneous solar incidence angle & irradiance using a set local " "time" msgstr "" -#: ../raster/r.sun/main.c:666 +#: ../raster/r.sun/main.c:670 msgid "incidout requires time parameter to be set" msgstr "" -#: ../raster/r.sun/main.c:668 +#: ../raster/r.sun/main.c:672 msgid "Mode 2: integrated daily irradiation for a given day of the year" msgstr "" -#: ../raster/r.sun/main.c:694 -#, c-format +#: ../raster/r.sun/main.c:698 msgid "Using Linke constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:697 +#: ../raster/r.sun/main.c:701 #, c-format msgid "Using Linke map <%s>" msgstr "" -#: ../raster/r.sun/main.c:702 -#, c-format +#: ../raster/r.sun/main.c:706 msgid "Using albedo constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:705 +#: ../raster/r.sun/main.c:709 #, c-format msgid "Using albedo map <%s>" msgstr "" -#: ../raster/r.sun/main.c:710 -#, c-format +#: ../raster/r.sun/main.c:714 msgid "Using slope constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:714 +#: ../raster/r.sun/main.c:718 #, c-format msgid "Using slope map <%s>" msgstr "" -#: ../raster/r.sun/main.c:719 -#, c-format +#: ../raster/r.sun/main.c:723 msgid "Using aspect constant: %lf" msgstr "" -#: ../raster/r.sun/main.c:723 +#: ../raster/r.sun/main.c:727 #, c-format msgid "Using aspect map <%s>" msgstr "" -#: ../raster/r.sun/main.c:738 +#: ../raster/r.sun/main.c:742 msgid "If you use -s and no horizon rasters, numpartitions must be =1" msgstr "" -#: ../raster/r.sun/main.c:751 +#: ../raster/r.sun/main.c:755 msgid "" "If you want to save memory and to use shadows, you must use pre-calculated " "horizons." msgstr "" -#: ../raster/r.sun/main.c:800 ../raster/r.horizon/main.c:529 -#: ../general/g.region/printwindow.c:252 ../general/g.region/printwindow.c:492 -#: ../general/g.region/printwindow.c:566 ../display/d.where/main.c:104 -msgid "Can't get projection info of current location" +#: ../raster/r.sun/main.c:804 ../general/g.region/printwindow.c:251 +#: ../general/g.region/printwindow.c:496 ../general/g.region/printwindow.c:570 +msgid "Can't get projection info of current project" msgstr "" -#: ../raster/r.sun/main.c:803 ../raster/r.horizon/main.c:532 -#: ../general/g.region/printwindow.c:256 ../general/g.region/printwindow.c:496 -#: ../general/g.region/printwindow.c:575 ../display/d.where/main.c:107 -msgid "Can't get projection units of current location" +#: ../raster/r.sun/main.c:807 ../general/g.region/printwindow.c:255 +#: ../general/g.region/printwindow.c:500 ../general/g.region/printwindow.c:579 +msgid "Can't get projection units of current project" msgstr "" -#: ../raster/r.sun/main.c:807 ../raster/r.horizon/main.c:535 -#: ../general/g.region/printwindow.c:260 ../general/g.region/printwindow.c:500 -#: ../general/g.region/printwindow.c:579 ../ps/ps.map/do_geogrid.c:279 -#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 -msgid "Can't get projection key values of current location" +#: ../raster/r.sun/main.c:811 ../general/g.region/printwindow.c:259 +#: ../general/g.region/printwindow.c:504 ../general/g.region/printwindow.c:583 +msgid "Can't get projection key values of current project" msgstr "" -#: ../raster/r.sun/main.c:816 ../raster/r.horizon/main.c:544 -#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1146 +#: ../raster/r.sun/main.c:820 ../raster/r.horizon/main.c:597 +#: ../raster/r.latlong/main.c:115 ../raster/r.in.gdal/main.c:1141 #: ../raster/r.proj/main.c:391 ../raster/r.proj/main.c:440 #: ../raster/r.proj/main.c:486 ../raster/r.proj/main.c:569 #: ../raster/r.sunmask/g_solposition.c:125 ../raster/r.sunhours/main.c:237 -#: ../general/g.region/printwindow.c:270 ../general/g.region/printwindow.c:510 -#: ../general/g.region/printwindow.c:617 ../ps/ps.map/do_geogrid.c:288 +#: ../general/g.region/printwindow.c:269 ../general/g.region/printwindow.c:514 +#: ../general/g.region/printwindow.c:621 ../ps/ps.map/do_geogrid.c:288 #: ../vector/v.proj/main.c:361 ../display/d.where/main.c:159 #: ../display/d.grid/plot.c:625 msgid "Unable to initialize coordinate transformation" msgstr "" -#: ../raster/r.sun/main.c:820 -msgid "latin and longin raster maps have no effect when in a Lat/Lon location" +#: ../raster/r.sun/main.c:824 +msgid "latin and longin raster maps have no effect when in a Lat/Lon project" msgstr "" -#: ../raster/r.sun/main.c:827 +#: ../raster/r.sun/main.c:831 msgid "Both latin and longin raster maps must be given, or neither" msgstr "" -#: ../raster/r.sun/main.c:871 ../raster/r.sun/main.c:881 -#: ../raster/r.sun/main.c:892 ../raster/r.sun/main.c:902 -#: ../raster/r.sun/main.c:912 ../raster/r.sun/main.c:922 -#: ../raster/r.sun/main.c:932 ../raster/r.sun/main.c:943 -#: ../raster/r.sun/main.c:953 ../raster/r.watershed/seg/dseg_open.c:43 +#: ../raster/r.sun/main.c:875 ../raster/r.sun/main.c:885 +#: ../raster/r.sun/main.c:896 ../raster/r.sun/main.c:906 +#: ../raster/r.sun/main.c:916 ../raster/r.sun/main.c:926 +#: ../raster/r.sun/main.c:936 ../raster/r.sun/main.c:947 +#: ../raster/r.sun/main.c:957 ../raster/r.watershed/seg/dseg_open.c:43 #: ../raster/r.watershed/seg/sseg_open.c:42 #: ../raster/r.watershed/seg/cseg_open.c:42 #: ../raster/r.watershed/seg/bseg_open.c:43 ../raster/r.to.rast3/main.c:243 @@ -3834,19 +3826,19 @@ msgstr "" #: ../vector/v.net.centrality/main.c:292 ../vector/v.net.centrality/main.c:297 #: ../vector/v.net.centrality/main.c:303 ../vector/v.net.centrality/main.c:309 #: ../vector/v.net.centrality/main.c:315 ../vector/v.net.allpairs/main.c:200 -#: ../vector/v.surf.rst/main.c:878 ../vector/v.net.connectivity/main.c:183 +#: ../vector/v.surf.rst/main.c:881 ../vector/v.net.connectivity/main.c:183 #: ../vector/v.net.connectivity/main.c:199 ../vector/v.mkgrid/write_grid.c:28 msgid "Out of memory" msgstr "" -#: ../raster/r.sun/main.c:1899 ../raster/r.latlong/main.c:134 +#: ../raster/r.sun/main.c:1903 ../raster/r.latlong/main.c:134 #: ../raster/r.sunmask/g_solposition.c:133 ../raster/r.sunhours/main.c:306 -#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:285 -#: ../general/g.region/printwindow.c:297 ../general/g.region/printwindow.c:309 -#: ../general/g.region/printwindow.c:321 ../general/g.region/printwindow.c:335 -#: ../general/g.region/printwindow.c:520 ../general/g.region/printwindow.c:627 -#: ../general/g.region/printwindow.c:642 ../general/g.region/printwindow.c:662 -#: ../general/g.region/printwindow.c:683 ../general/g.region/printwindow.c:701 +#: ../raster/r.sunhours/main.c:404 ../general/g.region/printwindow.c:284 +#: ../general/g.region/printwindow.c:296 ../general/g.region/printwindow.c:308 +#: ../general/g.region/printwindow.c:320 ../general/g.region/printwindow.c:334 +#: ../general/g.region/printwindow.c:524 ../general/g.region/printwindow.c:631 +#: ../general/g.region/printwindow.c:646 ../general/g.region/printwindow.c:666 +#: ../general/g.region/printwindow.c:687 ../general/g.region/printwindow.c:705 #: ../vector/v.proj/main.c:427 ../vector/v.proj/main.c:440 #: ../vector/v.proj/main.c:456 ../vector/v.proj/main.c:472 #: ../vector/v.proj/main.c:555 ../vector/v.proj/main.c:562 @@ -3915,9 +3907,9 @@ msgid "Start angle for multidirectional horizon [degrees]" msgstr "" #: ../raster/r.horizon/main.c:218 ../raster/r.horizon/main.c:227 -#: ../raster/r.horizon/main.c:236 ../raster/r.horizon/main.c:244 -#: ../raster/r.horizon/main.c:252 ../raster/r.horizon/main.c:260 -#: ../raster/r.horizon/main.c:268 ../raster/r.horizon/main.c:280 +#: ../raster/r.horizon/main.c:237 ../raster/r.horizon/main.c:246 +#: ../raster/r.horizon/main.c:255 ../raster/r.horizon/main.c:264 +#: ../raster/r.horizon/main.c:273 ../raster/r.horizon/main.c:285 msgid "Raster mode" msgstr "" @@ -3931,36 +3923,36 @@ msgid "" "region" msgstr "" -#: ../raster/r.horizon/main.c:242 +#: ../raster/r.horizon/main.c:243 msgid "" "For horizon rasters, read from the DEM an extra buffer eastward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:250 +#: ../raster/r.horizon/main.c:252 msgid "" "For horizon rasters, read from the DEM an extra buffer westward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:258 +#: ../raster/r.horizon/main.c:261 msgid "" "For horizon rasters, read from the DEM an extra buffer northward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:266 +#: ../raster/r.horizon/main.c:270 msgid "" "For horizon rasters, read from the DEM an extra buffer southward the present " "region" msgstr "" -#: ../raster/r.horizon/main.c:275 +#: ../raster/r.horizon/main.c:280 #: ../locale/scriptstrings/r.skyview_to_translate.c:5 msgid "The maximum distance to consider when finding the horizon height" msgstr "" -#: ../raster/r.horizon/main.c:276 ../raster/r.horizon/main.c:293 +#: ../raster/r.horizon/main.c:281 ../raster/r.horizon/main.c:299 #: ../locale/scriptstrings/r.fill.category_to_translate.c:12 #: ../locale/scriptstrings/r.fill.category_to_translate.c:14 #: ../locale/scriptstrings/t.rast.kappa_to_translate.c:7 @@ -4015,6 +4007,9 @@ msgstr "" #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:56 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:58 #: ../locale/scriptstrings/r.landscape.evol_to_translate.c:60 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:18 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:23 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:22 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:43 #: ../locale/scriptstrings/r.suitability.regions_to_translate.c:46 @@ -4035,46 +4030,55 @@ msgstr "" msgid "Optional" msgstr "" -#: ../raster/r.horizon/main.c:284 -msgid "Coordinate for which you want to calculate the horizon" +#: ../raster/r.horizon/main.c:289 +msgid "Coordinate(s) for which you want to calculate the horizon" msgstr "" -#: ../raster/r.horizon/main.c:285 ../raster/r.horizon/main.c:301 +#: ../raster/r.horizon/main.c:291 ../raster/r.horizon/main.c:310 +#: ../raster/r.horizon/main.c:318 ../raster/r.horizon/main.c:324 msgid "Point mode" msgstr "" -#: ../raster/r.horizon/main.c:300 ../raster/r.profile/main.c:63 +#: ../raster/r.horizon/main.c:305 +msgid "Output format used for point mode" +msgstr "" + +#: ../raster/r.horizon/main.c:317 ../raster/r.profile/main.c:63 msgid "Name of file for output (use output=- for stdout)" msgstr "" -#: ../raster/r.horizon/main.c:306 +#: ../raster/r.horizon/main.c:323 +msgid "Include horizon distance in the output" +msgstr "" + +#: ../raster/r.horizon/main.c:329 msgid "Write output in degrees (default is radians)" msgstr "" -#: ../raster/r.horizon/main.c:311 +#: ../raster/r.horizon/main.c:334 msgid "Write output in compass orientation (default is CCW, East=0)" msgstr "" -#: ../raster/r.horizon/main.c:350 +#: ../raster/r.horizon/main.c:374 msgid "" "Note: In latitude-longitude coordinate system specify buffers in degree unit" msgstr "" -#: ../raster/r.horizon/main.c:364 +#: ../raster/r.horizon/main.c:403 msgid "Can't read the coordinates from the \"coordinate\" option." msgstr "" -#: ../raster/r.horizon/main.c:369 +#: ../raster/r.horizon/main.c:409 msgid "Coordinates are outside of the current region" msgstr "" -#: ../raster/r.horizon/main.c:386 ../raster/r.recode/main.c:89 +#: ../raster/r.horizon/main.c:428 ../raster/r.recode/main.c:89 #: ../raster/r.out.ascii/main.c:152 ../raster/r.out.ppm3/main.c:134 -#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:669 +#: ../raster/r.profile/main.c:174 ../raster/r.in.lidar/main.c:670 #: ../raster/r.category/main.c:169 ../misc/m.nviz.script/main.c:198 #: ../misc/m.transform/main.c:273 ../raster3d/r3.out.vtk/main.c:422 #: ../general/g.pnmcomp/main.c:243 ../general/g.pnmcomp/main.c:260 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:410 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:411 #: ../imagery/i.atcorr/6s.cpp:54 ../vector/v.out.vtk/main.c:172 #: ../vector/v.profile/main.c:340 ../vector/v.edit/main.c:82 #: ../vector/v.net/main.c:99 ../vector/v.out.ascii/main.c:129 @@ -4083,82 +4087,94 @@ msgstr "" msgid "Unable to open file <%s>" msgstr "" -#: ../raster/r.horizon/main.c:394 +#: ../raster/r.horizon/main.c:440 msgid "You didn't specify a direction value or step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:400 +#: ../raster/r.horizon/main.c:446 msgid "You didn't specify a horizon raster name. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:415 +#: ../raster/r.horizon/main.c:461 msgid "Negative values of start angle are not allowed. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:418 +#: ../raster/r.horizon/main.c:464 msgid "End angle is not between 0 and 360. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:422 +#: ../raster/r.horizon/main.c:468 msgid "You specify a start grater than the end angle. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:430 +#: ../raster/r.horizon/main.c:477 msgid "You didn't specify an angle step size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:441 +#: ../raster/r.horizon/main.c:489 msgid "Could not read bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:446 ../raster/r.horizon/main.c:452 -#: ../raster/r.horizon/main.c:458 ../raster/r.horizon/main.c:464 +#: ../raster/r.horizon/main.c:494 ../raster/r.horizon/main.c:500 +#: ../raster/r.horizon/main.c:506 ../raster/r.horizon/main.c:512 #, c-format msgid "Could not read %s bufferzone size. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:447 +#: ../raster/r.horizon/main.c:495 msgid "east" msgstr "" -#: ../raster/r.horizon/main.c:453 +#: ../raster/r.horizon/main.c:501 msgid "west" msgstr "" -#: ../raster/r.horizon/main.c:459 +#: ../raster/r.horizon/main.c:507 msgid "south" msgstr "" -#: ../raster/r.horizon/main.c:465 +#: ../raster/r.horizon/main.c:513 msgid "north" msgstr "" -#: ../raster/r.horizon/main.c:470 +#: ../raster/r.horizon/main.c:520 msgid "Could not read maximum distance. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:483 +#: ../raster/r.horizon/main.c:533 msgid "The distance value must be 0.5-1.5. Aborting." msgstr "" -#: ../raster/r.horizon/main.c:641 ../raster/r.in.ascii/main.c:187 +#: ../raster/r.horizon/main.c:582 ../display/d.where/main.c:104 +msgid "Can't get projection info of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:585 ../display/d.where/main.c:107 +msgid "Can't get projection units of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:588 ../ps/ps.map/do_geogrid.c:279 +#: ../display/d.where/main.c:111 ../display/d.grid/plot.c:578 +msgid "Can't get projection key values of current location" +msgstr "" + +#: ../raster/r.horizon/main.c:723 ../raster/r.in.ascii/main.c:187 #, c-format msgid "OOPS: rows changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:645 ../raster/r.in.ascii/main.c:190 +#: ../raster/r.horizon/main.c:727 ../raster/r.in.ascii/main.c:190 #, c-format msgid "OOPS: cols changed from %d to %d" msgstr "" -#: ../raster/r.horizon/main.c:814 ../raster/r.horizon/main.c:831 -#: ../raster/r.horizon/main.c:1164 ../raster/r.horizon/main.c:1184 +#: ../raster/r.horizon/main.c:759 ../raster/r.horizon/main.c:774 #: ../raster/r.proj/main.c:504 ../raster/r.proj/main.c:610 #, c-format msgid "Error in %s" msgstr "" -#: ../raster/r.horizon/main.c:1137 +#: ../raster/r.horizon/main.c:1190 #, c-format msgid "Calculating map %01d of %01d (angle %.2f, raster map <%s>)" msgstr "" @@ -4958,7 +4974,7 @@ msgstr "" #: ../vector/v.extract/main.c:147 ../vector/v.overlay/main.c:136 #: ../vector/v.overlay/main.c:146 ../vector/v.in.ogr/main.c:321 #: ../vector/v.in.ogr/main.c:330 ../vector/v.in.ogr/main.c:339 -#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:405 +#: ../vector/v.in.ogr/main.c:375 ../vector/v.in.ogr/main.c:406 msgid "Attributes" msgstr "" @@ -5037,7 +5053,7 @@ msgstr "" #: ../vector/v.to.points/main.c:223 ../vector/v.patch/main.c:390 #: ../vector/v.in.dxf/write_vect.c:239 ../vector/v.mkgrid/main.c:371 #: ../vector/v.mkgrid/main.c:431 ../vector/v.overlay/main.c:623 -#: ../vector/v.in.ogr/main.c:1175 ../vector/v.select/copy_tabs.c:87 +#: ../vector/v.in.ogr/main.c:1176 ../vector/v.select/copy_tabs.c:87 #, c-format msgid "Unable to grant privileges on table <%s>" msgstr "" @@ -5166,7 +5182,7 @@ msgstr "" #: ../raster/r.recode/main.c:60 ../raster/r.in.ascii/main.c:78 #: ../raster/r.reclass/main.c:67 ../raster3d/r3.in.ascii/main.c:87 -#: ../general/g.proj/main.c:144 ../general/g.proj/main.c:162 +#: ../general/g.proj/main.c:145 ../general/g.proj/main.c:163 #: ../db/db.execute/main.c:149 ../db/db.select/main.c:206 #: ../locale/scriptstrings/m.proj_to_translate.c:8 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:7 @@ -5365,9 +5381,8 @@ msgid "Cannot open file %s for reading" msgstr "" #: ../raster/r.in.pdal/projection.c:36 ../raster/r.in.lidar/projection.c:38 -#: ../raster3d/r3.in.lidar/projection.c:39 ../vector/v.in.lidar/projection.c:36 -#: ../vector/v.in.pdal/projection.c:36 -msgid "GRASS LOCATION PROJ_INFO is:\n" +#: ../vector/v.in.lidar/projection.c:36 ../vector/v.in.pdal/projection.c:36 +msgid "GRASS project PROJ_INFO is:\n" msgstr "" #: ../raster/r.in.pdal/projection.c:45 ../raster/r.in.pdal/projection.c:51 @@ -5383,7 +5398,7 @@ msgstr "" #: ../raster3d/r3.in.lidar/projection.c:95 ../vector/v.in.lidar/projection.c:92 #: ../vector/v.in.pdal/projection.c:92 msgid "" -"Consider generating a new location with 'location' parameter from input data " +"Consider generating a new project with 'project' parameter from input data " "set.\n" msgstr "" @@ -5590,9 +5605,9 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:185 ../raster/r.in.pdal/main.cpp:206 #: ../raster/r.in.pdal/main.cpp:225 ../raster/r.in.pdal/main.cpp:245 -#: ../raster/r.in.pdal/main.cpp:409 ../raster/r.in.lidar/main.c:187 +#: ../raster/r.in.pdal/main.cpp:410 ../raster/r.in.lidar/main.c:187 #: ../raster/r.in.lidar/main.c:205 ../raster/r.in.lidar/main.c:221 -#: ../raster/r.in.lidar/main.c:335 ../raster3d/r3.in.lidar/main.c:248 +#: ../raster/r.in.lidar/main.c:336 ../raster3d/r3.in.lidar/main.c:248 #: ../raster3d/r3.in.lidar/main.c:261 ../raster3d/r3.in.lidar/main.c:277 msgid "Transform" msgstr "" @@ -5610,7 +5625,7 @@ msgstr "" #: ../raster/r.in.pdal/main.cpp:324 ../raster/r.in.pdal/main.cpp:336 #: ../raster/r.in.pdal/main.cpp:370 ../raster/r.in.lidar/main.c:197 #: ../raster/r.in.lidar/main.c:213 ../raster/r.in.lidar/main.c:266 -#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:343 +#: ../raster/r.in.lidar/main.c:276 ../raster/r.in.lidar/main.c:344 #: ../raster/r.category/main.c:59 ../raster/r.category/main.c:68 #: ../raster3d/r3.in.lidar/main.c:230 ../raster3d/r3.in.lidar/main.c:240 #: ../raster3d/r3.in.lidar/main.c:269 ../raster3d/r3.in.lidar/main.c:285 @@ -5695,10 +5710,10 @@ msgstr "" #: ../vector/v.out.ascii/args.c:44 ../vector/v.out.ascii/args.c:47 #: ../vector/v.in.pdal/main.cpp:183 ../vector/v.in.pdal/main.cpp:191 #: ../vector/v.in.pdal/main.cpp:200 ../vector/v.in.pdal/main.cpp:210 -#: ../vector/v.in.pdal/main.cpp:253 ../vector/v.in.ogr/main.c:269 +#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:269 #: ../vector/v.in.ogr/main.c:274 ../vector/v.in.ogr/main.c:283 #: ../vector/v.in.ogr/main.c:299 ../vector/v.in.ogr/main.c:346 -#: ../vector/v.in.ogr/main.c:392 ../vector/v.select/args.c:19 +#: ../vector/v.in.ogr/main.c:393 ../vector/v.select/args.c:19 #: ../vector/v.select/args.c:25 ../vector/v.select/args.c:34 #: ../vector/v.select/args.c:40 ../vector/v.select/args.c:110 #: ../display/d.rast/main.c:70 ../display/d.rast/main.c:87 @@ -5737,30 +5752,30 @@ msgstr "" msgid "Use if output dimension is not Z or intensity" msgstr "" -#: ../raster/r.in.pdal/main.cpp:251 ../vector/v.in.pdal/main.cpp:215 -msgid "Reproject to location's coordinate system if needed" +#: ../raster/r.in.pdal/main.cpp:251 +msgid "Reproject to project's coordinate system if needed" msgstr "" -#: ../raster/r.in.pdal/main.cpp:253 ../vector/v.in.pdal/main.cpp:217 +#: ../raster/r.in.pdal/main.cpp:253 msgid "" -"Reprojects input dataset to the coordinate system of the GRASS location (by " -"default only datasets with the matching coordinate system can be imported" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with matching coordinate system can be imported" msgstr "" #: ../raster/r.in.pdal/main.cpp:256 ../raster/r.in.pdal/main.cpp:270 -#: ../raster/r.in.pdal/main.cpp:399 ../raster/r.in.gdal/main.c:146 -#: ../raster/r.in.gdal/main.c:220 ../raster/r.in.gdal/main.c:226 -#: ../vector/v.info/print.c:455 ../vector/v.info/print.c:459 -#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:228 -#: ../vector/v.in.pdal/main.cpp:241 +#: ../raster/r.in.pdal/main.cpp:400 ../raster/r.in.gdal/main.c:146 +#: ../raster/r.in.gdal/main.c:219 ../raster/r.in.gdal/main.c:225 +#: ../vector/v.info/print.c:456 ../vector/v.info/print.c:460 +#: ../vector/v.in.pdal/main.cpp:220 ../vector/v.in.pdal/main.cpp:229 +#: ../vector/v.in.pdal/main.cpp:242 msgid "Projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:237 +#: ../raster/r.in.pdal/main.cpp:266 ../vector/v.in.pdal/main.cpp:238 msgid "Input dataset projection (WKT or EPSG, e.g. EPSG:4326)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:239 +#: ../raster/r.in.pdal/main.cpp:268 ../vector/v.in.pdal/main.cpp:240 msgid "" "Override input dataset coordinate system using EPSG code or WKT definition" msgstr "" @@ -5880,123 +5895,123 @@ msgid "" "created new raster map" msgstr "" -#: ../raster/r.in.pdal/main.cpp:405 ../raster/r.in.lidar/main.c:331 +#: ../raster/r.in.pdal/main.cpp:406 ../raster/r.in.lidar/main.c:332 msgid "Use base raster resolution instead of computational region" msgstr "" -#: ../raster/r.in.pdal/main.cpp:407 ../raster/r.in.lidar/main.c:333 +#: ../raster/r.in.pdal/main.cpp:408 ../raster/r.in.lidar/main.c:334 msgid "" "For getting values from base raster, use its actual resolution instead of " "computational region resolution" msgstr "" -#: ../raster/r.in.pdal/main.cpp:414 ../raster/r.in.lidar/main.c:280 -#: ../raster3d/r3.in.lidar/main.c:296 ../vector/v.in.lidar/main.c:281 +#: ../raster/r.in.pdal/main.cpp:415 ../raster/r.in.lidar/main.c:280 +#: ../raster3d/r3.in.lidar/main.c:297 ../vector/v.in.lidar/main.c:281 msgid "Print LAS file info and exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:420 +#: ../raster/r.in.pdal/main.cpp:421 msgid "Print data file extent in shell script style and then exit" msgstr "" -#: ../raster/r.in.pdal/main.cpp:437 ../raster/r.in.lidar/main.c:378 -#: ../raster3d/r3.in.lidar/main.c:341 +#: ../raster/r.in.pdal/main.cpp:438 ../raster/r.in.lidar/main.c:379 +#: ../raster3d/r3.in.lidar/main.c:342 #, c-format msgid "File <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:458 +#: ../raster/r.in.pdal/main.cpp:459 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag or -%c flag" msgstr "" -#: ../raster/r.in.pdal/main.cpp:469 ../raster/r.in.lidar/main.c:371 +#: ../raster/r.in.pdal/main.cpp:470 ../raster/r.in.lidar/main.c:372 msgid "Trim option can be used only with trimmean method" msgstr "" -#: ../raster/r.in.pdal/main.cpp:481 +#: ../raster/r.in.pdal/main.cpp:482 msgid "" "Binning methods 'n', 'sidnmax', 'sidnmin' and eigenvalues are ignoring " "specified dimension" msgstr "" -#: ../raster/r.in.pdal/main.cpp:487 ../raster/r.in.lidar/main.c:411 -#: ../raster3d/r3.in.lidar/main.c:378 ../vector/v.in.lidar/main.c:350 -#: ../vector/v.in.pdal/main.cpp:267 +#: ../raster/r.in.pdal/main.cpp:488 ../raster/r.in.lidar/main.c:412 +#: ../raster3d/r3.in.lidar/main.c:379 ../vector/v.in.lidar/main.c:351 +#: ../vector/v.in.pdal/main.cpp:268 #, c-format msgid "Input file <%s> does not exist" msgstr "" -#: ../raster/r.in.pdal/main.cpp:555 ../raster/r.in.pdal/main.cpp:567 +#: ../raster/r.in.pdal/main.cpp:556 ../raster/r.in.pdal/main.cpp:568 msgid "Output map type set to CELL" msgstr "" -#: ../raster/r.in.pdal/main.cpp:630 ../raster/r.in.lidar/main.c:539 -#: ../general/g.region/main.c:915 +#: ../raster/r.in.pdal/main.cpp:631 ../raster/r.in.lidar/main.c:540 +#: ../general/g.region/main.c:916 #, c-format msgid "Invalid input <%s=%s>" msgstr "" -#: ../raster/r.in.pdal/main.cpp:634 ../raster/r.in.lidar/main.c:543 +#: ../raster/r.in.pdal/main.cpp:635 ../raster/r.in.lidar/main.c:544 #, c-format msgid "Option '%s' must be > 0.0" msgstr "" -#: ../raster/r.in.pdal/main.cpp:700 ../raster/r.contour/main.c:253 -#: ../raster/r.in.lidar/main.c:627 ../vector/v.generalize/displacement.c:78 +#: ../raster/r.in.pdal/main.cpp:701 ../raster/r.contour/main.c:253 +#: ../raster/r.in.lidar/main.c:628 ../vector/v.generalize/displacement.c:78 msgid "Reading data..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:734 ../vector/v.in.pdal/main.cpp:350 -msgid "Reprojecting the input to the location projection" +#: ../raster/r.in.pdal/main.cpp:735 ../vector/v.in.pdal/main.cpp:351 +msgid "Reprojecting the input to the project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:783 ../vector/v.in.pdal/main.cpp:372 +#: ../raster/r.in.pdal/main.cpp:784 ../vector/v.in.pdal/main.cpp:373 msgid "" -"Overriding projection check and assuming that the projection of input " -"matches the location projection" +"Overriding projection check and assuming that the CRS of input matches the " +"project's CRS" msgstr "" -#: ../raster/r.in.pdal/main.cpp:791 ../vector/v.in.pdal/main.cpp:380 +#: ../raster/r.in.pdal/main.cpp:792 ../vector/v.in.pdal/main.cpp:381 msgid "The input dataset has undefined projection" msgstr "" -#: ../raster/r.in.pdal/main.cpp:799 ../vector/v.in.pdal/main.cpp:387 +#: ../raster/r.in.pdal/main.cpp:800 ../vector/v.in.pdal/main.cpp:388 msgid "Running PDAL algorithms..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:823 ../vector/v.in.pdal/main.cpp:433 +#: ../raster/r.in.pdal/main.cpp:824 ../vector/v.in.pdal/main.cpp:434 msgid "Scanning points..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:828 +#: ../raster/r.in.pdal/main.cpp:829 msgid "Cannot identify the requested dimension. Check dimension name spelling." msgstr "" -#: ../raster/r.in.pdal/main.cpp:832 +#: ../raster/r.in.pdal/main.cpp:833 #, c-format msgid "" "Both dimension and user dimension parameters are specified. Using '%s' as " "the dimension to import." msgstr "" -#: ../raster/r.in.pdal/main.cpp:840 +#: ../raster/r.in.pdal/main.cpp:841 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' (possibly a programming error)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:857 ../raster/r.drain/main.c:485 +#: ../raster/r.in.pdal/main.cpp:858 ../raster/r.drain/main.c:485 #: ../raster/r.viewshed/grass.cpp:620 ../raster/r.path/main.c:560 -#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:782 +#: ../raster/r.path/main.c:590 ../raster/r.in.lidar/main.c:783 msgid "Writing output raster map..." msgstr "" -#: ../raster/r.in.pdal/main.cpp:875 +#: ../raster/r.in.pdal/main.cpp:876 msgid " points found in input file(s)" msgstr "" -#: ../raster/r.in.pdal/main.cpp:908 ../raster/r.in.pdal/main.cpp:915 +#: ../raster/r.in.pdal/main.cpp:909 ../raster/r.in.pdal/main.cpp:916 #, c-format msgid "Raster map <%s> created. " msgstr "" @@ -6096,7 +6111,7 @@ msgstr "" #: ../raster/r.stats.quantile/main.c:638 ../raster/r.out.bin/main.c:388 #: ../raster/r.in.bin/main.c:451 ../raster/r.in.bin/main.c:457 -#: ../raster/r.neighbors/main.c:315 +#: ../raster/r.neighbors/main.c:318 #, c-format msgid "-%c and %s= are mutually exclusive" msgstr "" @@ -6130,7 +6145,7 @@ msgstr "" #. GTC Count of window rows #: ../raster/r.thin/io.c:102 ../raster/r.thin/io.c:173 #: ../raster/r.thin/io.c:182 ../vector/v.kernel/main.c:304 -#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:208 +#: ../vector/v.surf.idw/main.c:248 ../display/d.rast.num/main.c:211 #, c-format msgid "%d row" msgid_plural "%d rows" @@ -6160,7 +6175,7 @@ msgstr "" #: ../raster/r.thin/io.c:129 ../raster/r.thin/io.c:137 #: ../raster/r.thin/io.c:147 ../raster/r.resamp.rst/main.c:551 -#: ../vector/v.surf.rst/main.c:905 +#: ../vector/v.surf.rst/main.c:908 #, c-format msgid "Error writing temporary file <%s>" msgstr "" @@ -6213,9 +6228,9 @@ msgstr "" msgid "Maximal number of iterations" msgstr "" -#: ../raster/r.surf.gauss/main.c:37 ../raster/r.random.surface/main.c:57 +#: ../raster/r.surf.gauss/main.c:39 ../raster/r.random.surface/main.c:57 #: ../raster/r.resamp.bspline/main.c:78 ../raster/r.surf.fractal/main.c:36 -#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:81 +#: ../raster/r.surf.contour/main.c:60 ../raster/r.surf.random/main.c:84 #: ../raster/r.surf.area/main.c:76 ../raster/r.contour/main.c:88 #: ../raster/r.fill.stats/main.c:766 ../raster/r.surf.idw/main.c:102 #: ../locale/scriptstrings/r.tri_to_translate.c:3 @@ -6231,8 +6246,8 @@ msgstr "" msgid "surface" msgstr "" -#: ../raster/r.surf.gauss/main.c:38 ../raster/r.random.surface/main.c:58 -#: ../raster/r.surf.random/main.c:82 ../raster/r.random.cells/main.c:51 +#: ../raster/r.surf.gauss/main.c:40 ../raster/r.random.surface/main.c:58 +#: ../raster/r.surf.random/main.c:85 ../raster/r.random.cells/main.c:51 #: ../raster/r.random/main.c:56 #: ../locale/scriptstrings/r.sample.category_to_translate.c:4 #: ../locale/scriptstrings/r.random.weight_to_translate.c:4 @@ -6242,24 +6257,55 @@ msgstr "" msgid "random" msgstr "" -#: ../raster/r.surf.gauss/main.c:39 +#: ../raster/r.surf.gauss/main.c:41 msgid "Generates a raster map using gaussian random number generator." msgstr "" -#: ../raster/r.surf.gauss/main.c:41 +#: ../raster/r.surf.gauss/main.c:43 msgid "" "Mean and standard deviation of gaussian deviates can be expressed by the " "user." msgstr "" -#: ../raster/r.surf.gauss/main.c:48 +#: ../raster/r.surf.gauss/main.c:50 msgid "Distribution mean" msgstr "" -#: ../raster/r.surf.gauss/main.c:54 +#: ../raster/r.surf.gauss/main.c:56 msgid "Standard deviation" msgstr "" +#: ../raster/r.surf.gauss/main.c:64 ../raster/r.sim/r.sim.sediment/main.c:270 +#: ../raster/r.sim/r.sim.water/main.c:304 ../raster/r.surf.random/main.c:107 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 +#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 +#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 +msgid "Seed for random number generator" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:65 ../raster/r.sim/r.sim.sediment/main.c:272 +#: ../raster/r.sim/r.sim.water/main.c:306 ../raster/r.surf.random/main.c:108 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 +#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 +msgid "" +"The same seed can be used to obtain same results or random seed can be " +"generated by other means." +msgstr "" + +#: ../raster/r.surf.gauss/main.c:75 ../raster/r.sim/r.sim.sediment/main.c:301 +#: ../raster/r.sim/r.sim.water/main.c:335 ../raster/r.surf.random/main.c:124 +#, c-format +msgid "Read random seed from %s option: %ld" +msgstr "" + +#: ../raster/r.surf.gauss/main.c:81 ../raster/r.surf.random/main.c:130 +#, c-format +msgid "Autogenerated random seed set to: %ld" +msgstr "" + #: ../raster/r.his/main.c:67 ../imagery/i.his.rgb/main.c:46 #: ../imagery/i.rgb.his/main.c:46 ../display/d.his/main.c:63 msgid "color transformation" @@ -6311,7 +6357,7 @@ msgstr "" #: ../raster/r.his/main.c:168 ../raster/r.his/main.c:184 #: ../raster/r.his/main.c:202 ../raster/r.out.ppm3/main.c:116 -#: ../display/d.rast.num/main.c:262 ../display/d.rast/display.c:21 +#: ../display/d.rast.num/main.c:261 ../display/d.rast/display.c:21 #: ../display/d.legend/main.c:405 ../display/d.legend/main.c:413 #: ../display/d.histogram/main.c:167 ../display/d.his/main.c:136 #: ../display/d.his/main.c:153 ../display/d.his/main.c:171 @@ -6611,7 +6657,7 @@ msgstr "" #: ../raster/r.topmodel/file_io.c:29 ../raster/r.topmodel/file_io.c:137 #: ../raster/r.topmodel/file_io.c:162 ../raster/r.buildvrt/main.c:125 #: ../raster/r.series.accumulate/main.c:222 ../raster/r.in.xyz/main.c:586 -#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:261 +#: ../raster/r.mapcalc/main.c:48 ../raster/r.series/main.c:264 #: ../raster/r.in.mat/main.c:126 ../raster/r.support/main.c:209 #: ../raster3d/r3.support/main.c:169 ../general/g.cairocomp/main.c:46 #: ../imagery/i.group/main.c:122 ../vector/v.segment/main.c:97 @@ -6717,7 +6763,6 @@ msgstr "" #: ../raster/r.param.scale/interface.c:53 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:6 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:5 #: ../locale/scriptstrings/v.stream.network_to_translate.c:5 msgid "geomorphology" msgstr "" @@ -6803,7 +6848,7 @@ msgid "Inappropriate window size (too big or even)" msgstr "" #: ../raster/r.param.scale/main.c:39 -msgid "Lat/Long locations are not supported by this module" +msgid "Lat/Long projects are not supported by this module" msgstr "" #: ../raster/r.colors.out/raster3d_main.c:48 @@ -7422,7 +7467,7 @@ msgid "Input map <%s@%s> is all NULL, skipping" msgstr "" #: ../raster/r.buildvrt/main.c:175 ../raster/r.series.accumulate/main.c:256 -#: ../raster/r.series/main.c:334 +#: ../raster/r.series/main.c:337 msgid "No raster map name found in input file" msgstr "" @@ -7431,7 +7476,7 @@ msgid "Only one raster map name found in input file" msgstr "" #: ../raster/r.buildvrt/main.c:186 ../raster/r.series.accumulate/main.c:266 -#: ../raster/r.series/main.c:346 ../raster/r.stats/main.c:284 +#: ../raster/r.series/main.c:349 ../raster/r.stats/main.c:284 msgid "Raster map not found" msgstr "" @@ -7536,7 +7581,7 @@ msgid "longitude" msgstr "" #: ../raster/r.latlong/main.c:58 ../raster/r.proj/main.c:147 -#: ../general/g.proj/main.c:69 ../general/g.setproj/main.c:78 +#: ../general/g.proj/main.c:70 ../general/g.setproj/main.c:78 #: ../locale/scriptstrings/v.in.csv_to_translate.c:4 #: ../locale/scriptstrings/g.proj.all_to_translate.c:3 #: ../locale/scriptstrings/g.projpicker_to_translate.c:3 @@ -7560,15 +7605,15 @@ msgstr "" msgid "Longitude output" msgstr "" -#: ../raster/r.latlong/main.c:101 ../raster/r.sunmask/g_solposition.c:101 +#: ../raster/r.latlong/main.c:101 msgid "Unable to get projection info of current location" msgstr "" -#: ../raster/r.latlong/main.c:104 ../raster/r.sunmask/g_solposition.c:105 +#: ../raster/r.latlong/main.c:104 msgid "Unable to get projection units of current location" msgstr "" -#: ../raster/r.latlong/main.c:107 ../raster/r.sunmask/g_solposition.c:109 +#: ../raster/r.latlong/main.c:107 msgid "Unable to get projection key values of current location" msgstr "" @@ -7641,7 +7686,7 @@ msgstr "" #: ../raster/r.stats.zonal/main.c:168 ../raster/r.proj/main.c:241 #: ../raster/r.statistics/main.c:118 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:148 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:149 #: ../imagery/i.rectify/main.c:149 ../vector/v.vect.stats/main.c:318 #: ../vector/v.neighbors/main.c:193 #, c-format @@ -7691,17 +7736,14 @@ msgid "Output raster map required" msgstr "" #: ../raster/r.random.surface/init.c:138 -#, c-format msgid "Distance value (%d): %lf must be >= 0.0" msgstr "" #: ../raster/r.random.surface/init.c:166 -#, c-format msgid "Exponent value (%lf) must be > 0.0" msgstr "" #: ../raster/r.random.surface/init.c:191 -#, c-format msgid "Flat value (%lf) must be less than distance value (%lf)" msgstr "" @@ -7759,6 +7801,7 @@ msgstr "" #: ../raster/r.regression.multi/main.c:131 ../imagery/i.svm.predict/main.c:54 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:4 #: ../locale/scriptstrings/r.learn.train_to_translate.c:4 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:4 #: ../locale/scriptstrings/r.mregression.series_to_translate.c:4 msgid "regression" msgstr "" @@ -7896,7 +7939,7 @@ msgstr "" #: ../raster/r.resamp.rst/main.c:545 ../raster3d/r3.in.ascii/main.c:169 #: ../general/g.setproj/get_stp.c:153 ../general/g.setproj/get_stp.c:156 #: ../general/g.setproj/get_stp.c:273 ../general/g.setproj/get_stp.c:277 -#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:899 +#: ../vector/v.in.ascii/main.c:277 ../vector/v.surf.rst/main.c:902 #: ../display/d.title/main.c:113 #, c-format msgid "Unable to open temporary file <%s>" @@ -7979,7 +8022,7 @@ msgid "Please specify min and/or max radius when using the binary flag" msgstr "" #: ../raster/r.circle/main.c:149 ../raster/r.surf.fractal/main.c:81 -#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:144 +#: ../raster/r.composite/main.c:256 ../raster/r.surf.random/main.c:168 #: ../raster/r.li/r.li.daemon/daemon.c:179 #, c-format msgid "Raster map <%s> created." @@ -8038,7 +8081,7 @@ msgstr "" #: ../raster3d/r3.out.v5d/main.c:306 ../raster3d/r3.null/main.c:93 #: ../raster3d/r3.mask/main.c:53 ../raster3d/r3.stats/main.c:95 #: ../raster3d/r3.to.rast/main.c:273 ../raster3d/r3.out.bin/main.c:313 -#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:479 +#: ../raster3d/r3.neighbors/main.c:225 ../general/g.region/main.c:480 #: ../vector/v.colors/main.c:326 #, c-format msgid "3D raster map <%s> not found" @@ -8099,7 +8142,7 @@ msgstr "" msgid "zones option and region flag -r are mutually exclusive" msgstr "" -#: ../raster/r.univar/r.univar_main.c:262 ../raster/r.out.png/main.c:271 +#: ../raster/r.univar/r.univar_main.c:265 ../raster/r.out.png/main.c:271 #, c-format msgid "Raster <%s> type mismatch" msgstr "" @@ -8222,7 +8265,6 @@ msgid "Calculating flow directions..." msgstr "" #: ../raster/r.drain/main.c:708 -#, c-format msgid "direction read: %lf, neighbour found: %i" msgstr "" @@ -8361,7 +8403,7 @@ msgstr "" msgid "<%d> is not valid number of threads." msgstr "" -#: ../raster/r.mfilter/main.c:151 +#: ../raster/r.mfilter/main.c:154 msgid "Raster map too small for the size of the filter" msgstr "" @@ -8453,8 +8495,8 @@ msgstr "" msgid "Pth percentile of the values" msgstr "" -#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:309 -#: ../raster3d/r3.in.lidar/main.c:300 +#: ../raster/r.in.xyz/main.c:326 ../raster/r.in.lidar/main.c:310 +#: ../raster3d/r3.in.lidar/main.c:301 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:10 msgid "Scan data file for extent then exit" msgstr "" @@ -8463,8 +8505,8 @@ msgstr "" msgid "Scan" msgstr "" -#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:314 -#: ../raster3d/r3.in.lidar/main.c:305 +#: ../raster/r.in.xyz/main.c:333 ../raster/r.in.lidar/main.c:315 +#: ../raster3d/r3.in.lidar/main.c:306 #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:11 msgid "In scan mode, print using shell script style" msgstr "" @@ -8482,7 +8524,7 @@ msgstr "" msgid "Please specify reasonable number of lines to skip" msgstr "" -#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:493 +#: ../raster/r.in.xyz/main.c:381 ../raster/r.in.lidar/main.c:494 msgid "Invalid zrange" msgstr "" @@ -8862,9 +8904,9 @@ msgid "" msgstr "" #: ../raster/r.solute.transport/main.c:243 ../raster/r.topidx/main.c:56 -#: ../raster/r.gwflow/main.c:237 ../raster/r.carve/main.c:207 +#: ../raster/r.gwflow/main.c:236 ../raster/r.carve/main.c:207 #, c-format -msgid "Lat/Long location is not supported by %s. Please reproject map first." +msgid "Lat/Long project is not supported by %s. Please reproject map first." msgstr "" #: ../raster/r.solute.transport/main.c:259 @@ -9088,13 +9130,11 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:315 #: ../vector/v.surf.bspline/crosscorr.c:301 -#, c-format msgid "Mean = %.5lf" msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:316 #: ../vector/v.surf.bspline/crosscorr.c:302 -#, c-format msgid "Root Mean Square (RMS) = %.5lf" msgstr "" @@ -9107,7 +9147,6 @@ msgstr "" #: ../raster/r.resamp.bspline/crosscorr.c:335 #: ../vector/v.surf.bspline/crosscorr.c:321 -#, c-format msgid "" "The minimum value for the test (rms=%lf) was obtained with: lambda_i = %.3f" msgstr "" @@ -9349,31 +9388,31 @@ msgstr "" msgid "Filter radius (vertical)" msgstr "" -#: ../raster/r.resamp.filter/main.c:500 ../vector/v.external.out/args.c:96 +#: ../raster/r.resamp.filter/main.c:503 ../vector/v.external.out/args.c:96 #, c-format msgid "%s= and %s=/%s= are mutually exclusive" msgstr "" -#: ../raster/r.resamp.filter/main.c:506 +#: ../raster/r.resamp.filter/main.c:509 #, c-format msgid "Either %s= or %s=/%s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:509 +#: ../raster/r.resamp.filter/main.c:512 #, c-format msgid "Both %s= and %s= required" msgstr "" -#: ../raster/r.resamp.filter/main.c:533 +#: ../raster/r.resamp.filter/main.c:536 msgid "Differing number of values for filter= and [xy_]radius=" msgstr "" -#: ../raster/r.resamp.filter/main.c:536 +#: ../raster/r.resamp.filter/main.c:539 #, c-format msgid "Too many filters (max: %d)" msgstr "" -#: ../raster/r.resamp.filter/main.c:555 +#: ../raster/r.resamp.filter/main.c:558 msgid "At least one filter must be finite" msgstr "" @@ -9389,12 +9428,11 @@ msgid "" "plate spline transformation (%s or %s)." msgstr "" -#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:70 +#: ../raster/r.in.gdal/main.c:116 ../general/g.proj/main.c:71 #: ../locale/scriptstrings/t.rast.import_to_translate.c:6 -#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 #: ../locale/scriptstrings/t.vect.import_to_translate.c:6 #: ../vector/v.in.ogr/main.c:216 -msgid "create location" +msgid "create project" msgstr "" #: ../raster/r.in.gdal/main.c:118 @@ -9409,18 +9447,17 @@ msgstr "" msgid "Band(s) to select (default is all bands)" msgstr "" -#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:257 +#: ../raster/r.in.gdal/main.c:134 ../raster/r.in.gdal/main.c:256 #: ../scripts/i.spectral/i.spectral.py:231 msgid "Bands" msgstr "" #: ../raster/r.in.gdal/main.c:142 -msgid "Name of GCPs target location" +msgid "Name of GCPs target project (location)" msgstr "" #: ../raster/r.in.gdal/main.c:143 -msgid "" -"Name of location to create or to read projection from for GCPs transformation" +msgid "Name of project to create or to read CRS from for GCPs transformation" msgstr "" #: ../raster/r.in.gdal/main.c:161 @@ -9444,10 +9481,9 @@ msgstr "" msgid "Name of the output file that contains the imported map names" msgstr "" -#: ../raster/r.in.gdal/main.c:188 -#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 -#: ../vector/v.in.lidar/main.c:276 ../vector/v.in.ogr/main.c:313 -msgid "Name for new location to create" +#: ../raster/r.in.gdal/main.c:188 ../vector/v.in.lidar/main.c:276 +#: ../vector/v.in.ogr/main.c:313 +msgid "Name for new project (location) to create" msgstr "" #: ../raster/r.in.gdal/main.c:195 @@ -9477,7 +9513,7 @@ msgstr "" msgid "GDAL dataset open options" msgstr "" -#: ../raster/r.in.gdal/main.c:234 ../raster/r.in.gdal/main.c:268 +#: ../raster/r.in.gdal/main.c:233 ../raster/r.in.gdal/main.c:267 #: ../locale/scriptstrings/v.clip_to_translate.c:9 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:15 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:18 @@ -9486,210 +9522,226 @@ msgstr "" msgid "Region" msgstr "" -#: ../raster/r.in.gdal/main.c:244 +#: ../raster/r.in.gdal/main.c:243 #: ../locale/scriptstrings/r.import_to_translate.c:28 msgid "Force Lat/Lon maps to fit into geographic coordinates (90N,S; 180E,W)" msgstr "" -#: ../raster/r.in.gdal/main.c:256 +#: ../raster/r.in.gdal/main.c:255 msgid "Keep band numbers instead of using band color names" msgstr "" -#: ../raster/r.in.gdal/main.c:262 +#: ../raster/r.in.gdal/main.c:261 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the raster file." msgstr "" -#: ../raster/r.in.gdal/main.c:267 ../vector/v.in.lidar/main.c:287 -#: ../vector/v.in.pdal/main.cpp:254 ../vector/v.in.ogr/main.c:393 +#: ../raster/r.in.gdal/main.c:266 ../vector/v.in.lidar/main.c:287 +#: ../vector/v.in.pdal/main.cpp:255 ../vector/v.in.ogr/main.c:394 msgid "Limit import to the current region" msgstr "" -#: ../raster/r.in.gdal/main.c:272 +#: ../raster/r.in.gdal/main.c:271 msgid "Print number of bands and exit" msgstr "" -#: ../raster/r.in.gdal/main.c:346 -msgid "You have to specify a target location different from output location" +#: ../raster/r.in.gdal/main.c:345 +msgid "You have to specify a target project different from output project" msgstr "" -#: ../raster/r.in.gdal/main.c:351 -msgid "You need to specify valid location name." +#: ../raster/r.in.gdal/main.c:350 +msgid "You need to specify valid project name." msgstr "" -#: ../raster/r.in.gdal/main.c:355 -msgid "The '-l' flag only works in Lat/Lon locations" +#: ../raster/r.in.gdal/main.c:354 +msgid "The '-l' flag only works in Lat/Lon projects" msgstr "" -#: ../raster/r.in.gdal/main.c:358 +#: ../raster/r.in.gdal/main.c:357 msgid "The number of digits for band numbering must be equal or greater than 0" msgstr "" -#: ../raster/r.in.gdal/main.c:372 -msgid "Disabling '-r' flag for new location" +#: ../raster/r.in.gdal/main.c:371 +msgid "Disabling '-r' flag for new project" msgstr "" -#: ../raster/r.in.gdal/main.c:379 +#: ../raster/r.in.gdal/main.c:378 #, c-format msgid "Using memory cache size: %s MiB" msgstr "" -#: ../raster/r.in.gdal/main.c:440 +#: ../raster/r.in.gdal/main.c:439 msgid "" "Input contains subdatasets which may need to be imported separately by name:" msgstr "" -#: ../raster/r.in.gdal/main.c:508 +#: ../raster/r.in.gdal/main.c:507 #, c-format msgid "No raster bands found in <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:523 ../raster/r.in.gdal/main.c:831 +#: ../raster/r.in.gdal/main.c:522 ../raster/r.in.gdal/main.c:830 #: ../imagery/i.landsat.toar/main.c:545 #, c-format msgid "Raster map <%s> already exists and will be overwritten" msgstr "" -#: ../raster/r.in.gdal/main.c:526 ../raster/r.in.gdal/main.c:835 +#: ../raster/r.in.gdal/main.c:525 ../raster/r.in.gdal/main.c:834 #, c-format msgid "Raster map <%s> already exists" msgstr "" -#: ../raster/r.in.gdal/main.c:551 +#: ../raster/r.in.gdal/main.c:550 msgid "" "Input raster map is flipped or rotated - cannot import. You may use " "'gdalwarp' to transform the map to North-up." msgstr "" -#: ../raster/r.in.gdal/main.c:572 +#: ../raster/r.in.gdal/main.c:571 #, c-format msgid "" "Unable to fetch the affine transformation coefficients. Flag -%c cannot be " "used in this case." msgstr "" -#: ../raster/r.in.gdal/main.c:605 +#: ../raster/r.in.gdal/main.c:604 msgid "" "Map bounds have been constrained to geographic coordinates. You will almost " "certainly want to check map bounds and resolution with r.info and reset them " "with r.region before going any further." msgstr "" -#: ../raster/r.in.gdal/main.c:650 ../raster/r.in.gdal/main.c:682 +#: ../raster/r.in.gdal/main.c:649 ../raster/r.in.gdal/main.c:681 msgid "" "Input raster does not overlap current computational region. Nothing to " "import." msgstr "" -#: ../raster/r.in.gdal/main.c:724 +#: ../raster/r.in.gdal/main.c:723 #, c-format msgid "Importing %d raster bands..." msgstr "" -#: ../raster/r.in.gdal/main.c:769 +#: ../raster/r.in.gdal/main.c:768 msgid "Unable to open the map names output text file" msgstr "" -#: ../raster/r.in.gdal/main.c:802 +#: ../raster/r.in.gdal/main.c:801 #, c-format msgid "Unable to get raster band number %d" msgstr "" -#: ../raster/r.in.gdal/main.c:884 +#: ../raster/r.in.gdal/main.c:883 #, c-format msgid "Copying %d GCPS in points file for <%s>" msgstr "" -#: ../raster/r.in.gdal/main.c:893 +#: ../raster/r.in.gdal/main.c:892 msgid "GCPs have the following OpenGIS WKT Coordinate System:" msgstr "" -#: ../raster/r.in.gdal/main.c:917 +#: ../raster/r.in.gdal/main.c:916 msgid "Re-projecting GCPs table:" msgstr "" -#: ../raster/r.in.gdal/main.c:918 +#: ../raster/r.in.gdal/main.c:917 #, c-format msgid "* Input projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:920 +#: ../raster/r.in.gdal/main.c:919 #, c-format msgid "* Output projection for GCP table: %s" msgstr "" -#: ../raster/r.in.gdal/main.c:942 +#: ../raster/r.in.gdal/main.c:941 #, c-format msgid "Error in %s (can't re-project GCP %i)" msgstr "" -#: ../raster/r.in.gdal/main.c:1046 +#: ../raster/r.in.gdal/main.c:979 ../vector/v.in.lidar/main.c:516 +#: ../vector/v.external/proj.c:166 +msgid "" +"Unable to convert input map CRS to GRASS format; cannot create new project." +msgstr "" + +#: ../raster/r.in.gdal/main.c:1044 #, c-format msgid "" -"The target for the output group <%s> has been set to location <%s>, mapset " +"The target for the output group <%s> has been set to project <%s>, mapset " "." msgstr "" -#: ../raster/r.in.gdal/main.c:1120 +#: ../raster/r.in.gdal/main.c:1118 msgid "Unable to translate projection key values of input GCPs" msgstr "" -#: ../raster/r.in.gdal/main.c:1137 -msgid "Unable to get projection info of target location" +#: ../raster/r.in.gdal/main.c:1134 +msgid "Unable to get CRS info of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1140 -msgid "Unable to get projection units of target location" +#: ../raster/r.in.gdal/main.c:1136 +msgid "Unable to get CRS units of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1143 -msgid "Unable to get projection key values of target location" +#: ../raster/r.in.gdal/main.c:1138 +msgid "Unable to get CRS key values of target project" msgstr "" -#: ../raster/r.in.gdal/main.c:1150 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 -#: ../imagery/i.rectify/target.c:31 ../vector/v.rectify/target.c:40 +#: ../raster/r.in.gdal/main.c:1145 ../vector/v.rectify/target.c:40 #, c-format -msgid "Mapset <%s> in target location <%s> - " +msgid "Mapset <%s> in target project <%s> - " msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "permission denied" msgstr "" -#: ../raster/r.in.gdal/main.c:1153 ../raster/r.proj/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:114 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:32 +#: ../raster/r.in.gdal/main.c:1148 ../raster/r.proj/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:115 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:33 #: ../imagery/i.rectify/target.c:32 ../vector/v.rectify/target.c:41 msgid "not found" msgstr "" -#: ../raster/r.in.gdal/main.c:1187 +#: ../raster/r.in.gdal/main.c:1182 #, c-format msgid "Importing raster map <%s>..." msgstr "" -#: ../raster/r.in.gdal/main.c:1305 ../raster/r.in.gdal/main.c:1370 -#: ../raster/r.in.gdal/main.c:1455 +#: ../raster/r.in.gdal/main.c:1300 ../raster/r.in.gdal/main.c:1365 +#: ../raster/r.in.gdal/main.c:1450 msgid "Invalid row" msgstr "" -#: ../raster/r.in.gdal/main.c:1312 ../raster/r.in.gdal/main.c:1376 -#: ../raster/r.in.gdal/main.c:1461 +#: ../raster/r.in.gdal/main.c:1307 ../raster/r.in.gdal/main.c:1371 +#: ../raster/r.in.gdal/main.c:1456 #, c-format msgid "Unable to read row %d" msgstr "" -#: ../raster/r.in.gdal/main.c:1966 +#: ../raster/r.in.gdal/main.c:1961 #, c-format msgid "Unable to open file <%s>: %s." msgstr "" +#: ../raster/r.in.gdal/proj.c:133 ../vector/v.in.ogr/proj.c:300 +msgid "" +"Unable to convert input map projection to GRASS format; cannot create new " +"project." +msgstr "" + +#: ../raster/r.in.gdal/proj.c:323 +msgid "" +"\n" +"In case of no significant differences in the CRS definitions, use the -o " +"flag to ignore them and use current project definition.\n" +msgstr "" + #: ../raster/r.clump/rclist.c:17 ../imagery/i.segment/rclist.c:17 msgid "rclist out of memory" msgstr "" @@ -10354,7 +10406,6 @@ msgid "Number of intermediate images to produce" msgstr "" #: ../raster/r.surf.fractal/main.c:75 -#, c-format msgid "Fractal dimension of %.2lf must be between 2 and 3." msgstr "" @@ -10467,6 +10518,18 @@ msgstr "" #: ../imagery/i.eb.hsebal01/main.c:166 ../imagery/i.eb.hsebal01/main.c:173 #: ../locale/scriptstrings/r.fill.category_to_translate.c:8 #: ../locale/scriptstrings/r.fill.category_to_translate.c:10 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:48 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:51 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:54 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:57 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:60 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:63 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:66 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:69 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:72 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:75 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:78 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:81 #: ../locale/scriptstrings/r.series.filter_to_translate.c:6 #: ../locale/scriptstrings/r.series.filter_to_translate.c:8 #: ../locale/scriptstrings/r.random.walk_to_translate.c:8 @@ -10498,26 +10561,6 @@ msgstr "" msgid "Water diffusion constant" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:270 -#: ../raster/r.sim/r.sim.water/main.c:304 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:63 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:28 -#: ../locale/scriptstrings/r.sample.category_to_translate.c:14 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:65 -#: ../locale/scriptstrings/r.random.walk_to_translate.c:15 -msgid "Seed for random number generator" -msgstr "" - -#: ../raster/r.sim/r.sim.sediment/main.c:272 -#: ../raster/r.sim/r.sim.water/main.c:306 -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:64 -#: ../locale/scriptstrings/r.futures.calib_to_translate.c:29 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:66 -msgid "" -"The same seed can be used to obtain same results or random seed can be " -"generated by other means." -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:277 #: ../raster/r.sim/r.sim.water/main.c:311 msgid "Generate random seed" @@ -10542,12 +10585,6 @@ msgstr "" msgid "Generated random seed (-s): %ld" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:301 -#: ../raster/r.sim/r.sim.water/main.c:335 -#, c-format -msgid "Read random seed from %s option: %ld" -msgstr "" - #: ../raster/r.sim/r.sim.sediment/main.c:373 #: ../raster/r.sim/r.sim.water/main.c:400 ../vector/v.surf.rst/main.c:410 #, c-format @@ -10555,40 +10592,40 @@ msgid "" "<%d> is not valid number of threads. Number of threads will be set on <%d>" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:383 -#: ../raster/r.sim/r.sim.water/main.c:410 +#: ../raster/r.sim/r.sim.sediment/main.c:387 +#: ../raster/r.sim/r.sim.water/main.c:414 #, c-format msgid "Number of threads: %d" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:397 -#: ../raster/r.sim/r.sim.water/main.c:504 +#: ../raster/r.sim/r.sim.sediment/main.c:401 +#: ../raster/r.sim/r.sim.water/main.c:508 msgid "More than 100 files are going to be created !!!!!" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:403 -#: ../raster/r.sim/r.sim.water/main.c:510 +#: ../raster/r.sim/r.sim.sediment/main.c:407 +#: ../raster/r.sim/r.sim.water/main.c:514 #, c-format msgid "default nwalk=%d, rwalk=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:412 -#: ../raster/r.sim/r.sim.water/main.c:520 +#: ../raster/r.sim/r.sim.sediment/main.c:416 +#: ../raster/r.sim/r.sim.water/main.c:524 #, c-format msgid "Using metric conversion factor %f, step=%f" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:419 +#: ../raster/r.sim/r.sim.sediment/main.c:423 msgid "You are not outputting any raster or site files" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:422 -#: ../raster/r.sim/r.sim.water/main.c:529 ../vector/v.vol.rst/main.c:911 -#: ../vector/v.surf.rst/main.c:675 ../vector/v.surf.rst/main.c:747 +#: ../raster/r.sim/r.sim.sediment/main.c:426 +#: ../raster/r.sim/r.sim.water/main.c:533 ../vector/v.vol.rst/main.c:911 +#: ../vector/v.surf.rst/main.c:678 ../vector/v.surf.rst/main.c:750 msgid "Input failed" msgstr "" -#: ../raster/r.sim/r.sim.sediment/main.c:435 ../raster/r.sim/simlib/hydro.c:502 +#: ../raster/r.sim/r.sim.sediment/main.c:439 ../raster/r.sim/simlib/hydro.c:502 msgid "Cannot write raster maps" msgstr "" @@ -10738,7 +10775,7 @@ msgstr "" msgid "Time-series output" msgstr "" -#: ../raster/r.sim/r.sim.water/main.c:526 +#: ../raster/r.sim/r.sim.water/main.c:530 msgid "You are not outputting any raster maps" msgstr "" @@ -10981,29 +11018,29 @@ msgid "" "Weighting factor for each input map, default value is 1.0 for each input map" msgstr "" -#: ../raster/r.series/main.c:289 ../raster/r.series/main.c:373 +#: ../raster/r.series/main.c:292 ../raster/r.series/main.c:376 msgid "Weights must be positive" msgstr "" -#: ../raster/r.series/main.c:312 ../raster/r.series/main.c:380 +#: ../raster/r.series/main.c:315 ../raster/r.series/main.c:383 #, c-format msgid "Reading raster map <%s> using weight %f..." msgstr "" -#: ../raster/r.series/main.c:316 ../raster/r.series/main.c:384 +#: ../raster/r.series/main.c:319 ../raster/r.series/main.c:387 #, c-format msgid "Unable to open input raster <%s>" msgstr "" -#: ../raster/r.series/main.c:358 +#: ../raster/r.series/main.c:361 msgid "input= and weights= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:419 +#: ../raster/r.series/main.c:422 msgid "output= and method= must have the same number of values" msgstr "" -#: ../raster/r.series/main.c:462 +#: ../raster/r.series/main.c:465 #, c-format msgid "Method %s not compatible with weights, using unweighed version instead" msgstr "" @@ -11056,71 +11093,38 @@ msgstr "" msgid "Option %s must be an integer, <%s> provided" msgstr "" -#: ../raster/r.surf.random/main.c:83 +#: ../raster/r.surf.random/main.c:86 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../raster/r.surf.random/main.c:90 +#: ../raster/r.surf.random/main.c:93 msgid "Minimum random value" msgstr "" -#: ../raster/r.surf.random/main.c:96 +#: ../raster/r.surf.random/main.c:99 msgid "Maximum random value" msgstr "" -#: ../raster/r.surf.random/main.c:102 +#: ../raster/r.surf.random/main.c:113 msgid "Create an integer raster map" msgstr "" -#: ../raster/r.surf.random/main.c:122 +#: ../raster/r.surf.random/main.c:146 #, c-format msgid "Minimum %s should be higher than maximum %s, but %s > %s" msgstr "" -#: ../raster/r.surf.random/main.c:132 +#: ../raster/r.surf.random/main.c:156 #, c-format msgid "Uniform random integer values in range [%s, %s]" msgstr "" -#: ../raster/r.surf.random/main.c:136 +#: ../raster/r.surf.random/main.c:160 #, c-format msgid "Uniform random float values in range [%s, %s)" msgstr "" -#: ../raster/r.flow/io.c:89 -msgid "Elevation raster map resolution differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:92 ../raster/r.flow/io.c:110 -#: ../raster/r.buffer/read_map.c:51 -#, c-format -msgid "Reading input raster map <%s>..." -msgstr "" - -#: ../raster/r.flow/io.c:107 -msgid "Resolution of aspect file differs from current region resolution" -msgstr "" - -#: ../raster/r.flow/io.c:124 -msgid "Reading input files: barrier" -msgstr "" - -#: ../raster/r.flow/io.c:152 -#, c-format -msgid "Cannot create segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:157 -#, c-format -msgid "Cannot format segment file %s" -msgstr "" - -#: ../raster/r.flow/io.c:163 -#, c-format -msgid "Cannot open segment file %s" -msgstr "" - #: ../raster/r.flow/mem.c:40 #, c-format msgid "Unable to write segment file for %s" @@ -11163,6 +11167,39 @@ msgstr "" msgid "Resolution too unbalanced (%f x %f); please resample input map" msgstr "" +#: ../raster/r.flow/flow_io.c:89 +msgid "Elevation raster map resolution differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:92 ../raster/r.flow/flow_io.c:110 +#: ../raster/r.buffer/read_map.c:51 +#, c-format +msgid "Reading input raster map <%s>..." +msgstr "" + +#: ../raster/r.flow/flow_io.c:107 +msgid "Resolution of aspect file differs from current region resolution" +msgstr "" + +#: ../raster/r.flow/flow_io.c:124 +msgid "Reading input files: barrier" +msgstr "" + +#: ../raster/r.flow/flow_io.c:152 +#, c-format +msgid "Cannot create segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:157 +#, c-format +msgid "Cannot format segment file %s" +msgstr "" + +#: ../raster/r.flow/flow_io.c:163 +#, c-format +msgid "Cannot open segment file %s" +msgstr "" + #: ../raster/r.flow/main.c:308 ../raster/r.topidx/topidx.c:41 #: ../imagery/i.landsat.toar/main.c:530 msgid "Calculating..." @@ -11866,7 +11903,7 @@ msgid "Unable to reproject map center %g, %g" msgstr "" #: ../raster/r.proj/main.c:148 ../misc/m.transform/main.c:313 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 #: ../imagery/i.fft/main.c:79 ../imagery/i.pca/main.c:68 #: ../imagery/i.ifft/main.c:79 #: ../locale/scriptstrings/v.in.csv_to_translate.c:5 @@ -11880,12 +11917,11 @@ msgid "transformation" msgstr "" #: ../raster/r.proj/main.c:150 -msgid "Re-projects a raster map from given location to the current location." +msgid "Re-projects a raster map from given project to the current project." msgstr "" #: ../raster/r.proj/main.c:155 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 -msgid "Location containing input raster map" +msgid "Project (location) containing input raster map" msgstr "" #: ../raster/r.proj/main.c:156 ../raster/r.proj/main.c:161 @@ -11911,10 +11947,8 @@ msgstr "" msgid "Name of input raster map to re-project" msgstr "" -#: ../raster/r.proj/main.c:169 -#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 -#: ../vector/v.proj/main.c:99 -msgid "Path to GRASS database of input location" +#: ../raster/r.proj/main.c:169 ../vector/v.proj/main.c:99 +msgid "Path to GRASS database of input project" msgstr "" #: ../raster/r.proj/main.c:174 @@ -11970,12 +12004,12 @@ msgstr "" msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag" msgstr "" -#: ../raster/r.proj/main.c:256 ../vector/v.proj/main.c:179 +#: ../raster/r.proj/main.c:256 msgid "Input and output locations can not be the same" msgstr "" #: ../raster/r.proj/main.c:258 -msgid "Input and output locations are the same" +msgid "Input and output projects are the same" msgstr "" #: ../raster/r.proj/main.c:268 @@ -11992,12 +12026,12 @@ msgstr "" #: ../raster/r.proj/main.c:289 #, c-format -msgid "Mapset <%s> in input location <%s> - %s" +msgid "Mapset <%s> in input project <%s> - %s" msgstr "" #: ../raster/r.proj/main.c:299 ../vector/v.proj/main.c:231 #, c-format -msgid "Checking location <%s> mapset <%s>" +msgid "Checking project <%s> mapset <%s>" msgstr "" #: ../raster/r.proj/main.c:311 ../vector/v.external/main.c:109 @@ -12005,7 +12039,7 @@ msgstr "" #: ../vector/v.edit/main.c:89 ../vector/v.net/args.c:150 #: ../vector/v.net/args.c:156 ../vector/v.net/args.c:162 #: ../vector/v.net/args.c:166 ../vector/v.net/args.c:176 -#: ../vector/v.in.ogr/main.c:453 ../vector/v.select/main.c:100 +#: ../vector/v.in.ogr/main.c:454 ../vector/v.select/main.c:100 #: ../scripts/d.frame/d.frame.py:311 #, c-format, python-format msgid "Required parameter <%s> not set" @@ -12013,7 +12047,7 @@ msgstr "" #: ../raster/r.proj/main.c:315 #, c-format -msgid "Raster map <%s> in location <%s> in mapset <%s> not found" +msgid "Raster map <%s> in project <%s> in mapset <%s> not found" msgstr "" #: ../raster/r.proj/main.c:323 @@ -12029,12 +12063,12 @@ msgid "Unable to get projection key values of input map" msgstr "" #: ../raster/r.proj/main.c:361 -msgid "Unable to work with unprojected data (xy location)" +msgid "Unable to work with unprojected data (xy project)" msgstr "" #: ../raster/r.proj/main.c:379 #, c-format -msgid "Input map <%s@%s> in location <%s>:" +msgid "Input map <%s@%s> in project <%s>:" msgstr "" #: ../raster/r.proj/main.c:524 @@ -12113,7 +12147,7 @@ msgid "Sorting events..." msgstr "" #: ../raster/r.viewshed/viewshed.cpp:240 ../raster/r.support/main.c:356 -#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:707 +#: ../scripts/d.polar/d.polar.py:414 ../scripts/r.fillnulls/r.fillnulls.py:716 #: ../scripts/v.in.e00/v.in.e00.py:174 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:293 #: ../scripts/r.plane/r.plane.py:131 ../scripts/r.in.aster/r.in.aster.py:176 @@ -12365,8 +12399,9 @@ msgid "Output format is invisible = 0, visible = 1" msgstr "" #: ../raster/r.viewshed/main.cpp:443 ../raster/r.viewshed/main.cpp:452 -#: ../raster/r.kappa/main.c:104 ../misc/m.transform/main.c:345 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:476 +#: ../raster/r.what/main.c:147 ../raster/r.kappa/main.c:104 +#: ../misc/m.transform/main.c:345 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:477 #: ../imagery/i.signatures/main.c:125 #: ../locale/scriptstrings/db.univar_to_translate.c:7 #: ../locale/scriptstrings/r.futures.validation_to_translate.c:10 @@ -12532,7 +12567,7 @@ msgstr "" #: ../raster/r.sunmask/g_solposition.c:67 msgid "" -"Unable to calculate sun position in un-projected locations. Specify " +"Unable to calculate sun position in projects without CRS. Specify " "sunposition directly." msgstr "" @@ -12543,6 +12578,18 @@ msgid "" "it will be used." msgstr "" +#: ../raster/r.sunmask/g_solposition.c:101 +msgid "Unable to get projection info of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:105 +msgid "Unable to get projection units of current project" +msgstr "" + +#: ../raster/r.sunmask/g_solposition.c:109 +msgid "Unable to get projection key values of current project" +msgstr "" + #: ../raster/r.sunmask/main.c:122 msgid "" "Calculates cast shadow areas from sun position and elevation raster map." @@ -13154,15 +13201,15 @@ msgid "Current projection is x,y (undefined)." msgstr "" #: ../raster/r.sunhours/main.c:221 -msgid "Cannot get projection info of current location" +msgid "Cannot get projection info of current project" msgstr "" #: ../raster/r.sunhours/main.c:224 -msgid "Cannot get projection units of current location" +msgid "Cannot get projection units of current project" msgstr "" #: ../raster/r.sunhours/main.c:228 -msgid "Cannot get projection key values of current location" +msgid "Cannot get projection key values of current project" msgstr "" #: ../raster/r.sunhours/main.c:367 @@ -13241,7 +13288,7 @@ msgid "survey feet" msgstr "" #: ../raster/r.relief/main.c:179 ../raster/r.relief/main.c:185 -#: ../raster/r.slope.aspect/main.c:362 +#: ../raster/r.slope.aspect/main.c:365 #, c-format msgid "%s=%s - must be a non-negative number" msgstr "" @@ -13251,7 +13298,7 @@ msgstr "" msgid "%s=%s - must not be zero" msgstr "" -#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:356 +#: ../raster/r.relief/main.c:198 ../raster/r.slope.aspect/main.c:359 #, c-format msgid "%s=%s - must be a positive number" msgstr "" @@ -13337,7 +13384,7 @@ msgstr "" #: ../vector/v.to.points/main.c:213 ../vector/v.net.flow/main.c:179 #: ../vector/v.net.alloc/main.c:323 ../vector/v.net.centrality/main.c:264 #: ../vector/v.net.allpairs/main.c:179 ../vector/v.overlay/main.c:614 -#: ../vector/v.in.ogr/main.c:1169 +#: ../vector/v.in.ogr/main.c:1170 #, c-format msgid "Unable to create table: '%s'" msgstr "" @@ -13346,7 +13393,7 @@ msgstr "" #: ../vector/v.in.lidar/attributes.c:137 ../vector/v.reclass/main.c:320 #: ../vector/v.in.ascii/main.c:547 ../vector/v.in.dwg/main.c:242 #: ../vector/v.to.points/main.c:218 ../vector/v.in.dxf/write_vect.c:242 -#: ../vector/v.in.ogr/main.c:1385 +#: ../vector/v.in.ogr/main.c:1386 #, c-format msgid "Unable to create index for table <%s>, key <%s>" msgstr "" @@ -13658,7 +13705,7 @@ msgstr "" msgid "Number of sinks or boundaries: %d" msgstr "" -#: ../raster/r.what/main.c:102 +#: ../raster/r.what/main.c:112 #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:5 #: ../locale/scriptstrings/v.what.vect_to_translate.c:5 #: ../locale/scriptstrings/v.what.strds.timestamp_to_translate.c:5 @@ -13669,19 +13716,19 @@ msgstr "" msgid "position" msgstr "" -#: ../raster/r.what/main.c:104 +#: ../raster/r.what/main.c:114 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../raster/r.what/main.c:109 +#: ../raster/r.what/main.c:119 msgid "Name of existing raster map(s) to query" msgstr "" -#: ../raster/r.what/main.c:112 ../vector/v.what/main.c:76 +#: ../raster/r.what/main.c:122 ../vector/v.what/main.c:76 msgid "Coordinates for query" msgstr "" -#: ../raster/r.what/main.c:113 ../raster/r.what/main.c:119 +#: ../raster/r.what/main.c:123 ../raster/r.what/main.c:129 #: ../db/db.select/main.c:201 ../db/db.select/main.c:207 #: ../db/db.select/main.c:211 ../db/db.select/main.c:249 #: ../db/db.select/main.c:259 ../vector/v.to.db/parse.c:105 @@ -13689,15 +13736,28 @@ msgstr "" msgid "Query" msgstr "" -#: ../raster/r.what/main.c:117 +#: ../raster/r.what/main.c:127 msgid "Name of vector points map for query" msgstr "" -#: ../raster/r.what/main.c:138 +#: ../raster/r.what/main.c:159 msgid "Size of point cache" msgstr "" -#: ../raster/r.what/main.c:140 ../raster/r.what/main.c:166 +#: ../raster/r.what/main.c:161 ../raster/r.what/main.c:187 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:99 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:102 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:105 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:108 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:111 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:114 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:117 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:120 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:123 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:126 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:129 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:132 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:135 #: ../display/d.legend/main.c:116 ../display/d.legend/main.c:126 #: ../display/d.legend/main.c:133 ../display/d.legend/main.c:165 #: ../display/d.legend/main.c:249 ../display/d.legend/main.c:254 @@ -13706,62 +13766,70 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../raster/r.what/main.c:144 +#: ../raster/r.what/main.c:165 #: ../locale/scriptstrings/t.rast.what_to_translate.c:11 #: ../locale/scriptstrings/t.rast.whatcsv_to_translate.c:9 msgid "Output header row" msgstr "" -#: ../raster/r.what/main.c:149 +#: ../raster/r.what/main.c:170 msgid "Show the category labels of the grid cell(s)" msgstr "" -#: ../raster/r.what/main.c:154 +#: ../raster/r.what/main.c:175 msgid "Output color values as RRR:GGG:BBB" msgstr "" -#: ../raster/r.what/main.c:160 +#: ../raster/r.what/main.c:181 msgid "Output integer category values, not cell values" msgstr "" -#: ../raster/r.what/main.c:165 +#: ../raster/r.what/main.c:186 msgid "Turn on cache reporting" msgstr "" -#: ../raster/r.what/main.c:170 +#: ../raster/r.what/main.c:191 #: ../locale/scriptstrings/t.rast.what_to_translate.c:13 msgid "Show the category for vector points map" msgstr "" -#: ../raster/r.what/main.c:201 +#: ../raster/r.what/main.c:222 msgid "Flag 'v' required option 'points'" msgstr "" -#: ../raster/r.what/main.c:215 +#: ../raster/r.what/main.c:236 #, c-format msgid "Can only do up to %d raster maps (more than %d given)" msgstr "" -#: ../raster/r.what/main.c:232 +#: ../raster/r.what/main.c:253 #, c-format msgid "Unable to read category file for <%s>" msgstr "" -#: ../raster/r.what/main.c:318 +#: ../raster/r.what/main.c:287 +msgid "Failed to initialize JSON array. Out of memory?" +msgstr "" + +#: ../raster/r.what/main.c:352 #, c-format msgid "Unable to read vector map <%s>" msgstr "" -#: ../raster/r.what/main.c:323 +#: ../raster/r.what/main.c:357 #, c-format msgid "Line %d is not point or centroid, skipped" msgstr "" -#: ../raster/r.what/main.c:420 +#: ../raster/r.what/main.c:454 #, c-format msgid "%s %s is outside your current region" msgstr "" +#: ../raster/r.what/main.c:624 +msgid "Failed to initialize pretty JSON string." +msgstr "" + #: ../raster/r.in.mat/main.c:97 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" @@ -13931,9 +13999,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:31 #: ../locale/scriptstrings/r.boxplot_to_translate.c:34 #: ../locale/scriptstrings/r.boxplot_to_translate.c:36 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:16 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:19 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:19 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:22 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:25 @@ -14272,21 +14337,21 @@ msgstr "" msgid "Input map resolution differs from current region resolution!" msgstr "" -#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:715 +#: ../raster/r.resamp.rst/main.c:392 ../vector/v.surf.rst/main.c:718 msgid "Processing all selected output files will require" msgstr "" -#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:719 +#: ../raster/r.resamp.rst/main.c:396 ../vector/v.surf.rst/main.c:722 #, c-format msgid "%.2f GB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:723 +#: ../raster/r.resamp.rst/main.c:400 ../vector/v.surf.rst/main.c:726 #, c-format msgid "%.2f MB of disk space for temp files." msgstr "" -#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:727 +#: ../raster/r.resamp.rst/main.c:404 ../vector/v.surf.rst/main.c:730 #, c-format msgid "%.2f KB of disk space for temp files." msgstr "" @@ -14470,80 +14535,80 @@ msgstr "" msgid "Default: degrees counter-clockwise from East, with flat = 0" msgstr "" -#: ../raster/r.slope.aspect/main.c:376 +#: ../raster/r.slope.aspect/main.c:379 #, c-format msgid "" -"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, <" -"%s>, <%s>, <%s>, <%s> or <%s>" +"You must specify at least one of the parameters: <%s>, <%s>, <%s>, <%s>, " +"<%s>, <%s>, <%s>, <%s> or <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:403 +#: ../raster/r.slope.aspect/main.c:406 #, c-format msgid "Wrong raster type: %s" msgstr "" -#: ../raster/r.slope.aspect/main.c:441 +#: ../raster/r.slope.aspect/main.c:444 msgid "" "r.slope.aspect does not convert horizontal units to meters in this version, " "see manual page." msgstr "" -#: ../raster/r.slope.aspect/main.c:1104 +#: ../raster/r.slope.aspect/main.c:1107 #, c-format msgid "Elevation products for mapset <%s> in <%s>" msgstr "" -#: ../raster/r.slope.aspect/main.c:1125 +#: ../raster/r.slope.aspect/main.c:1128 #, c-format msgid "Min computed aspect %.4f, max computed aspect %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1230 +#: ../raster/r.slope.aspect/main.c:1233 #, c-format msgid "Aspect raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1286 +#: ../raster/r.slope.aspect/main.c:1289 #, c-format msgid "Min computed slope %.4f, max computed slope %.4f" msgstr "" -#: ../raster/r.slope.aspect/main.c:1340 +#: ../raster/r.slope.aspect/main.c:1343 #, c-format msgid "Slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1406 +#: ../raster/r.slope.aspect/main.c:1409 #, c-format msgid "Profile curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1433 +#: ../raster/r.slope.aspect/main.c:1436 #, c-format msgid "Tangential curve raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1457 +#: ../raster/r.slope.aspect/main.c:1460 #, c-format msgid "E-W slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1481 +#: ../raster/r.slope.aspect/main.c:1484 #, c-format msgid "N-S slope raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1505 +#: ../raster/r.slope.aspect/main.c:1508 #, c-format msgid "Dxx raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1529 +#: ../raster/r.slope.aspect/main.c:1532 #, c-format msgid "Dyy raster map <%s> complete" msgstr "" -#: ../raster/r.slope.aspect/main.c:1553 +#: ../raster/r.slope.aspect/main.c:1556 #, c-format msgid "Dxy raster map <%s> complete" msgstr "" @@ -15418,31 +15483,31 @@ msgstr "" msgid "SECTION 4: RUSLE LS and/or S factor determination." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:115 +#: ../raster/r.watershed/ram/do_cum.c:116 #: ../raster/r.watershed/seg/do_cum.c:122 msgid "SECTION 3: Accumulating Surface Flow with SFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:294 +#: ../raster/r.watershed/ram/do_cum.c:296 #: ../raster/r.watershed/seg/do_cum.c:315 msgid "SECTION 3a: Accumulating Surface Flow with MFD." msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:464 +#: ../raster/r.watershed/ram/do_cum.c:466 #: ../raster/r.watershed/seg/do_cum.c:514 #: ../raster/r.stream.extract/streams.c:336 #, c-format msgid "MFD: cumulative proportion of flow distribution not 1.0 but %f" msgstr "" -#: ../raster/r.watershed/ram/do_cum.c:501 +#: ../raster/r.watershed/ram/do_cum.c:503 #, c-format -msgid "MFD: A * path already processed when distributing flow: %d of %d cell" +msgid "MFD: A * path already processed when distributing flow: %d of %zu cell" msgid_plural "" -"MFD: A * path already processed when distributing flow: %d of %d cells" +"MFD: A * path already processed when distributing flow: %d of %zu cells" msgstr[0] "" -#: ../raster/r.watershed/ram/do_cum.c:508 +#: ../raster/r.watershed/ram/do_cum.c:510 #: ../raster/r.watershed/seg/do_cum.c:561 msgid "SECTION 3b: Adjusting drainage directions." msgstr "" @@ -15458,61 +15523,61 @@ msgstr "" msgid "SECTION %d: Watershed determination." msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:53 +#: ../raster/r.watershed/ram/do_flatarea.c:54 msgid "Beautify flat areas: priority queue error" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:230 +#: ../raster/r.watershed/ram/do_flatarea.c:232 msgid "flat cell escaped for uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:236 +#: ../raster/r.watershed/ram/do_flatarea.c:238 #, c-format msgid "queue error: last uphill order %d > current uphill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:242 +#: ../raster/r.watershed/ram/do_flatarea.c:244 msgid "uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:270 +#: ../raster/r.watershed/ram/do_flatarea.c:272 msgid "flat cell escaped in uphill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:306 +#: ../raster/r.watershed/ram/do_flatarea.c:308 msgid "downhill order: no more points in down queue" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:314 +#: ../raster/r.watershed/ram/do_flatarea.c:316 msgid "flat cell escaped for downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:320 +#: ../raster/r.watershed/ram/do_flatarea.c:322 #, c-format msgid "queue error: last downhill order %d > current downhill order %d" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:326 +#: ../raster/r.watershed/ram/do_flatarea.c:328 msgid "downhill order: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:351 +#: ../raster/r.watershed/ram/do_flatarea.c:353 msgid "flat cell escaped in downhill correction" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:390 +#: ../raster/r.watershed/ram/do_flatarea.c:392 msgid "flat cell escaped for adjustment" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:397 +#: ../raster/r.watershed/ram/do_flatarea.c:399 msgid "adjustment: uphill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:399 +#: ../raster/r.watershed/ram/do_flatarea.c:401 msgid "adjustment: downhill order not set" msgstr "" -#: ../raster/r.watershed/ram/do_flatarea.c:429 +#: ../raster/r.watershed/ram/do_flatarea.c:431 msgid "flat cell escaped in adjustment" msgstr "" @@ -15536,7 +15601,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.segments_to_translate.c:3 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:3 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:3 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:3 @@ -16475,46 +16539,46 @@ msgid "" "equation system." msgstr "" -#: ../raster/r.gwflow/main.c:223 ../raster3d/r3.gwflow/main.c:167 +#: ../raster/r.gwflow/main.c:222 ../raster3d/r3.gwflow/main.c:167 msgid "groundwater flow" msgstr "" -#: ../raster/r.gwflow/main.c:226 +#: ../raster/r.gwflow/main.c:225 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../raster/r.gwflow/main.c:253 +#: ../raster/r.gwflow/main.c:252 msgid "Please provide river_head, river_leak and river_bed maps" msgstr "" -#: ../raster/r.gwflow/main.c:265 +#: ../raster/r.gwflow/main.c:264 msgid "Please provide drain_head and drain_leak maps" msgstr "" -#: ../raster/r.gwflow/main.c:280 +#: ../raster/r.gwflow/main.c:279 msgid "" "The cholesky solver dos not work with sparse matrices. You may choose a full " "filled quadratic matrix, flag -f." msgstr "" -#: ../raster/r.gwflow/main.c:309 +#: ../raster/r.gwflow/main.c:308 #, c-format msgid "Calculation time: %g" msgstr "" -#: ../raster/r.gwflow/main.c:396 +#: ../raster/r.gwflow/main.c:395 #, c-format msgid "Calculation of unconfined groundwater flow loop %i" msgstr "" -#: ../raster/r.gwflow/main.c:419 +#: ../raster/r.gwflow/main.c:418 #, c-format msgid "Maximum difference between this and last increment: %g" msgstr "" -#: ../raster/r.gwflow/main.c:567 ../raster3d/r3.gwflow/main.c:286 +#: ../raster/r.gwflow/main.c:563 ../raster3d/r3.gwflow/main.c:286 msgid "Unable to create and solve the linear equation system" msgstr "" @@ -16839,7 +16903,7 @@ msgstr "" #: ../raster/r.path/main.c:497 ../vector/v.voronoi/main.c:215 #: ../vector/v.buffer/main.c:410 ../vector/v.overlay/main.c:237 -#: ../vector/v.in.ogr/main.c:880 +#: ../vector/v.in.ogr/main.c:881 msgid "Unable to create temporary vector map" msgstr "" @@ -17290,8 +17354,8 @@ msgstr "" #: ../raster/r.profile/main.c:102 msgid "" -"If units are not specified, current location units are used. Meters are used " -"by default in geographic (latlon) locations." +"If units are not specified, current project units are used. Meters are used " +"by default in geographic (latlon) projects." msgstr "" #: ../raster/r.profile/main.c:116 @@ -17418,97 +17482,97 @@ msgstr "" msgid "El-Swaify (1985)" msgstr "" -#: ../raster/r.in.lidar/main.c:318 +#: ../raster/r.in.lidar/main.c:319 msgid "Use intensity values rather than Z values" msgstr "" -#: ../raster/r.in.lidar/main.c:320 +#: ../raster/r.in.lidar/main.c:321 msgid "Uses intensity values everywhere as if they would be Z coordinates" msgstr "" -#: ../raster/r.in.lidar/main.c:326 +#: ../raster/r.in.lidar/main.c:327 msgid "Use Z values for filtering, but intensity values for statistics" msgstr "" -#: ../raster/r.in.lidar/main.c:339 ../raster3d/r3.in.lidar/main.c:281 +#: ../raster/r.in.lidar/main.c:340 ../raster3d/r3.in.lidar/main.c:281 #: ../vector/v.in.lidar/main.c:296 msgid "Use only valid points" msgstr "" -#: ../raster/r.in.lidar/main.c:341 ../raster3d/r3.in.lidar/main.c:283 +#: ../raster/r.in.lidar/main.c:342 ../raster3d/r3.in.lidar/main.c:283 #: ../vector/v.in.lidar/main.c:298 msgid "" "Points invalid according to APSRS LAS specification will be filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:362 +#: ../raster/r.in.lidar/main.c:363 #, c-format msgid "Flag %c makes sense only with %s option or -%c flag" msgstr "" -#: ../raster/r.in.lidar/main.c:396 +#: ../raster/r.in.lidar/main.c:397 msgid "zrange will not be taken into account during scan" msgstr "" -#: ../raster/r.in.lidar/main.c:415 ../raster3d/r3.in.lidar/main.c:382 +#: ../raster/r.in.lidar/main.c:416 ../raster3d/r3.in.lidar/main.c:383 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud" msgstr "" -#: ../raster/r.in.lidar/main.c:419 ../raster3d/r3.in.lidar/main.c:386 -#: ../vector/v.in.lidar/main.c:359 +#: ../raster/r.in.lidar/main.c:420 ../raster3d/r3.in.lidar/main.c:387 +#: ../vector/v.in.lidar/main.c:360 #, c-format msgid "Unable to read LAS header of <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:435 ../raster3d/r3.in.lidar/main.c:402 +#: ../raster/r.in.lidar/main.c:436 ../raster3d/r3.in.lidar/main.c:403 msgid "" "First file's projection checked, checking projection of the other files..." msgstr "" -#: ../raster/r.in.lidar/main.c:473 +#: ../raster/r.in.lidar/main.c:474 #, c-format msgid "Unknown filter option <%s>" msgstr "" -#: ../raster/r.in.lidar/main.c:507 +#: ../raster/r.in.lidar/main.c:508 #, c-format msgid "Invalid %s" msgstr "" -#: ../raster/r.in.lidar/main.c:615 +#: ../raster/r.in.lidar/main.c:616 #, c-format msgid "" "Unable to process the whole map at once. Please set the '%s' option to some " "value lower than 100." msgstr "" -#: ../raster/r.in.lidar/main.c:635 +#: ../raster/r.in.lidar/main.c:636 #, c-format msgid "Pass #%d (of %d)..." msgstr "" -#: ../raster/r.in.lidar/main.c:805 +#: ../raster/r.in.lidar/main.c:806 #, c-format msgid "%lu points found in input file(s)" msgstr "" -#: ../raster/r.in.lidar/main.c:825 +#: ../raster/r.in.lidar/main.c:826 #, c-format msgid "%lu input points were invalid and filtered out" msgstr "" -#: ../raster/r.in.lidar/main.c:828 +#: ../raster/r.in.lidar/main.c:829 #, c-format msgid "%lu input points were invalid, use -%c flag to filter them out" msgstr "" -#: ../raster/r.in.lidar/main.c:833 +#: ../raster/r.in.lidar/main.c:834 #, c-format msgid "Raster map <%s> created. %lu points from %d files found in region." msgstr "" -#: ../raster/r.in.lidar/main.c:839 +#: ../raster/r.in.lidar/main.c:840 #, c-format msgid "Raster map <%s> created. %lu points found in region." msgstr "" @@ -17771,11 +17835,11 @@ msgstr "" #: ../imagery/i.smap/main.c:38 ../imagery/i.svm.train/main.c:55 #: ../imagery/i.signatures/main.c:106 ../imagery/i.segment/main.c:39 #: ../imagery/i.maxlik/main.c:62 ../imagery/i.gensigset/main.c:41 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:3 #: ../locale/scriptstrings/r.confusionmatrix_to_translate.c:5 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:3 #: ../locale/scriptstrings/v.class.mlpy_to_translate.c:3 #: ../locale/scriptstrings/r.learn.train_to_translate.c:3 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:3 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:4 #: ../locale/scriptstrings/v.lidar.mcc_to_translate.c:4 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:2 @@ -17974,32 +18038,32 @@ msgstr "" msgid "Neighborhood size must be odd" msgstr "" -#: ../raster/r.neighbors/main.c:320 +#: ../raster/r.neighbors/main.c:323 msgid "File with weighting matrix is missing." msgstr "" -#: ../raster/r.neighbors/main.c:326 +#: ../raster/r.neighbors/main.c:329 #, c-format msgid "Weighting function '%s' requires a %s." msgstr "" -#: ../raster/r.neighbors/main.c:357 +#: ../raster/r.neighbors/main.c:360 #, c-format msgid "%s= and %s= must have the same number of values" msgstr "" -#: ../raster/r.neighbors/main.c:392 +#: ../raster/r.neighbors/main.c:395 #, c-format msgid "Computing %s weights..." msgstr "" -#: ../raster/r.neighbors/main.c:418 +#: ../raster/r.neighbors/main.c:421 #, c-format msgid "" "Method %s not compatible with weighing window, using weight mask instead" msgstr "" -#: ../raster/r.neighbors/main.c:466 +#: ../raster/r.neighbors/main.c:469 #, c-format msgid "Opening selection map <%s>" msgstr "" @@ -18082,7 +18146,7 @@ msgid "Units" msgstr "" #: ../misc/m.measure/main.c:56 -msgid "Default: location map units" +msgid "Default: project map units" msgstr "" #: ../misc/m.measure/main.c:60 @@ -18105,8 +18169,9 @@ msgstr "" #: ../locale/scriptstrings/d.background_to_translate.c:3 #: ../visualization/ximgview/main.c:284 ../display/d.rast/main.c:54 #: ../display/d.his/main.c:62 ../display/d.rgb/main.c:55 -#: ../display/d.vect/main.c:73 ../display/d.erase/main.c:29 -#: ../display/d.mon/main.c:50 ../display/d.info/main.c:34 +#: ../display/d.redraw/main.c:40 ../display/d.vect/main.c:73 +#: ../display/d.erase/main.c:29 ../display/d.mon/main.c:50 +#: ../display/d.info/main.c:34 msgid "graphics" msgstr "" @@ -18860,8 +18925,8 @@ msgid "Not enough points, %d are required" msgstr "" #: ../misc/m.transform/main.c:93 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:157 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:193 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:158 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:194 #, c-format msgid "Error conducting transform (%d)" msgstr "" @@ -18871,28 +18936,28 @@ msgid "Poorly placed control points" msgstr "" #: ../misc/m.transform/main.c:193 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:315 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:316 msgid "Insufficient memory" msgstr "" #: ../misc/m.transform/main.c:195 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:317 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:318 msgid "Parameter error" msgstr "" #: ../misc/m.transform/main.c:197 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:319 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:320 msgid "No active control points" msgstr "" #: ../misc/m.transform/main.c:292 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:429 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:430 #, c-format msgid "Invalid coordinates: [%s]" msgstr "" #: ../misc/m.transform/main.c:316 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:455 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:456 msgid "Computes a coordinate transformation based on the control points." msgstr "" @@ -18901,57 +18966,57 @@ msgid "Rectification polynomial order" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "point index" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "source coordinates" msgstr "" #: ../misc/m.transform/main.c:337 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:468 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 msgid "destination coordinates" msgstr "" #: ../misc/m.transform/main.c:338 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:469 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 msgid "forward coordinates (destination)" msgstr "" #: ../misc/m.transform/main.c:339 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:470 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 msgid "reverse coordinates (source)" msgstr "" #: ../misc/m.transform/main.c:340 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:471 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 msgid "forward coordinates difference (destination)" msgstr "" #: ../misc/m.transform/main.c:341 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:472 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 msgid "reverse coordinates difference (source)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "forward error (destination)" msgstr "" #: ../misc/m.transform/main.c:342 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:473 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:474 msgid "reverse error (source)" msgstr "" #: ../misc/m.transform/main.c:349 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:480 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:481 msgid "Display summary information" msgstr "" #: ../misc/m.transform/main.c:354 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:486 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:487 msgid "File containing coordinates to transform (\"-\" to read from stdin)" msgstr "" @@ -18960,7 +19025,7 @@ msgid "Local x,y coordinates to target east,north" msgstr "" #: ../misc/m.transform/main.c:359 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:492 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:493 msgid "Reverse transform of coords file or coeff. dump" msgstr "" @@ -18969,7 +19034,7 @@ msgid "Target east,north coordinates to local x,y" msgstr "" #: ../misc/m.transform/main.c:364 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:498 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:499 msgid "Display transform matrix coefficients" msgstr "" @@ -19461,6 +19526,10 @@ msgstr "" msgid "Error while reading history file" msgstr "" +#: ../raster3d/r3.in.lidar/projection.c:39 +msgid "GRASS LOCATION PROJ_INFO is:\n" +msgstr "" + #: ../raster3d/r3.in.lidar/filters.c:26 #, c-format msgid "Invalid range <%s> for option %s" @@ -19519,64 +19588,72 @@ msgstr "" msgid "Use base raster actual resolution instead of computational region" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:328 +#: ../raster3d/r3.in.lidar/main.c:290 +#: ../locale/scriptstrings/v.unpack_to_translate.c:9 +#: ../locale/scriptstrings/r.unpack_to_translate.c:8 +#: ../locale/scriptstrings/t.rast.import_to_translate.c:16 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:14 +msgid "Override projection check (use current projects's CRS)" +msgstr "" + +#: ../raster3d/r3.in.lidar/main.c:329 #, c-format msgid "%s will not be taken into account during scan" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:488 ../raster3d/r3.in.lidar/main.c:496 -#: ../raster3d/r3.in.lidar/main.c:504 ../raster3d/r3.in.lidar/main.c:512 -#: ../raster3d/r3.in.lidar/main.c:520 ../raster3d/r3.in.lidar/main.c:529 -#: ../raster3d/r3.in.lidar/main.c:537 ../raster3d/r3.gwflow/main.c:368 +#: ../raster3d/r3.in.lidar/main.c:489 ../raster3d/r3.in.lidar/main.c:497 +#: ../raster3d/r3.in.lidar/main.c:505 ../raster3d/r3.in.lidar/main.c:513 +#: ../raster3d/r3.in.lidar/main.c:521 ../raster3d/r3.in.lidar/main.c:530 +#: ../raster3d/r3.in.lidar/main.c:538 ../raster3d/r3.gwflow/main.c:368 #, c-format msgid "Unable to create 3D raster map <%s>" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:541 +#: ../raster3d/r3.in.lidar/main.c:542 msgid "Preparing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:575 ../vector/v.sample/main.c:197 +#: ../raster3d/r3.in.lidar/main.c:576 ../vector/v.sample/main.c:197 msgid "Reading points..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:661 +#: ../raster3d/r3.in.lidar/main.c:662 msgid "Computing proportional count map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:666 +#: ../raster3d/r3.in.lidar/main.c:667 msgid "Computing proportional sum map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:671 +#: ../raster3d/r3.in.lidar/main.c:672 msgid "Computing mean map..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:676 +#: ../raster3d/r3.in.lidar/main.c:677 msgid "Closing the maps..." msgstr "" -#: ../raster3d/r3.in.lidar/main.c:711 ../vector/v.in.lidar/main.c:811 +#: ../raster3d/r3.in.lidar/main.c:712 ../vector/v.in.lidar/main.c:812 #, c-format msgid "%lu input points were not valid and filtered out" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:714 ../vector/v.in.lidar/main.c:821 +#: ../raster3d/r3.in.lidar/main.c:715 ../vector/v.in.lidar/main.c:822 #, c-format msgid "%lu input points were filtered out by return number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:717 ../vector/v.in.lidar/main.c:824 +#: ../raster3d/r3.in.lidar/main.c:718 ../vector/v.in.lidar/main.c:825 #, c-format msgid "%lu input points were filtered out by class number" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:720 +#: ../raster3d/r3.in.lidar/main.c:721 #, c-format msgid "%lu input points had intensity out of range" msgstr "" -#: ../raster3d/r3.in.lidar/main.c:723 ../vector/v.in.lidar/main.c:850 +#: ../raster3d/r3.in.lidar/main.c:724 ../vector/v.in.lidar/main.c:851 #, c-format msgid "%lu input points were not valid, use -%c flag to filter them out" msgstr "" @@ -19682,7 +19759,6 @@ msgstr "" #: ../locale/scriptstrings/d.region.grid_to_translate.c:2 #: ../locale/scriptstrings/d.polar_to_translate.c:2 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:2 -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:2 #: ../locale/scriptstrings/d.what.rast_to_translate.c:2 #: ../locale/scriptstrings/d.shade_to_translate.c:2 #: ../locale/scriptstrings/d.out.file_to_translate.c:2 @@ -19695,10 +19771,8 @@ msgstr "" #: ../locale/scriptstrings/v.faultdirections_to_translate.c:2 #: ../locale/scriptstrings/d.background_to_translate.c:2 #: ../locale/scriptstrings/r.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:2 #: ../locale/scriptstrings/d.what.vect_to_translate.c:2 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:2 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:2 #: ../locale/scriptstrings/v.boxplot_to_translate.c:2 #: ../visualization/ximgview/main.c:283 ../display/d.rast.num/main.c:77 #: ../display/d.where/main.c:44 ../display/d.title/main.c:48 @@ -19712,11 +19786,11 @@ msgstr "" #: ../display/d.vect.thematic/main.c:88 ../display/d.linegraph/main.c:220 #: ../display/d.legend.vect/main.c:48 ../display/d.extract/main.c:47 #: ../display/d.his/main.c:61 ../display/d.rgb/main.c:54 -#: ../display/d.graph/main.c:57 ../display/d.vect/main.c:72 -#: ../display/d.barscale/main.c:62 ../display/d.rhumbline/main.c:42 -#: ../display/d.geodesic/main.c:45 ../display/d.erase/main.c:28 -#: ../display/d.colortable/main.c:58 ../display/d.mon/main.c:49 -#: ../display/d.info/main.c:33 +#: ../display/d.redraw/main.c:39 ../display/d.graph/main.c:57 +#: ../display/d.vect/main.c:72 ../display/d.barscale/main.c:62 +#: ../display/d.rhumbline/main.c:42 ../display/d.geodesic/main.c:45 +#: ../display/d.erase/main.c:28 ../display/d.colortable/main.c:58 +#: ../display/d.mon/main.c:49 ../display/d.info/main.c:33 msgid "display" msgstr "" @@ -20210,10 +20284,10 @@ msgstr "" #: ../general/g.pnmcomp/main.c:281 ../general/g.findfile/main.c:38 #: ../general/g.rename/main.c:44 ../general/g.list/main.c:62 #: ../general/g.findetc/main.c:27 ../general/g.access/main.c:39 -#: ../general/g.proj/main.c:68 ../general/g.message/main.c:32 +#: ../general/g.proj/main.c:69 ../general/g.message/main.c:37 #: ../general/g.cairocomp/main.c:199 ../general/g.filename/main.c:40 #: ../general/g.copy/main.c:41 ../general/g.mapset/main.c:49 -#: ../general/g.mapsets/main.c:63 ../general/g.mkfontcap/main.c:63 +#: ../general/g.mapsets/main.c:86 ../general/g.mkfontcap/main.c:63 #: ../general/g.ppmtopng/main.c:114 ../general/g.dirseps/main.c:33 #: ../general/g.setproj/main.c:77 #: ../locale/scriptstrings/g.extension_to_translate.c:3 @@ -20269,9 +20343,9 @@ msgstr "" msgid "command line interface with GUI startup screen" msgstr "" -#: ../general/g.gui/main.c:59 ../general/g.message/main.c:42 -#: ../general/g.message/main.c:47 ../general/g.message/main.c:52 -#: ../general/g.message/main.c:57 +#: ../general/g.gui/main.c:59 ../general/g.message/main.c:47 +#: ../general/g.message/main.c:52 ../general/g.message/main.c:57 +#: ../general/g.message/main.c:62 msgid "Type" msgstr "" @@ -20331,13 +20405,13 @@ msgid "Launching <%s> GUI in the background, please wait..." msgstr "" #: ../general/g.tempfile/main.c:39 ../general/g.version/main.c:70 -#: ../general/g.message/main.c:33 +#: ../general/g.message/main.c:38 msgid "support" msgstr "" #: ../general/g.tempfile/main.c:40 ../general/g.gisenv/main.c:45 #: ../general/g.findfile/main.c:40 ../general/g.findetc/main.c:29 -#: ../general/g.message/main.c:34 ../general/g.filename/main.c:42 +#: ../general/g.message/main.c:39 ../general/g.filename/main.c:42 #: ../general/g.dirseps/main.c:35 msgid "scripts" msgstr "" @@ -20698,67 +20772,67 @@ msgstr "" msgid "Save current region settings in named region file" msgstr "" -#: ../general/g.region/main.c:433 ../scripts/r.in.wms/r.in.wms.py:225 +#: ../general/g.region/main.c:434 ../scripts/r.in.wms/r.in.wms.py:225 #, c-format, python-format msgid "Region <%s> not found" msgstr "" -#: ../general/g.region/main.c:482 ../general/g.list/list.c:123 +#: ../general/g.region/main.c:483 ../general/g.list/list.c:123 #, c-format msgid "Unable to read header of 3D raster map <%s@%s>" msgstr "" -#: ../general/g.region/main.c:524 +#: ../general/g.region/main.c:525 msgid "Unable to get map bounding box" msgstr "" -#: ../general/g.region/main.c:842 +#: ../general/g.region/main.c:843 #, c-format msgid "" "'%s' option not used with <%s> because a coordinate would become invalid" msgstr "" -#: ../general/g.region/main.c:852 ../general/g.region/main.c:862 -#: ../general/g.region/main.c:872 +#: ../general/g.region/main.c:853 ../general/g.region/main.c:863 +#: ../general/g.region/main.c:873 #, c-format msgid "" "'%s' option not used with <%s> because <%s> would become minor than <%s>" msgstr "" -#: ../general/g.region/main.c:885 +#: ../general/g.region/main.c:886 #, c-format msgid "Unable to set region <%s>" msgstr "" -#: ../general/g.region/main.c:891 +#: ../general/g.region/main.c:892 msgid "Unable to update current region" msgstr "" -#: ../general/g.region/main.c:899 +#: ../general/g.region/main.c:900 msgid "Unable to change default region. The current mapset is not ." msgstr "" -#: ../general/g.region/printwindow.c:396 +#: ../general/g.region/printwindow.c:399 msgid "You are already in Lat/Long. Use the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:399 +#: ../general/g.region/printwindow.c:402 msgid "" -"You are in a simple XY location, projection to Lat/Lon is not possible. Use " +"You are in a simple XY project, projection to Lat/Lon is not possible. Use " "the -p flag instead." msgstr "" -#: ../general/g.region/printwindow.c:593 +#: ../general/g.region/printwindow.c:597 msgid "" -"WGS84 output not possible as this location does not contain datum " +"WGS84 output not possible as this project does not contain datum " "transformation parameters. Try running g.setproj." msgstr "" -#: ../general/g.region/printwindow.c:606 +#: ../general/g.region/printwindow.c:610 msgid "Unable to update lat/long projection parameters" msgstr "" -#: ../general/g.region/printwindow.c:754 +#: ../general/g.region/printwindow.c:759 msgid "Lat/Long calculations are not possible from a simple XY system" msgstr "" @@ -21002,8 +21076,8 @@ msgstr "" #: ../general/g.findfile/main.c:97 #, c-format msgid "" -"Parameter 'file' contains reference to <%s> mapset, but mapset parameter <" -"%s> does not correspond" +"Parameter 'file' contains reference to <%s> mapset, but mapset parameter " +"<%s> does not correspond" msgstr "" #: ../general/g.rename/main.c:46 @@ -21269,154 +21343,154 @@ msgstr "" msgid "Unable to open init file <%s>" msgstr "" -#: ../general/g.proj/main.c:72 +#: ../general/g.proj/main.c:73 msgid "" "Prints or modifies GRASS projection information files (in various co-" "ordinate system descriptions)." msgstr "" -#: ../general/g.proj/main.c:74 -msgid "Can also be used to create new GRASS locations." +#: ../general/g.proj/main.c:75 +msgid "Can also be used to create new GRASS projects." msgstr "" -#: ../general/g.proj/main.c:77 +#: ../general/g.proj/main.c:78 msgid "Prints and manipulates GRASS projection information files." msgstr "" -#: ../general/g.proj/main.c:84 +#: ../general/g.proj/main.c:85 msgid "Print projection information in conventional GRASS format" msgstr "" -#: ../general/g.proj/main.c:90 +#: ../general/g.proj/main.c:91 msgid "Print projection information in shell script style" msgstr "" -#: ../general/g.proj/main.c:96 +#: ../general/g.proj/main.c:97 msgid "Verify datum information and print transformation parameters" msgstr "" -#: ../general/g.proj/main.c:102 +#: ../general/g.proj/main.c:103 msgid "Print projection information in PROJ.4 format" msgstr "" -#: ../general/g.proj/main.c:108 +#: ../general/g.proj/main.c:109 msgid "" "Print 'flat' output with no linebreaks (applies to WKT and PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:112 +#: ../general/g.proj/main.c:113 msgid "Print 'flat' output with no linebreaks (applies to PROJ.4 output)" msgstr "" -#: ../general/g.proj/main.c:119 +#: ../general/g.proj/main.c:120 msgid "Print projection information in WKT format" msgstr "" -#: ../general/g.proj/main.c:125 +#: ../general/g.proj/main.c:126 msgid "Use ESRI-style format (applies to WKT output only)" msgstr "" -#: ../general/g.proj/main.c:132 ../general/g.proj/main.c:141 -#: ../general/g.proj/main.c:151 ../general/g.proj/main.c:160 -#: ../general/g.proj/main.c:170 +#: ../general/g.proj/main.c:133 ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:152 ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:171 msgid "Specification" msgstr "" -#: ../general/g.proj/main.c:133 +#: ../general/g.proj/main.c:134 msgid "Name of georeferenced data file to read projection information from" msgstr "" -#: ../general/g.proj/main.c:142 +#: ../general/g.proj/main.c:143 msgid "Name of ASCII file containing a WKT projection description" msgstr "" -#: ../general/g.proj/main.c:152 +#: ../general/g.proj/main.c:153 msgid "Spatial reference ID with authority name and code" msgstr "" -#: ../general/g.proj/main.c:153 +#: ../general/g.proj/main.c:154 msgid "E.g. EPSG:4326 or urn:ogc:def:crs:EPSG::4326" msgstr "" -#: ../general/g.proj/main.c:161 +#: ../general/g.proj/main.c:162 msgid "PROJ.4 projection description" msgstr "" -#: ../general/g.proj/main.c:171 +#: ../general/g.proj/main.c:172 #: ../locale/scriptstrings/v.import_to_translate.c:21 msgid "EPSG projection code" msgstr "" -#: ../general/g.proj/main.c:181 +#: ../general/g.proj/main.c:182 msgid "List codes for given authority, e.g. EPSG, and exit" msgstr "" -#: ../general/g.proj/main.c:188 ../general/g.proj/main.c:201 -#: ../general/g.proj/main.c:207 +#: ../general/g.proj/main.c:189 ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:208 msgid "Datum" msgstr "" -#: ../general/g.proj/main.c:190 +#: ../general/g.proj/main.c:191 msgid "Datum (overrides any datum specified in input co-ordinate system)" msgstr "" -#: ../general/g.proj/main.c:192 +#: ../general/g.proj/main.c:193 msgid "Accepts standard GRASS datum codes, or \"list\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:202 +#: ../general/g.proj/main.c:203 #: ../locale/scriptstrings/v.import_to_translate.c:23 msgid "Index number of datum transform parameters" msgstr "" -#: ../general/g.proj/main.c:203 +#: ../general/g.proj/main.c:204 msgid "\"0\" for unspecified or \"-1\" to list and exit" msgstr "" -#: ../general/g.proj/main.c:209 +#: ../general/g.proj/main.c:210 msgid "" "Force override of datum transformation information in input co-ordinate " "system" msgstr "" -#: ../general/g.proj/main.c:215 -msgid "Modify current location projection files" +#: ../general/g.proj/main.c:216 +msgid "Modify current project's projection files" msgstr "" -#: ../general/g.proj/main.c:222 ../general/g.mapset/main.c:71 +#: ../general/g.proj/main.c:223 ../general/g.mapset/main.c:71 #: ../locale/scriptstrings/r.mask_to_translate.c:20 msgid "Create" msgstr "" -#: ../general/g.proj/main.c:223 -msgid "Name of new location to create" +#: ../general/g.proj/main.c:224 +msgid "Name of new project (location) to create" msgstr "" -#: ../general/g.proj/main.c:245 +#: ../general/g.proj/main.c:246 #, c-format msgid "Only one of '%s', '%s', '%s', '%s' or '%s' options may be specified" msgstr "" -#: ../general/g.proj/main.c:297 +#: ../general/g.proj/main.c:298 msgid "Projection files missing" msgstr "" -#: ../general/g.proj/main.c:316 +#: ../general/g.proj/main.c:317 #, c-format msgid "Only one of -%c, -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:321 +#: ../general/g.proj/main.c:322 #, c-format msgid "Only one of -%c, -%c, -%c, -%c or -%c flags may be specified" msgstr "" -#: ../general/g.proj/main.c:343 +#: ../general/g.proj/main.c:344 #, c-format msgid "No output format specified, define one of flags -%c, -%c, -%c, or -%c" msgstr "" -#: ../general/g.proj/main.c:348 +#: ../general/g.proj/main.c:349 #, c-format msgid "No output format specified, define one of flags -%c, -%c, or -%c" msgstr "" @@ -21505,7 +21579,7 @@ msgstr "" #: ../general/g.proj/create.c:18 #, c-format -msgid "Unable to create location <%s>: %s" +msgid "Unable to create project <%s>: %s" msgstr "" #: ../general/g.proj/create.c:21 @@ -21515,97 +21589,97 @@ msgstr "" #: ../general/g.proj/create.c:25 #, c-format -msgid "Unable to create location <%s>" +msgid "Unable to create project <%s>" msgstr "" #: ../general/g.proj/create.c:27 #, c-format msgid "" -"You can switch to the new location by\n" +"You can switch to the new project by\n" "`%s=%s`" msgstr "" #: ../general/g.proj/create.c:38 #, c-format msgid "" -"You must select the PERMANENT mapset before updating the current location's " -"projection (current mapset is <%s>)" +"You must select the PERMANENT mapset before updating the current project's " +"coordinate reference system (current mapset is <%s>)" msgstr "" -#: ../general/g.proj/create.c:77 +#: ../general/g.proj/create.c:78 msgid "" "Default region was updated to the new projection, but if you have multiple " "mapsets `g.region -d` should be run in each to update the region from the " "default" msgstr "" -#: ../general/g.proj/create.c:82 +#: ../general/g.proj/create.c:83 msgid "Projection information updated" msgstr "" -#: ../general/g.message/main.c:35 +#: ../general/g.message/main.c:40 msgid "" "Prints a message, warning, progress info, or fatal error in the GRASS way." msgstr "" -#: ../general/g.message/main.c:38 +#: ../general/g.message/main.c:43 msgid "This module should be used in scripts for messages served to user." msgstr "" -#: ../general/g.message/main.c:43 +#: ../general/g.message/main.c:48 msgid "Print message as warning" msgstr "" -#: ../general/g.message/main.c:48 +#: ../general/g.message/main.c:53 msgid "Print message as fatal error" msgstr "" -#: ../general/g.message/main.c:53 +#: ../general/g.message/main.c:58 msgid "Print message as debug message" msgstr "" -#: ../general/g.message/main.c:58 +#: ../general/g.message/main.c:63 msgid "Print message as progress info" msgstr "" -#: ../general/g.message/main.c:62 ../general/g.message/main.c:68 -#: ../general/g.message/main.c:84 +#: ../general/g.message/main.c:67 ../general/g.message/main.c:73 +#: ../general/g.message/main.c:89 msgid "Level" msgstr "" -#: ../general/g.message/main.c:63 +#: ../general/g.message/main.c:68 msgid "Print message in all modes except of quiet mode" msgstr "" -#: ../general/g.message/main.c:64 +#: ../general/g.message/main.c:69 msgid "Message is printed on GRASS_VERBOSE>=1" msgstr "" -#: ../general/g.message/main.c:69 +#: ../general/g.message/main.c:74 msgid "Print message only in verbose mode" msgstr "" -#: ../general/g.message/main.c:70 +#: ../general/g.message/main.c:75 msgid "Message is printed only on GRASS_VERBOSE>=3" msgstr "" -#: ../general/g.message/main.c:77 +#: ../general/g.message/main.c:82 msgid "Text of the message to be printed" msgstr "" -#: ../general/g.message/main.c:78 +#: ../general/g.message/main.c:83 msgid "Message is printed on GRASS_VERBOSE>=2" msgstr "" -#: ../general/g.message/main.c:87 +#: ../general/g.message/main.c:92 msgid "Level to use for debug messages" msgstr "" -#: ../general/g.message/main.c:94 +#: ../general/g.message/main.c:99 msgid "Select only one message level" msgstr "" -#: ../general/g.message/main.c:108 +#: ../general/g.message/main.c:113 msgid "Unable to parse input message" msgstr "" @@ -21748,7 +21822,8 @@ msgstr "" #: ../general/g.mapset/main.c:52 msgid "" -"Optionally create new mapset or list available mapsets in given location." +"Optionally create new mapset or list available mapsets in given project " +"(location)." msgstr "" #: ../general/g.mapset/main.c:57 @@ -21831,33 +21906,55 @@ msgstr "" msgid "Your current mapset is <%s>" msgstr "" -#: ../general/g.mapsets/list.c:12 +#: ../general/g.mapsets/list.c:13 +msgid "Failed to initialize JSON object. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:22 +msgid "Failed to initialize mapsets array. Out of memory?" +msgstr "" + +#: ../general/g.mapsets/list.c:34 +msgid "Failed to serialize JSON to pretty format." +msgstr "" + +#: ../general/g.mapsets/list.c:45 msgid "Available mapsets:" msgstr "" -#: ../general/g.mapsets/list.c:37 +#: ../general/g.mapsets/list.c:60 msgid "Accessible mapsets:" msgstr "" -#: ../general/g.mapsets/main.c:65 +#: ../general/g.mapsets/main.c:45 ../vector/v.db.select/main.c:40 +#, c-format +msgid "The flag -%c is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:55 ../vector/v.db.select/main.c:50 +#, c-format +msgid "The option %s is not allowed with %s=%s. %s" +msgstr "" + +#: ../general/g.mapsets/main.c:88 msgid "search path" msgstr "" -#: ../general/g.mapsets/main.c:66 +#: ../general/g.mapsets/main.c:89 msgid "Modifies/prints the user's current mapset search path." msgstr "" -#: ../general/g.mapsets/main.c:67 +#: ../general/g.mapsets/main.c:90 msgid "" "Affects the user's access to data existing under the other mapsets in the " -"current location." +"current project." msgstr "" -#: ../general/g.mapsets/main.c:74 +#: ../general/g.mapsets/main.c:97 msgid "Name(s) of existing mapset(s) to add/remove or set" msgstr "" -#: ../general/g.mapsets/main.c:82 +#: ../general/g.mapsets/main.c:105 #: ../locale/scriptstrings/g.extension_to_translate.c:10 #: ../locale/scriptstrings/i.band.library_to_translate.c:7 #: ../locale/scriptstrings/g.extension.all_to_translate.c:6 @@ -21866,69 +21963,73 @@ msgstr "" msgid "Operation to be performed" msgstr "" -#: ../general/g.mapsets/main.c:86 -msgid "Field separator for printing (-l and -p flags)" +#: ../general/g.mapsets/main.c:112 +msgid "Output format for printing (-l and -p flags)" msgstr "" -#: ../general/g.mapsets/main.c:93 +#: ../general/g.mapsets/main.c:126 msgid "List all available mapsets in alphabetical order" msgstr "" -#: ../general/g.mapsets/main.c:99 +#: ../general/g.mapsets/main.c:132 msgid "Print mapsets in current search path" msgstr "" -#: ../general/g.mapsets/main.c:105 +#: ../general/g.mapsets/main.c:138 msgid "Launch mapset selection GUI dialog" msgstr "" -#: ../general/g.mapsets/main.c:128 +#: ../general/g.mapsets/main.c:161 #, c-format msgid "Unknown operation '%s'" msgstr "" -#: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:140 -#: ../general/g.mapsets/main.c:150 ../display/d.mon/main.c:177 +#: ../general/g.mapsets/main.c:172 +msgid "Separator is part of the format." +msgstr "" + +#: ../general/g.mapsets/main.c:191 ../general/g.mapsets/main.c:193 +#: ../general/g.mapsets/main.c:209 ../display/d.mon/main.c:177 #, c-format msgid "Flag -%c ignored" msgstr "" -#: ../general/g.mapsets/main.c:142 ../general/g.mapsets/main.c:152 -#: ../general/g.mapsets/main.c:160 ../display/d.mon/main.c:222 +#: ../general/g.mapsets/main.c:195 ../general/g.mapsets/main.c:211 +#: ../general/g.mapsets/main.c:225 ../display/d.mon/main.c:222 #, c-format msgid "Option <%s> ignored" msgstr "" -#: ../general/g.mapsets/main.c:177 ../general/g.mapsets/main.c:212 +#: ../general/g.mapsets/main.c:242 ../general/g.mapsets/main.c:277 #, c-format msgid "Mapset <%s> not found" msgstr "" -#: ../general/g.mapsets/main.c:184 ../general/g.mapsets/main.c:243 +#: ../general/g.mapsets/main.c:249 ../general/g.mapsets/main.c:308 #, c-format msgid "Current mapset (<%s>) must always included in the search path" msgstr "" -#: ../general/g.mapsets/main.c:207 +#: ../general/g.mapsets/main.c:272 #, c-format msgid "Mapset <%s> already in the path" msgstr "" -#: ../general/g.mapsets/main.c:214 +#: ../general/g.mapsets/main.c:279 #, c-format msgid "Mapset <%s> added to search path" msgstr "" -#: ../general/g.mapsets/main.c:247 +#: ../general/g.mapsets/main.c:312 #, c-format msgid "Mapset <%s> removed from search path" msgstr "" -#: ../general/g.mapsets/main.c:259 +#: ../general/g.mapsets/main.c:324 msgid "Search path not modified" msgstr "" -#: ../general/g.mapsets/main.c:277 +#: ../general/g.mapsets/main.c:342 msgid "Unable to open SEARCH_PATH for write" msgstr "" @@ -21943,37 +22044,34 @@ msgid "" msgstr "" #: ../general/g.mkfontcap/main.c:71 -msgid "Overwrite font configuration file if already existing" -msgstr "" - -#: ../general/g.mkfontcap/main.c:76 msgid "" "Write font configuration file to standard output instead of $GISBASE/etc" msgstr "" -#: ../general/g.mkfontcap/main.c:83 +#: ../general/g.mkfontcap/main.c:78 msgid "List of extra directories to scan" msgstr "" -#: ../general/g.mkfontcap/main.c:85 +#: ../general/g.mkfontcap/main.c:80 msgid "" "Comma-separated list of extra directories to scan for Freetype-compatible " "fonts as well as the defaults (see documentation)" msgstr "" -#: ../general/g.mkfontcap/main.c:104 +#: ../general/g.mkfontcap/main.c:98 #, c-format msgid "" -"Fontcap file %s already exists; use -%c flag if you wish to overwrite it" +"Fontcap file %s already exists; use --overwrite flag if you wish to " +"overwrite it" msgstr "" -#: ../general/g.mkfontcap/main.c:116 +#: ../general/g.mkfontcap/main.c:111 msgid "" "This GRASS installation was compiled without Freetype support, extradirs " "parameter ignored" msgstr "" -#: ../general/g.mkfontcap/main.c:143 +#: ../general/g.mkfontcap/main.c:138 #, c-format msgid "Cannot open %s for writing: %s" msgstr "" @@ -22326,7 +22424,7 @@ msgstr "" #: ../imagery/i.zc/main.c:52 ../imagery/i.ortho.photo/i.ortho.camera/main.c:55 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:62 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:42 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:450 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:49 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:85 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:43 @@ -23513,7 +23611,7 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:56 #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:63 #: ../imagery/i.ortho.photo/i.ortho.photo/menu.c:43 -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:451 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:452 #: ../imagery/i.ortho.photo/i.ortho.target/main.c:50 #: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:86 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:44 @@ -23609,7 +23707,8 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.camera/main.c:212 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses camera file [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses camera file [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:64 @@ -23617,7 +23716,7 @@ msgid "Select or modify the target elevation model." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:71 -msgid "Name of the target location" +msgid "Name of the target project (location)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:75 @@ -23651,34 +23750,35 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.elev/main.c:141 #, c-format -msgid "Target location [%s] not found\n" +msgid "Target project (location) [%s] not found\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:150 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:151 #, c-format msgid "Cannot find default elevation map for target in group [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:190 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:191 #, c-format msgid "Elevation map name is missing. Please set '%s' option" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:227 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:229 #, c-format -msgid "Group [%s] in location [%s] mapset [%s] now uses elevation map [%s]" +msgid "" +"Group [%s] in project (location) [%s] mapset [%s] now uses elevation map [%s]" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:232 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 #, c-format -msgid "Mapset [%s] in target location [%s] - %s " +msgid "Mapset [%s] in target project (location) [%s] - %s " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "permission denied\n" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:234 +#: ../imagery/i.ortho.photo/i.ortho.elev/main.c:236 msgid "not found\n" msgstr "" @@ -23731,61 +23831,66 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:102 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:19 -#: ../imagery/i.rectify/target.c:19 ../vector/v.rectify/target.c:29 #, c-format -msgid "Target location <%s> not found" +msgid "Target project (location) <%s> not found" +msgstr "" + +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:113 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target project (location) <%s> - " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:117 -#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:35 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:118 +#: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:36 #: ../imagery/i.rectify/target.c:35 msgid "Please run i.target for group " msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:311 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:312 msgid "Poorly placed image to photo control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:313 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:314 msgid "Poorly placed image to target control points" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:453 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:454 msgid "GCP" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:488 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:489 msgid "Local x,y,z coordinates to target east,north,height" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:494 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:495 msgid "Target east,north,height coordinates to local x,y,z" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:502 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:137 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:503 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:138 msgid "Enable panorama camera correction" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:519 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:520 #, c-format msgid "Can not read reference points for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:528 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:242 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:529 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:243 #, c-format msgid "No camera reference file selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:532 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:246 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:533 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:247 #, c-format msgid "Bad format in camera file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:539 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:253 +#: ../imagery/i.ortho.photo/i.ortho.transform/main.c:540 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:254 #, c-format msgid "Bad format in initial exposure station file for group <%s>" msgstr "" @@ -23795,7 +23900,7 @@ msgid "Select or modify the imagery group target." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:60 -msgid "Name of target location for ortho-rectification" +msgid "Name of target project (location) for ortho-rectification" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:66 @@ -23804,20 +23909,20 @@ msgstr "" #: ../imagery/i.ortho.photo/i.ortho.target/main.c:80 #, c-format -msgid "Unable to access target location/mapset %s/%s" +msgid "Unable to access target project/mapset %s/%s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:88 -msgid "Target locations with XY (unreferenced) are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:87 +msgid "Target projects (locations) with XY (unreferenced) are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:90 -msgid "Target locations with lon/lat are not supported" +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:91 +msgid "Target projects (locations) with lon/lat are not supported" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.target/main.c:95 +#: ../imagery/i.ortho.photo/i.ortho.target/main.c:96 #, c-format -msgid "Group [%s] targeted for location [%s], mapset [%s]" +msgid "Group [%s] targeted for project (location) [%s], mapset [%s]" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74 @@ -23932,15 +24037,13 @@ msgid " Run OPTION 5 of i.ortho.photo!" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43 -#: ../imagery/i.rectify/rectify.c:43 #, c-format -msgid "Rectify <%s@%s> (location <%s>)" +msgid "Rectify <%s@%s> (project <%s>)" msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:46 -#: ../imagery/i.rectify/rectify.c:45 #, c-format -msgid "into <%s@%s> (location <%s>) ..." +msgid "into <%s@%s> (project <%s>) ..." msgstr "" #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:80 @@ -23980,101 +24083,99 @@ msgstr "" msgid "Raster map with camera angle relative to ground surface" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:128 -#: ../imagery/i.rectify/main.c:129 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:129 msgid "" -"Use current region settings in target location (def.=calculate smallest area)" +"Use current region settings in target project (location) (def.=calculate " +"smallest area)" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:133 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:134 #: ../imagery/i.rectify/main.c:134 msgid "Rectify all raster maps in group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:177 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:178 #: ../imagery/i.rectify/main.c:181 ../imagery/i.group/main.c:178 #: ../imagery/i.pca/main.c:141 #, c-format msgid "Group <%s> not found" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:182 -#: ../imagery/i.rectify/main.c:186 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 #, c-format -msgid "Location: %s" +msgid "Project (location): %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:183 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 #: ../imagery/i.rectify/main.c:187 #, c-format msgid "Mapset: %s" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:184 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:185 #: ../imagery/i.rectify/main.c:188 #, c-format msgid "Could not read REF file for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:189 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:190 #: ../imagery/i.rectify/main.c:193 #, c-format msgid "Group <%s> contains no raster maps; run i.group" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:287 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:288 #: ../imagery/i.rectify/main.c:267 #, c-format msgid "Extension <%s> is illegal" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:290 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:299 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 #: ../imagery/i.rectify/main.c:270 msgid "The following raster map already exists in" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:291 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:300 -#: ../imagery/i.rectify/main.c:271 ../vector/v.rectify/main.c:205 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:292 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:301 #, c-format -msgid "target LOCATION %s, MAPSET %s:" +msgid "target project (location) %s, mapset %s:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:294 -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:303 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:295 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:304 #: ../imagery/i.rectify/main.c:274 msgid "Orthorectification cancelled." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:318 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:319 #: ../imagery/i.rectify/main.c:289 msgid "Target resolution must be > 0, ignored" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:325 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:326 #: ../imagery/i.rectify/main.c:296 #, c-format msgid "Using region: N=%f S=%f, E=%f W=%f" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:334 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:335 #, c-format msgid "No target elevation model selected for group <%s>" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:394 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:395 #: ../imagery/i.rectify/main.c:318 #, c-format msgid "Input raster map <%s> does not exist in group <%s>." msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:396 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:397 #: ../imagery/i.rectify/main.c:320 msgid "Try:" msgstr "" -#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:401 +#: ../imagery/i.ortho.photo/i.ortho.rectify/main.c:402 #: ../imagery/i.rectify/main.c:325 msgid "Exit!" msgstr "" @@ -24198,6 +24299,16 @@ msgstr "" msgid "Resolution EW=%f NS=%f" msgstr "" +#: ../imagery/i.rectify/rectify.c:43 +#, c-format +msgid "Rectify <%s@%s> (location <%s>)" +msgstr "" + +#: ../imagery/i.rectify/rectify.c:45 +#, c-format +msgid "into <%s@%s> (location <%s>) ..." +msgstr "" + #: ../imagery/i.rectify/main.c:82 #: ../locale/scriptstrings/v.ply.rectify_to_translate.c:5 #: ../vector/v.rectify/main.c:68 @@ -24214,6 +24325,11 @@ msgstr "" msgid "Rectification polynomial order (1-3)" msgstr "" +#: ../imagery/i.rectify/main.c:129 +msgid "" +"Use current region settings in target location (def.=calculate smallest area)" +msgstr "" + #: ../imagery/i.rectify/main.c:138 msgid "Use thin plate spline" msgstr "" @@ -24223,6 +24339,26 @@ msgstr "" msgid "Invalid order (%d); please enter 1 to %d" msgstr "" +#: ../imagery/i.rectify/main.c:186 +#, c-format +msgid "Location: %s" +msgstr "" + +#: ../imagery/i.rectify/main.c:271 +#, c-format +msgid "target LOCATION %s, MAPSET %s:" +msgstr "" + +#: ../imagery/i.rectify/target.c:19 +#, c-format +msgid "Target location <%s> not found" +msgstr "" + +#: ../imagery/i.rectify/target.c:31 +#, c-format +msgid "Mapset <%s> in target location <%s> - " +msgstr "" + #: ../imagery/i.his.rgb/main.c:50 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " @@ -24588,6 +24724,7 @@ msgid "svm" msgstr "" #: ../imagery/i.svm.predict/main.c:53 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:7 msgid "prediction" msgstr "" @@ -26147,8 +26284,8 @@ msgid "For no rescaling use 0,0" msgstr "" #: ../imagery/i.pca/main.c:93 -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:46 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:50 msgid "Rescale" msgstr "" @@ -26472,17 +26609,14 @@ msgid "Preliminary scene analysis:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:126 -#, c-format msgid "* Desert index: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:127 -#, c-format msgid "* Snow cover: %.2lf %%" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:128 -#, c-format msgid "* Cloud cover: %.2lf %%" msgstr "" @@ -26491,17 +26625,14 @@ msgid "* Temperature of clouds:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:130 -#, c-format msgid "** Maximum: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:131 -#, c-format msgid "** Mean (%s cloud): %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:133 -#, c-format msgid "** Minimum: %.2lf K" msgstr "" @@ -26510,17 +26641,14 @@ msgid "Histogram cloud signature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:150 -#, c-format msgid "* Mean temperature: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:151 -#, c-format msgid "* Standard deviation: %.2lf" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:152 -#, c-format msgid "* Skewness: %.2lf" msgstr "" @@ -26530,17 +26658,14 @@ msgid "* Histogram classes: %d" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:165 -#, c-format msgid "* 98.75 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:166 -#, c-format msgid "* 97.50 percentile: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:167 -#, c-format msgid "* 83.50 percentile: %.2lf K" msgstr "" @@ -26549,12 +26674,10 @@ msgid "Maximum temperature:" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:189 -#, c-format msgid "* Cold cloud: %.2lf K" msgstr "" #: ../imagery/i.landsat.acca/algorithm.c:190 -#, c-format msgid "* Warm cloud: %.2lf K" msgstr "" @@ -27335,11 +27458,15 @@ msgstr "" msgid "Unable to describe table." msgstr "" -#: ../db/drivers/mysql/db.c:61 ../db/drivers/postgres/db.c:71 +#: ../db/drivers/mysql/db.c:62 ../db/drivers/postgres/db.c:71 #: ../db/drivers/postgres/db.c:249 msgid "Connection failed." msgstr "" +#: ../db/drivers/mysql/db.c:74 +msgid "Unable to set SQL ANSI_QUOTES mode:" +msgstr "" + #: ../db/drivers/mysql/dbe.c:44 msgid "Unable parse MySQL embedded database name" msgstr "" @@ -27388,7 +27515,7 @@ msgstr "" msgid "Unable to commit transaction:" msgstr "" -#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:264 +#: ../db/drivers/mysql/fetch.c:33 ../db/drivers/mysql/fetch.c:263 #: ../db/drivers/ogr/fetch.c:55 ../db/drivers/ogr/fetch.c:192 #: ../db/drivers/postgres/fetch.c:33 ../db/drivers/sqlite/fetch.c:253 msgid "Cursor not found" @@ -27481,16 +27608,15 @@ msgid "OGR layer <%s> not found" msgstr "" #: ../db/drivers/ogr/execute.c:71 ../vector/v.in.db/main.c:188 -#: ../vector/v.db.connect/main.c:297 ../vector/v.to.3d/trans3.c:65 +#: ../vector/v.db.connect/main.c:292 ../vector/v.to.3d/trans3.c:65 #: ../vector/v.to.3d/trans2.c:63 ../vector/v.distance/main.c:547 #: ../vector/v.distance/main.c:588 ../vector/v.reclass/main.c:145 #: ../vector/v.colors.out/make_colors.c:42 ../vector/v.out.lidar/main.c:114 #: ../vector/v.out.lidar/main.c:154 ../vector/v.univar/main.c:368 #: ../vector/v.vect.stats/main.c:445 ../vector/v.colors/scan_attr.c:34 #: ../vector/v.transform/trans_digit.c:116 ../vector/v.neighbors/main.c:234 -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:101 -#: ../scripts/db.univar/db.univar.py:140 ../scripts/v.db.join/v.db.join.py:112 -#: ../scripts/v.db.join/v.db.join.py:119 ../scripts/v.db.join/v.db.join.py:136 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:104 +#: ../scripts/db.univar/db.univar.py:140 #, c-format, python-format msgid "Column <%s> not found in table <%s>" msgstr "" @@ -28059,6 +28185,40 @@ msgstr "" msgid "List of frequencies for sin and cos functions" msgstr "" +#: ../locale/scriptstrings/v.histogram_to_translate.c:1 +msgid "Draws the histogram of values in a vector attribute column" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:3 +#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:3 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 +#: ../display/d.profile/main.c:196 +msgid "plot" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:4 +#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 +#: ../display/d.histogram/main.c:81 +msgid "histogram" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:5 +msgid "Attribute column to create histogram from" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:6 +#: ../locale/scriptstrings/i.variance_to_translate.c:7 +msgid "" +"Name for graphic output file for plot (extension decides format, - for " +"screen)" +msgstr "" + +#: ../locale/scriptstrings/v.histogram_to_translate.c:7 +msgid "Number of bins in histogram" +msgstr "" + #: ../locale/scriptstrings/t.merge_to_translate.c:1 msgid "Merges several space time datasets into a single space time dataset." msgstr "" @@ -28101,6 +28261,8 @@ msgstr "" #: ../locale/scriptstrings/r.learn.train_to_translate.c:16 #: ../locale/scriptstrings/r.learn.train_to_translate.c:19 #: ../locale/scriptstrings/r.learn.train_to_translate.c:22 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:7 #: ../locale/scriptstrings/r.vector.ruggedness_to_translate.c:11 msgid "Required" @@ -28135,58 +28297,68 @@ msgid "Input bands" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24 -msgid "Name of output vector cloud mask" +msgid "Name of output raster cloud and shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:26 -msgid "Name of output raster cloud mask" +msgid "Name of output vector cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:28 -msgid "Name of output vector shadow mask" +msgid "Name of output raster cloud mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:30 -msgid "Name of output raster shadow mask" +msgid "Name of output vector shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:32 -msgid "Threshold for cleaning small areas from cloud mask (in square meters)" +msgid "Name of output raster shadow mask" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34 -msgid "Threshold for cleaning small areas from shadow mask (in square meters)" +msgid "Threshold for cleaning small areas from cloud mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36 -msgid "Name of the image metadata file (MTD_TL.xml)" +msgid "Threshold for cleaning small areas from shadow mask (in square meters)" msgstr "" #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38 +msgid "" +"Comma separted pair of values for mean sun zenith and mean sun azimuth as " +"reported in metadata" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:40 +msgid "Name of the image metadata file (MTD_TL.xml)" +msgstr "" + +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:42 msgid "Name of Sentinel metadata json file" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:39 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 msgid "Default is LOCATION/MAPSET/cell_misc/BAND/description.json" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:41 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 msgid "Rescale factor" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:43 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 msgid "Set computational region to maximum image extent" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:44 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:48 msgid "Do not delete temporary files" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:45 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:49 msgid "Rescale input bands" msgstr "" -#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:47 +#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:51 msgid "Compute only the cloud mask" msgstr "" @@ -28264,231 +28436,14 @@ msgstr "" #: ../locale/scriptstrings/t.support_to_translate.c:6 #: ../locale/scriptstrings/t.copy_to_translate.c:5 #: ../locale/scriptstrings/t.rename_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:6 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:9 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:12 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:15 #: ../locale/scriptstrings/t.info.iso_to_translate.c:6 msgid "input" msgstr "" -#: ../locale/scriptstrings/v.class.ml_to_translate.c:1 -msgid "Classification of a vector maps based on the values in attribute tables" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:4 -#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 -#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 -#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 -msgid "machine learning" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:5 -#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 -#: ../locale/scriptstrings/v.explode_to_translate.c:6 -#: ../locale/scriptstrings/v.stats_to_translate.c:5 -#: ../vector/v.voronoi/main.c:128 -msgid "Name of input vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:6 -msgid "Name of training vector map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:7 -msgid "layer name or number to use for data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:8 -msgid "layer number/name for the training layer" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:9 -msgid "layer number/name for the ML results" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:10 -msgid "Data with statistics in npy format." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:11 -msgid "Numpy array with vector cats." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:12 -msgid "Numpy array with columns names." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:13 -msgid "Boolean numpy array with training indexes." -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:14 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:16 -msgid "training npy file with training set, default: training_data.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:15 -#: ../locale/scriptstrings/v.class.ml_to_translate.c:17 -msgid "training npy file with the classes, default: training_classes.npy" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:18 -msgid "" -"CSV file name with the feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:19 -msgid "" -"Figure file name with feature importances rank using extra tree algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:20 -msgid "scaler method, center the data before scaling, if no, not scale at all" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:21 -msgid "" -"choose a decomposition method (PCA, KernelPCA, ProbabilisticPCA, " -"RandomizedPCA, FastICA, TruncatedSVD) and set the parameters using the | to " -"separate the decomposition method from the parameters like: PCA|" -"n_components=98" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:22 -msgid "" -"Number of random training per class to training the machine learning " -"algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:23 -msgid "a python file with classifiers" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:24 -msgid "name of the python variable that must be a list of dictionary" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:25 -msgid "" -"specify the index or range of index of the classifiers that you want to use" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:26 -msgid "Index of the classifiers to optimize the training set" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:27 -msgid "Column pattern:Value or Numpy funtion to use to substitute NaN values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:28 -msgid "Key:Value or Numpy funtion to use to substitute Inf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:29 -msgid "Key:Value or Numpy funtion to use to substitute neginf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:30 -msgid "Key:Value or Numpy funtion to use to substitute posinf values" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:31 -msgid "csv file name with results of different machine learning scores" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:32 -msgid "text file name with the report of different machine learning algorithms" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:33 -msgid "C value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:34 -msgid "gamma value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:35 -msgid "kernel value range list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:36 -msgid "polynomial order list to explore SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:37 -msgid "number of jobs to use during the domain exploration" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:38 -msgid "definitive C value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:39 -msgid "definitive gamma value" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:40 -msgid "" -"definitive kernel value. Available kernel are: 'linear', 'poly', 'rbf', " -"'sigmoid', 'precomputed'" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:41 -msgid "filename pattern with the image of SVC parameter" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:42 -msgid "filename pattern for raster" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:43 -msgid "Extract the training set from the vtraining map" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:44 -msgid "Export to numpy files" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:45 -msgid "Feature importances using extra trees algorithm" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:46 -msgid "Balance the training using the class with the minor number of data" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:47 -msgid "Optimize the training samples" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:48 -msgid "Classify the whole dataset" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:49 -msgid "Export the classify results to raster maps" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:50 -msgid "Test different classification methods" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:51 -msgid "add to test to compute the Bias variance" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:52 -msgid "add to test to compute extra parameters like: confusion matrix, ROC, PR" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:53 -msgid "Explore the SVC domain" -msgstr "" - -#: ../locale/scriptstrings/v.class.ml_to_translate.c:54 -msgid "append the classification results" -msgstr "" - #: ../locale/scriptstrings/r.green.hydro.delplants_to_translate.c:1 msgid "Delete segments where there is an existing plant" msgstr "" @@ -28687,6 +28642,500 @@ msgstr "" msgid "output DOS code to set up display" msgstr "" +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:1 +msgid "Create and train a Maxent model" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:2 +#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 +#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:2 +msgid "modeling" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:3 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:3 +msgid "Maxent" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:4 +msgid "Sample file presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:5 +msgid "" +"Please enter the name of a file containing presence locations for one or " +"more species." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:7 +msgid "Sample file with background locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:8 +msgid "" +"Please enter the file name of the SWD file with environmental variables (can " +"be created with v.maxent.swd or r.out.maxent_swd)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:10 +msgid "Prefix that identifies categorical data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:11 +msgid "" +"Toggle continuous/categorical for environmental variables whose names begin " +"with this prefix (default: all continuous)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:13 +msgid "Location of an alternate set of environmental variables." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:14 +msgid "" +"Location of an alternate set of environmental variables. Maxent models will " +"be projected onto these variables. The result will be imported in grass gis." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:16 +msgid "Suffix for name(s) of prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:17 +msgid "Add a suffix to the name(s) of imported prediction layer(s)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:19 +msgid "Nodata values" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:20 +msgid "Value to be interpreted as nodata values in SWD sample data" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:22 +msgid "Directory where outputs will be written." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:23 +msgid "" +"Directory where outputs will be written. This should be different from the " +"environmental layers directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:25 +msgid "Create a vector point layer from the sample predictions" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:26 +msgid "Import the file(s) with sample predictions as point feature layer." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:28 +msgid "Name of sample prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:29 +msgid "" +"Give the name of sample prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:31 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:32 +msgid "Create a vector point layer with predictions at background points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:34 +msgid "Name of background prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:35 +msgid "" +"Give the name of background prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:37 +msgid "Name of raster prediction layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:38 +msgid "" +"Give the name of raster prediction layer. If you leave this empty, the " +"default name given by Maxent will be used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:40 +msgid "Create response curves." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:41 +msgid "" +"Create graphs showing how predicted relative probability of occurrence " +"depends on the value of each environmental variable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:43 +msgid "Write response curve data to file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:44 +msgid "" +"Write output files containing the data used to make response curves, for " +"import into external plotting software." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:46 +msgid "Representation probability" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:47 +msgid "" +"Representation of probabilities used in writing output grids. See Help for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:49 +msgid "Multiply all automatic regularization parameters by this number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:50 +msgid "" +"Multiply all automatic regularization parameters by this number. A higher " +"number gives a more spread-out distribution." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:52 +msgid "Extrapolate" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:53 +msgid "" +"Predict to regions of environmental space outside the limits encountered " +"during training." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:55 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:21 +msgid "Do not apply clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:56 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:22 +msgid "Do not apply clamping when projecting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:58 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:24 +msgid "Fade effect clamping" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:59 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:25 +msgid "" +"Reduce prediction at each point in projections by the difference between " +"clamped and non-clamped output at that point." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:61 +msgid "Disable linear features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:62 +msgid "Do not use linear features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:64 +msgid "Disable quadratic features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:65 +msgid "Do not use quadratic features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:67 +msgid "Disable product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:68 +msgid "Do not use product features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:70 +msgid "Use product features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:71 +msgid "" +"By default, threshold features are not used. Use this flag to enable them." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:73 +msgid "Disable hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:74 +msgid "Do not use hinge features for the model (they are used by default)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:76 +msgid "Do not use automatic selection of feature classes" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:77 +msgid "" +"By default, Maxent automatically selects which feature classes to use, based " +"on number of training samples. Use this flag to disable autoselection of " +"features." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:79 +msgid "Don't add sample points to background if conditions differ" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:80 +msgid "" +"By default, samples that have a combination of environmental values that " +"isn't already present in the background are added to the background samples. " +"Use this flag to avoid that." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:82 +msgid "Use jackknife validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:83 +msgid "" +"Measure importance of each environmental variable by training with each " +"environmental variable first omitted, then used in isolation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:84 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:87 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:90 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:93 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:96 +msgid "Validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:85 +msgid "Percentage of random test points" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:86 +msgid "" +"Percentage of presence localities to be randomly set aside as test points, " +"used to compute the AUC, omission, etc." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:88 +msgid "Test presence locations" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:89 +msgid "" +"Use the presence localities in this csv file to compute statistics (AUC, " +"omission, etc.)." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:91 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:94 +msgid "Number of replicates in cross-validation" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:92 +msgid "" +"If replicates > 1, do multiple runs using crossvalidate,bootstrap or " +"subsample. See the Maxent help file for the difference." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:95 +msgid "" +"If replicates > 1, do multiple runs of this type: Crossvalidate: samples " +"divided into replicates folds; each fold in turn used for test data. " +"Bootstrap: replicate sample sets chosen by sampling with replacement. " +"Subsample: replicate sample sets chosen by removing random test percentage " +"without replacement to be used for evaluation." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:97 +msgid "Maximum iterations optimization" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:98 +msgid "Stop training after this many iterations of the optimization algorithm." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:100 +msgid "Convergence threshold" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:101 +msgid "" +"Stop training when the drop in log loss per iteration drops below this " +"number." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:103 +msgid "Threshold for product and threshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:104 +msgid "" +"Number of samples at which product and threshold features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:106 +msgid "Threshold for quadratic feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:107 +msgid "Number of samples at which quadratic features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:109 +msgid "Threshold for hinge feature" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:110 +msgid "Number of samples at which hinge features start being used." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:112 +msgid "Regularization parameter for treshold features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:113 +msgid "" +"Regularization parameter to be applied to all threshold features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:115 +msgid "Regularization parameter for categorical features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:116 +msgid "" +"Regularization parameter to be applied to all categorical features; negative " +"value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:118 +msgid "Regularization parameter for lin, quad and prod features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:119 +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:122 +msgid "" +"Regularization parameter to be applied to all linear, quadratic and product " +"features; negative value enables automatic setting." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:121 +msgid "Regularization parameter for hinge features" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:124 +msgid "Default prevalence of the species" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:125 +msgid "" +"Default prevalence of the species: probability of presence at ordinary " +"occurrence points. See Elith et al., Diversity and Distributions, 2011 for " +"details." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:127 +msgid "Keep duplicate presence records." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:128 +msgid "" +"Keep duplicate presence records. If environmental data are in grids, " +"duplicates are records in the same grid cell. Otherwise, duplicates are " +"records with identical coordinates." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:130 +msgid "Use a random seed" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:131 +msgid "" +"If selected, a different random seed will be used for each run, so a " +"different random test/train partition will be made and a different random " +"subset of the background will be used, if applicable." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:133 +msgid "Add all samples to the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:134 +msgid "" +"Add all samples to the background, even if they have combinations of " +"environmental values that are already present in the background" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:136 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:27 +msgid "Location Maxent jar file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:137 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:28 +msgid "Give the path to the Maxent executable file (maxent.jar)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:138 +msgid "Number of processor threads to use." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:139 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:29 +msgid "Maximum memory to be used by Maxent (in MB)" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:140 +msgid "Show the Maxent user interface" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:141 +msgid "" +"Use this flag to show the Maxent interface. Note that when you select this " +"option, Maxent will not start before you hit the start option." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:142 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:30 +msgid "Copy maxent.jar to addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:143 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:31 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:144 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:32 +msgid "Overwrites maxent.jar in addon directory" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.train_to_translate.c:145 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:33 +msgid "" +"Copy the maxent.jar (path provided with the 'maxent' parameter) to the addon " +"scripts directory. If the file already exists in the addon directory, it is " +"overwritten." +msgstr "" + #: ../locale/scriptstrings/r.in.srtm_to_translate.c:1 msgid "Imports SRTM HGT files into raster map." msgstr "" @@ -28877,10 +29326,15 @@ msgstr "" msgid "Name for output vector map" msgstr "" +#: ../locale/scriptstrings/v.in.osm_to_translate.c:8 +#: ../locale/scriptstrings/i.landsat.import_to_translate.c:27 +#: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:42 +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:17 +#: ../locale/scriptstrings/i.sentinel.import_to_translate.c:26 +msgid "Override projection check (use current location's projection)" +msgstr "" + #: ../locale/scriptstrings/v.in.osm_to_translate.c:9 -#: ../locale/scriptstrings/r.import_to_translate.c:30 -#: ../locale/scriptstrings/v.import_to_translate.c:28 -#: ../vector/v.external/args.c:50 ../vector/v.in.ogr/main.c:381 msgid "Assume that the dataset has the same projection as the current location" msgstr "" @@ -29106,6 +29560,14 @@ msgstr "" msgid "Default: taken from input file internals" msgstr "" +#: ../locale/scriptstrings/v.unpack_to_translate.c:10 +#: ../locale/scriptstrings/r.unpack_to_translate.c:9 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:15 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"project" +msgstr "" + #: ../locale/scriptstrings/v.unpack_to_translate.c:12 #: ../locale/scriptstrings/r.unpack_to_translate.c:11 msgid "Print projection information of input pack file and exit" @@ -30268,7 +30730,7 @@ msgid "ogc" msgstr "" #: ../locale/scriptstrings/v.in.ogc.features_to_translate.c:5 -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "features" msgstr "" @@ -30312,11 +30774,6 @@ msgstr "" msgid "landscape" msgstr "" -#: ../locale/scriptstrings/r.futures.simulation_to_translate.c:7 -#: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:7 -msgid "modeling" -msgstr "" - #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:10 #: ../locale/scriptstrings/r.futures.simulation_to_translate.c:65 #: ../locale/scriptstrings/r.futures.parallelpga_to_translate.c:67 @@ -31365,7 +31822,6 @@ msgstr "" #: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:12 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:11 msgid "Layer number or name" msgstr "" @@ -31399,6 +31855,17 @@ msgstr "" msgid "Example: income < 1000 and population >= 10000" msgstr "" +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:19 +msgid "Retain mapset name" +msgstr "" + +#: ../locale/scriptstrings/v.what.rast.multi_to_translate.c:20 +msgid "" +"When no column names are provided, the column names are created using the " +"names of the input layers. Using this flag will retain the mapset part of " +"the name (if given), but replacing the @ for an underscore." +msgstr "" + #: ../locale/scriptstrings/i.signature.copy_to_translate.c:1 msgid "Copies signature file from a group/subgroup to another group/subgroup." msgstr "" @@ -31750,7 +32217,6 @@ msgstr "" #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:11 #: ../locale/scriptstrings/v.gsflow.mapdata_to_translate.c:13 -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:7 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:9 #: ../locale/scriptstrings/v.gsflow.gravres_to_translate.c:11 @@ -31943,7 +32409,7 @@ msgid "recode" msgstr "" #: ../locale/scriptstrings/r.recode.attr_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 msgid "Input map" msgstr "" @@ -31976,6 +32442,14 @@ msgstr "" msgid "URL of ZIP, TAR.GZ, or other similar archive" msgstr "" +#: ../locale/scriptstrings/g.download.location_to_translate.c:9 +msgid "Path to database, use path option instead" +msgstr "" + +#: ../locale/scriptstrings/g.download.location_to_translate.c:10 +msgid "This option is obsolete and replaced by path" +msgstr "" + #: ../locale/scriptstrings/i.zero2null_to_translate.c:1 msgid "" "Replaces zero values with null at edges, otherwise replaces zero values with " @@ -32981,11 +33455,8 @@ msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1 msgid "" "Export raster values at given point locations as text file in SWD format for " -"input in Maxent" -msgstr "" - -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:4 -msgid "Maxent" +"input in Maxent. In addition, the addon can export the environmental raster " +"layers as ascii files." msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:5 @@ -33031,44 +33502,57 @@ msgid "Vector layer with background / absence points" msgstr "" #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:21 -msgid "Background SWD file" +msgid "Thin species and background points" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:23 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:22 +msgid "" +"Select this flag if you want to limit the species and background points to " +"maximum one point per raster cell. Note that this is already the case for " +"the background points with the nbgp option." +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:24 msgid "Species SWD file" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:25 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:26 +msgid "Background SWD file" +msgstr "" + +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:28 msgid "CSV file with alias and map names" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:27 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:30 msgid "Folder where to export the predictor raster layers to" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:29 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 msgid "Raster data format to write (case sensitive, see r.out.gdal)" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:31 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:16 msgid "Automatically adapt resolution" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:32 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:17 msgid "" "When the ns and ew resolution are not the same, nearest neighbor resampling " "will be used to ensure both are the same." msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:33 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:36 msgid "skip header in csv" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:34 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:37 msgid "nodata value in output files" msgstr "" -#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:35 +#: ../locale/scriptstrings/v.maxent.swd_to_translate.c:38 msgid "Seed for generating random points" msgstr "" @@ -33833,8 +34317,17 @@ msgid "" "scikit-learn package" msgstr "" +#: ../locale/scriptstrings/r.learn.ml_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlpy_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.train_to_translate.c:5 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:5 +#: ../locale/scriptstrings/v.class.mlR_to_translate.c:3 +msgid "machine learning" +msgstr "" + #: ../locale/scriptstrings/r.learn.ml_to_translate.c:6 #: ../locale/scriptstrings/r.learn.train_to_translate.c:6 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:6 msgid "scikit-learn" msgstr "" @@ -33844,6 +34337,7 @@ msgid "Group of raster layers to be classified" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:9 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:9 msgid "" "GRASS imagery group of raster maps representing feature variables to be used " "in the machine learning model" @@ -33881,10 +34375,12 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:19 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:13 msgid "Output Map" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:20 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:14 msgid "" "Raster layer name to store result from classification or regression model. " "The name will also used as a perfix if class probabilities or intermediate " @@ -34175,6 +34671,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:104 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:16 msgid "Output class membership probabilities" msgstr "" @@ -34186,6 +34683,7 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:107 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:19 msgid "Only predict class probabilities" msgstr "" @@ -34214,6 +34712,7 @@ msgid "Save model to file (for compression use e.g. '.gz' extension)" msgstr "" #: ../locale/scriptstrings/r.learn.ml_to_translate.c:121 +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:10 msgid "Load model from file" msgstr "" @@ -34573,63 +35072,6 @@ msgid "" "them" msgstr "" -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:1 -#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 -msgid "Build a linked stream network: each link knows its downstream link" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6 -msgid "Starting line segment category" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8 -msgid "Vector input of stream network created by r.stream.extract" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:9 -msgid "Vector output stream" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:10 -msgid "Which directon to march: up or down" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:11 -msgid "Topography (DEM)" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:12 -msgid "Flow accumulation raster" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:13 -msgid "Map of slope created by r.slope.area" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:14 -msgid "Flow accumulation units" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:15 -msgid "Multiplier to convert flow accumulation to your chosen unit" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:16 -msgid "Averaging distance [map units]" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:17 -msgid "Plots to generate" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:18 -msgid "output file for data on original grid" -msgstr "" - -#: ../locale/scriptstrings/v.stream.profiler_to_translate.c:19 -msgid "output file for data on smoothed grid" -msgstr "" - #: ../locale/scriptstrings/t.select_to_translate.c:1 msgid "" "Select maps from space time datasets by topological relationships to other " @@ -34962,11 +35404,13 @@ msgid "" msgstr "" #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 msgid "Extend location extents based on new dataset" msgstr "" +#: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:18 +msgid "Assume that the dataset has same projection as the current location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:20 msgid "URL or name of input netcdf-file (\"-\" = stdin)" msgstr "" @@ -35794,6 +36238,14 @@ msgid "" "mapset." msgstr "" +#: ../locale/scriptstrings/g.proj.all_to_translate.c:5 +msgid "Location containing input raster map" +msgstr "" + +#: ../locale/scriptstrings/g.proj.all_to_translate.c:9 +msgid "Path to GRASS database of input location" +msgstr "" + #: ../locale/scriptstrings/g.proj.all_to_translate.c:11 #: ../locale/scriptstrings/g.proj.all_to_translate.c:14 #: ../locale/scriptstrings/g.proj.all_to_translate.c:16 @@ -35920,12 +36372,12 @@ msgid "WFS standard" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:16 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 msgid "Maximum number of features to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs2_to_translate.c:17 -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:11 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 msgid "(default: unlimited)" msgstr "" @@ -36061,9 +36513,8 @@ msgstr "" #: ../locale/scriptstrings/r.out.legend_to_translate.c:32 #: ../locale/scriptstrings/r.boxplot_to_translate.c:17 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:35 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 #: ../display/d.legend/main.c:215 ../display/d.northarrow/main.c:149 #: ../display/d.legend.vect/main.c:119 ../display/d.barscale/main.c:182 msgid "Font size" @@ -36106,19 +36557,29 @@ msgid "Path to the extraction directory" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:12 -#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 msgid "" -"Create a new location and import the data into it. Do not run this module in " -"parallel or interrupt it when a new location should be created" +"Create a new project and import the data into it. Do not run this module in " +"parallel or interrupt it when a new project should be created" msgstr "" #: ../locale/scriptstrings/t.rast.import_to_translate.c:13 msgid "Set the current region from the last map that was imported" msgstr "" +#: ../locale/scriptstrings/t.rast.import_to_translate.c:15 +#: ../locale/scriptstrings/t.vect.import_to_translate.c:13 +msgid "Extend project extents based on new dataset" +msgstr "" + +#: ../locale/scriptstrings/t.rast.import_to_translate.c:17 +msgid "" +"Assume that the dataset has same coordinate reference system as the current " +"location" +msgstr "" + #: ../locale/scriptstrings/t.rast.import_to_translate.c:18 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time raster datasets." msgstr "" @@ -36127,7 +36588,7 @@ msgid "Links all OGR layers available in given OGR datasource." msgstr "" #: ../locale/scriptstrings/v.external.all_to_translate.c:4 -#: ../vector/v.external/args.c:66 +#: ../vector/v.external/args.c:67 msgid "List available layers in data source and exit" msgstr "" @@ -36254,31 +36715,6 @@ msgstr "" msgid "Base name for output file" msgstr "" -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:1 -msgid "Draws the histogram of values in a vector attribute column" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:4 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 -msgid "geology" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:5 -#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 -msgid "Attribute column containing azimuth" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:6 -#: ../locale/scriptstrings/i.variance_to_translate.c:7 -msgid "" -"Name for graphic output file for plot (extension decides format, - for " -"screen)" -msgstr "" - -#: ../locale/scriptstrings/d.vect.colhist_to_translate.c:7 -msgid "Number of bins in histogram" -msgstr "" - #: ../locale/scriptstrings/r.local.relief_to_translate.c:1 msgid "Creates a local relief model from elevation map." msgstr "" @@ -36900,6 +37336,10 @@ msgstr "" msgid "Queries projection information spatially." msgstr "" +#: ../locale/scriptstrings/g.projpicker_to_translate.c:4 +msgid "create location" +msgstr "" + #: ../locale/scriptstrings/g.projpicker_to_translate.c:5 msgid "Logical operator for coordinates" msgstr "" @@ -37180,7 +37620,7 @@ msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:1 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" @@ -37211,7 +37651,7 @@ msgid "Layer number or name." msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:9 -msgid "Name of attribute column used to dissolve common boundaries" +msgid "Name of attribute column used to dissolve features" msgstr "" #: ../locale/scriptstrings/v.dissolve_to_translate.c:12 @@ -37886,9 +38326,15 @@ msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" +#: ../locale/scriptstrings/t.vect.import_to_translate.c:12 +msgid "" +"Create a new project (location) and import the data into it. Do not run this " +"module in parallel or interrupt it when a new project should be created" +msgstr "" + #: ../locale/scriptstrings/t.vect.import_to_translate.c:16 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the space time vector datasets." msgstr "" @@ -38135,6 +38581,14 @@ msgstr "" msgid "Estimate resolution only" msgstr "" +#: ../locale/scriptstrings/r.import_to_translate.c:30 +#: ../locale/scriptstrings/v.import_to_translate.c:28 +#: ../vector/v.in.ogr/main.c:382 +msgid "" +"Assume that the dataset has the same coordinate reference system (CRS) as " +"the current project" +msgstr "" + #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1 msgid "Download user-requested products through the USGS TNM API" msgstr "" @@ -39132,8 +39586,8 @@ msgid "" "where 'buffer' is the value entered for option 'buffer', 'name' is the value " "in \"name_column\" for each input point and 'id#' is unique running id " "number. If no value specified in \"name_column\", cat value will be used in " -"place of 'name'). NOTE: this function is NOT compatible with option \"in_cost" -"\" or flag \"l\"" +"place of 'name'). NOTE: this function is NOT compatible with option " +"\"in_cost\" or flag \"l\"" msgstr "" #: ../locale/scriptstrings/r.catchment_to_translate.c:17 @@ -39225,39 +39679,47 @@ msgid "Comma separated names of data layers to download" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:8 -msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgid "Name of data layers to import" msgstr "" #: ../locale/scriptstrings/v.in.wfs_to_translate.c:9 +msgid "Specify alternate spatial reference system (example: EPSG:4326)" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:10 msgid "" "The given code must be supported by the server, consult the capabilities file" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:12 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 msgid "Skip earlier feature IDs and start downloading at this one" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:13 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 msgid "(default: start with the first feature)" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:14 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +msgid "version of WFS, e.g.:1.0.0 or 2.0.0" +msgstr "" + +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 msgid "" "Username or file with username or environment variable name with username" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:15 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 msgid "" "Password or file with password or environment variable name with password" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:16 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:18 msgid "" "Download server capabilities to 'wms_capabilities.xml' in the current " "directory and exit" msgstr "" -#: ../locale/scriptstrings/v.in.wfs_to_translate.c:17 +#: ../locale/scriptstrings/v.in.wfs_to_translate.c:19 msgid "Restrict fetch to features which touch the current region" msgstr "" @@ -42388,8 +42850,8 @@ msgstr "" #: ../locale/scriptstrings/d.frame_to_translate.c:4 #: ../locale/scriptstrings/d.redraw_to_translate.c:4 -#: ../display/d.erase/main.c:30 ../display/d.mon/main.c:51 -#: ../display/d.info/main.c:35 +#: ../display/d.redraw/main.c:41 ../display/d.erase/main.c:30 +#: ../display/d.mon/main.c:51 ../display/d.info/main.c:35 msgid "monitors" msgstr "" @@ -42427,6 +42889,7 @@ msgid "Implies only when -c or --overwrite flag is given" msgstr "" #: ../locale/scriptstrings/d.redraw_to_translate.c:1 +#: ../display/d.redraw/main.c:43 msgid "Redraws the content of currently selected monitor." msgstr "" @@ -42824,6 +43287,13 @@ msgstr "" msgid "multiple" msgstr "" +#: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:10 +#: ../locale/scriptstrings/v.explode_to_translate.c:6 +#: ../locale/scriptstrings/v.stats_to_translate.c:5 +#: ../vector/v.voronoi/main.c:128 +msgid "Name of input vector map" +msgstr "" + #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:13 msgid "" "Vector features can have category values in different layers. This number " @@ -42873,6 +43343,18 @@ msgstr "" msgid "Register empty maps" msgstr "" +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:1 +msgid "Split multi-part polygons into single-part polygons." +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:4 +msgid "Input vector layer" +msgstr "" + +#: ../locale/scriptstrings/v.multi2singlepart_to_translate.c:5 +msgid "Output vector layer" +msgstr "" + #: ../locale/scriptstrings/r.to.vect.tiled_to_translate.c:1 msgid "Converts a raster map into vector tiles." msgstr "" @@ -42908,6 +43390,36 @@ msgstr "" msgid "Number of tiles in y direction" msgstr "" +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:1 +msgid "" +"Apply a fitted scikit-learn estimator to rasters in a GRASS GIS imagery " +"group." +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:8 +msgid "Group of raster layers used for prediction" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:11 +msgid "File representing pickled scikit-learn estimator model" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:17 +msgid "" +"A raster layer is created for each class. For the case of a binary " +"classification, only the positive (maximum) class is output" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:21 +msgid "Number of pixels to pass to the prediction method" +msgstr "" + +#: ../locale/scriptstrings/r.learn.predict_to_translate.c:22 +msgid "" +"Number of pixels to pass to the prediction method. GRASS GIS reads raster by-" +"row so chunksize is rounded down based on the number of columns" +msgstr "" + #: ../locale/scriptstrings/r.shalstab_to_translate.c:1 msgid "A model for shallow landslide susceptibility." msgstr "" @@ -43310,8 +43822,8 @@ msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:31 msgid "" -"USGS Earth Explorer only supports query options \"identifier\", \"filename" -"\" (in ESA name format) or \"usgs_identifier\" (in USGS name format)" +"USGS Earth Explorer only supports query options \"identifier\", \"filename\" " +"(in ESA name format) or \"usgs_identifier\" (in USGS name format)" msgstr "" #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:33 @@ -44031,6 +44543,10 @@ msgstr "" msgid "Name for output raster map (default: coveragename)" msgstr "" +#: ../locale/scriptstrings/r.in.wcs_to_translate.c:18 +msgid "Name for new location to create" +msgstr "" + #: ../locale/scriptstrings/r.in.wcs_to_translate.c:19 msgid "Name for region instead of current region" msgstr "" @@ -44310,6 +44826,10 @@ msgstr "" msgid "Offset factor for input" msgstr "" +#: ../locale/scriptstrings/v.stream.network_to_translate.c:1 +msgid "Build a linked stream network: each link knows its downstream link" +msgstr "" + #: ../locale/scriptstrings/v.stream.network_to_translate.c:12 msgid "Adjacent downstream segment category" msgstr "" @@ -44726,10 +45246,84 @@ msgstr "" msgid "Use adaptive spectral bandwidth (with mean shift)" msgstr "" +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:1 +msgid "Use a Maxent model to create a suitability distribution layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:4 +msgid "Lambda model file" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:5 +msgid "Lambda model file created by Maxent or the r.maxent.train addon." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:7 +msgid "Names of the input raster layers" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:8 +msgid "" +"Names of the raster layers representing the environmental variables used in " +"the Maxent model." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:10 +msgid "variable names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:11 +msgid "" +"Names of the environmental parameter(s) as used in the model. These need to " +"be given in the same order as the corresponding raster layers. If left out, " +"the names are assumed to be the same as the name of the raster layers." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:13 +msgid "csv file with variable and layer names" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:14 +msgid "" +"A csv file with in the first column the names of the explanatory variables " +"used in the model, and in the second column the names of corresponding " +"raster layers. Make both are provided in the same order." +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:18 +msgid "Prediction raster layer" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:19 +msgid "The name of the raster layer with the predicted suitability scores" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:23 +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:26 +msgid "parameters" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:34 +msgid "Print Maxent command" +msgstr "" + +#: ../locale/scriptstrings/r.maxent.predict_to_translate.c:35 +msgid "" +"Print the Maxent command used to create the prediction layer. For debugging." +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:1 msgid "Creates a polar plot of fault directions" msgstr "" +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:4 +msgid "geology" +msgstr "" + +#: ../locale/scriptstrings/v.faultdirections_to_translate.c:5 +msgid "Attribute column containing azimuth" +msgstr "" + #: ../locale/scriptstrings/v.faultdirections_to_translate.c:6 msgid "Step of binning (in degrees)" msgstr "" @@ -45213,17 +45807,7 @@ msgid "" "a zonal raster layer" msgstr "" -#: ../locale/scriptstrings/r.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:4 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 -#: ../locale/scriptstrings/v.boxplot_to_translate.c:4 -#: ../display/d.profile/main.c:196 -msgid "plot" -msgstr "" - #: ../locale/scriptstrings/r.boxplot_to_translate.c:5 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:5 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:5 #: ../locale/scriptstrings/v.boxplot_to_translate.c:6 msgid "boxplot" @@ -45247,22 +45831,19 @@ msgid "categorical map with zones" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:9 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:9 msgid "Name of output image file" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:23 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:11 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:20 msgid "Plot dimensions (width,height)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:15 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:24 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:12 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:22 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:21 msgid "Dimensions (width,height) of the figure in inches" msgstr "" @@ -45272,9 +45853,8 @@ msgid "Default font size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:20 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:11 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:14 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:23 msgid "DPI" msgstr "" @@ -45291,13 +45871,11 @@ msgid "Create a vector point layer of outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:26 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:14 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:17 msgid "Include outliers" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:27 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:15 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:18 msgid "Draw boxplot(s) with outliers" msgstr "" @@ -45307,14 +45885,12 @@ msgid "Draw notches" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:30 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:18 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:21 #: ../locale/scriptstrings/v.boxplot_to_translate.c:24 msgid "Draw boxplot(s) with notch" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:20 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:23 msgid "Range (value > 0)" msgstr "" @@ -45347,14 +45923,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:48 #: ../locale/scriptstrings/r.boxplot_to_translate.c:51 #: ../locale/scriptstrings/r.boxplot_to_translate.c:53 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:25 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:28 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:31 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:34 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:37 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:13 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:28 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:31 @@ -45365,26 +45933,22 @@ msgid "Plot format" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:40 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:26 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:29 msgid "Horizontal boxplot(s)" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:41 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:27 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:30 #: ../locale/scriptstrings/v.boxplot_to_translate.c:18 msgid "Draw the boxplot horizontal" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:43 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:29 #: ../locale/scriptstrings/v.boxplot_to_translate.c:26 msgid "Rotate labels" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:44 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:30 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:32 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:33 msgid "Rotate labels (degrees)" @@ -45428,15 +45992,6 @@ msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:76 #: ../locale/scriptstrings/r.boxplot_to_translate.c:79 #: ../locale/scriptstrings/r.boxplot_to_translate.c:82 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:49 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:52 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:55 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:57 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:72 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:43 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:46 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:49 @@ -45454,7 +46009,6 @@ msgid "Color boxploxs using the colors of the categories of the zonal raster" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:60 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:47 msgid "Boxplot width" msgstr "" @@ -45464,48 +46018,39 @@ msgid "The width of the boxplots (0,1])" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:63 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:53 msgid "boxplot linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:64 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:54 msgid "The linewidth of the boxplots" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:66 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:56 msgid "width of the boxplot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:68 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:58 msgid "Color of the boxlot median line" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:69 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:59 msgid "Color of median" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:71 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:61 msgid "Whisker and cap linewidth" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:72 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:62 msgid "The linewidth of the whiskers and caps" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:74 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:64 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:47 msgid "Flier marker" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:75 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:65 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:48 msgid "" "Set flier marker (see https://matplotlib.org/stable/api/markers_api.html for " @@ -45513,101 +46058,23 @@ msgid "" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:77 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:67 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:50 msgid "Flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:78 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:68 msgid "Set the flier size" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:80 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:70 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:53 msgid "Flier color" msgstr "" #: ../locale/scriptstrings/r.boxplot_to_translate.c:81 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:71 msgid "Set the flier color" msgstr "" -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:1 -msgid "Draws the boxplot of the raster maps of a space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:7 -msgid "input space-time raster dataset" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:12 -msgid "Resolution of plot" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:17 -msgid "Draw notch" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:21 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 -msgid "" -"This determines how far the plot whiskers extend out from the box. If range " -"is positive, the whiskers extend to the most extreme data point which is no " -"more than range times the interquartile range from the box. A value of zero " -"causes the whiskers to extend to the data extremes." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:32 -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:33 -msgid "Add grid lines" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:36 -msgid "Font size of labels" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:38 -msgid "Date format" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:39 -msgid "Set date format (see https://strftime.org/ for options)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:41 -msgid "ConciseDateFormatter" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:42 -msgid "" -"Us date format as compact as possible while still having complete date " -"information. This will override the data_format setting." -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:44 -msgid "limit value axis" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:45 -msgid "min and max value of y-axis, or x-axis if -h flag is set)" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:48 -msgid "The width of the boxplots" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:50 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 -msgid "Boxplot color" -msgstr "" - -#: ../locale/scriptstrings/t.rast.boxplot_to_translate.c:51 -#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 -msgid "Color of the boxplots. See manual page for color notation options." -msgstr "" - #: ../locale/scriptstrings/i.cva_to_translate.c:1 msgid "Performs Change Vector Analysis (CVA) in two dimensions." msgstr "" @@ -46780,6 +47247,14 @@ msgstr "" msgid "Draw the notch" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:24 +msgid "" +"This determines how far the plot whiskers extend out from the box. If range " +"is positive, the whiskers extend to the most extreme data point which is no " +"more than range times the interquartile range from the box. A value of zero " +"causes the whiskers to extend to the data extremes." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:26 msgid "Boxplot text labels" msgstr "" @@ -46802,6 +47277,14 @@ msgstr "" msgid "add grid lines" msgstr "" +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41 +msgid "Boxplot color" +msgstr "" + +#: ../locale/scriptstrings/r.series.boxplot_to_translate.c:42 +msgid "Color of the boxplots. See manual page for color notation options." +msgstr "" + #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51 msgid "Set flier size" msgstr "" @@ -46891,278 +47374,278 @@ msgid "" "layer in a scatterplot." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:5 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:4 msgid "scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:7 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:6 msgid "input vector layer" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:8 msgid "Name of x column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:10 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:9 msgid "Name of the column with x values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:11 msgid "Name of y column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:13 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:12 msgid "Name of the column with y values" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:14 msgid "Plot type" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:16 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:15 msgid "Type of plot (scatter, density)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:17 msgid "Name of the output file (extension decides format)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:19 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:18 msgid "" "Name of the output file. The format is determined by the file extension." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:25 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:24 msgid "Resolution of plot in dpi's" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:26 msgid "Plot title" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:27 msgid "The title of the plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:29 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:28 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 msgid "Aesthetics" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:31 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:30 msgid "The basis font size (default = 10)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:32 msgid "Dot marker" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:34 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:33 msgid "" "Set dot marker (see https://matplotlib.org/stable/api/markers_api.html for " "options)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:35 msgid "Marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:37 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:36 msgid "Set marker size" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:38 msgid "Dot color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:40 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:39 msgid "Color of dots" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:41 msgid "RGB column" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:43 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:42 msgid "" "Column with RGB values defining the colors of the dots of the scatterplot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:44 msgid "2D bins" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:45 msgid "" "The number of bins in x and y dimension. Density is expressed as the number " "of points falling within the x and y boundaries of a bin." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:46 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 msgid "Density" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:47 msgid "Density plot color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:49 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:48 msgid "Select the color map to be used for the density scatter plot" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:51 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:50 msgid "Reverse color map" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:52 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 msgid "Trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:54 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:53 msgid "Plot trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:55 msgid "Degree" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:57 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:56 msgid "Degree polynomial trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:58 msgid "Color trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:60 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59 msgid "Color of the trendline" msgstr "" +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:61 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:63 msgid "Line style trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:64 msgid "trendline width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:66 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:65 msgid "Line width of the trendline" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:67 msgid "Draw a covariance confidence ellipse(s)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:68 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 msgid "Ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:69 #: ../vector/v.class/main.c:75 ../display/d.vect.thematic/main.c:123 msgid "standard deviations" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:71 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:70 msgid "" "Draw the covariance confidence ellipse(s) with radius of n standard " "deviations (n_sd)." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:72 msgid "Ellipse color" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:74 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:73 msgid "Color of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:75 msgid "Opacity ellipse fill." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:77 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:76 msgid "Opacity of the fill color of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:78 msgid "Ellipse edge style" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:80 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:79 msgid "Line style of the ellipse" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:81 msgid "Ellipse edge width" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:83 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:82 msgid "Width of the ellipse edge" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:84 msgid "Column grouping the features in categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:86 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:85 msgid "" "Colum with categories. If selected, a separate ellipse will be drawn for " "each group/category" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:87 msgid "RGB column for ellipse categories" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:89 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:88 msgid "" "Column with RGB values per category. These will be used to define the color " "of the ellipse." msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:90 msgid "legend for ellipses" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:92 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:91 msgid "" "Print the legend for the ellipses (only for if ellipses for groups are drawn)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:93 msgid "X axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:94 msgid "Set the X axis range to be displayed" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:95 msgid "Y axis range (min,max)" msgstr "" -#: ../locale/scriptstrings/v.scatterplot_to_translate.c:97 +#: ../locale/scriptstrings/v.scatterplot_to_translate.c:96 msgid "Set the Y axis range to be displayed" msgstr "" @@ -47491,8 +47974,8 @@ msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:10 msgid "" -"Separator inside connections resources item string '{Name}{Separator}" -"{URL}' (print only), use \"separator\"" +"Separator inside connections resources item string '{Name}{Separator}{URL}' " +"(print only), use \"separator\"" msgstr "" #: ../locale/scriptstrings/m.csw.update_to_translate.c:12 @@ -47572,166 +48055,6 @@ msgid "" "map of a space time vector dataset" msgstr "" -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:1 -msgid "Create a dasymetric weighting layer with Random Forest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:4 -msgid "density" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:5 -msgid "dasymetry" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:7 -msgid "Vector with spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:8 -msgid "" -"Polygon vector containing unique ID and response variable in the attribute " -"table" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:9 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:12 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:15 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:18 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:21 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:50 -msgid "Required inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:10 -msgid "vector_layer,id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:13 -msgid "id,response_variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:14 -msgid "Name of the column containing unique ID of spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:16 -msgid "Name of the column containing response variable" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17 -msgid "Format: All values must be >0" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:19 -msgid "Input raster 1" -msgstr "" - -#: ../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..." -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:22 -msgid "Input raster 2 (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:24 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:27 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:41 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:44 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:46 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:48 -#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 -msgid "Optional inputs" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:25 -msgid "Input distance raster (optional)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:26 -msgid "Distance to zones of interest" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:28 -msgid "Spatial resolution of output weighting layer" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:29 -msgid "(in metres)" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:31 -msgid "Output weighting layer name" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:33 -msgid "Name for output vector gridded spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:35 -msgid "Name for output plot of model feature importances" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:37 -msgid "Name for output file with log of the random forest run" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:39 -msgid "Categories of basemap A to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:40 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:43 -msgid "Format: 1,2,3" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:42 -msgid "Categories of basemap B to be used" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:45 -msgid "Use class names for basemap A" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:47 -msgid "Use class names for basemap B" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:49 -msgid "Number of cores to be used for the parallel process" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:51 -msgid "Keep all covariates in the final model" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:52 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:54 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:57 -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:59 -msgid "Feature selection and tuning" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:53 -msgid "Include detailed results of grid search cross-validation" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:55 -msgid "" -"Number of k-fold cross-validation for grid search parameter optimization" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:56 -msgid "Format: Must have a value > 2 and < N spatial units" -msgstr "" - -#: ../locale/scriptstrings/r.area.createweight_to_translate.c:58 -msgid "" -"Python dictionary of customized tunegrid for sklearn RandomForestRegressor" -msgstr "" - #: ../locale/scriptstrings/r3.in.xyz_to_translate.c:1 msgid "" "Create a 3D raster map from an assemblage of many coordinates using " @@ -48519,11 +48842,6 @@ msgstr "" msgid "Draws the boxplot of values in a vector attribute column" msgstr "" -#: ../locale/scriptstrings/v.boxplot_to_translate.c:5 -#: ../display/d.histogram/main.c:81 -msgid "histogram" -msgstr "" - #: ../locale/scriptstrings/v.boxplot_to_translate.c:8 msgid "Attribute column value to be plotted" msgstr "" @@ -53270,6 +53588,45 @@ msgstr "" msgid "Aspect from r.slope.aspect" msgstr "" +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:1 +msgid "" +"Imports the 0.5 meter resolution dtm or dsm from the AHN (Actueel " +"Hoogtebestand Nederland (AHN), version 4." +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:2 +msgid "dem" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:5 +msgid "product" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:6 +msgid "Choose which product to download (dsm or dtm)" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:7 +msgid "Download whole tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:8 +msgid "" +"Download the selected product for the AHN tile that overlap with the current " +"region. If enabled, a vector layer with the bounds of the AHN tiles will be " +"saved, using the output name with as suffix _tiles" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:9 +msgid "Set to original computational region" +msgstr "" + +#: ../locale/scriptstrings/r.in.ahn_to_translate.c:10 +msgid "" +"After downloading and importing the requested layer, set the region back to " +"the original computation region." +msgstr "" + #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:1 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" @@ -53800,8 +54157,8 @@ msgid "Unable to open file '%s': %s" msgstr "" #: ../ps/ps.map/main.c:208 ../ps/ps.map/main.c:227 -#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:142 -#: ../vector/v.to.db/parse.c:145 +#: ../vector/v.univar/main.c:146 ../vector/v.to.db/parse.c:149 +#: ../vector/v.to.db/parse.c:152 #, c-format msgid "" "Required parameter <%s> not set:\n" @@ -54102,8 +54459,8 @@ msgstr "" #: ../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 ../display/d.path/main.c:126 -msgid "Use geodesic calculation for longitude-latitude locations" +#: ../vector/v.net.allpairs/main.c:112 +msgid "Use geodesic calculation for longitude-latitude projects" msgstr "" #: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276 @@ -54283,7 +54640,7 @@ msgid "" "option or <-%c> flag" msgstr "" -#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:441 +#: ../vector/v.decimate/main.c:289 ../vector/v.in.lidar/main.c:442 #: ../vector/v.in.pdal/filters.c:65 #, c-format msgid "Invalid zrange <%s>" @@ -54297,7 +54654,7 @@ msgstr "" msgid "Cannot select by z range, input is not 3D" msgstr "" -#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:617 +#: ../vector/v.decimate/main.c:339 ../vector/v.in.lidar/main.c:618 msgid "Settings for count-based decimation are not valid" msgstr "" @@ -54825,7 +55182,7 @@ msgstr "" msgid "Add points on nodes" msgstr "" -#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:345 +#: ../vector/v.net.components/main.c:191 ../vector/v.db.connect/main.c:340 #: ../vector/v.net.distance/main.c:297 ../vector/v.net.timetable/main.c:103 #: ../vector/v.sample/main.c:191 ../vector/v.net.iso/main.c:392 #: ../vector/v.net.path/path.c:114 ../vector/v.kcv/main.c:176 @@ -55115,7 +55472,7 @@ msgid "" "Output vector map, table <%s> (driver: <%s>, database: <%s>) already exists" msgstr "" -#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:303 +#: ../vector/v.in.db/main.c:191 ../vector/v.db.connect/main.c:298 msgid "Data type of key column must be integer" msgstr "" @@ -55204,49 +55561,45 @@ msgid "Print types/names of table columns for specified layer and exit" msgstr "" #: ../vector/v.db.connect/main.c:107 -msgid "Overwrite connection parameter for certain layer" -msgstr "" - -#: ../vector/v.db.connect/main.c:112 msgid "Delete connection for certain layer (not the table)" msgstr "" -#: ../vector/v.db.connect/main.c:148 +#: ../vector/v.db.connect/main.c:143 msgid "Please choose only one print style" msgstr "" -#: ../vector/v.db.connect/main.c:158 ../vector/v.kcv/main.c:170 +#: ../vector/v.db.connect/main.c:153 ../vector/v.kcv/main.c:170 msgid "Unable to modify vector map stored in other mapset" msgstr "" -#: ../vector/v.db.connect/main.c:166 +#: ../vector/v.db.connect/main.c:161 #, c-format msgid "Map <%s> is not connected to a database" msgstr "" -#: ../vector/v.db.connect/main.c:174 +#: ../vector/v.db.connect/main.c:169 #, c-format msgid "Vector map <%s> is connected by:\n" msgstr "" -#: ../vector/v.db.connect/main.c:179 ../display/d.vect.thematic/main.c:291 +#: ../vector/v.db.connect/main.c:174 ../display/d.vect.thematic/main.c:291 #: ../display/d.vect/opt.c:143 msgid "Database connection not defined" msgstr "" -#: ../vector/v.db.connect/main.c:195 +#: ../vector/v.db.connect/main.c:190 #, c-format msgid "" "layer <%d/%s> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:203 +#: ../vector/v.db.connect/main.c:198 #, c-format msgid "" "layer <%d> table <%s> in database <%s> through driver <%s> with key <%s>\n" msgstr "" -#: ../vector/v.db.connect/main.c:217 ../vector/v.to.rast/vect2rast.c:53 +#: ../vector/v.db.connect/main.c:212 ../vector/v.to.rast/vect2rast.c:53 #: ../vector/v.to.3d/trans3.c:51 ../vector/v.to.3d/trans2.c:49 #: ../vector/v.distance/main.c:530 ../vector/v.distance/main.c:611 #: ../vector/v.colors.out/make_colors.c:31 ../vector/v.extract/main.c:217 @@ -55256,33 +55609,33 @@ msgstr "" msgid "Database connection not defined for layer <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:275 +#: ../vector/v.db.connect/main.c:270 #, c-format -msgid "Use -o to overwrite existing link for layer <%d>" +msgid "Use --overwrite to overwrite existing link for layer <%d>" msgstr "" -#: ../vector/v.db.connect/main.c:284 ../vector/v.db.connect/main.c:323 +#: ../vector/v.db.connect/main.c:279 ../vector/v.db.connect/main.c:318 #, c-format msgid "Table <%s> does not exist in database <%s>" msgstr "" -#: ../vector/v.db.connect/main.c:310 ../vector/v.db.connect/main.c:330 +#: ../vector/v.db.connect/main.c:305 ../vector/v.db.connect/main.c:325 #, c-format msgid "" "The table <%s> is now part of vector map <%s> and may be deleted or " "overwritten by GRASS modules" msgstr "" -#: ../vector/v.db.connect/main.c:349 ../vector/v.kcv/main.c:180 +#: ../vector/v.db.connect/main.c:344 ../vector/v.kcv/main.c:180 #, c-format msgid "Cannot grant privileges on table %s" msgstr "" -#: ../vector/v.db.connect/main.c:353 ../vector/v.kcv/main.c:182 +#: ../vector/v.db.connect/main.c:348 ../vector/v.kcv/main.c:182 msgid "Select privileges were granted on the table" msgstr "" -#: ../vector/v.db.connect/main.c:360 +#: ../vector/v.db.connect/main.c:355 msgid "" "For defining a new connection you have to specify these parameters: driver, " "database, table [, key [, layer]]" @@ -55319,7 +55672,7 @@ msgstr "" #: ../vector/v.out.lidar/main.c:506 ../vector/v.out.lidar/main.c:513 #: ../vector/v.in.pdal/main.cpp:147 ../vector/v.in.pdal/main.cpp:155 #: ../vector/v.in.pdal/main.cpp:163 ../vector/v.in.pdal/main.cpp:171 -#: ../vector/v.in.pdal/main.cpp:249 +#: ../vector/v.in.pdal/main.cpp:250 msgid "Categories" msgstr "" @@ -55396,178 +55749,178 @@ msgstr "" msgid "Invert mask when selecting points" msgstr "" -#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:246 +#: ../vector/v.in.lidar/main.c:312 ../vector/v.in.pdal/main.cpp:247 msgid "Do not automatically add unique ID as category to each point" msgstr "" -#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:247 +#: ../vector/v.in.lidar/main.c:313 ../vector/v.in.pdal/main.cpp:248 msgid "Create only requested layers and categories" msgstr "" -#: ../vector/v.in.lidar/main.c:329 ../vector/v.in.ogr/main.c:410 +#: ../vector/v.in.lidar/main.c:330 ../vector/v.in.ogr/main.c:411 msgid "" -"Create the location specified by the \"location\" parameter and exit. Do not " +"Create the project specified by the \"project\" parameter and exit. Do not " "import the vector data." msgstr "" -#: ../vector/v.in.lidar/main.c:355 +#: ../vector/v.in.lidar/main.c:356 #, c-format msgid "Unable to open file <%s> as a LiDAR point cloud. %s" msgstr "" -#: ../vector/v.in.lidar/main.c:420 +#: ../vector/v.in.lidar/main.c:421 #, c-format msgid "-%c flag is not set but ID layer is not specified" msgstr "" -#: ../vector/v.in.lidar/main.c:422 +#: ../vector/v.in.lidar/main.c:423 msgid "ID layer is required to store attribute table" msgstr "" -#: ../vector/v.in.lidar/main.c:431 ../vector/v.in.pdal/main.cpp:297 +#: ../vector/v.in.lidar/main.c:432 ../vector/v.in.pdal/main.cpp:298 #, c-format msgid "" "Storing generated point IDs as categories in the layer <%d>, consequently no " "more than %d points can be imported" msgstr "" -#: ../vector/v.in.lidar/main.c:456 ../vector/v.in.ogr/main.c:723 -#: ../vector/v.in.ogr/main.c:2164 +#: ../vector/v.in.lidar/main.c:457 ../vector/v.in.ogr/main.c:724 +#: ../vector/v.in.ogr/main.c:2165 msgid "Select either the current region flag or the spatial option, not both" msgstr "" -#: ../vector/v.in.lidar/main.c:486 ../vector/v.in.ogr/main.c:2192 +#: ../vector/v.in.lidar/main.c:487 ../vector/v.in.ogr/main.c:2193 msgid "4 parameters required for 'spatial' parameter" msgstr "" -#: ../vector/v.in.lidar/main.c:552 ../scripts/v.unpack/v.unpack.py:115 +#: ../vector/v.in.lidar/main.c:553 ../scripts/v.unpack/v.unpack.py:115 #, c-format, python-format msgid "Vector map <%s> already exists and will be overwritten" msgstr "" -#: ../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 +#: ../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 #, c-format, python-format msgid "Vector map <%s> already exists" msgstr "" -#: ../vector/v.in.lidar/main.c:621 +#: ../vector/v.in.lidar/main.c:622 #, c-format msgid "Scanning %llu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:623 +#: ../vector/v.in.lidar/main.c:624 #, c-format msgid "Scanning %lu points..." msgstr "" -#: ../vector/v.in.lidar/main.c:763 +#: ../vector/v.in.lidar/main.c:764 msgid "" "The underlying libLAS library is at its limits. Previously reported counts " "might have been distorted. However, the import itself should be unaffected." msgstr "" -#: ../vector/v.in.lidar/main.c:769 +#: ../vector/v.in.lidar/main.c:770 #, c-format msgid "%llu points imported (limit was %llu)" msgstr "" -#: ../vector/v.in.lidar/main.c:774 +#: ../vector/v.in.lidar/main.c:775 #, c-format msgid "%llu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:777 +#: ../vector/v.in.lidar/main.c:778 #, c-format msgid "%llu input points were not valid and filtered out" msgstr "" -#: ../vector/v.in.lidar/main.c:780 +#: ../vector/v.in.lidar/main.c:781 #, c-format msgid "%llu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:784 +#: ../vector/v.in.lidar/main.c:785 #, c-format msgid "%llu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:787 +#: ../vector/v.in.lidar/main.c:788 #, c-format msgid "%llu input points were filtered out by return number" msgstr "" -#: ../vector/v.in.lidar/main.c:790 +#: ../vector/v.in.lidar/main.c:791 #, c-format msgid "%llu input points were filtered out by class number" msgstr "" -#: ../vector/v.in.lidar/main.c:793 +#: ../vector/v.in.lidar/main.c:794 #, c-format msgid "%llu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:798 +#: ../vector/v.in.lidar/main.c:799 #, c-format msgid "%llu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:801 +#: ../vector/v.in.lidar/main.c:802 #, c-format msgid "%llu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:805 +#: ../vector/v.in.lidar/main.c:806 #, c-format msgid "%lu points imported (limit was %d)" msgstr "" -#: ../vector/v.in.lidar/main.c:809 +#: ../vector/v.in.lidar/main.c:810 #, c-format msgid "%lu points imported" msgstr "" -#: ../vector/v.in.lidar/main.c:814 +#: ../vector/v.in.lidar/main.c:815 #, c-format msgid "%lu input points were outside of the selected area" msgstr "" -#: ../vector/v.in.lidar/main.c:818 +#: ../vector/v.in.lidar/main.c:819 #, c-format msgid "%lu input points were outside of the area specified by mask" msgstr "" -#: ../vector/v.in.lidar/main.c:827 +#: ../vector/v.in.lidar/main.c:828 #, c-format msgid "%lu input points were filtered outsite the range for z coordinate" msgstr "" -#: ../vector/v.in.lidar/main.c:832 +#: ../vector/v.in.lidar/main.c:833 #, c-format msgid "%lu input points were skipped at the begging using offset" msgstr "" -#: ../vector/v.in.lidar/main.c:835 +#: ../vector/v.in.lidar/main.c:836 #, c-format msgid "%lu input points were skipped by count-based decimation" msgstr "" -#: ../vector/v.in.lidar/main.c:837 +#: ../vector/v.in.lidar/main.c:838 msgid "" "Accuracy of the printed point counts might be limited by your computer " "architecture." msgstr "" -#: ../vector/v.in.lidar/main.c:841 +#: ../vector/v.in.lidar/main.c:842 msgid "The rest of points was ignored" msgstr "" -#: ../vector/v.in.lidar/main.c:845 +#: ../vector/v.in.lidar/main.c:846 #, c-format msgid "%llu input points were not valid, use -%c flag to filter them out" msgstr "" -#: ../vector/v.in.lidar/main.c:856 +#: ../vector/v.in.lidar/main.c:857 #, c-format msgid "" "Maximum number of categories reached (%d). Import ended prematurely. Try to " @@ -56038,7 +56391,7 @@ msgstr "" #: ../vector/v.to.rast/support.c:297 ../vector/v.to.rast/support.c:528 #: ../vector/v.to.rast/vect2rast.c:67 ../vector/v.what.rast3/main.c:143 -#: ../scripts/v.dissolve/v.dissolve.py:613 +#: ../scripts/v.dissolve/v.dissolve.py:615 #: ../scripts/v.db.update/v.db.update.py:103 #, c-format, python-format msgid "Column <%s> not found" @@ -56274,11 +56627,11 @@ msgstr "" msgid "Name for output GRASS vector map (default: input layer)" msgstr "" -#: ../vector/v.external/args.c:72 +#: ../vector/v.external/args.c:73 msgid "List available layers including feature type in data source and exit" msgstr "" -#: ../vector/v.external/args.c:75 +#: ../vector/v.external/args.c:76 msgid "Format: layer name,type,projection check,geometry" msgstr "" @@ -56305,7 +56658,7 @@ msgid "" "instead of native GRASS-PostGIS data driver." msgstr "" -#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:634 +#: ../vector/v.external/main.c:123 ../vector/v.in.ogr/main.c:635 #, c-format msgid "Layer <%s> not available" msgstr "" @@ -56314,7 +56667,7 @@ msgstr "" msgid "No layer defined" msgstr "" -#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:550 +#: ../vector/v.external/main.c:148 ../vector/v.in.ogr/main.c:551 #, c-format msgid "Unable to open data source <%s>" msgstr "" @@ -56334,7 +56687,7 @@ msgstr "" msgid "Link to vector map <%s> created." msgstr "" -#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:740 +#: ../vector/v.external/proj.c:35 ../vector/v.in.ogr/main.c:741 #: ../vector/v.in.ogr/proj.c:36 #, c-format msgid "Geometry column <%s> not found in input layer <%s>" @@ -56370,11 +56723,11 @@ msgid "Projection for layer <%s> does not contain a valid SRS" msgstr "" #: ../vector/v.proj/main.c:78 -msgid "Re-projects a vector map from one location to the current location." +msgid "Re-projects a vector map from one project to the current project." msgstr "" #: ../vector/v.proj/main.c:84 -msgid "Location containing input vector map" +msgid "Project (location) containing input vector map" msgstr "" #: ../vector/v.proj/main.c:88 @@ -56409,13 +56762,17 @@ msgstr "" msgid "Recommended for massive point projection" msgstr "" +#: ../vector/v.proj/main.c:179 +msgid "Input and output projects can not be the same" +msgstr "" + #: ../vector/v.proj/main.c:242 msgid "No vector maps found" msgstr "" #: ../vector/v.proj/main.c:256 #, c-format -msgid "Vector map <%s> in location <%s> mapset <%s> not found" +msgid "Vector map <%s> in project <%s> mapset <%s> not found" msgstr "" #: ../vector/v.proj/main.c:310 ../vector/v.proj/main.c:395 @@ -56430,12 +56787,12 @@ msgstr "" #: ../vector/v.proj/main.c:368 #, c-format -msgid "Mapset <%s> in input location <%s> - permission denied" +msgid "Mapset <%s> in input project <%s> - permission denied" msgstr "" #: ../vector/v.proj/main.c:371 #, c-format -msgid "Mapset <%s> in input location <%s> not found" +msgid "Mapset <%s> in input project <%s> not found" msgstr "" #: ../vector/v.proj/main.c:517 @@ -57583,7 +57940,7 @@ msgstr "" #: ../vector/v.out.postgis/create.c:78 #, c-format -msgid "EPSG code defined for current location (%s) is overridden by %s" +msgid "EPSG code defined for current project (%s) is overridden by %s" msgstr "" #: ../vector/v.out.postgis/create.c:107 @@ -58205,7 +58562,7 @@ msgid "" msgstr "" #: ../vector/v.in.ascii/main.c:577 ../vector/v.in.ascii/main.c:580 -#: ../vector/v.in.ogr/main.c:1947 +#: ../vector/v.in.ogr/main.c:1948 msgid "Import failed" msgstr "" @@ -58509,12 +58866,12 @@ msgid "Cleaning output topology" msgstr "" #: ../vector/v.voronoi/clean_topo.c:85 ../vector/v.buffer/main.c:819 -#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1495 +#: ../vector/v.patch/main.c:569 ../vector/v.in.ogr/main.c:1496 msgid "Removing dangles..." msgstr "" #: ../vector/v.voronoi/clean_topo.c:87 ../vector/v.buffer/main.c:822 -#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1510 +#: ../vector/v.patch/main.c:575 ../vector/v.in.ogr/main.c:1511 msgid "Removing bridges..." msgstr "" @@ -58714,19 +59071,19 @@ msgid "Snapping boundaries..." msgstr "" #: ../vector/v.buffer/main.c:797 ../vector/v.patch/main.c:533 -#: ../vector/v.in.ogr/main.c:1454 +#: ../vector/v.in.ogr/main.c:1455 msgid "Breaking polygons..." msgstr "" #: ../vector/v.buffer/main.c:800 ../vector/v.buffer/main.c:807 #: ../vector/v.patch/main.c:537 ../vector/v.patch/main.c:554 #: ../vector/v.delaunay/main.c:144 ../vector/v.overlay/area_area.c:127 -#: ../vector/v.in.ogr/main.c:1460 ../vector/v.in.ogr/main.c:1475 +#: ../vector/v.in.ogr/main.c:1461 ../vector/v.in.ogr/main.c:1476 msgid "Removing duplicates..." msgstr "" #: ../vector/v.buffer/main.c:804 ../vector/v.patch/main.c:550 -#: ../vector/v.in.ogr/main.c:1471 +#: ../vector/v.in.ogr/main.c:1472 msgid "Breaking boundaries..." msgstr "" @@ -58934,7 +59291,7 @@ msgstr[0] "" #: ../vector/v.colors.out/make_colors.c:27 #: ../vector/v.colors.out/scan_cats.c:23 ../vector/v.colors/main.c:284 -#: ../vector/v.surf.rst/main.c:588 ../vector/v.out.ascii/main.c:109 +#: ../vector/v.surf.rst/main.c:591 ../vector/v.out.ascii/main.c:109 #, c-format msgid "Layer <%s> not found" msgstr "" @@ -59092,10 +59449,10 @@ msgstr "" #: ../vector/v.vol.rst/main.c:713 ../vector/v.vol.rst/main.c:736 #: ../vector/v.vol.rst/main.c:759 ../vector/v.vol.rst/main.c:782 #: ../vector/v.vol.rst/user3.c:264 ../vector/v.vol.rst/user3.c:270 -#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:535 -#: ../vector/v.surf.rst/main.c:540 ../vector/v.surf.rst/main.c:544 -#: ../vector/v.surf.rst/main.c:549 ../vector/v.surf.rst/main.c:553 -#: ../vector/v.surf.rst/main.c:557 +#: ../vector/v.vol.rst/user3.c:276 ../vector/v.surf.rst/main.c:538 +#: ../vector/v.surf.rst/main.c:543 ../vector/v.surf.rst/main.c:547 +#: ../vector/v.surf.rst/main.c:552 ../vector/v.surf.rst/main.c:556 +#: ../vector/v.surf.rst/main.c:560 #, c-format msgid "Not enough memory for %s" msgstr "" @@ -59134,6 +59491,10 @@ msgstr "" msgid "Name of input surface raster map for cross-section" msgstr "" +#: ../vector/v.vol.rst/main.c:238 ../vector/v.vol.rst/main.c:287 +msgid "Optional inputs" +msgstr "" + #: ../vector/v.vol.rst/main.c:244 msgid "Name of column containing w-values attribute to interpolate" msgstr "" @@ -59234,9 +59595,9 @@ msgid "" msgstr "" #: ../vector/v.vol.rst/main.c:527 ../vector/v.vol.rst/main.c:531 -#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:563 -#: ../vector/v.surf.rst/main.c:567 ../vector/v.surf.rst/main.c:570 -#: ../vector/v.surf.rst/main.c:574 +#: ../vector/v.vol.rst/main.c:533 ../vector/v.surf.rst/main.c:566 +#: ../vector/v.surf.rst/main.c:570 ../vector/v.surf.rst/main.c:573 +#: ../vector/v.surf.rst/main.c:577 #, c-format msgid "Unable to create %s" msgstr "" @@ -59250,7 +59611,7 @@ msgstr "" msgid "Vector is not 3D" msgstr "" -#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:648 +#: ../vector/v.vol.rst/main.c:593 ../vector/v.surf.rst/main.c:651 #, c-format msgid "Unable to create table '%s'" msgstr "" @@ -59335,7 +59696,6 @@ msgid "Cannot allocate memory for point" msgstr "" #: ../vector/v.vol.rst/user1.c:221 -#, c-format msgid "Can't insert %lf,%lf,%lf,%lf,%lf a=%d" msgstr "" @@ -59363,8 +59723,8 @@ msgstr "" #: ../vector/v.vol.rst/user1.c:318 #, c-format msgid "" -"%d points given for interpolation (after thinning) is less than given NPMIN=" -"%d" +"%d points given for interpolation (after thinning) is less than given " +"NPMIN=%d" msgstr "" #: ../vector/v.vol.rst/user1.c:339 @@ -59981,7 +60341,7 @@ msgid "Categories already exist in layer %d" msgstr "" #: ../vector/v.category/main.c:377 ../vector/v.delaunay/main.c:172 -#: ../vector/v.in.ogr/main.c:1534 +#: ../vector/v.in.ogr/main.c:1535 msgid "Unable to calculate area centroid" msgstr "" @@ -60113,8 +60473,8 @@ msgstr "" #: ../vector/v.external.out/link.c:25 ../vector/v.out.ogr/main.c:105 #, c-format msgid "" -"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format (\"%s" -"\" given)" +"Data source starts with \"PG:\" prefix, expecting \"PostgreSQL\" format " +"(\"%s\" given)" msgstr "" #: ../vector/v.external.out/link.c:97 @@ -61875,17 +62235,17 @@ msgstr "" msgid "Error reading vector map <%s> - some data may not be correct" msgstr "" -#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1437 +#: ../vector/v.patch/main.c:528 ../vector/v.in.ogr/main.c:1438 #, c-format msgid "Snapping boundaries (threshold = %.3e)..." msgstr "" #: ../vector/v.patch/main.c:558 ../vector/v.overlay/area_area.c:130 -#: ../vector/v.in.ogr/main.c:1479 +#: ../vector/v.in.ogr/main.c:1480 msgid "Cleaning boundaries at nodes..." msgstr "" -#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1485 +#: ../vector/v.patch/main.c:565 ../vector/v.in.ogr/main.c:1486 msgid "Merging boundaries..." msgstr "" @@ -62061,13 +62421,13 @@ msgstr "" msgid "No default DB defined" msgstr "" -#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:592 +#: ../vector/v.surf.bspline/main.c:275 ../vector/v.surf.rst/main.c:595 msgid "" "Input is 3D: using attribute values instead of z-coordinates for " "approximation" msgstr "" -#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:596 +#: ../vector/v.surf.bspline/main.c:279 ../vector/v.surf.rst/main.c:599 msgid "Input is 3D: using z-coordinates for approximation" msgstr "" @@ -62313,42 +62673,46 @@ msgid "Field separator for print mode" msgstr "" #: ../vector/v.to.db/parse.c:127 +msgid "Print header" +msgstr "" + +#: ../vector/v.to.db/parse.c:132 msgid "Only print SQL statements" msgstr "" -#: ../vector/v.to.db/parse.c:133 +#: ../vector/v.to.db/parse.c:138 msgid "Print also totals for option length, area, or count" msgstr "" -#: ../vector/v.to.db/parse.c:182 +#: ../vector/v.to.db/parse.c:190 msgid "This option requires one column" msgstr "" -#: ../vector/v.to.db/parse.c:187 +#: ../vector/v.to.db/parse.c:195 msgid "This option requires two columns" msgstr "" -#: ../vector/v.to.db/parse.c:193 +#: ../vector/v.to.db/parse.c:201 msgid "This option requires at least two columns" msgstr "" -#: ../vector/v.to.db/parse.c:198 +#: ../vector/v.to.db/parse.c:206 msgid "This option requires four columns" msgstr "" -#: ../vector/v.to.db/parse.c:205 +#: ../vector/v.to.db/parse.c:213 msgid "Parameter 'qcolumn' must be specified for 'option=query'" msgstr "" -#: ../vector/v.to.db/parse.c:210 +#: ../vector/v.to.db/parse.c:218 msgid "The 'sides' option makes sense only for boundaries" msgstr "" -#: ../vector/v.to.db/parse.c:213 +#: ../vector/v.to.db/parse.c:221 msgid "The 'sinuous' option makes sense only for lines" msgstr "" -#: ../vector/v.to.db/parse.c:216 +#: ../vector/v.to.db/parse.c:224 msgid "The 'azimuth' option makes sense only for lines" msgstr "" @@ -63330,16 +63694,6 @@ msgstr "" msgid "Writing shortest paths..." msgstr "" -#: ../vector/v.db.select/main.c:40 -#, c-format -msgid "The flag -%c is not allowed with %s=%s. %s" -msgstr "" - -#: ../vector/v.db.select/main.c:50 -#, c-format -msgid "The option %s is not allowed with %s=%s. %s" -msgstr "" - #: ../vector/v.db.select/main.c:101 msgid "Prints vector map attributes." msgstr "" @@ -64733,66 +65087,66 @@ msgid "" "disabled." msgstr "" -#: ../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 +#: ../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 #, c-format msgid "Output vector map name <%s> is not valid map name" msgstr "" -#: ../vector/v.surf.rst/main.c:465 +#: ../vector/v.surf.rst/main.c:468 msgid "You are not outputting any raster or vector maps" msgstr "" -#: ../vector/v.surf.rst/main.c:474 +#: ../vector/v.surf.rst/main.c:477 msgid "" "Both cross-validation options (-c flag and cvdev vector output) must be " "specified" msgstr "" -#: ../vector/v.surf.rst/main.c:478 +#: ../vector/v.surf.rst/main.c:481 msgid "" "The cross-validation cannot be computed simultaneously with output raster or " "devi file" msgstr "" -#: ../vector/v.surf.rst/main.c:497 +#: ../vector/v.surf.rst/main.c:500 msgid "Using anisotropy - both theta and scalex have to be specified" msgstr "" -#: ../vector/v.surf.rst/main.c:507 +#: ../vector/v.surf.rst/main.c:510 msgid "Both smatt and smooth options specified - using constant" msgstr "" -#: ../vector/v.surf.rst/main.c:517 +#: ../vector/v.surf.rst/main.c:520 msgid "The computation will last too long - lower npmin is suggested" msgstr "" -#: ../vector/v.surf.rst/main.c:601 +#: ../vector/v.surf.rst/main.c:604 msgid "Input is 2D: using attribute values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:604 +#: ../vector/v.surf.rst/main.c:607 msgid "Input is 2D: using category values for approximation" msgstr "" -#: ../vector/v.surf.rst/main.c:731 +#: ../vector/v.surf.rst/main.c:734 #, c-format msgid "%d bytes of disk space for temp files." msgstr "" -#: ../vector/v.surf.rst/main.c:752 +#: ../vector/v.surf.rst/main.c:755 msgid "Processing segments in parallel..." msgstr "" -#: ../vector/v.surf.rst/main.c:758 ../vector/v.surf.rst/main.c:767 +#: ../vector/v.surf.rst/main.c:761 ../vector/v.surf.rst/main.c:770 msgid "Interp_segmets failed" msgstr "" -#: ../vector/v.surf.rst/main.c:761 +#: ../vector/v.surf.rst/main.c:764 msgid "Processing segments..." msgstr "" -#: ../vector/v.surf.rst/main.c:786 +#: ../vector/v.surf.rst/main.c:789 msgid "Unable to write raster maps - try to increase resolution" msgstr "" @@ -65078,7 +65432,7 @@ msgstr "" msgid "Querying vector map <%s>..." msgstr "" -#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1623 +#: ../vector/v.overlay/area_area.c:293 ../vector/v.in.ogr/main.c:1624 msgid "Writing centroids..." msgstr "" @@ -65535,164 +65889,164 @@ msgstr "" msgid "Unable to open driver <%s>" msgstr "" -#: ../vector/v.info/print.c:300 +#: ../vector/v.info/print.c:301 msgid "Name:" msgstr "" -#: ../vector/v.info/print.c:302 +#: ../vector/v.info/print.c:303 msgid "Mapset:" msgstr "" -#: ../vector/v.info/print.c:305 -msgid "Location:" +#: ../vector/v.info/print.c:306 +msgid "Project:" msgstr "" -#: ../vector/v.info/print.c:307 +#: ../vector/v.info/print.c:308 msgid "Database:" msgstr "" -#: ../vector/v.info/print.c:310 +#: ../vector/v.info/print.c:311 msgid "Title:" msgstr "" -#: ../vector/v.info/print.c:312 +#: ../vector/v.info/print.c:313 msgid "Map scale:" msgstr "" -#: ../vector/v.info/print.c:315 +#: ../vector/v.info/print.c:316 msgid "Name of creator:" msgstr "" -#: ../vector/v.info/print.c:317 +#: ../vector/v.info/print.c:318 msgid "Organization:" msgstr "" -#: ../vector/v.info/print.c:319 +#: ../vector/v.info/print.c:320 msgid "Source date:" msgstr "" -#: ../vector/v.info/print.c:325 +#: ../vector/v.info/print.c:326 msgid "Timestamp (first layer): " msgstr "" -#: ../vector/v.info/print.c:329 +#: ../vector/v.info/print.c:330 msgid "Timestamp (first layer): none" msgstr "" -#: ../vector/v.info/print.c:336 ../vector/v.info/print.c:360 -#: ../vector/v.info/print.c:397 +#: ../vector/v.info/print.c:337 ../vector/v.info/print.c:361 +#: ../vector/v.info/print.c:398 msgid "Map format:" msgstr "" -#: ../vector/v.info/print.c:341 +#: ../vector/v.info/print.c:342 msgid "OGR layer:" msgstr "" -#: ../vector/v.info/print.c:344 +#: ../vector/v.info/print.c:345 msgid "OGR datasource:" msgstr "" -#: ../vector/v.info/print.c:347 ../vector/v.info/print.c:376 +#: ../vector/v.info/print.c:348 ../vector/v.info/print.c:377 msgid "Feature type:" msgstr "" -#: ../vector/v.info/print.c:365 +#: ../vector/v.info/print.c:366 msgid "DB table:" msgstr "" -#: ../vector/v.info/print.c:368 +#: ../vector/v.info/print.c:369 msgid "DB name:" msgstr "" -#: ../vector/v.info/print.c:372 +#: ../vector/v.info/print.c:373 msgid "Geometry column:" msgstr "" -#: ../vector/v.info/print.c:383 ../vector/v.info/print.c:391 +#: ../vector/v.info/print.c:384 ../vector/v.info/print.c:392 msgid "Topology:" msgstr "" -#: ../vector/v.info/print.c:384 +#: ../vector/v.info/print.c:385 msgid "schema:" msgstr "" -#: ../vector/v.info/print.c:388 +#: ../vector/v.info/print.c:389 msgid "Topology column:" msgstr "" -#: ../vector/v.info/print.c:403 +#: ../vector/v.info/print.c:404 msgid "Type of map" msgstr "" -#: ../vector/v.info/print.c:404 +#: ../vector/v.info/print.c:405 msgid "level" msgstr "" -#: ../vector/v.info/print.c:409 +#: ../vector/v.info/print.c:410 msgid "Number of points:" msgstr "" -#: ../vector/v.info/print.c:411 +#: ../vector/v.info/print.c:412 msgid "Number of centroids:" msgstr "" -#: ../vector/v.info/print.c:414 +#: ../vector/v.info/print.c:415 msgid "Number of lines:" msgstr "" -#: ../vector/v.info/print.c:416 +#: ../vector/v.info/print.c:417 msgid "Number of boundaries:" msgstr "" -#: ../vector/v.info/print.c:419 +#: ../vector/v.info/print.c:420 msgid "Number of areas:" msgstr "" -#: ../vector/v.info/print.c:420 +#: ../vector/v.info/print.c:421 msgid "Number of islands:" msgstr "" -#: ../vector/v.info/print.c:425 +#: ../vector/v.info/print.c:426 msgid "Number of faces:" msgstr "" -#: ../vector/v.info/print.c:426 +#: ../vector/v.info/print.c:427 msgid "Number of kernels:" msgstr "" -#: ../vector/v.info/print.c:430 +#: ../vector/v.info/print.c:431 msgid "Number of volumes:" msgstr "" -#: ../vector/v.info/print.c:431 +#: ../vector/v.info/print.c:432 msgid "Number of holes:" msgstr "" -#: ../vector/v.info/print.c:436 +#: ../vector/v.info/print.c:437 msgid "Map is 3D:" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "Yes" msgstr "" -#: ../vector/v.info/print.c:437 +#: ../vector/v.info/print.c:438 msgid "No" msgstr "" -#: ../vector/v.info/print.c:439 +#: ../vector/v.info/print.c:440 msgid "Number of dblinks:" msgstr "" -#: ../vector/v.info/print.c:456 +#: ../vector/v.info/print.c:457 msgid "zone" msgstr "" -#: ../vector/v.info/print.c:486 +#: ../vector/v.info/print.c:487 msgid "Digitization threshold" msgstr "" -#: ../vector/v.info/print.c:488 +#: ../vector/v.info/print.c:489 msgid "Comment" msgstr "" @@ -65868,27 +66222,50 @@ msgstr "" msgid "An error occurred, nothing to be exported" msgstr "" +#: ../vector/v.in.pdal/projection.c:30 +msgid "" +"Coordinate reference system of the dataset does not appear to match current " +"project.\n" +"\n" +msgstr "" + +#: ../vector/v.in.pdal/projection.c:134 +msgid "" +"Coordinate reference system of the input dataset and current project appear " +"to match" +msgstr "" + #: ../vector/v.in.pdal/main.cpp:132 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../vector/v.in.pdal/main.cpp:405 +#: ../vector/v.in.pdal/main.cpp:215 +msgid "Reproject to projects's coordinate system if needed" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:217 +msgid "" +"Reprojects input dataset to the coordinate system of the GRASS project (by " +"default only datasets with the matching coordinate system can be imported" +msgstr "" + +#: ../vector/v.in.pdal/main.cpp:406 msgid "" "Cannot store return information because the input does not have a return " "dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:417 +#: ../vector/v.in.pdal/main.cpp:418 msgid "" "Cannot store class because the input does not have a classification dimension" msgstr "" -#: ../vector/v.in.pdal/main.cpp:428 +#: ../vector/v.in.pdal/main.cpp:429 msgid "" "Cannot store RGB colors because the input does not have a RGB dimensions" msgstr "" -#: ../vector/v.in.pdal/main.cpp:445 +#: ../vector/v.in.pdal/main.cpp:446 #, c-format msgid "" "Dataset doesn't have requested dimension '%s' with ID %d (possibly a " @@ -65955,274 +66332,274 @@ msgstr "" msgid "Force 2D output even if input is 3D" msgstr "" -#: ../vector/v.in.ogr/main.c:404 +#: ../vector/v.in.ogr/main.c:405 msgid "Change column names to lowercase characters" msgstr "" -#: ../vector/v.in.ogr/main.c:554 +#: ../vector/v.in.ogr/main.c:555 #, c-format msgid "Using OGR driver '%s/%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:567 +#: ../vector/v.in.ogr/main.c:568 msgid "Using interleaved reading mode" msgstr "" -#: ../vector/v.in.ogr/main.c:572 +#: ../vector/v.in.ogr/main.c:573 #, c-format msgid "" "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)." msgstr "" -#: ../vector/v.in.ogr/main.c:583 +#: ../vector/v.in.ogr/main.c:584 #, c-format msgid "Encoding value not supported by OGR driver <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:590 +#: ../vector/v.in.ogr/main.c:591 msgid "No OGR layers available" msgstr "" -#: ../vector/v.in.ogr/main.c:597 +#: ../vector/v.in.ogr/main.c:598 #, c-format msgid "Data source <%s> (format '%s') contains %d layers:" msgstr "" -#: ../vector/v.in.ogr/main.c:649 +#: ../vector/v.in.ogr/main.c:650 msgid "" "Detected different projections of input layers. Input layers must be " "imported separately." msgstr "" -#: ../vector/v.in.ogr/main.c:688 +#: ../vector/v.in.ogr/main.c:689 #, c-format msgid "Illegal output name <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:709 +#: ../vector/v.in.ogr/main.c:710 #, c-format msgid "All available OGR layers will be imported into vector map <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:718 +#: ../vector/v.in.ogr/main.c:719 msgid "" -"When creating a new location, the current region can not be used as spatial " +"When creating a new project, the current region can not be used as spatial " "filter, disabling" msgstr "" -#: ../vector/v.in.ogr/main.c:750 ../vector/v.in.ogr/main.c:2050 +#: ../vector/v.in.ogr/main.c:751 ../vector/v.in.ogr/main.c:2051 #, c-format msgid "Error setting attribute filter '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:791 +#: ../vector/v.in.ogr/main.c:792 #, c-format msgid "Geometry column <%s> not found in OGR layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:803 +#: ../vector/v.in.ogr/main.c:804 #, c-format msgid "Check if OGR layer <%s> contains polygons..." msgstr "" -#: ../vector/v.in.ogr/main.c:851 +#: ../vector/v.in.ogr/main.c:852 #, c-format msgid "Boundary splitting distance in map units: %G" msgstr "" -#: ../vector/v.in.ogr/main.c:882 +#: ../vector/v.in.ogr/main.c:883 #, c-format msgid "Using temporary vector <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:928 +#: ../vector/v.in.ogr/main.c:929 #, c-format msgid "Key column '%s' not found in input layer <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:939 +#: ../vector/v.in.ogr/main.c:940 #, c-format msgid "Key column '%s' in input layer <%s> is not integer" msgstr "" -#: ../vector/v.in.ogr/main.c:951 +#: ../vector/v.in.ogr/main.c:952 #, c-format msgid "Creating attribute table for layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1018 +#: ../vector/v.in.ogr/main.c:1019 #, c-format msgid "Column name <%s> renamed to <%s>" msgstr "" -#: ../vector/v.in.ogr/main.c:1050 +#: ../vector/v.in.ogr/main.c:1051 #, c-format msgid "Writing column <%s> with integer 64 as integer 32" msgstr "" -#: ../vector/v.in.ogr/main.c:1060 +#: ../vector/v.in.ogr/main.c:1061 #, c-format msgid "Writing column <%s> with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1084 +#: ../vector/v.in.ogr/main.c:1085 #, c-format msgid "" "Width for column %s set to 255 (was not specified by OGR), some strings may " "be truncated!" msgstr "" -#: ../vector/v.in.ogr/main.c:1102 +#: ../vector/v.in.ogr/main.c:1103 #, c-format msgid "Writing column %s with fixed length %d chars (may be truncated)" msgstr "" -#: ../vector/v.in.ogr/main.c:1108 +#: ../vector/v.in.ogr/main.c:1109 #, c-format msgid "Column <%s> of unsupported data type \"%s\" is omitted from import" msgstr "" -#: ../vector/v.in.ogr/main.c:1132 +#: ../vector/v.in.ogr/main.c:1133 #, c-format msgid "Column name <%s> renamed to <%s_%d>" msgstr "" -#: ../vector/v.in.ogr/main.c:1196 +#: ../vector/v.in.ogr/main.c:1197 #, c-format msgid "Importing %lld features (OGR layer <%s>)..." msgstr "" -#: ../vector/v.in.ogr/main.c:1352 +#: ../vector/v.in.ogr/main.c:1353 #, c-format msgid "Cannot insert new row for input layer <%s>: %s" msgstr "" -#: ../vector/v.in.ogr/main.c:1368 +#: ../vector/v.in.ogr/main.c:1369 #, c-format msgid "%d %s without geometry in input layer <%s> skipped" msgstr "" -#: ../vector/v.in.ogr/main.c:1369 +#: ../vector/v.in.ogr/main.c:1370 msgid "feature" msgstr "" -#: ../vector/v.in.ogr/main.c:1392 +#: ../vector/v.in.ogr/main.c:1393 #, c-format msgid "Unable to drop table: '%s'" msgstr "" -#: ../vector/v.in.ogr/main.c:1433 +#: ../vector/v.in.ogr/main.c:1434 msgid "Cleaning polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1491 +#: ../vector/v.in.ogr/main.c:1492 msgid "Changing boundary dangles to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1504 +#: ../vector/v.in.ogr/main.c:1505 msgid "Changing boundary bridges to lines..." msgstr "" -#: ../vector/v.in.ogr/main.c:1553 +#: ../vector/v.in.ogr/main.c:1554 #, c-format msgid "Finding centroids for OGR layer <%s>..." msgstr "" -#: ../vector/v.in.ogr/main.c:1592 +#: ../vector/v.in.ogr/main.c:1593 #, c-format msgid "The order of features in input layer <%s> has changed" msgstr "" -#: ../vector/v.in.ogr/main.c:1669 +#: ../vector/v.in.ogr/main.c:1670 #, c-format msgid "%d input polygons\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1670 +#: ../vector/v.in.ogr/main.c:1671 #, c-format msgid "%d input polygons" msgstr "" -#: ../vector/v.in.ogr/main.c:1673 +#: ../vector/v.in.ogr/main.c:1674 #, c-format msgid "Total area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1674 +#: ../vector/v.in.ogr/main.c:1675 #, c-format msgid "Total area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1677 +#: ../vector/v.in.ogr/main.c:1678 #, c-format msgid "Overlapping area: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1680 +#: ../vector/v.in.ogr/main.c:1681 #, c-format msgid "Overlapping area: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1685 +#: ../vector/v.in.ogr/main.c:1686 #, c-format msgid "Area without category: %G (%d areas)\n" msgstr "" -#: ../vector/v.in.ogr/main.c:1688 +#: ../vector/v.in.ogr/main.c:1689 #, c-format msgid "Area without category: %G (%d areas)" msgstr "" -#: ../vector/v.in.ogr/main.c:1814 +#: ../vector/v.in.ogr/main.c:1815 msgid "The output contains topological errors:" msgstr "" -#: ../vector/v.in.ogr/main.c:1818 +#: ../vector/v.in.ogr/main.c:1819 #, c-format msgid "Unable to calculate a centroid for %d areas" msgstr "" -#: ../vector/v.in.ogr/main.c:1824 +#: ../vector/v.in.ogr/main.c:1825 #, c-format msgid "Number of incorrect boundaries: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1830 +#: ../vector/v.in.ogr/main.c:1831 #, c-format msgid "Number of centroids outside area: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1836 +#: ../vector/v.in.ogr/main.c:1837 #, c-format msgid "Number of duplicate centroids: %d" msgstr "" -#: ../vector/v.in.ogr/main.c:1840 ../vector/v.in.ogr/main.c:1936 +#: ../vector/v.in.ogr/main.c:1841 ../vector/v.in.ogr/main.c:1937 msgid "The input could be cleaned by snapping vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1845 ../vector/v.in.ogr/main.c:1892 -#: ../vector/v.in.ogr/main.c:1929 ../vector/v.in.ogr/main.c:1939 +#: ../vector/v.in.ogr/main.c:1846 ../vector/v.in.ogr/main.c:1893 +#: ../vector/v.in.ogr/main.c:1930 ../vector/v.in.ogr/main.c:1940 #, c-format msgid "Estimated range of snapping threshold: [%g, %g]" msgstr "" -#: ../vector/v.in.ogr/main.c:1858 ../vector/v.in.ogr/main.c:1869 -#: ../vector/v.in.ogr/main.c:1905 +#: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870 +#: ../vector/v.in.ogr/main.c:1906 #, c-format msgid "Try to import again, snapping with %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1862 ../vector/v.in.ogr/main.c:1898 +#: ../vector/v.in.ogr/main.c:1863 ../vector/v.in.ogr/main.c:1899 #, c-format msgid "Try to import again, snapping with at least %g: 'snap=%g'" msgstr "" -#: ../vector/v.in.ogr/main.c:1874 ../vector/v.in.ogr/main.c:1910 +#: ../vector/v.in.ogr/main.c:1875 ../vector/v.in.ogr/main.c:1911 msgid "Manual cleaning may be needed." msgstr "" -#: ../vector/v.in.ogr/main.c:1878 +#: ../vector/v.in.ogr/main.c:1879 #, c-format msgid "" "%d areas represent multiple (overlapping) features, because polygons overlap " @@ -66231,51 +66608,51 @@ msgid "" "%d" msgstr "" -#: ../vector/v.in.ogr/main.c:1887 +#: ../vector/v.in.ogr/main.c:1888 msgid "" "If overlapping is not desired, the input data can be cleaned by snapping " "vertices to each other." msgstr "" -#: ../vector/v.in.ogr/main.c:1917 +#: ../vector/v.in.ogr/main.c:1918 #, c-format msgid "%d input polygons got lost during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1922 +#: ../vector/v.in.ogr/main.c:1923 #, c-format msgid "%d additional areas where created during import." msgstr "" -#: ../vector/v.in.ogr/main.c:1927 +#: ../vector/v.in.ogr/main.c:1928 #, c-format msgid "The snapping threshold %g might be too large." msgstr "" -#: ../vector/v.in.ogr/main.c:1932 +#: ../vector/v.in.ogr/main.c:1933 msgid "Try to reduce the snapping threshold or clean the output manually." msgstr "" -#: ../vector/v.in.ogr/main.c:1983 +#: ../vector/v.in.ogr/main.c:1984 msgid "" "Input data contains 3D features. Created vector is 2D only, disable -2 flag " "to import 3D vector." msgstr "" -#: ../vector/v.in.ogr/main.c:2003 +#: ../vector/v.in.ogr/main.c:2004 #, c-format msgid "Using GDAL 2.2+ style interleaved reading for GDAL version %d.%d.%d" msgstr "" -#: ../vector/v.in.ogr/main.c:2195 +#: ../vector/v.in.ogr/main.c:2196 msgid "xmin is larger than xmax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2198 +#: ../vector/v.in.ogr/main.c:2199 msgid "ymin is larger than ymax in 'spatial' parameters" msgstr "" -#: ../vector/v.in.ogr/main.c:2218 +#: ../vector/v.in.ogr/main.c:2219 #, c-format msgid "" "The spatial filter does not overlap with OGR layer <%s>. Nothing to import." @@ -66431,10 +66808,20 @@ msgstr "" msgid "The vector map <%s> already exists in" msgstr "" +#: ../vector/v.rectify/main.c:205 +#, c-format +msgid "target project %s, mapset %s:" +msgstr "" + #: ../vector/v.rectify/main.c:207 msgid "Rectification cancelled." msgstr "" +#: ../vector/v.rectify/target.c:29 +#, c-format +msgid "Target project <%s> not found" +msgstr "" + #: ../vector/v.rectify/target.c:43 msgid "Please run i.target for group." msgstr "" @@ -66598,14 +66985,14 @@ msgstr "" msgid "Text encoding (only applicable to TrueType fonts)" msgstr "" -#: ../display/d.rast.num/main.c:209 +#: ../display/d.rast.num/main.c:212 #, c-format msgid "%d col" msgid_plural "%d cols" msgstr[0] "" #. GTC %s will be replaced by strings "X rows" and "Y cols" -#: ../display/d.rast.num/main.c:211 +#: ../display/d.rast.num/main.c:214 #, c-format msgid "" "Current region size: %s X %s\n" @@ -66613,7 +67000,7 @@ msgid "" "graphics window may be too small for cell category number to be visible." msgstr "" -#: ../display/d.rast.num/main.c:220 +#: ../display/d.rast.num/main.c:223 msgid "Aborting (region larger then 200 rows X 200 cols is not allowed)" msgstr "" @@ -67599,6 +67986,10 @@ msgstr "" msgid "Highlight color" msgstr "" +#: ../display/d.path/main.c:126 +msgid "Use geodesic calculation for longitude-latitude locations" +msgstr "" + #: ../display/d.path/main.c:130 msgid "Render bold lines" msgstr "" @@ -68161,6 +68552,23 @@ msgid "" "in the active graphics frame." msgstr "" +#: ../display/d.redraw/main.c:49 ../scripts/d.out.file/d.out.file.py:58 +#: ../scripts/d.what.rast/d.what.rast.py:44 +#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 +#: ../scripts/d.to.rast/d.to.rast.py:44 +msgid "No graphics device selected. Use d.mon to select graphics device." +msgstr "" + +#: ../display/d.redraw/main.c:61 +#, c-format +msgid "Unable to open file '%s' for reading." +msgstr "" + +#: ../display/d.redraw/main.c:100 +#, c-format +msgid "Unable to open file '%s' for writing." +msgstr "" + #: ../display/d.graph/graphics.c:60 ../display/d.graph/do_graph.c:129 #: ../display/d.graph/do_graph.c:193 ../display/d.graph/do_graph.c:213 #: ../display/d.graph/do_graph.c:262 ../display/d.graph/do_graph.c:328 @@ -68721,7 +69129,7 @@ msgid "No monitors running" msgstr "" #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35 -#: ../scripts/d.what.vect/d.what.vect.py:35 ../scripts/d.redraw/d.redraw.py:39 +#: ../scripts/d.what.vect/d.what.vect.py:35 #, c-format, python-format msgid "Unable to open file '%s'" msgstr "" @@ -68960,22 +69368,15 @@ msgstr "" msgid "Input DSN <%s> not found or not readable" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:164 +#: ../scripts/db.in.ogr/db.in.ogr.py:171 msgid "Something went wrong. Should not happen" msgstr "" -#: ../scripts/db.in.ogr/db.in.ogr.py:184 +#: ../scripts/db.in.ogr/db.in.ogr.py:193 #, python-format msgid "Imported table <%s> with %d rows" msgstr "" -#: ../scripts/d.out.file/d.out.file.py:58 -#: ../scripts/d.what.rast/d.what.rast.py:44 -#: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282 -#: ../scripts/d.to.rast/d.to.rast.py:44 ../scripts/d.redraw/d.redraw.py:34 -msgid "No graphics device selected. Use d.mon to select graphics device." -msgstr "" - #: ../scripts/v.db.droptable/v.db.droptable.py:58 #, python-brace-format msgid "Vector map <{name}> not found in the current mapset ({mapset})" @@ -71000,38 +71401,38 @@ msgid "" "aggregation backend is '{backend}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:375 +#: ../scripts/v.dissolve/v.dissolve.py:376 #, python-brace-format msgid "" "Methods must be specified with {backend} backend and with result columns " "provided" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:588 +#: ../scripts/v.dissolve/v.dissolve.py:590 #, python-format msgid "" -"No '%s' option specified. Dissolving based on category values from layer <" -"%s>." +"No '%s' option specified. Dissolving based on category values from layer " +"<%s>." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:604 +#: ../scripts/v.dissolve/v.dissolve.py:606 #, python-format msgid "" "Invalid layer number (%d). Parameter '%s' specified, assuming layer '1'." msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:616 +#: ../scripts/v.dissolve/v.dissolve.py:618 msgid "Key column must be of type integer or string" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:621 +#: ../scripts/v.dissolve/v.dissolve.py:623 #, python-brace-format msgid "" "Key column type must be string (text) for aggregation method to work, not " "'{column_type}'" msgstr "" -#: ../scripts/v.dissolve/v.dissolve.py:675 +#: ../scripts/v.dissolve/v.dissolve.py:676 #, python-brace-format msgid "" "A processing step failed. Check the above error messages and see the " @@ -71111,11 +71512,11 @@ msgid "" "not compatible with the projection of the current location" msgstr "" -#: ../scripts/r.tileset/r.tileset.py:359 +#: ../scripts/r.tileset/r.tileset.py:361 msgid "Computing tiling..." msgstr "" -#: ../scripts/r.tileset/r.tileset.py:400 +#: ../scripts/r.tileset/r.tileset.py:402 #, python-format msgid "During computation %i tiles could not be created" msgstr "" @@ -71140,103 +71541,103 @@ msgstr "" msgid "Skipping masked raster parts" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:207 -#: ../scripts/r.fillnulls/r.fillnulls.py:663 +#: ../scripts/r.fillnulls/r.fillnulls.py:210 +#: ../scripts/r.fillnulls/r.fillnulls.py:672 msgid "Restoring user mask (MASK)..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:211 -#: ../scripts/r.fillnulls/r.fillnulls.py:667 +#: ../scripts/r.fillnulls/r.fillnulls.py:214 +#: ../scripts/r.fillnulls/r.fillnulls.py:676 msgid "Failed to restore user MASK!" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:215 +#: ../scripts/r.fillnulls/r.fillnulls.py:218 msgid "Growing NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:230 -#: ../scripts/r.fillnulls/r.fillnulls.py:248 -#: ../scripts/r.fillnulls/r.fillnulls.py:403 +#: ../scripts/r.fillnulls/r.fillnulls.py:233 +#: ../scripts/r.fillnulls/r.fillnulls.py:252 +#: ../scripts/r.fillnulls/r.fillnulls.py:408 msgid "abandoned. Removing temporary map, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:236 +#: ../scripts/r.fillnulls/r.fillnulls.py:240 msgid "Assigning IDs to NULL areas" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:275 -#: ../scripts/r.fillnulls/r.fillnulls.py:331 -#: ../scripts/r.fillnulls/r.fillnulls.py:353 -#: ../scripts/r.fillnulls/r.fillnulls.py:370 -#: ../scripts/r.fillnulls/r.fillnulls.py:431 -#: ../scripts/r.fillnulls/r.fillnulls.py:529 -#: ../scripts/r.fillnulls/r.fillnulls.py:560 -#: ../scripts/r.fillnulls/r.fillnulls.py:575 +#: ../scripts/r.fillnulls/r.fillnulls.py:279 +#: ../scripts/r.fillnulls/r.fillnulls.py:336 +#: ../scripts/r.fillnulls/r.fillnulls.py:358 +#: ../scripts/r.fillnulls/r.fillnulls.py:375 +#: ../scripts/r.fillnulls/r.fillnulls.py:436 +#: ../scripts/r.fillnulls/r.fillnulls.py:535 +#: ../scripts/r.fillnulls/r.fillnulls.py:566 +#: ../scripts/r.fillnulls/r.fillnulls.py:581 msgid "abandoned. Removing temporary maps, restoring user mask if needed:" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:305 -#: ../scripts/r.fillnulls/r.fillnulls.py:619 -#: ../scripts/r.fillnulls/r.fillnulls.py:651 +#: ../scripts/r.fillnulls/r.fillnulls.py:309 +#: ../scripts/r.fillnulls/r.fillnulls.py:626 +#: ../scripts/r.fillnulls/r.fillnulls.py:659 #, python-format msgid "Input map <%s> has no holes. Copying to output without modification." msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:311 +#: ../scripts/r.fillnulls/r.fillnulls.py:316 #, python-format msgid "Processing %d map holes" msgstr "" #. GTC Hole is a NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:317 +#: ../scripts/r.fillnulls/r.fillnulls.py:322 #, python-format msgid "Filling hole %s of %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:438 +#: ../scripts/r.fillnulls/r.fillnulls.py:443 #, python-format msgid "Interpolating %d points" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:441 +#: ../scripts/r.fillnulls/r.fillnulls.py:446 msgid "No points to interpolate" msgstr "" #. GTC Hole is NULL area in a raster map -#: ../scripts/r.fillnulls/r.fillnulls.py:468 +#: ../scripts/r.fillnulls/r.fillnulls.py:473 #, python-format msgid "Failed to fill hole %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:483 +#: ../scripts/r.fillnulls/r.fillnulls.py:488 #, python-format msgid "" "Filling has failed silently. Leaving temporary maps with prefix <%s> for " "debugging." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:581 +#: ../scripts/r.fillnulls/r.fillnulls.py:588 #, python-format msgid "Using %s bspline interpolation" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:625 -#: ../scripts/r.fillnulls/r.fillnulls.py:657 +#: ../scripts/r.fillnulls/r.fillnulls.py:633 +#: ../scripts/r.fillnulls/r.fillnulls.py:666 #, python-format msgid "Failure during bspline interpolation. Error message: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:681 +#: ../scripts/r.fillnulls/r.fillnulls.py:690 msgid "Patching fill data into NULL areas..." msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:690 +#: ../scripts/r.fillnulls/r.fillnulls.py:699 #, python-format msgid "Filled raster map is: %s" msgstr "" -#: ../scripts/r.fillnulls/r.fillnulls.py:698 +#: ../scripts/r.fillnulls/r.fillnulls.py:707 msgid "" "Following holes where not filled. Temporary maps with are left in place to " "allow examination of unfilled holes" @@ -71248,336 +71649,336 @@ msgid "" "the GDAL driver." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:274 +#: ../scripts/r.in.wms/r.in.wms.py:275 msgid "Importing raster map into GRASS..." msgstr "" -#: ../scripts/r.in.wms/r.in.wms.py:277 +#: ../scripts/r.in.wms/r.in.wms.py:278 msgid "" "Nothing to import.\n" "No data has been downloaded from wms server." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:80 +#: ../scripts/r.in.wms/wms_base.py:81 #, python-format msgid "Please insert both %s and %s parameters or none of them." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:92 +#: ../scripts/r.in.wms/wms_base.py:93 msgid "JPEG format does not support transparency" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:101 +#: ../scripts/r.in.wms/wms_base.py:102 #, python-format msgid "Invalid EPSG code %d" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:111 +#: ../scripts/r.in.wms/wms_base.py:112 #, python-format msgid "" -"WMS version <1.3.0> will be used, because version <1.1.1> does not support <" -"%s>projection" +"WMS version <1.3.0> will be used, because version <1.1.1> does not support " +"<%s>projection" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:133 +#: ../scripts/r.in.wms/wms_base.py:135 #, python-format msgid "" "SRS differences: WMS source EPSG %s != location EPSG %s (use srs=%s to " "adjust)" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:146 +#: ../scripts/r.in.wms/wms_base.py:149 msgid "Unable to get projection info" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:153 +#: ../scripts/r.in.wms/wms_base.py:156 msgid "Maxcols must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:157 +#: ../scripts/r.in.wms/wms_base.py:160 msgid "Maxrows must be greater than 100" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:197 +#: ../scripts/r.in.wms/wms_base.py:202 #, python-format msgid "" "These parameter are ignored: %s\n" " %s driver does not support the parameters." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:211 +#: ../scripts/r.in.wms/wms_base.py:216 #, python-format msgid "" "These flags are ignored: %s\n" " %s driver does not support the flags." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:262 +#: ../scripts/r.in.wms/wms_base.py:267 #, python-format msgid "Authorization failed to <%s> when fetching capabilities" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:266 +#: ../scripts/r.in.wms/wms_base.py:271 #, python-brace-format msgid "Unable to fetch capabilities from <{0}>. Reason: " msgstr "" -#: ../scripts/r.in.wms/wms_base.py:307 +#: ../scripts/r.in.wms/wms_base.py:312 #, python-format msgid "" "Unable to open file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:350 +#: ../scripts/r.in.wms/wms_base.py:355 msgid "Unable to write data into tempfile" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:364 +#: ../scripts/r.in.wms/wms_base.py:373 #, python-format msgid "Unable to determine region, %s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:368 +#: ../scripts/r.in.wms/wms_base.py:377 msgid "Region definition: 4 points required" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:374 +#: ../scripts/r.in.wms/wms_base.py:383 msgid "Reprojection of region using m.proj failed." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:414 +#: ../scripts/r.in.wms/wms_base.py:423 msgid "Reprojecting raster..." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:473 ../scripts/r.in.wms/wms_base.py:533 -#: ../scripts/r.in.wms/wms_base.py:543 ../scripts/r.in.wms/wms_base.py:598 -#: ../scripts/r.in.wms/wms_base.py:624 ../scripts/r.in.wms/wms_base.py:638 -#: ../scripts/r.in.wms/wms_base.py:681 +#: ../scripts/r.in.wms/wms_base.py:482 ../scripts/r.in.wms/wms_base.py:542 +#: ../scripts/r.in.wms/wms_base.py:552 ../scripts/r.in.wms/wms_base.py:607 +#: ../scripts/r.in.wms/wms_base.py:633 ../scripts/r.in.wms/wms_base.py:647 +#: ../scripts/r.in.wms/wms_base.py:690 #, python-format msgid "%s failed" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:490 +#: ../scripts/r.in.wms/wms_base.py:499 msgid "Unable to create temporary files" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:520 +#: ../scripts/r.in.wms/wms_base.py:529 #, python-format msgid "" "Please change output name, or change names of these rasters: %s, module " "needs to create this temporary maps during execution." msgstr "" -#: ../scripts/r.in.wms/wms_base.py:575 +#: ../scripts/r.in.wms/wms_base.py:584 msgid "WMS import failed, nothing imported" msgstr "" -#: ../scripts/r.in.wms/wms_base.py:582 +#: ../scripts/r.in.wms/wms_base.py:591 #, python-format msgid "<%s> created." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:29 ../scripts/r.in.wms/wms_gdal_drv.py:23 -#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:348 +#: ../scripts/r.in.wms/wms_drv.py:30 ../scripts/r.in.wms/wms_gdal_drv.py:23 +#: ../scripts/v.import/v.import.py:272 ../scripts/v.import/v.import.py:349 msgid "" "Unable to load GDAL Python bindings (requires package 'python-gdal' being " "installed)" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:56 +#: ../scripts/r.in.wms/wms_drv.py:58 msgid "Downloading data from WMS server..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:116 +#: ../scripts/r.in.wms/wms_drv.py:119 #, python-format msgid "" "Authorization failed to '%s' when fetching data.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:121 +#: ../scripts/r.in.wms/wms_drv.py:124 #, python-format msgid "" "Unable to fetch data from: '%s'\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:146 +#: ../scripts/r.in.wms/wms_drv.py:150 #, python-format msgid "" "Server refused to send data for a tile.\n" "Request will be repeated after %d s." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:154 +#: ../scripts/r.in.wms/wms_drv.py:159 #, python-format msgid "" "Unable to write data into tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:167 +#: ../scripts/r.in.wms/wms_drv.py:172 #, python-format msgid "" "Unable to read data from tempfile.\n" "%s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:172 +#: ../scripts/r.in.wms/wms_drv.py:177 #, python-format msgid "WMS server error: %s" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:174 +#: ../scripts/r.in.wms/wms_drv.py:179 msgid "WMS server unknown error" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:180 +#: ../scripts/r.in.wms/wms_drv.py:185 #, python-format msgid "WMS server error: no band(s) received. Is server URL correct? <%s>" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:205 +#: ../scripts/r.in.wms/wms_drv.py:211 #, python-format msgid "Driver %s does not supports Create() method" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:282 +#: ../scripts/r.in.wms/wms_drv.py:289 #, python-format msgid "Unable to open %s " msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:358 +#: ../scripts/r.in.wms/wms_drv.py:366 msgid "Region is out of server data extend." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:390 +#: ../scripts/r.in.wms/wms_drv.py:398 #, python-format msgid "Fetching %d tiles with %d x %d pixel size per tile..." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:620 ../scripts/r.in.wms/wms_drv.py:894 +#: ../scripts/r.in.wms/wms_drv.py:631 ../scripts/r.in.wms/wms_drv.py:912 #, python-format msgid "" "Unable to parse tile service file.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:665 +#: ../scripts/r.in.wms/wms_drv.py:679 #, python-format msgid "Layer '%s' was not found in capabilities file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:684 +#: ../scripts/r.in.wms/wms_drv.py:698 #, python-format msgid "Layer '%s' is not available with %s code." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:917 +#: ../scripts/r.in.wms/wms_drv.py:936 #, python-format msgid "" "Unable to parse tile service file. \n" " No tag '%s' was found." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:930 +#: ../scripts/r.in.wms/wms_drv.py:949 #, python-format msgid "Tiled group '%s' was not found in tile service file" msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1026 +#: ../scripts/r.in.wms/wms_drv.py:1046 #, python-format msgid "" "Wrong form of parameter '%s' in '%s'. \n" " The parameter was ignored." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1051 +#: ../scripts/r.in.wms/wms_drv.py:1071 #, python-format msgid "Parameter '%s' in '%s' is not variable in tile pattern url." msgstr "" -#: ../scripts/r.in.wms/wms_drv.py:1058 +#: ../scripts/r.in.wms/wms_drv.py:1078 #, python-format msgid "" "%s driver supports only '%s' parameter in '%s'. Other parameters are ignored." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:146 +#: ../scripts/r.in.wms/wms_gdal_drv.py:147 msgid "" "If module will not be able to fetch the data in this geographic " "projection, \n" " try 'WMS_GRASS' driver or use WMS version 1.1.1." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:168 +#: ../scripts/r.in.wms/wms_gdal_drv.py:170 msgid "Unable to open GDAL WMS driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:174 +#: ../scripts/r.in.wms/wms_gdal_drv.py:176 #, python-format msgid "Unable to find %s driver" msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:182 +#: ../scripts/r.in.wms/wms_gdal_drv.py:184 #, python-format msgid "Driver %s supports CreateCopy() method." msgstr "" -#: ../scripts/r.in.wms/wms_gdal_drv.py:196 +#: ../scripts/r.in.wms/wms_gdal_drv.py:198 msgid "Incorrect WMS query" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:44 -#: ../scripts/r.in.wms/wms_cap_parsers.py:53 +#: ../scripts/r.in.wms/wms_cap_parsers.py:45 +#: ../scripts/r.in.wms/wms_cap_parsers.py:54 msgid "Unable to parse XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:47 +#: ../scripts/r.in.wms/wms_cap_parsers.py:48 #, python-format msgid "" "Unable to open XML file '%s'.\n" "%s\n" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:56 +#: ../scripts/r.in.wms/wms_cap_parsers.py:57 msgid "Root node was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:71 +#: ../scripts/r.in.wms/wms_cap_parsers.py:72 #, python-format msgid "" "Unable to parse capabilities file.\n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:104 +#: ../scripts/r.in.wms/wms_cap_parsers.py:106 msgid "Missing version attribute root node in Capabilities XML file" msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:117 +#: ../scripts/r.in.wms/wms_cap_parsers.py:119 #, python-format msgid "WMS server does not support '%s' version." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:263 -#: ../scripts/r.in.wms/wms_cap_parsers.py:280 +#: ../scripts/r.in.wms/wms_cap_parsers.py:267 +#: ../scripts/r.in.wms/wms_cap_parsers.py:284 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag <%s> was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:514 -#: ../scripts/r.in.wms/wms_cap_parsers.py:534 +#: ../scripts/r.in.wms/wms_cap_parsers.py:520 +#: ../scripts/r.in.wms/wms_cap_parsers.py:540 #, python-format msgid "" "Unable to parse capabilities file. \n" " Tag '%s' was not found." msgstr "" -#: ../scripts/r.in.wms/wms_cap_parsers.py:592 +#: ../scripts/r.in.wms/wms_cap_parsers.py:599 #, python-format msgid "" "Unable to parse tile service file. \n" @@ -71630,50 +72031,50 @@ msgstr "" msgid "Imported <%s> vector map <%s>." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:169 +#: ../scripts/r.in.srtm/r.in.srtm.py:172 msgid "This module only operates in LatLong locations" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:194 +#: ../scripts/r.in.srtm/r.in.srtm.py:197 #, python-format msgid "'%s' does not appear to be a valid zip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:201 +#: ../scripts/r.in.srtm/r.in.srtm.py:204 #, python-format msgid "File '%s' or '%s' not found" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:226 +#: ../scripts/r.in.srtm/r.in.srtm.py:229 #, python-format msgid "Extracting '%s'..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:231 +#: ../scripts/r.in.srtm/r.in.srtm.py:234 msgid "Unable to unzip file." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:233 +#: ../scripts/r.in.srtm/r.in.srtm.py:236 msgid "Converting input file to BIL..." msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:257 +#: ../scripts/r.in.srtm/r.in.srtm.py:260 msgid "Attempting to import 1-arcsec SWBD data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:260 +#: ../scripts/r.in.srtm/r.in.srtm.py:263 msgid "Attempting to import 1-arcsec data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:278 +#: ../scripts/r.in.srtm/r.in.srtm.py:281 msgid "Unable to import data" msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:287 +#: ../scripts/r.in.srtm/r.in.srtm.py:290 msgid "Done: generated map " msgstr "" -#: ../scripts/r.in.srtm/r.in.srtm.py:289 +#: ../scripts/r.in.srtm/r.in.srtm.py:292 msgid "" "(Note: Holes in the data can be closed with 'r.fillnulls' using splines)" msgstr "" @@ -71701,13 +72102,13 @@ msgid "" "be cut with respect to the original Geonames.org column content" msgstr "" -#: ../scripts/v.in.geonames/v.in.geonames.py:68 +#: ../scripts/v.in.geonames/v.in.geonames.py:69 #, python-format msgid "Converting %d place names..." msgstr "" #: ../scripts/db.droptable/db.droptable.py:70 -#: ../scripts/db.dropcolumn/db.dropcolumn.py:59 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:71 msgid "Forcing ..." msgstr "" @@ -71764,85 +72165,85 @@ msgid "" "'estimated' resolution" msgstr "" -#: ../scripts/r.import/r.import.py:205 ../scripts/v.import/v.import.py:230 +#: ../scripts/r.import/r.import.py:206 ../scripts/v.import/v.import.py:230 #, python-format msgid "Input <%s> successfully imported without reprojection" msgstr "" -#: ../scripts/r.import/r.import.py:210 ../scripts/r.import/r.import.py:297 +#: ../scripts/r.import/r.import.py:211 ../scripts/r.import/r.import.py:298 #, python-format msgid "Unable to import GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:218 ../scripts/v.import/v.import.py:243 +#: ../scripts/r.import/r.import.py:219 ../scripts/v.import/v.import.py:243 #, python-format -msgid "Coordinate reference system not available for current location <%s>" +msgid "Coordinate reference system not available for current project <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:231 ../scripts/v.import/v.import.py:264 +#: ../scripts/r.import/r.import.py:232 ../scripts/v.import/v.import.py:264 #, python-format -msgid "Creating temporary location for <%s>..." +msgid "Creating temporary project for <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:249 +#: ../scripts/r.import/r.import.py:250 #, python-format msgid "Unable to read GDAL dataset <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:269 ../scripts/v.import/v.import.py:306 +#: ../scripts/r.import/r.import.py:270 ../scripts/v.import/v.import.py:307 #, python-format msgid "Coordinate reference system not available for input <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:274 +#: ../scripts/r.import/r.import.py:275 #, python-format -msgid "Importing <%s> to temporary location..." +msgid "Importing <%s> to temporary project..." msgstr "" -#: ../scripts/r.import/r.import.py:308 +#: ../scripts/r.import/r.import.py:309 msgid "Input contains GCPs, rectification is required" msgstr "" -#: ../scripts/r.import/r.import.py:347 +#: ../scripts/r.import/r.import.py:348 msgid "Unable to get reprojected map extent" msgstr "" -#: ../scripts/r.import/r.import.py:388 +#: ../scripts/r.import/r.import.py:389 msgid "Please check the 'extent' parameter" msgstr "" -#: ../scripts/r.import/r.import.py:390 ../scripts/v.import/v.import.py:333 -msgid "Unable to reproject to source location" +#: ../scripts/r.import/r.import.py:391 ../scripts/v.import/v.import.py:334 +msgid "Unable to reproject to source project" msgstr "" -#: ../scripts/r.import/r.import.py:410 +#: ../scripts/r.import/r.import.py:411 #, python-brace-format msgid "Estimated target resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:428 +#: ../scripts/r.import/r.import.py:429 #, python-brace-format msgid "Using given resolution for input band <{out}>: {res}" msgstr "" -#: ../scripts/r.import/r.import.py:438 +#: ../scripts/r.import/r.import.py:439 #, python-brace-format msgid "" "Using current region resolution for input band <{out}>: nsres={ns}, " "ewres={ew}" msgstr "" -#: ../scripts/r.import/r.import.py:444 ../scripts/v.import/v.import.py:377 +#: ../scripts/r.import/r.import.py:445 ../scripts/v.import/v.import.py:379 #, python-format msgid "Reprojecting <%s>..." msgstr "" -#: ../scripts/r.import/r.import.py:459 +#: ../scripts/r.import/r.import.py:460 #, python-format msgid "Unable to to reproject raster <%s>" msgstr "" -#: ../scripts/r.import/r.import.py:462 +#: ../scripts/r.import/r.import.py:463 #, python-format msgid "The reprojected raster <%s> is empty" msgstr "" @@ -71888,28 +72289,28 @@ msgstr "" msgid "Shrinking failed. Removing temporary maps." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:64 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:76 #, python-format msgid "" "Deleting <%s> column which may be needed to keep table connected to a vector " "map" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:72 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:87 #, python-format msgid "Column <%s> not found in table" msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:75 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:90 #, python-format msgid "Column <%s> would be deleted." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:78 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:93 msgid "You must use the force flag (-f) to actually remove it. Exiting." msgstr "" -#: ../scripts/db.dropcolumn/db.dropcolumn.py:127 +#: ../scripts/db.dropcolumn/db.dropcolumn.py:142 msgid "Cannot continue (problem deleting column)" msgstr "" @@ -71966,27 +72367,27 @@ msgstr "" msgid "Unable to import <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:288 +#: ../scripts/v.import/v.import.py:289 #, python-format -msgid "Unable to create location from OGR datasource <%s>" +msgid "Unable to create project from OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:340 +#: ../scripts/v.import/v.import.py:341 #, python-format msgid "Importing <%s> ..." msgstr "" -#: ../scripts/v.import/v.import.py:357 +#: ../scripts/v.import/v.import.py:359 #, python-format msgid "Unable to import OGR datasource <%s>" msgstr "" -#: ../scripts/v.import/v.import.py:371 ../scripts/v.pack/v.pack.py:87 +#: ../scripts/v.import/v.import.py:373 ../scripts/v.pack/v.pack.py:87 #, python-format msgid "option <%s>: <%s> exists." msgstr "" -#: ../scripts/v.import/v.import.py:387 +#: ../scripts/v.import/v.import.py:389 #, python-format msgid "Unable to to reproject vector <%s>" msgstr "" @@ -71996,7 +72397,6 @@ msgstr "" #: ../scripts/v.db.update/v.db.update.py:73 #: ../scripts/v.db.addtable/v.db.addtable.py:73 #: ../scripts/v.db.dropcolumn/v.db.dropcolumn.py:54 -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:58 #, python-format msgid "Vector map <%s> not found in current mapset" msgstr "" @@ -72006,14 +72406,14 @@ msgid "" "There is no table connected to the input vector map. Cannot rename any column" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:78 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:79 #, python-format msgid "" "Column name <%s> too long. The DBF driver supports column names not longer " "than 10 characters" msgstr "" -#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:86 +#: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:88 #, python-format msgid "" "Cannot rename column <%s> as it is needed to keep table <%s> connected to " @@ -72021,72 +72421,72 @@ msgid "" msgstr "" #: ../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 +#: ../scripts/v.rast.stats/v.rast.stats.py:176 +#: ../scripts/v.rast.stats/v.rast.stats.py:187 #: ../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 " "first." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:146 +#: ../scripts/v.rast.stats/v.rast.stats.py:147 #, python-brace-format msgid "" "Number of raster maps ({0}) different from number of " "column prefixes ({1})" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:208 +#: ../scripts/v.rast.stats/v.rast.stats.py:209 #, python-format msgid "Processing input data (%d categories)..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:233 +#: ../scripts/v.rast.stats/v.rast.stats.py:234 msgid "Updating the database ..." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:241 +#: ../scripts/v.rast.stats/v.rast.stats.py:242 #, python-brace-format msgid "" "Statistics calculated from raster map <{raster}> and uploaded to attribute " "table of vector map <{vector}>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:248 +#: ../scripts/v.rast.stats/v.rast.stats.py:249 #, python-format msgid "Failed to upload statistics to attribute table of vector map <%s>." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:285 +#: ../scripts/v.rast.stats/v.rast.stats.py:286 msgid "An error occurred while converting vector to raster" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:313 +#: ../scripts/v.rast.stats/v.rast.stats.py:314 msgid "No categories found in raster map" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:343 +#: ../scripts/v.rast.stats/v.rast.stats.py:344 #, python-brace-format msgid "" "Not all vector categories converted to raster. " "Converted {0} of {1}." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:428 +#: ../scripts/v.rast.stats/v.rast.stats.py:429 #, python-format msgid "Cannot create column <%s> (already present). " msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:429 +#: ../scripts/v.rast.stats/v.rast.stats.py:430 msgid "Use -c flag to update values in this column." msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:439 +#: ../scripts/v.rast.stats/v.rast.stats.py:440 #, python-format msgid "Adding columns '%s'" msgstr "" -#: ../scripts/v.rast.stats/v.rast.stats.py:445 +#: ../scripts/v.rast.stats/v.rast.stats.py:446 msgid "Adding columns failed. Exiting." msgstr "" @@ -72313,7 +72713,7 @@ msgstr "" msgid "Input file <%s> not found" msgstr "" -#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:198 +#: ../scripts/v.in.mapgen/v.in.mapgen.py:95 ../scripts/v.in.wfs/v.in.wfs.py:219 msgid "Importing data..." msgstr "" @@ -72331,64 +72731,65 @@ msgstr "" msgid "An error occurred on creating \"%s\", please check" msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:68 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:69 msgid "Do not forget to set region properly to cover all images." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:80 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:81 #, python-format msgid "Mosaicing %d images..." msgstr "" -#: ../scripts/i.image.mosaic/i.image.mosaic.py:92 +#: ../scripts/i.image.mosaic/i.image.mosaic.py:93 #, python-format msgid "Done. Raster map <%s> created." msgstr "" #. GTC Invalid WFS maximum features parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:120 +#: ../scripts/v.in.wfs/v.in.wfs.py:141 msgid "Invalid maximum number of features" msgstr "" #. GTC Invalid WFS start index parameter -#: ../scripts/v.in.wfs/v.in.wfs.py:126 +#: ../scripts/v.in.wfs/v.in.wfs.py:147 msgid "Features begin with index \"1\"" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:142 +#: ../scripts/v.in.wfs/v.in.wfs.py:165 msgid "Setting username and password..." msgstr "" #. GTC Downloading WFS features -#: ../scripts/v.in.wfs/v.in.wfs.py:167 +#: ../scripts/v.in.wfs/v.in.wfs.py:190 msgid "Retrieving data..." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:173 +#. GTC WFS request HTTP failure +#: ../scripts/v.in.wfs/v.in.wfs.py:195 #, python-format msgid "" -"The server couldn't fulfill the request.\n" +"Server couldn't fulfill the request.\n" "Error code: %s" msgstr "" #. GTC WFS request network failure -#: ../scripts/v.in.wfs/v.in.wfs.py:177 +#: ../scripts/v.in.wfs/v.in.wfs.py:198 #, python-format msgid "" "Failed to reach the server.\n" "Reason: %s" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:192 +#: ../scripts/v.in.wfs/v.in.wfs.py:213 msgid "A file called \"wms_capabilities.xml\" already exists here" msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:201 +#: ../scripts/v.in.wfs/v.in.wfs.py:231 #, python-format msgid "Vector map <%s> imported from WFS." msgstr "" -#: ../scripts/v.in.wfs/v.in.wfs.py:203 +#: ../scripts/v.in.wfs/v.in.wfs.py:233 msgid "WFS import failed" msgstr "" @@ -72528,79 +72929,79 @@ msgstr "" msgid "Adjusting blue channel color table..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:435 +#: ../scripts/i.pansharpen/i.pansharpen.py:436 msgid "The following pan-sharpened output maps have been generated:" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:437 +#: ../scripts/i.pansharpen/i.pansharpen.py:438 #, python-format msgid "%s_%s" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:439 +#: ../scripts/i.pansharpen/i.pansharpen.py:440 #, python-format msgid "To visualize output, run: g.region -p raster=%s_red" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:440 +#: ../scripts/i.pansharpen/i.pansharpen.py:441 #, python-format msgid "d.rgb r=%s_red g=%s_green b=%s_blue" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:442 +#: ../scripts/i.pansharpen/i.pansharpen.py:443 msgid "If desired, combine channels into a single RGB map with 'r.composite'." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:444 +#: ../scripts/i.pansharpen/i.pansharpen.py:445 msgid "Channel colors can be rebalanced using i.colors.enhance." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:455 +#: ../scripts/i.pansharpen/i.pansharpen.py:456 msgid "cleaning up temp files" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:465 +#: ../scripts/i.pansharpen/i.pansharpen.py:466 msgid "Using Brovey algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:468 +#: ../scripts/i.pansharpen/i.pansharpen.py:469 msgid "Pan channel/intensity histogram matching using linear regression" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:483 +#: ../scripts/i.pansharpen/i.pansharpen.py:484 msgid "Calculating Brovey transformation..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:542 +#: ../scripts/i.pansharpen/i.pansharpen.py:543 msgid "Using IHS<->RGB algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:544 +#: ../scripts/i.pansharpen/i.pansharpen.py:545 msgid "Transforming to IHS color space..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:562 +#: ../scripts/i.pansharpen/i.pansharpen.py:563 msgid "Transforming back to RGB color space and sharpening..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:584 +#: ../scripts/i.pansharpen/i.pansharpen.py:585 msgid "Using PCA/inverse PCA algorithm" msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:585 +#: ../scripts/i.pansharpen/i.pansharpen.py:586 msgid "Creating PCA images and calculating eigenvectors..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:596 -#: ../scripts/i.pansharpen/i.pansharpen.py:742 +#: ../scripts/i.pansharpen/i.pansharpen.py:597 +#: ../scripts/i.pansharpen/i.pansharpen.py:743 msgid "Input has no data. Check region settings." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:629 +#: ../scripts/i.pansharpen/i.pansharpen.py:630 msgid "Performing inverse PCA ..." msgstr "" -#: ../scripts/i.pansharpen/i.pansharpen.py:720 +#: ../scripts/i.pansharpen/i.pansharpen.py:721 msgid "Histogram matching..." msgstr "" @@ -72712,40 +73113,40 @@ msgstr "" msgid "MASK already found in current mapset. Delete first or overwrite." msgstr "" -#: ../scripts/r.mask/r.mask.py:129 +#: ../scripts/r.mask/r.mask.py:130 msgid "MASK already exists and will be overwritten" msgstr "" -#: ../scripts/r.mask/r.mask.py:143 +#: ../scripts/r.mask/r.mask.py:144 #, python-format msgid "" "The raster map <%s> must be integer (CELL type) in order to use the " "'maskcats' parameter" msgstr "" -#: ../scripts/r.mask/r.mask.py:170 +#: ../scripts/r.mask/r.mask.py:171 #, python-format msgid "No area found in vector map <%s>. Creating a convex hull for MASK." msgstr "" -#: ../scripts/r.mask/r.mask.py:192 +#: ../scripts/r.mask/r.mask.py:193 #, python-format msgid "Unable to create a convex hull for vector map <%s>" msgstr "" -#: ../scripts/r.mask/r.mask.py:218 +#: ../scripts/r.mask/r.mask.py:219 msgid "Creating inverted raster MASK..." msgstr "" -#: ../scripts/r.mask/r.mask.py:220 +#: ../scripts/r.mask/r.mask.py:221 msgid "Inverted raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:222 +#: ../scripts/r.mask/r.mask.py:223 msgid "Raster MASK created" msgstr "" -#: ../scripts/r.mask/r.mask.py:226 +#: ../scripts/r.mask/r.mask.py:227 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." @@ -72781,7 +73182,7 @@ msgid "Raster map <{name}> already exists and will be overwritten" msgstr "" #: ../scripts/r.unpack/r.unpack.py:123 ../scripts/v.unpack/v.unpack.py:133 -#: ../scripts/g.extension/g.extension.py:1860 +#: ../scripts/g.extension/g.extension.py:1865 msgid "Extracting may be unsafe; consider updating Python" msgstr "" @@ -72792,34 +73193,34 @@ msgid "" ">" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:144 -msgid "Overriding projection check (using current location's projection)." +#: ../scripts/r.unpack/r.unpack.py:143 +msgid "Overriding projection check (using current project's CRS)." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:158 +#: ../scripts/r.unpack/r.unpack.py:156 msgid "" -"PROJ_INFO file is missing, unpack raster map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack raster map in XY (unprojected) project." msgstr "" -#: ../scripts/r.unpack/r.unpack.py:181 ../scripts/v.unpack/v.unpack.py:187 +#: ../scripts/r.unpack/r.unpack.py:180 ../scripts/v.unpack/v.unpack.py:188 #, python-brace-format msgid "" -"Difference between PROJ_INFO file of packed map and of current location:\n" +"Difference between PROJ_INFO file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:188 ../scripts/v.unpack/v.unpack.py:194 +#: ../scripts/r.unpack/r.unpack.py:187 ../scripts/v.unpack/v.unpack.py:195 #, python-brace-format msgid "" -"Difference between PROJ_UNITS file of packed map and of current location:\n" +"Difference between PROJ_UNITS file of packed map and of current project:\n" "{diff}" msgstr "" -#: ../scripts/r.unpack/r.unpack.py:194 ../scripts/v.unpack/v.unpack.py:200 +#: ../scripts/r.unpack/r.unpack.py:193 ../scripts/v.unpack/v.unpack.py:201 msgid "" -"Projection of dataset does not appear to match current location. In case of " -"no significant differences in the projection definitions, use the -o flag to " -"ignore them and use current location definition." +"Coordinate reference system of dataset does not appear to match current " +"project. In case of no significant differences in the CRS definitions, use " +"the -o flag to ignore them and use current project definition." msgstr "" #: ../scripts/r.unpack/r.unpack.py:249 @@ -72911,34 +73312,34 @@ msgstr "" #: ../scripts/v.unpack/v.unpack.py:157 msgid "" -"PROJ_INFO file is missing, unpack vector map in XY (unprojected) location." +"PROJ_INFO file is missing, unpack vector map in XY (unprojected) project." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:182 +#: ../scripts/v.unpack/v.unpack.py:183 msgid "Projection information does not match. Proceeding..." msgstr "" -#: ../scripts/v.unpack/v.unpack.py:253 +#: ../scripts/v.unpack/v.unpack.py:255 #, python-format msgid "Coping table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:268 +#: ../scripts/v.unpack/v.unpack.py:270 #, python-format msgid "Unable to copy table <%s> as table <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:273 +#: ../scripts/v.unpack/v.unpack.py:275 #, python-format msgid "Connect table <%s> to vector map <%s> at layer <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:292 +#: ../scripts/v.unpack/v.unpack.py:294 #, python-format msgid "Unable to connect table <%s> to vector map <%s>" msgstr "" -#: ../scripts/v.unpack/v.unpack.py:296 +#: ../scripts/v.unpack/v.unpack.py:298 #, python-format msgid "Vector map <%s> successfully unpacked" msgstr "" @@ -73017,316 +73418,316 @@ msgstr "" msgid "No metadata available for module '{}':" msgstr "" -#: ../scripts/g.extension/g.extension.py:259 +#: ../scripts/g.extension/g.extension.py:262 msgid "" "Failed to get Git version.\n" "{}" msgstr "" -#: ../scripts/g.extension/g.extension.py:265 +#: ../scripts/g.extension/g.extension.py:268 msgid "Failed to get Git version." msgstr "" -#: ../scripts/g.extension/g.extension.py:295 +#: ../scripts/g.extension/g.extension.py:298 msgid "Could not found Git. Please install it." msgstr "" -#: ../scripts/g.extension/g.extension.py:304 +#: ../scripts/g.extension/g.extension.py:307 msgid "Cannot write to working directory {}." msgstr "" -#: ../scripts/g.extension/g.extension.py:361 +#: ../scripts/g.extension/g.extension.py:365 #, python-brace-format msgid "Branch <{branch}> not found in repository <{url}>" msgstr "" -#: ../scripts/g.extension/g.extension.py:387 -#: ../scripts/g.extension/g.extension.py:2783 +#: ../scripts/g.extension/g.extension.py:391 +#: ../scripts/g.extension/g.extension.py:2792 #, python-brace-format msgid "" "Failed to get addons files list from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:412 +#: ../scripts/g.extension/g.extension.py:416 msgid "No addon named <{}> found in the repository." msgstr "" -#: ../scripts/g.extension/g.extension.py:517 +#: ../scripts/g.extension/g.extension.py:521 #, python-brace-format msgid "" "Failed to get branch from the Git repository <{repo_path}>.\n" "{error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:542 +#: ../scripts/g.extension/g.extension.py:546 msgid "Cannot retrieve organization and repository from URL: <{}>." msgstr "" -#: ../scripts/g.extension/g.extension.py:582 +#: ../scripts/g.extension/g.extension.py:586 #, python-brace-format msgid "" "Download file from <{url}>, failed. File is not on the server or check your " "internet connection." msgstr "" -#: ../scripts/g.extension/g.extension.py:597 +#: ../scripts/g.extension/g.extension.py:601 #, python-format msgid "'%s' required. Please install '%s' first." msgstr "" -#: ../scripts/g.extension/g.extension.py:661 +#: ../scripts/g.extension/g.extension.py:665 msgid "List of installed extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:663 +#: ../scripts/g.extension/g.extension.py:667 msgid "List of installed extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:668 +#: ../scripts/g.extension/g.extension.py:672 msgid "No extension (toolbox) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:670 +#: ../scripts/g.extension/g.extension.py:674 msgid "No extension (module) installed" msgstr "" -#: ../scripts/g.extension/g.extension.py:743 +#: ../scripts/g.extension/g.extension.py:747 msgid "List of available extensions (toolboxes):" msgstr "" -#: ../scripts/g.extension/g.extension.py:759 +#: ../scripts/g.extension/g.extension.py:763 msgid "List of available extensions (modules):" msgstr "" -#: ../scripts/g.extension/g.extension.py:785 -#: ../scripts/g.extension/g.extension.py:815 +#: ../scripts/g.extension/g.extension.py:789 +#: ../scripts/g.extension/g.extension.py:819 msgid "Unable to fetch addons metadata file" msgstr "" -#: ../scripts/g.extension/g.extension.py:890 +#: ../scripts/g.extension/g.extension.py:894 #, python-brace-format msgid "" "Unable to parse '{url}'. Trying to scan Git repository (may take some " "time)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:938 +#: ../scripts/g.extension/g.extension.py:942 msgid "" "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:945 +#: ../scripts/g.extension/g.extension.py:949 msgid "Flag 'c' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:947 +#: ../scripts/g.extension/g.extension.py:951 msgid "Flag 'g' ignored, addons metadata file not available" msgstr "" -#: ../scripts/g.extension/g.extension.py:952 -#: ../scripts/g.extension/g.extension.py:987 +#: ../scripts/g.extension/g.extension.py:956 +#: ../scripts/g.extension/g.extension.py:991 #, python-format msgid "Checking for '%s' modules..." msgstr "" -#: ../scripts/g.extension/g.extension.py:960 -#: ../scripts/g.extension/g.extension.py:994 +#: ../scripts/g.extension/g.extension.py:964 +#: ../scripts/g.extension/g.extension.py:998 #, python-format msgid "Unable to fetch '%s'" msgstr "" -#: ../scripts/g.extension/g.extension.py:1156 +#: ../scripts/g.extension/g.extension.py:1160 msgid "$GISBASE not defined" msgstr "" -#: ../scripts/g.extension/g.extension.py:1160 +#: ../scripts/g.extension/g.extension.py:1164 #, python-format msgid "Extension <%s> already installed. Re-installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1171 +#: ../scripts/g.extension/g.extension.py:1175 #, python-format msgid "Installing toolbox <%s>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1181 +#: ../scripts/g.extension/g.extension.py:1185 msgid "Nothing to install" msgstr "" -#: ../scripts/g.extension/g.extension.py:1215 +#: ../scripts/g.extension/g.extension.py:1219 msgid "Installation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:1219 +#: ../scripts/g.extension/g.extension.py:1223 msgid "Updating extensions metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1223 +#: ../scripts/g.extension/g.extension.py:1227 msgid "Updating extension modules metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1230 +#: ../scripts/g.extension/g.extension.py:1234 #, python-format msgid "Installation of <%s> successfully finished" msgstr "" -#: ../scripts/g.extension/g.extension.py:1236 +#: ../scripts/g.extension/g.extension.py:1240 msgid "" "This add-on module will not function until you set the GRASS_ADDON_BASE " "environment variable (see \"g.manual variables\")" msgstr "" -#: ../scripts/g.extension/g.extension.py:1271 +#: ../scripts/g.extension/g.extension.py:1275 msgid "Unable to read addons metadata file from the remote server" msgstr "" -#: ../scripts/g.extension/g.extension.py:1281 +#: ../scripts/g.extension/g.extension.py:1285 msgid "No addons metadata available" msgstr "" -#: ../scripts/g.extension/g.extension.py:1284 +#: ../scripts/g.extension/g.extension.py:1288 #, python-format msgid "No addons metadata available for <%s>" msgstr "" -#: ../scripts/g.extension/g.extension.py:1343 +#: ../scripts/g.extension/g.extension.py:1347 #, python-brace-format msgid "Unable to read addons metadata file from the remote server: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1348 +#: ../scripts/g.extension/g.extension.py:1352 #, python-format, python-brace-format msgid "Unable to parse '%s': {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1534 +#: ../scripts/g.extension/g.extension.py:1538 #, python-brace-format msgid "No metadata available for module '{name}': {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1603 +#: ../scripts/g.extension/g.extension.py:1608 msgid "Downloading precompiled GRASS Addons <{}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1699 +#: ../scripts/g.extension/g.extension.py:1704 msgid "svn not found but needed to fetch AddOns from an SVN repository" msgstr "" -#: ../scripts/g.extension/g.extension.py:1706 -#: ../scripts/g.extension/g.extension.py:1740 +#: ../scripts/g.extension/g.extension.py:1711 +#: ../scripts/g.extension/g.extension.py:1745 #, python-format msgid "GRASS Addons <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1831 +#: ../scripts/g.extension/g.extension.py:1836 #, python-brace-format msgid "ZIP file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1866 +#: ../scripts/g.extension/g.extension.py:1871 #, python-brace-format msgid "Archive file is unreadable: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:1883 +#: ../scripts/g.extension/g.extension.py:1888 #, python-brace-format msgid "Type of source identified as '{source}'." msgstr "" -#: ../scripts/g.extension/g.extension.py:1886 -#: ../scripts/g.extension/g.extension.py:1895 -#: ../scripts/g.extension/g.extension.py:1902 +#: ../scripts/g.extension/g.extension.py:1891 +#: ../scripts/g.extension/g.extension.py:1900 +#: ../scripts/g.extension/g.extension.py:1907 #, python-brace-format msgid "Fetching <{name}> from <{url}> (be patient)..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1917 +#: ../scripts/g.extension/g.extension.py:1922 #, python-brace-format msgid "Expected default branch not found. Trying again from <{url}>..." msgstr "" -#: ../scripts/g.extension/g.extension.py:1925 +#: ../scripts/g.extension/g.extension.py:1930 #, python-brace-format msgid "Extension <{name}> not found. Please check 'url' and 'branch' options" msgstr "" -#: ../scripts/g.extension/g.extension.py:1930 +#: ../scripts/g.extension/g.extension.py:1935 msgid "Extension <{}> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:1958 +#: ../scripts/g.extension/g.extension.py:1963 #, python-brace-format msgid "" "Unknown extension (addon) source type '{0}'. Please report this to the grass-" "user mailing list." msgstr "" -#: ../scripts/g.extension/g.extension.py:1969 +#: ../scripts/g.extension/g.extension.py:1974 msgid "Path to the source code:" msgstr "" -#: ../scripts/g.extension/g.extension.py:1991 +#: ../scripts/g.extension/g.extension.py:1996 msgid "Module name not found. Check module Makefile syntax (PGM variable)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2064 +#: ../scripts/g.extension/g.extension.py:2069 msgid "To compile run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2066 +#: ../scripts/g.extension/g.extension.py:2071 msgid "To install run:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2074 +#: ../scripts/g.extension/g.extension.py:2079 msgid "Compiling..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2076 +#: ../scripts/g.extension/g.extension.py:2081 msgid "Please install GRASS development package" msgstr "" -#: ../scripts/g.extension/g.extension.py:2079 +#: ../scripts/g.extension/g.extension.py:2084 msgid "Compilation failed, sorry. Please check above error messages." msgstr "" -#: ../scripts/g.extension/g.extension.py:2093 +#: ../scripts/g.extension/g.extension.py:2098 msgid "Installing..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2184 +#: ../scripts/g.extension/g.extension.py:2189 msgid "List of removed files:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2186 +#: ../scripts/g.extension/g.extension.py:2191 msgid "Files to be removed:" msgstr "" -#: ../scripts/g.extension/g.extension.py:2192 +#: ../scripts/g.extension/g.extension.py:2197 msgid "Updating addons metadata file..." msgstr "" -#: ../scripts/g.extension/g.extension.py:2196 +#: ../scripts/g.extension/g.extension.py:2201 #, python-format msgid "Extension <%s> successfully uninstalled." msgstr "" -#: ../scripts/g.extension/g.extension.py:2201 +#: ../scripts/g.extension/g.extension.py:2206 #, python-format msgid "Toolbox <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2209 +#: ../scripts/g.extension/g.extension.py:2214 #, python-format msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal" msgstr "" -#: ../scripts/g.extension/g.extension.py:2260 +#: ../scripts/g.extension/g.extension.py:2265 #, python-format msgid "Extension <%s> not found" msgstr "" -#: ../scripts/g.extension/g.extension.py:2364 +#: ../scripts/g.extension/g.extension.py:2369 #, python-brace-format msgid "" "Unable to create '{filename}': {error}. Is the GRASS GIS documentation " @@ -73334,60 +73735,60 @@ msgid "" "right." msgstr "" -#: ../scripts/g.extension/g.extension.py:2383 +#: ../scripts/g.extension/g.extension.py:2388 #, python-format msgid "Unable to create '%s': %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2411 +#: ../scripts/g.extension/g.extension.py:2416 #, python-format msgid "Manual page for <%s> updated" msgstr "" -#: ../scripts/g.extension/g.extension.py:2418 +#: ../scripts/g.extension/g.extension.py:2423 #, python-format msgid "Unable to read manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2463 +#: ../scripts/g.extension/g.extension.py:2468 #, python-format msgid "Unable for write manual page: %s" msgstr "" -#: ../scripts/g.extension/g.extension.py:2476 +#: ../scripts/g.extension/g.extension.py:2481 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons" msgstr "" -#: ../scripts/g.extension/g.extension.py:2485 +#: ../scripts/g.extension/g.extension.py:2490 #, python-brace-format msgid "" "You don't have permission to install extension to <{0}>. Try to run {1} with " "administrator rights (su or sudo)." msgstr "" -#: ../scripts/g.extension/g.extension.py:2577 +#: ../scripts/g.extension/g.extension.py:2582 #, python-brace-format msgid "Identified {0} as known hosting service" msgstr "" -#: ../scripts/g.extension/g.extension.py:2582 +#: ../scripts/g.extension/g.extension.py:2587 #, python-brace-format msgid "" "Not using {service} as known hosting service because the URL ends with " "'{suffix}'" msgstr "" -#: ../scripts/g.extension/g.extension.py:2603 +#: ../scripts/g.extension/g.extension.py:2608 #, python-brace-format msgid "Will use the following URL for download: {0}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2636 +#: ../scripts/g.extension/g.extension.py:2641 #, python-brace-format msgid "Cannot open URL <{url}>: {error}" msgstr "" -#: ../scripts/g.extension/g.extension.py:2838 +#: ../scripts/g.extension/g.extension.py:2847 msgid "Flag '{}' is relevant only to 'operation=add'. Ignoring this flag." msgstr "" @@ -73439,27 +73840,37 @@ msgstr "" msgid "Building topology for vector map <%s> failed" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:103 +#: ../scripts/v.db.join/v.db.join.py:82 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:60 +#, python-brace-format +msgid "Unable to remove file {file}: {message}" +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:120 msgid "JOIN is not supported for tables stored in DBF format" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:107 +#: ../scripts/v.db.join/v.db.join.py:124 msgid "There is no table connected to this map. Unable to join any column." msgstr "" -#: ../scripts/v.db.join/v.db.join.py:181 -#, python-format -msgid "Error creating column <%s>" +#: ../scripts/v.db.join/v.db.join.py:130 ../scripts/v.db.join/v.db.join.py:141 +#: ../scripts/v.db.join/v.db.join.py:162 +#, python-brace-format +msgid "Column <{column}> not found in table <{table}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:191 -#, python-format -msgid "Updating column <%s> of vector map <%s>..." +#: ../scripts/v.db.join/v.db.join.py:211 +msgid "Error creating columns <{}>" msgstr "" -#: ../scripts/v.db.join/v.db.join.py:197 -#, python-format -msgid "Error filling column <%s>" +#: ../scripts/v.db.join/v.db.join.py:224 +#, python-brace-format +msgid "Updating columns {columns} of vector map {map_name}..." +msgstr "" + +#: ../scripts/v.db.join/v.db.join.py:240 +msgid "Error filling columns {}" msgstr "" #: ../scripts/g.download.location/g.download.location.py:105 @@ -73505,16 +73916,6 @@ msgstr "" msgid "Path to the location now <{path}>" msgstr "" -#: ../scripts/d.redraw/d.redraw.py:53 -#, python-format -msgid "Unable to open file '%s' for reading. Details: %s" -msgstr "" - -#: ../scripts/d.redraw/d.redraw.py:64 -#, python-format -msgid "Unable to open file '%s' for writing. Details: %s" -msgstr "" - #: ../scripts/r.plane/r.plane.py:84 msgid "Input coordinates seems to be invalid" msgstr "" @@ -73585,41 +73986,48 @@ msgstr "" msgid "Number of maps differs from number of semantic labels" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:66 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:78 +msgid "Vector map <{}> not found in current mapset" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:86 #, python-brace-format msgid "" "There is no table connected to layer <{layer}> of <{name}>. Run v.db.connect " "or v.db.addtable first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:72 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:92 #, python-brace-format msgid "" "There is no table connected to <{name}>. Run v.db.connect or v.db.addtable " "first." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:84 +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:106 msgid "There is an empty column. Did you leave a trailing comma?" msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:87 -#, python-format -msgid "Column <%s> is already in the table. Skipping." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:111 +msgid "" +"Incorrect new column(s) format, use <'name type [,name type, ...]'> format, " +"please." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:89 -#, python-format -msgid "Adding column <%s> to the table" +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:118 +msgid "Column <{}> is already in the table. Skipping." msgstr "" -#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:98 -#, python-format -msgid "Unable to add column <%s>." +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:121 +msgid "Adding column <{}> to the table" +msgstr "" + +#: ../scripts/v.db.addcolumn/v.db.addcolumn.py:137 +msgid "Error adding columns {}" msgstr "" #: ../scripts/r.reclass.area/r.reclass.area.py:97 -#: ../scripts/r.reclass.area/r.reclass.area.py:217 +#: ../scripts/r.reclass.area/r.reclass.area.py:218 msgid "xy-locations are not supported" msgstr "" @@ -73667,15 +74075,15 @@ msgstr "" msgid "No areas of size greater than or equal to %f hectares found." msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:215 +#: ../scripts/r.reclass.area/r.reclass.area.py:216 msgid "Latitude-longitude locations are not supported" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:222 +#: ../scripts/r.reclass.area/r.reclass.area.py:223 msgid "You have to specify mode='lesser' with method='rmarea'" msgstr "" -#: ../scripts/r.reclass.area/r.reclass.area.py:232 +#: ../scripts/r.reclass.area/r.reclass.area.py:233 #, python-format msgid "Generating output raster map <%s>..." msgstr "" diff --git a/locale/po/grasswxpy_ar.po b/locale/po/grasswxpy_ar.po index 42115ba472c..d2e9f2f9760 100644 --- a/locale/po/grasswxpy_ar.po +++ b/locale/po/grasswxpy_ar.po @@ -9,16 +9,24 @@ msgstr "" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2022-04-20 07:10-0400\n" ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +"POT-Creation-Date: 2024-05-23 03:37-0600\n" +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD "POT-Creation-Date: 2024-02-09 06:51-0700\n" ======= "POT-Creation-Date: 2022-04-20 07:10-0400\n" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= "POT-Creation-Date: 2022-04-20 07:10-0400\n" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -26,6 +34,15 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +"POT-Creation-Date: 2022-04-20 07:10-0400\n" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -34,6 +51,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -41,6 +59,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/nviz/tools.py:109 ../gui/wxpython/nviz/preferences.py:65 #: ../gui/wxpython/nviz/preferences.py:69 msgid "View" @@ -48,12 +68,12 @@ msgstr "" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "" @@ -61,837 +81,837 @@ msgstr "" msgid "Analysis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1086,8 +1106,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "" @@ -1131,7 +1151,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1239,14 +1259,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "" @@ -1356,8 +1376,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1428,12 +1448,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1495,115 +1515,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1644,7 +1664,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1655,169 +1675,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1907,6 +1927,9 @@ msgid "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2426,6 +2449,7 @@ msgstr "" msgid "Status bar" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2437,6 +2461,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 @@ -2462,12 +2491,20 @@ msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: ../gui/wxpython/modules/import_export.py:563 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 #: ../gui/wxpython/modules/import_export.py:562 @@ -2475,28 +2512,46 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:563 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Import vector data" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:55 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: ../gui/wxpython/modules/import_export.py:421 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #: ../gui/wxpython/modules/import_export.py:416 ======= #: ../gui/wxpython/modules/import_export.py:421 @@ -2507,6 +2562,9 @@ msgstr "" #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2574,6 +2632,7 @@ msgstr "" msgid "Last used mapset in path '{mapsetpath}' has different owner {owner}." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2581,61 +2640,63 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/datacatalog/catalog.py:51 msgid "Data catalog" msgstr "" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" +#: ../gui/wxpython/datacatalog/catalog.py:212 +msgid "Do you want to create a new project (also known as location)?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" +#: ../gui/wxpython/datacatalog/catalog.py:217 +msgid "Create project?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2643,326 +2704,323 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:50 msgid "Data Catalog - GRASS GIS" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +#: ../gui/wxpython/datacatalog/tree.py:96 ======= -<<<<<<< HEAD ======= ->>>>>>> osgeo-main +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD #: ../gui/wxpython/datacatalog/tree.py:95 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" +#: ../gui/wxpython/datacatalog/tree.py:2168 +msgid "&Delete project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" +#: ../gui/wxpython/datacatalog/tree.py:2174 +msgid "&Rename project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" +#: ../gui/wxpython/datacatalog/tree.py:2193 +msgid "&Create new project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" +#: ../gui/wxpython/datacatalog/tree.py:2239 +msgid "&Delete projects (locations)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" @@ -2970,12 +3028,8 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2995,40 +3049,38 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" +msgid "Create new mapset in current project" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 <<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/modules/extensions.py:76 -#: ../gui/wxpython/gui_core/menu.py:163 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 ======= +#: ../gui/wxpython/datacatalog/toolbars.py:61 <<<<<<< HEAD -======= ->>>>>>> osgeo-main <<<<<<< HEAD #: ../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 ======= #: ../gui/wxpython/modules/extensions.py:76 @@ -3038,51 +3090,46 @@ msgstr "" #: ../gui/wxpython/modules/extensions.py:76 #: ../gui/wxpython/gui_core/menu.py:163 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -<<<<<<< HEAD <<<<<<< HEAD +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 ======= +#: ../gui/wxpython/datacatalog/dialogs.py:45 <<<<<<< HEAD -======= ->>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/modules/import_export.py:927 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/datacatalog/dialogs.py:116 +======= #: ../gui/wxpython/datacatalog/dialogs.py:117 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main #: ../gui/wxpython/modules/import_export.py:924 msgid "Reprojection" msgstr "" @@ -3101,18 +3148,13 @@ msgstr "" #: ../gui/wxpython/datacatalog/dialogs.py:118 <<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (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 +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" @@ -3121,31 +3163,31 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD +#: ../gui/wxpython/datacatalog/dialogs.py:124 ======= -<<<<<<< HEAD ======= ->>>>>>> osgeo-main +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD #: ../gui/wxpython/datacatalog/dialogs.py:125 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 +======= #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main #: ../gui/wxpython/datacatalog/dialogs.py:126 msgid "Estimated resolution:" msgstr "" @@ -3514,25 +3556,17 @@ msgstr "" msgid "More options..." msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2007 -<<<<<<< HEAD <<<<<<< HEAD ======= -<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD >>>>>>> osgeo-main ======= ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main -msgid "Data Catalog" -msgstr "" - -#: ../gui/wxpython/datacatalog/frame.py:42 -msgid "Close GRASS GIS Data Catalog" +#: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:50 +msgid "Data Catalog - GRASS GIS" msgstr "" <<<<<<< HEAD @@ -3542,22696 +3576,30523 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD -#: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87 -msgid "Map Swipe Tool - GRASS GIS" +#: ../gui/wxpython/datacatalog/tree.py:95 +#, python-brace-format +msgid "Failed to read mapsets from location <{l}>." msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 -msgid "Tools" +#: ../gui/wxpython/datacatalog/tree.py:121 +#, python-brace-format +msgid "Failed to read maps from location <{l}>." msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:28 -#: ../gui/wxpython/mapswipe/dialogs.py:52 -msgid "Select raster maps" +#: ../gui/wxpython/datacatalog/tree.py:156 +#, python-brace-format +msgid "" +"Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " +"to overwrite it?" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:31 -#: ../gui/wxpython/mapdisp/toolbars.py:29 -msgid "Query raster/vector map(s)" +#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/rdigit/dialogs.py:114 +#: ../gui/wxpython/modules/colorrules.py:674 +#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/animation/dialogs.py:1573 +msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:32 -#: ../gui/wxpython/mapdisp/toolbars.py:30 -msgid "Query selected raster/vector map(s)" +#: ../gui/wxpython/datacatalog/tree.py:183 +msgid "name unknown" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:141 -msgid "Swipe mode" +#: ../gui/wxpython/datacatalog/tree.py:185 +#, python-brace-format +msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:141 -#: ../gui/wxpython/mapswipe/dialogs.py:284 -msgid "Mirror mode" +#: ../gui/wxpython/datacatalog/tree.py:187 +#, python-brace-format +msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:154 -msgid "Choose view mode" +#: ../gui/wxpython/datacatalog/tree.py:191 +#, python-brace-format +msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:188 -msgid "Switch orientation" +#: ../gui/wxpython/datacatalog/tree.py:193 +#, python-brace-format +msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:194 -msgid "Switch maps" +#: ../gui/wxpython/datacatalog/tree.py:197 +#, python-brace-format +msgid "{name}" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:147 -msgid "Name of top/left raster map:" +#: ../gui/wxpython/datacatalog/tree.py:902 +#, python-brace-format +msgid "" +"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " +"display it you need to switch to <{map_location}> location. Note that if you " +"switch there all current Map Displays will be closed.\n" +"\n" +"Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:154 -msgid "Name of bottom/right raster map:" +#: ../gui/wxpython/datacatalog/tree.py:912 +msgid "Map in a different location" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:199 -msgid "Switch to advanced mode" +#: ../gui/wxpython/datacatalog/tree.py:1031 +#, python-brace-format +msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:200 ../gui/wxpython/gui_core/wrap.py:271 -msgid "Cancel" +#: ../gui/wxpython/datacatalog/tree.py:1033 +#, python-brace-format +msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:204 -msgid "Switch to simple mode" +#: ../gui/wxpython/datacatalog/tree.py:1046 +#, python-brace-format +msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 -msgid "Close" +#: ../gui/wxpython/datacatalog/tree.py:1048 +#, python-brace-format +msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:228 -msgid "Name of the first map is missing." +#: ../gui/wxpython/datacatalog/tree.py:1063 +#: ../gui/wxpython/datacatalog/tree.py:1402 +msgid "New name" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:230 -msgid "Name of the second map is missing." +#: ../gui/wxpython/datacatalog/tree.py:1064 +msgid "Rename map" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:263 -msgid "Map Swipe settings" +#: ../gui/wxpython/datacatalog/tree.py:1213 +msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:287 -msgid "Mirrored cursor" +#: ../gui/wxpython/datacatalog/tree.py:1226 +#, python-brace-format +msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:309 -msgid "Shape:" +#: ../gui/wxpython/datacatalog/tree.py:1238 +msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 -msgid "Line width:" +#: ../gui/wxpython/datacatalog/tree.py:1250 +#, python-brace-format +msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 -msgid "Map Swipe" +#: ../gui/wxpython/datacatalog/tree.py:1262 +#, python-brace-format +msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 -msgid "Main Toolbar" +#: ../gui/wxpython/datacatalog/tree.py:1272 +#, python-brace-format +msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 -msgid "Misc Toolbar" +#: ../gui/wxpython/datacatalog/tree.py:1288 +msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:458 -#, python-format -msgid "Map <%s> not found. " +#: ../gui/wxpython/datacatalog/tree.py:1290 +msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 -#, python-format -msgid "Map <%s> not found." +#: ../gui/wxpython/datacatalog/tree.py:1312 +#: ../gui/wxpython/datacatalog/tree.py:1332 +#, python-brace-format +msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 -msgid "Nothing to render (empty map). Operation canceled." +#: ../gui/wxpython/datacatalog/tree.py:1315 +#: ../gui/wxpython/datacatalog/tree.py:1335 +#: ../gui/wxpython/datacatalog/tree.py:1403 +msgid "Select new name" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 -#: ../gui/wxpython/modules/histogram.py:474 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 -msgid "Choose a file name to save the image (no need to add extension)" +#: ../gui/wxpython/datacatalog/tree.py:1353 +#, python-brace-format +msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 -msgid "No raster or vector map layer selected for querying." +#: ../gui/wxpython/datacatalog/tree.py:1355 +#, python-brace-format +msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/icons/icon.py:36 -#, python-format -msgid "Unknown iconset '%s', using default 'grass'...\n" +#: ../gui/wxpython/datacatalog/tree.py:1369 +#: ../gui/wxpython/datacatalog/tree.py:1371 +msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/icons/icon.py:50 -#, python-format -msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." +#: ../gui/wxpython/datacatalog/tree.py:1392 +msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/history/tree.py:79 -msgid "Double-click to open the tool" +#: ../gui/wxpython/datacatalog/tree.py:1468 +#: ../gui/wxpython/datacatalog/tree.py:1584 +msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/history/tree.py:120 -msgid "&Remove" +#: ../gui/wxpython/datacatalog/tree.py:1548 +#, python-brace-format +msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/history/tree.py:179 -msgid "Cannot be parsed into command" +#: ../gui/wxpython/datacatalog/tree.py:1552 +#, python-brace-format +msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/history/tree.py:195 -msgid "Do you really want to remove <{}> command?" +#: ../gui/wxpython/datacatalog/tree.py:1553 +msgid "Delete map" msgstr "" -#: ../gui/wxpython/history/tree.py:196 -msgid "Remove command" +#: ../gui/wxpython/datacatalog/tree.py:1554 +#, python-brace-format +msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/history/tree.py:197 -msgid "Removing <{}>" +#: ../gui/wxpython/datacatalog/tree.py:1744 +msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/history/tree.py:203 -msgid "<{}> removed" +#: ../gui/wxpython/datacatalog/tree.py:1757 +msgid "" +"To move or copy maps to other location, please drag them to a mapset in the " +"destination location" msgstr "" -#: ../gui/wxpython/history/browser.py:46 -msgid "History browser" +#: ../gui/wxpython/datacatalog/tree.py:2087 +msgid "&Cut" msgstr "" -#: ../gui/wxpython/history/browser.py:68 -msgid "&Export history" +#: ../gui/wxpython/datacatalog/tree.py:2093 +msgid "&Copy" msgstr "" -#: ../gui/wxpython/history/browser.py:70 -msgid "Export history of executed commands to a file" +#: ../gui/wxpython/datacatalog/tree.py:2097 +msgid "Copy &name" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/datacatalog/tree.py:2101 +#: ../gui/wxpython/datacatalog/tree.py:2146 +#: ../gui/wxpython/datacatalog/tree.py:2250 +msgid "&Paste" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." +#. GTC Delete mapset +#: ../gui/wxpython/datacatalog/tree.py:2107 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +msgid "&Delete" msgstr "" -#: ../gui/wxpython/history/browser.py:115 -#, python-brace-format -msgid "{txt} (*.txt)|*.txt|{files} (*)|*" +#. GTC Rename mapset +#: ../gui/wxpython/datacatalog/tree.py:2112 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 +#: ../gui/wxpython/dbmgr/base.py:2488 +msgid "&Rename" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Text files" +#: ../gui/wxpython/datacatalog/tree.py:2127 +msgid "&Display layers" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" +#: ../gui/wxpython/datacatalog/tree.py:2129 +msgid "&Display layer" msgstr "" -#: ../gui/wxpython/history/browser.py:127 -msgid "Command history saved to '{}'" +#: ../gui/wxpython/datacatalog/tree.py:2133 +msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 -msgid "Download in progress, wait until it is finished 0%" +#: ../gui/wxpython/datacatalog/tree.py:2152 +msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 -#, python-brace-format -msgid "" -"Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " -"{3:.0f} seconds passed" +#: ../gui/wxpython/datacatalog/tree.py:2162 +msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/datacatalog/tree.py:2168 +msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 -msgid "Abort" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#: ../gui/wxpython/datacatalog/tree.py:2205 +#: ../gui/wxpython/datacatalog/tree.py:2240 +msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/datacatalog/tree.py:2178 +msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/datacatalog/tree.py:2189 +msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 -msgid "Do&wnload" +#: ../gui/wxpython/datacatalog/tree.py:2193 +msgid "&Delete location" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/datacatalog/tree.py:2199 +msgid "&Rename location" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 -msgid "Download" +#: ../gui/wxpython/datacatalog/tree.py:2218 +msgid "&Create new location" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 -msgid "Download in progress, wait until it is finished" +#: ../gui/wxpython/datacatalog/tree.py:2222 +msgid "&Download sample location" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/datacatalog/tree.py:2227 +msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 -#, python-format -msgid "Download failed: %s" +#: ../gui/wxpython/datacatalog/tree.py:2234 +msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 -msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +#: ../gui/wxpython/datacatalog/tree.py:2264 +msgid "&Delete locations" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/datacatalog/tree.py:2276 +msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 -#, python-brace-format -msgid "Error: {text}" +#: ../gui/wxpython/datacatalog/tree.py:2282 +msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" +#: ../gui/wxpython/datacatalog/tree.py:2292 +msgid "No available options" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/datacatalog/toolbars.py:23 +msgid "Reload GRASS locations" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" +#: ../gui/wxpython/datacatalog/toolbars.py:24 +msgid "Reload current GRASS mapset only" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:85 -msgid "Invalid mapset name" +#: ../gui/wxpython/datacatalog/toolbars.py:26 +msgid "Restrict edits to the current mapset only" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/datacatalog/toolbars.py:29 +msgid "Allow edits outside of the current mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:134 -msgid "Name for the new mapset:" +#: ../gui/wxpython/datacatalog/toolbars.py:32 +msgid "Add existing or create new database" msgstr "" -#: ../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 -msgid "Create new mapset" +#: ../gui/wxpython/datacatalog/toolbars.py:35 +msgid "Create new mapset in current location" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:150 -msgid "Unable to create new mapset: {}" +#: ../gui/wxpython/datacatalog/toolbars.py:38 +msgid "Create new location in current GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" +#: ../gui/wxpython/datacatalog/toolbars.py:42 +msgid "Download sample location to current GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 -msgid "Import data?" +#: ../gui/wxpython/datacatalog/toolbars.py:45 +msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 -#, python-brace-format -msgid "" -"Cannot rename mapset <{mapset}> for the following reason:\n" -"\n" -"{reason}\n" -"\n" -"No mapset will be renamed." +#: ../gui/wxpython/datacatalog/toolbars.py:48 +msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 -msgid "Unable to rename selected mapset" +#: ../gui/wxpython/datacatalog/toolbars.py:51 +msgid "Select another import option" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 -msgid "" -"Current name: {}\n" -"\n" -"Enter new name:" +#: ../gui/wxpython/datacatalog/toolbars.py:61 +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/modules/extensions.py:76 +#: ../gui/wxpython/gui_core/menu.py:163 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/modules/extensions.py:76 +======= +#: ../gui/wxpython/modules/extensions.py:76 +#: ../gui/wxpython/gui_core/menu.py:163 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/modules/extensions.py:76 +#: ../gui/wxpython/gui_core/menu.py:163 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +msgid "Search" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 -msgid "Rename selected mapset" +#: ../gui/wxpython/datacatalog/toolbars.py:79 +msgid "" +"Type to search database by map type or name. Use Python regular expressions " +"to refine your search." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 -#: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 -#: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 -msgid "Error" +#: ../gui/wxpython/datacatalog/dialogs.py:45 +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:927 +msgid "Reprojection" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:260 -msgid "" -"Unable to rename mapset.\n" -"\n" -"{}" +#: ../gui/wxpython/datacatalog/dialogs.py:103 +msgid "Reproject" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 -#, python-brace-format -msgid "" -"Cannot rename location <{location}> for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No location will be renamed." +#: ../gui/wxpython/datacatalog/dialogs.py:105 +msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/datacatalog/dialogs.py:107 +msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" +#: ../gui/wxpython/datacatalog/dialogs.py:117 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:924 +msgid "Reprojection" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:313 -msgid "" -"Unable to rename location.\n" -"\n" -"{}" +#: ../gui/wxpython/datacatalog/dialogs.py:104 +msgid "Reproject" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:375 -#, python-brace-format -msgid "" -"Cannot delete one or more mapsets for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No mapsets will be deleted." +#: ../gui/wxpython/datacatalog/dialogs.py:106 +msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 -msgid "Unable to delete selected mapsets" +#: ../gui/wxpython/datacatalog/dialogs.py:108 +msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/datacatalog/dialogs.py:118 +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 #, python-brace-format msgid "" -"Do you want to continue with deleting one or more of the following mapsets?\n" -"\n" -"{deletes}\n" -"\n" -"All maps included in these mapsets will be permanently deleted!" +"Map layer <{ml}> needs to be reprojected.\n" +"Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 -msgid "Delete selected mapsets" +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/datacatalog/dialogs.py:125 +msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 -msgid "Error when deleting mapsets" +#: ../gui/wxpython/datacatalog/dialogs.py:131 +msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 -#, python-brace-format -msgid "" -"The following error occurred when deleting mapset <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of mapsets was interrupted." +#: ../gui/wxpython/datacatalog/dialogs.py:138 +msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 -#, python-brace-format -msgid "" -"Cannot delete one or more locations for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No locations will be deleted." +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/datacatalog/dialogs.py:126 +msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" +#: ../gui/wxpython/datacatalog/dialogs.py:132 +msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:480 -#, python-brace-format -msgid "" -"Do you want to continue with deleting one or more of the following " -"locations?\n" -"\n" -"{deletes}\n" -"\n" -"All mapsets included in these locations will be permanently deleted!" +#: ../gui/wxpython/datacatalog/dialogs.py:139 +msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" +#: ../gui/wxpython/datacatalog/tree.py:104 +#, python-brace-format +msgid "Failed to read mapsets from location <{l}>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" +#: ../gui/wxpython/datacatalog/tree.py:130 +#, python-brace-format +msgid "Failed to read maps from location <{l}>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/datacatalog/tree.py:255 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of locations was interrupted." +"Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " +"to overwrite it?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 -#, python-brace-format -msgid "" -"Cannot delete GRASS database from disk for the following reason:\n" -"\n" -"{reasons}\n" -"\n" -"GRASS database will not be deleted." +#: ../gui/wxpython/datacatalog/tree.py:258 +#: ../gui/wxpython/animation/dialogs.py:1575 +#: ../gui/wxpython/rdigit/dialogs.py:114 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/modules/colorrules.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:537 ../gui/wxpython/gcp/manager.py:1807 +msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 -msgid "Unable to delete selected GRASS database" +#: ../gui/wxpython/datacatalog/tree.py:282 +msgid "name unknown" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/datacatalog/tree.py:284 #, python-brace-format -msgid "" -"Do you want to delete the following GRASS database from disk?\n" -"\n" -"{grassdb}\n" -"\n" -"The directory will be permanently deleted!" +msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 -msgid "Delete selected GRASS database" +#: ../gui/wxpython/datacatalog/tree.py:286 +#, python-brace-format +msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 -msgid "Error when deleting GRASS database" +#: ../gui/wxpython/datacatalog/tree.py:290 +#, python-brace-format +msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/datacatalog/tree.py:292 #, python-brace-format -msgid "" -"The following error occurred when deleting database <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of GRASS database was interrupted." +msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 -msgid "unknown" +#: ../gui/wxpython/datacatalog/tree.py:296 +#, python-brace-format +msgid "{name}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/datacatalog/tree.py:1043 #, python-brace-format msgid "" -"User {user} is already running GRASS in selected mapset <{mapset}>\n" -" (file {lockpath} created {timestamp} found).\n" -"\n" -"Concurrent use not allowed.\n" +"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " +"display it you need to switch to <{map_location}> location. Note that if you " +"switch there all current Map Displays will be closed.\n" "\n" -"Do you want to stay in the current mapset or remove .gislock and switch to " -"selected mapset?" +"Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 -msgid "Mapset is in use" +#: ../gui/wxpython/datacatalog/tree.py:1053 +msgid "Map in a different location" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 -msgid "Error when removing lock file" +#: ../gui/wxpython/datacatalog/tree.py:1172 +#, python-brace-format +msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/datacatalog/tree.py:1174 #, python-brace-format -msgid "" -"Unable to remove {lockpath}.\n" -"\n" -" Details: {error}." +msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 -#, python-format -msgid "" -"Import of <%(name)s> failed.\n" -"Reason: %(msg)s" +#: ../gui/wxpython/datacatalog/tree.py:1187 +#, python-brace-format +msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 -#, python-format -msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +#: ../gui/wxpython/datacatalog/tree.py:1189 +#, python-brace-format +msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format -msgid "" -"Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" -"Current mapset is <%(mapset)s>." +#: ../gui/wxpython/datacatalog/tree.py:1204 +#: ../gui/wxpython/datacatalog/tree.py:1543 +msgid "New name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format -msgid "" -"Current location is <%(loc)s>.\n" -"Current mapset is <%(mapset)s>." +#: ../gui/wxpython/datacatalog/tree.py:1205 +msgid "Rename map" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:724 -#, python-format -msgid "Current mapset is <%s>." +#: ../gui/wxpython/datacatalog/tree.py:1354 +msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 -msgid "Setup for georectification" +#: ../gui/wxpython/datacatalog/tree.py:1367 +#, python-brace-format +msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 -msgid "Georectifying setup canceled." +#: ../gui/wxpython/datacatalog/tree.py:1379 +msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 -msgid "Select map type and location/mapset" +#: ../gui/wxpython/datacatalog/tree.py:1391 +#, python-brace-format +msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 -msgid "Map type to georectify" +#: ../gui/wxpython/datacatalog/tree.py:1403 +#, python-brace-format +msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 -msgid "raster" +#: ../gui/wxpython/datacatalog/tree.py:1413 +#, python-brace-format +msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 -msgid "vector" +#: ../gui/wxpython/datacatalog/tree.py:1429 +msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 -msgid "Select source location:" +#: ../gui/wxpython/datacatalog/tree.py:1431 +msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 -msgid "Select source mapset:" +#: ../gui/wxpython/datacatalog/tree.py:1453 +#: ../gui/wxpython/datacatalog/tree.py:1473 +#, python-brace-format +msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 -msgid "You must select a valid location before selecting a mapset" +#: ../gui/wxpython/datacatalog/tree.py:1456 +#: ../gui/wxpython/datacatalog/tree.py:1476 +#: ../gui/wxpython/datacatalog/tree.py:1544 +msgid "Select new name" msgstr "" -#: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 -msgid "You must select a valid location and mapset in order to continue" +#: ../gui/wxpython/datacatalog/tree.py:1494 +#, python-brace-format +msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 -msgid "Select image/map group to georectify" +#: ../gui/wxpython/datacatalog/tree.py:1496 +#, python-brace-format +msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:567 -msgid "Select/create group:" +#: ../gui/wxpython/datacatalog/tree.py:1510 +#: ../gui/wxpython/datacatalog/tree.py:1512 +msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 -msgid "Create group if none exists" +#: ../gui/wxpython/datacatalog/tree.py:1533 +msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 -msgid "Add vector map to group..." +#: ../gui/wxpython/datacatalog/tree.py:1609 +#: ../gui/wxpython/datacatalog/tree.py:1725 +msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 -msgid "Extension for output maps:" +#: ../gui/wxpython/datacatalog/tree.py:1689 +#, python-brace-format +msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:690 -msgid "No vector maps." +#: ../gui/wxpython/datacatalog/tree.py:1693 +#, python-brace-format +msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 -msgid "You must select a valid image/map group in order to continue" +#: ../gui/wxpython/datacatalog/tree.py:1694 +msgid "Delete map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 -msgid "You must enter an map name extension in order to continue" +#: ../gui/wxpython/datacatalog/tree.py:1695 +#, python-brace-format +msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 -msgid "Select maps to display for ground control point (GCP) creation" +#: ../gui/wxpython/datacatalog/tree.py:1885 +msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/gcp/manager.py:784 -msgid "Map Display Web Service Layer(s)" +#: ../gui/wxpython/datacatalog/tree.py:1898 +msgid "" +"To move or copy maps to other location, please drag them to a mapset in the " +"destination location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 -msgid "Select source map to display:" +#: ../gui/wxpython/datacatalog/tree.py:2212 +msgid "&Cut" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 -msgid "Select target raster map to display:" +#: ../gui/wxpython/datacatalog/tree.py:2218 +msgid "&Copy" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 -msgid "Select target vector map to display:" +#: ../gui/wxpython/datacatalog/tree.py:2222 +msgid "Copy &name" msgstr "" -#: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 -msgid "You must select a source map in order to continue" +#: ../gui/wxpython/datacatalog/tree.py:2226 +#: ../gui/wxpython/datacatalog/tree.py:2271 +#: ../gui/wxpython/datacatalog/tree.py:2371 +msgid "&Paste" msgstr "" -#: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 -#, python-format -msgid "" -"No maps in selected group <%s>.\n" -"Please edit group or select another group." +#. GTC Delete mapset +#: ../gui/wxpython/datacatalog/tree.py:2232 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 +msgid "&Delete" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 -msgid "Manage Ground Control Points" +#. GTC Rename mapset +#: ../gui/wxpython/datacatalog/tree.py:2237 ../gui/wxpython/dbmgr/base.py:2480 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +msgid "&Rename" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 -#, python-format -msgid "At least %d GCPs required. Operation canceled." +#: ../gui/wxpython/datacatalog/tree.py:2252 +msgid "&Display layers" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 -msgid "source" +#: ../gui/wxpython/datacatalog/tree.py:2254 +msgid "&Display layer" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 -msgid "target" +#: ../gui/wxpython/datacatalog/tree.py:2258 +msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 -msgid "Set GCP coordinates" +#: ../gui/wxpython/datacatalog/tree.py:2277 +msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 -#, python-format -msgid "" -"Set %(coor)s coordinates for GCP No. %(key)s? \n" -"\n" -"East: %(coor0)s \n" -"North: %(coor1)s" +#: ../gui/wxpython/datacatalog/tree.py:2287 +msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 -msgid "Writing POINTS file failed" +#: ../gui/wxpython/datacatalog/tree.py:2293 +msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 -#, python-format -msgid "POINTS file saved for group <%s>" +#: ../gui/wxpython/datacatalog/tree.py:2299 +#: ../gui/wxpython/datacatalog/tree.py:2326 +#: ../gui/wxpython/datacatalog/tree.py:2361 +msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 -msgid "source mapwin not defined" +#: ../gui/wxpython/datacatalog/tree.py:2310 +msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 -msgid "target mapwin not defined" +#: ../gui/wxpython/datacatalog/tree.py:2314 +msgid "&Delete location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 -msgid "Reading POINTS file failed" +#: ../gui/wxpython/datacatalog/tree.py:2320 +msgid "&Rename location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 -#, python-format -msgid "" -"Insufficient points defined and active (checked) for selected rectification " -"method (order: %d).\n" -"3+ points needed for 1st order,\n" -"6+ points for 2nd order, and\n" -"10+ points for 3rd order." +#: ../gui/wxpython/datacatalog/tree.py:2339 +msgid "&Create new location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 -#, python-brace-format -msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" +#: ../gui/wxpython/datacatalog/tree.py:2343 +msgid "&Download sample location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 -msgid "Rectifying images, please wait..." +#: ../gui/wxpython/datacatalog/tree.py:2348 +msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 -#, python-format -msgid "Transforming <%s>..." +#: ../gui/wxpython/datacatalog/tree.py:2355 +msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 -#, python-format -msgid "Rectifying vector map <%s>, please wait..." +#: ../gui/wxpython/datacatalog/tree.py:2385 +msgid "&Delete locations" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 -#, python-format -msgid "Georectification of vector map <%s> failed" +#: ../gui/wxpython/datacatalog/tree.py:2397 +msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 -msgid "GCP Manager settings" +#: ../gui/wxpython/datacatalog/tree.py:2409 +msgid "No available options" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 -msgid "Quit GCP Manager" +#: ../gui/wxpython/datacatalog/catalog.py:51 +msgid "Data catalog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 -msgid "Save ground control points?" +#: ../gui/wxpython/datacatalog/catalog.py:203 +#: ../gui/wxpython/location_wizard/wizard.py:330 +msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 -msgid "" -"Could not calculate RMS Error.\n" -"Possible error with m.transform." +#: ../gui/wxpython/datacatalog/catalog.py:211 +msgid "Do you want to create a location?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 -msgid "" -"Could not calculate new extends.\n" -"Possible error with m.transform." +#: ../gui/wxpython/datacatalog/catalog.py:215 +msgid "Create location?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 -msgid "Adjust source display to target display" +#: ../gui/wxpython/datacatalog/catalog.py:312 +msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 -msgid "Adjust target display to source display" +#: ../gui/wxpython/datacatalog/catalog.py:318 +msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 -msgid "use" +#: ../gui/wxpython/datacatalog/catalog.py:326 +msgid "Set raster output format [r.external.out]" msgstr "" -#: ../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 -msgid "source E" +#: ../gui/wxpython/datacatalog/catalog.py:332 +msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 -msgid "source N" +#: ../gui/wxpython/datacatalog/catalog.py:340 +msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 -msgid "target E" +#: ../gui/wxpython/datacatalog/catalog.py:344 +msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 -msgid "target N" +#: ../gui/wxpython/datacatalog/catalog.py:351 +msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 -msgid "Forward error" +#: ../gui/wxpython/datacatalog/catalog.py:357 +msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 -msgid "Backward error" +#: ../gui/wxpython/datacatalog/catalog.py:363 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1188 +msgid "Link external data" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 -msgid "Invalid coordinate value. Operation canceled." +#: ../gui/wxpython/datacatalog/catalog.py:366 +msgid "More options..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 -msgid "Create vector map group" +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2007 +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2007 +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "Data Catalog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 -msgid "Select vector map(s) to add to group:" +#: ../gui/wxpython/datacatalog/frame.py:42 +msgid "Close GRASS GIS Data Catalog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 -msgid "Edit GCP" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87 +msgid "Map Swipe Tool - GRASS GIS" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 -msgid "Ground Control Point No." +#: ../gui/wxpython/mapswipe/toolbars.py:27 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 +msgid "Tools" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 -msgid "source E:" +#: ../gui/wxpython/mapswipe/toolbars.py:28 +#: ../gui/wxpython/mapswipe/dialogs.py:52 +msgid "Select raster maps" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 -msgid "target E:" +#: ../gui/wxpython/mapswipe/toolbars.py:31 +#: ../gui/wxpython/mapdisp/toolbars.py:29 +msgid "Query raster/vector map(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 -msgid "source N:" +#: ../gui/wxpython/mapswipe/toolbars.py:32 +#: ../gui/wxpython/mapdisp/toolbars.py:30 +msgid "Query selected raster/vector map(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 -msgid "target N:" +#: ../gui/wxpython/mapswipe/toolbars.py:141 +msgid "Swipe mode" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 -msgid "Apply changes for the current session" +#: ../gui/wxpython/mapswipe/toolbars.py:141 +#: ../gui/wxpython/mapswipe/dialogs.py:284 +msgid "Mirror mode" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 -msgid "" -"Apply and save changes to user settings file (default for next sessions)" +#: ../gui/wxpython/mapswipe/toolbars.py:154 +msgid "Choose view mode" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 -#: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 -#: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 -msgid "Close dialog" +#: ../gui/wxpython/mapswipe/toolbars.py:188 +msgid "Switch orientation" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 -msgid "Symbology" +#: ../gui/wxpython/mapswipe/toolbars.py:194 +msgid "Switch maps" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 -msgid "Highlight highest RMS error only" +#: ../gui/wxpython/mapswipe/dialogs.py:147 +msgid "Name of top/left raster map:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 -msgid "Highlight RMS error > M + SD * factor:" +#: ../gui/wxpython/mapswipe/dialogs.py:154 +msgid "Name of bottom/right raster map:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 -msgid "" -"Highlight GCPs with an RMS error larger than \n" -"mean + standard deviation * given factor. \n" -"Recommended values for this factor are between 1 and 2." -msgstr "" - -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 -msgid "Symbol settings" -msgstr "" - -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 -msgid "Color for high RMS error:" -msgstr "" - -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 -msgid "Color for selected GCP:" +#: ../gui/wxpython/mapswipe/dialogs.py:199 +msgid "Switch to advanced mode" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 -msgid "Color for unused GCPs:" +#: ../gui/wxpython/mapswipe/dialogs.py:200 ../gui/wxpython/gui_core/wrap.py:271 +msgid "Cancel" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 -msgid "Show unused GCPs" +#: ../gui/wxpython/mapswipe/dialogs.py:204 +msgid "Switch to simple mode" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 -msgid "Symbol size:" +#: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 +msgid "Close" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 -msgid "Rectification" +#: ../gui/wxpython/mapswipe/dialogs.py:228 +msgid "Name of the first map is missing." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 -msgid "Select rectification order" +#: ../gui/wxpython/mapswipe/dialogs.py:230 +msgid "Name of the second map is missing." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 -msgid "1st order" +#: ../gui/wxpython/mapswipe/dialogs.py:263 +msgid "Map Swipe settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 -msgid "2nd order" +#: ../gui/wxpython/mapswipe/dialogs.py:287 +msgid "Mirrored cursor" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 -msgid "3rd order" +#: ../gui/wxpython/mapswipe/dialogs.py:309 +msgid "Shape:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 -msgid "Select interpolation method:" +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 +msgid "Line width:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 -msgid "clip to computational region in target location" +#: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 +#: ../gui/wxpython/menustrings.py:2046 +msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 -msgid "overwrite result map" +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 +msgid "Main Toolbar" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 -msgid "RMS threshold factor must be > 0" +#: ../gui/wxpython/mapswipe/frame.py:309 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 +msgid "Misc Toolbar" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 -msgid "" -"RMS threshold factor is < 1\n" -"Too many points might be highlighted" +#: ../gui/wxpython/mapswipe/frame.py:458 +#, python-format +msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format -msgid "GCP Manager settings saved to file '%s'." +msgid "Map <%s> not found." msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:268 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:272 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:264 -msgid "GCP Display toolbar" +#: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 +#: ../gui/wxpython/mapdisp/frame.py:922 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 +msgid "Nothing to render (empty map). Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:289 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:293 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:285 -msgid "GCP Manager toolbar" +#: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 +#: ../gui/wxpython/gmodeler/panels.py:1009 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 +#: ../gui/wxpython/mapdisp/frame.py:744 +#: ../gui/wxpython/modules/histogram.py:474 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 +msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:309 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:313 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:305 -msgid "GCP List" +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 +msgid "No raster or vector map layer selected for querying." msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:324 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:328 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:320 -msgid "Source Display" +#: ../gui/wxpython/icons/icon.py:36 +#, python-format +msgid "Unknown iconset '%s', using default 'grass'...\n" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:335 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:339 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:331 -msgid "Target Display" +#: ../gui/wxpython/icons/icon.py:50 +#, python-format +msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 -#: ../gui/wxpython/wxplot/base.py:614 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 -#: ../gui/wxpython/modules/histogram.py:502 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 -#: ../gui/wxpython/psmap/toolbars.py:82 -msgid "Page setup" +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 -#: ../gui/wxpython/modules/histogram.py:506 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 -msgid "Print preview" +#: ../gui/wxpython/history/tree.py:142 +msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 -#: ../gui/wxpython/gui_core/toolbars.py:68 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 -#: ../gui/wxpython/modules/histogram.py:510 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 -msgid "Print display" +#: ../gui/wxpython/history/tree.py:191 +msgid "&Remove" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:522 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:526 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:518 -msgid "Zoom to computational region (set with g.region)" +#: ../gui/wxpython/history/tree.py:465 +msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:527 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 -msgid "Zoom to default region" +#: ../gui/wxpython/history/tree.py:491 +msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:531 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 -msgid "Zoom to saved region" +#: ../gui/wxpython/history/tree.py:492 +msgid "Remove command" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:536 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:540 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:532 -msgid "Set computational region from display" +#: ../gui/wxpython/history/tree.py:495 +msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:542 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 -msgid "Save display geometry to named region" +#: ../gui/wxpython/history/tree.py:512 +msgid "<{}> removed" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 -msgid "Pan to GCP by number" +#: ../gui/wxpython/history/browser.py:40 +msgid "Timestamp:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 -msgid "Valid Range:" +#: ../gui/wxpython/history/browser.py:41 +msgid "Runtime duration:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 -msgid "RMS error" +#: ../gui/wxpython/history/browser.py:42 +msgid "Status:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 -#, python-format -msgid "Forward: %(forw)s, Backward: %(back)s" +#: ../gui/wxpython/history/browser.py:43 +msgid "Mask 2D:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:40 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:40 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:40 -msgid "Add new GCP to the list" +#: ../gui/wxpython/history/browser.py:44 +msgid "Mask 3D:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:41 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:41 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:41 -msgid "Delete selected GCP" +#: ../gui/wxpython/history/browser.py:45 +msgid "North:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:42 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:42 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:42 -msgid "Clear selected GCP" +#: ../gui/wxpython/history/browser.py:46 +msgid "South:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:43 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:43 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:43 -msgid "Recalculate RMS error" +#: ../gui/wxpython/history/browser.py:47 +msgid "West:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:44 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 -msgid "Georectify" +#: ../gui/wxpython/history/browser.py:48 +msgid "East:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:45 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:45 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:45 -msgid "Save GCPs to POINTS file" +#: ../gui/wxpython/history/browser.py:49 +msgid "North-south resolution:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:47 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:47 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:47 -msgid "Reload GCPs from POINTS file" +#: ../gui/wxpython/history/browser.py:50 +msgid "East-west resolution:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:117 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:117 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:117 -msgid " / Zoom to map" +#: ../gui/wxpython/history/browser.py:51 +msgid "Number of rows:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:134 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:134 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:134 -msgid "Update GCP coordinates" +#: ../gui/wxpython/history/browser.py:52 +msgid "Number of columns:" msgstr "" -#: ../gui/wxpython/gcp/toolbars.py:135 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:135 -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:135 -msgid "Update GCP coordinates)" +#: ../gui/wxpython/history/browser.py:53 +msgid "Number of cells:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/history/browser.py:63 +msgid "{} sec" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:197 -msgid "Change" +#: ../gui/wxpython/history/browser.py:117 +msgid "General info" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 -#: ../gui/wxpython/gui_core/forms.py:1170 -msgid "This option is required" +#: ../gui/wxpython/history/browser.py:138 +msgid "Computational region during command execution" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 -msgid "(optional)" +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +msgid "Update current region" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 -msgid "Name" +#: ../gui/wxpython/history/browser.py:271 +msgid "Region match" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/history/browser.py:294 +msgid "Set current computational region to the region of executed command" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 -msgid "Description" +#: ../gui/wxpython/history/browser.py:359 +msgid "History browser" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/history/browser.py:396 +msgid "&Export history" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:296 -msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " -"excluding characters {} and space." +#: ../gui/wxpython/history/browser.py:398 +msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 -#: ../gui/wxpython/modules/import_export.py:261 -msgid "Invalid name" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:310 -msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +#: ../gui/wxpython/history/browser.py:466 +msgid "JSON files" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 -msgid "" -"Title of the location is limited only to one line and 256 characters. The " -"rest of the text will be ignored." +#: ../gui/wxpython/history/browser.py:470 +#, python-brace-format +msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 -msgid "Select Coordinate Reference System (CRS)" +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Text files" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 -msgid "Select CRS from a list by EPSG or description" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 -msgid "Read CRS from a georeferenced data file" +#: ../gui/wxpython/history/browser.py:485 +msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 -msgid "Create a generic cartesian coordinate system (XY)" +#: ../gui/wxpython/startup/locdownload.py:148 +msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 -msgid "Specify CRS using WKT string" +#: ../gui/wxpython/startup/locdownload.py:159 +#, python-brace-format +msgid "" +"Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " +"{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 -msgid "Specify CRS using PROJ.4 string" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 -msgid "Define custom CRS" +#: ../gui/wxpython/startup/locdownload.py:225 +msgid "Abort" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 -msgid "Additional methods:" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -msgid "Code" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample project to download:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:535 -msgid "Projection code:" +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 +msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 -msgid "Search in description:" +#: ../gui/wxpython/startup/locdownload.py:295 +msgid "Download selected project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:733 -#, python-format -msgid "Unable to read list: %s" +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 +msgid "Download" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:826 -msgid "Choose projection parameters" +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 +msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:845 -msgid "Select datum or ellipsoid (next page)" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:856 -msgid "Datum with associated ellipsoid" +#: ../gui/wxpython/startup/locdownload.py:338 +#, python-format +msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:860 -msgid "Ellipsoid only" +#: ../gui/wxpython/startup/locdownload.py:343 +msgid "" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:917 -#, python-format -msgid "You must enter a value for %s" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 -#, python-format -msgid " Enter parameters for %s projection " +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 +#, python-brace-format +msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 -msgid "No" +#: ../gui/wxpython/startup/locdownload.py:439 +msgid "Dataset Download" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 -msgid "Yes" +#: ../gui/wxpython/startup/locdownload.py:447 +msgid "Download selected dataset" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1051 -msgid "Specify geodetic datum" +#: ../gui/wxpython/startup/locdownload.py:490 +msgid "Do you want to cancel dataset download?" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 -msgid "Ellipsoid" +#: ../gui/wxpython/startup/guiutils.py:84 +msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1082 -msgid "Datum code:" +#: ../gui/wxpython/startup/guiutils.py:112 +msgid "Invalid project name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1243 -msgid "Specify ellipsoid" +#: ../gui/wxpython/startup/guiutils.py:133 +msgid "Name for the new mapset:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 -msgid "Earth based" +#: ../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 +msgid "Create new mapset" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 -msgid "Planetary bodies" +#: ../gui/wxpython/startup/guiutils.py:149 +msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 -msgid "Ellipsoid code:" +#: ../gui/wxpython/startup/guiutils.py:173 +msgid "Do you want to import {} to the newly created project?" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1450 -msgid "Georeferenced file:" +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 +msgid "Import data?" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1508 -msgid "Select georeferenced file" +#: ../gui/wxpython/startup/guiutils.py:230 +#, python-brace-format +msgid "" +"Cannot rename mapset <{mapset}> for the following reason:\n" +"\n" +"{reason}\n" +"\n" +"No mapset will be renamed." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 -msgid "Enter WKT parameters string:" +#: ../gui/wxpython/startup/guiutils.py:234 +msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 -msgid "Select CRS from a list" +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 +msgid "" +"Current name: {}\n" +"\n" +"Enter new name:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 -msgid "Filter by EPSG code or description:" +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 +msgid "Rename selected mapset" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 -msgid "Find more information at:" +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 +#: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 +msgid "Error" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/vnet/dialogs.py:384 -msgid "Parameters" +#: ../gui/wxpython/startup/guiutils.py:259 +msgid "" +"Unable to rename mapset.\n" +"\n" +"{}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format -msgid "Unable to read EPGS codes: {0}" -msgstr "" - -#: ../gui/wxpython/location_wizard/wizard.py:1775 -msgid "Choose IAU Code" +msgid "" +"Cannot rename project <{location}> for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No project will be renamed." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 -msgid "Path to the IAU-codes file:" +#: ../gui/wxpython/startup/guiutils.py:288 +msgid "Unable to rename selected project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 -msgid "IAU code:" +#: ../gui/wxpython/startup/guiutils.py:300 +msgid "Rename selected project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 -msgid "Choose IAU codes file" +#: ../gui/wxpython/startup/guiutils.py:312 +msgid "" +"Unable to rename project.\n" +"\n" +"{}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format -msgid "Unable to read IAU codes: {0}" -msgstr "" - -#: ../gui/wxpython/location_wizard/wizard.py:2067 -msgid "Enter PROJ.4 parameters string:" -msgstr "" - -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 -msgid "Datum transform is required." +msgid "" +"Cannot delete one or more mapsets for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 -#: ../gui/wxpython/rlisetup/wizard.py:1954 -msgid "Summary" +#: ../gui/wxpython/startup/guiutils.py:378 +msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2229 -msgid "GRASS Database:" +#: ../gui/wxpython/startup/guiutils.py:394 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following mapsets?\n" +"\n" +"{deletes}\n" +"\n" +"All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" +#: ../gui/wxpython/startup/guiutils.py:399 +msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2247 -#: ../gui/wxpython/gmodeler/preferences.py:740 -msgid "Description:" +#: ../gui/wxpython/startup/guiutils.py:412 +msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2259 -msgid "Projection:" +#: ../gui/wxpython/startup/guiutils.py:414 +#, python-brace-format +msgid "" +"The following error occurred when deleting mapset <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/startup/guiutils.py:459 +#, python-brace-format msgid "" -"PROJ.4 definition:\n" -" (non-definitive)" +"Cannot delete one or more projects for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 -msgid "custom" +#: ../gui/wxpython/startup/guiutils.py:463 +msgid "Unable to delete selected projects" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:479 +#, python-brace-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Do you want to continue with deleting one or more of the following " +"projects?\n" "\n" -"Details: %(err)s" +"{deletes}\n" +"\n" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/startup/guiutils.py:484 +msgid "Delete selected projects" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/startup/guiutils.py:497 +msgid "Error when deleting projects" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format -msgid "Unable to create new GRASS Database <{path}>: {error}" +msgid "" +"The following error occurred when deleting project <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 -msgid "EPSG code missing." +#: ../gui/wxpython/startup/guiutils.py:532 +#, python-brace-format +msgid "" +"Cannot delete GRASS database from disk for the following reason:\n" +"\n" +"{reasons}\n" +"\n" +"GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2733 -msgid "IAU code missing." +#: ../gui/wxpython/startup/guiutils.py:536 +msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 -#, python-format -msgid "File <%s> not found." +#: ../gui/wxpython/startup/guiutils.py:544 +#, python-brace-format +msgid "" +"Do you want to delete the following GRASS database from disk?\n" +"\n" +"{grassdb}\n" +"\n" +"The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2757 -msgid "WKT string missing." +#: ../gui/wxpython/startup/guiutils.py:549 +msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 -msgid "Set default region extent and resolution" +#: ../gui/wxpython/startup/guiutils.py:561 +msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 -msgid "&Set region" +#: ../gui/wxpython/startup/guiutils.py:563 +#, python-brace-format +msgid "" +"The following error occurred when deleting database <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:121 -msgid "Invalid location selected." +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 +msgid "unknown" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:139 -msgid "Invalid region" +#: ../gui/wxpython/startup/guiutils.py:596 +#, python-brace-format +msgid "" +"User {user} is already running GRASS in selected mapset <{mapset}>\n" +" (file {lockpath} created {timestamp} found).\n" +"\n" +"Concurrent use not allowed.\n" +"\n" +"Do you want to stay in the current mapset or remove .gislock and switch to " +"selected mapset?" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:171 -msgid "Click here to show 3D settings" +#: ../gui/wxpython/startup/guiutils.py:603 +msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 -msgid "Click here to hide 3D settings" +#: ../gui/wxpython/startup/guiutils.py:614 +msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 -#, python-format -msgid "Rows: %d" +#: ../gui/wxpython/startup/guiutils.py:616 +#, python-brace-format +msgid "" +"Unable to remove {lockpath}.\n" +"\n" +" Details: {error}." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format -msgid "Cols: %d" +msgid "" +"Import of <%(name)s> failed.\n" +"Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format -msgid "Cells: %d" +msgid "" +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/startup/guiutils.py:693 #, python-format -msgid "Depth: %d" +msgid "" +"Current GRASS database is <%(dbase)s>.\n" +"Current project is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/startup/guiutils.py:711 #, python-format -msgid "3D Cells: %d" +msgid "" +"Current project is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 -msgid "Top" +#: ../gui/wxpython/startup/guiutils.py:723 +#, python-format +msgid "Current mapset is <%s>." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 -msgid "Bottom" +#: ../gui/wxpython/gcp/manager.py:157 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 +msgid "Setup for georectification" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 -msgid "T-B resolution" +#: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 +msgid "Georectifying setup canceled." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 -msgid "North" -msgstr "" - -#: ../gui/wxpython/location_wizard/dialogs.py:361 -msgid "West" -msgstr "" - -#: ../gui/wxpython/location_wizard/dialogs.py:398 -msgid "East" +#: ../gui/wxpython/gcp/manager.py:403 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 +msgid "Select map type and location/mapset" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:415 -msgid "South" +#: ../gui/wxpython/gcp/manager.py:418 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 +msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:426 -msgid "N-S resolution" +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 +msgid "raster" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:443 -msgid "E-W resolution" +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 +msgid "vector" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:542 -#, python-format -msgid "Invalid value: %s" +#: ../gui/wxpython/gcp/manager.py:432 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 +msgid "Select source location:" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:646 -msgid "Select datum transformation" +#: ../gui/wxpython/gcp/manager.py:447 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 +msgid "Select source mapset:" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 -msgid "Select from list of datum transformations" +#: ../gui/wxpython/gcp/manager.py:511 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 +msgid "You must select a valid location before selecting a mapset" msgstr "" -#: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 -msgid "Graphical Modeler - GRASS GIS" +#: ../gui/wxpython/gcp/manager.py:525 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 +msgid "You must select a valid location and mapset in order to continue" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 -msgid "Modeler settings" +#: ../gui/wxpython/gcp/manager.py:548 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 +msgid "Select image/map group to georectify" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 -#: ../gui/wxpython/vdigit/preferences.py:129 -#: ../gui/wxpython/mapdisp/properties.py:381 -#: ../gui/wxpython/animation/dialogs.py:360 -#: ../gui/wxpython/animation/dialogs.py:1895 -msgid "General" +#: ../gui/wxpython/gcp/manager.py:567 +msgid "Select/create group:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:54 -msgid "Item properties" +#: ../gui/wxpython/gcp/manager.py:589 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 +msgid "Create group if none exists" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:61 -msgid "Disabled:" +#: ../gui/wxpython/gcp/manager.py:600 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 +msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 -msgid "Python editor" +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 +msgid "Extension for output maps:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:95 -msgid "GRASS API:" +#: ../gui/wxpython/gcp/manager.py:690 +msgid "No vector maps." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:136 -#: ../gui/wxpython/gmodeler/dialogs.py:196 -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Command" +#: ../gui/wxpython/gcp/manager.py:698 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 +msgid "You must select a valid image/map group in order to continue" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:147 -#: ../gui/wxpython/gmodeler/preferences.py:466 -#: ../gui/wxpython/gmodeler/preferences.py:573 -msgid "Valid:" +#: ../gui/wxpython/gcp/manager.py:706 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 +msgid "You must enter an map name extension in order to continue" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:168 -msgid "Invalid:" +#: ../gui/wxpython/gcp/manager.py:779 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 +msgid "Select maps to display for ground control point (GCP) creation" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:189 -msgid "Running:" +#: ../gui/wxpython/gcp/manager.py:784 +msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:218 -#: ../gui/wxpython/gmodeler/preferences.py:388 -#: ../gui/wxpython/gmodeler/preferences.py:495 -#: ../gui/wxpython/gmodeler/preferences.py:600 -msgid "Shape size" +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 +msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 -msgid "Type" +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 +msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:296 -msgid "Raster:" +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 +msgid "Select target vector map to display:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:317 -msgid "3D raster:" +#: ../gui/wxpython/gcp/manager.py:920 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 +msgid "You must select a source map in order to continue" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:338 -msgid "Vector:" +#: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 +#, python-format +msgid "" +"No maps in selected group <%s>.\n" +"Please edit group or select another group." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:359 -msgid "Table:" +#: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 +msgid "Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:455 -msgid "Loop" +#: ../gui/wxpython/gcp/manager.py:1341 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 +#, python-format +msgid "At least %d GCPs required. Operation canceled." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:562 -msgid "Comment" +#: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 +msgid "source" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 -msgid "Model properties" +#: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 +msgid "target" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 -msgid "Metadata" +#: ../gui/wxpython/gcp/manager.py:1495 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 +msgid "Set GCP coordinates" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:695 -msgid "Commands" +#: ../gui/wxpython/gcp/manager.py:1497 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 +#, python-format +msgid "" +"Set %(coor)s coordinates for GCP No. %(key)s? \n" +"\n" +"East: %(coor0)s \n" +"North: %(coor1)s" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 -#: ../gui/wxpython/modules/import_export.py:102 -#: ../gui/wxpython/modules/mcalc_builder.py:284 -msgid "Allow output files to overwrite existing files" +#: ../gui/wxpython/gcp/manager.py:1583 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 +msgid "Writing POINTS file failed" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:718 -msgid "Apply properties" +#: ../gui/wxpython/gcp/manager.py:1596 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 +#, python-format +msgid "POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 -#: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 -msgid "Close dialog and ignore changes" +#: ../gui/wxpython/gcp/manager.py:1610 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 +msgid "source mapwin not defined" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 -#: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 -#: ../gui/wxpython/animation/dialogs.py:411 -msgid "Name:" +#: ../gui/wxpython/gcp/manager.py:1613 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 +msgid "target mapwin not defined" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:750 -msgid "Author(s):" +#: ../gui/wxpython/gcp/manager.py:1643 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 +msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 +#, python-format +msgid "" +"Insufficient points defined and active (checked) for selected rectification " +"method (order: %d).\n" +"3+ points needed for 1st order,\n" +"6+ points for 2nd order, and\n" +"10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gcp/manager.py:1798 +#, python-brace-format +msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 +msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 +#, python-format +msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 +#, python-format +msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 +#, python-format +msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 +msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 +msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 +msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 +msgid "" +"Could not calculate RMS Error.\n" +"Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 +msgid "" +"Could not calculate new extends.\n" +"Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 +msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 +msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +msgid "use" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../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 +msgid "source E" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 +msgid "source N" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 +msgid "target E" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 +msgid "target N" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 +msgid "Forward error" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 +msgid "Backward error" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 +msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 +msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 +msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:317 -#, python-format -msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 +msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 +msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 +msgid "source E:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 +msgid "target E:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:431 -#, python-format -msgid "Data: %s" +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 +msgid "source N:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 +msgid "target N:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 +msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:463 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +"Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gcp/manager.py:2984 +#: ../gui/wxpython/web_services/dialogs.py:152 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 +#: ../gui/wxpython/modules/import_export.py:124 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 +msgid "Close dialog" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 +msgid "Symbology" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 +msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 +msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 +msgid "" +"Highlight GCPs with an RMS error larger than \n" +"mean + standard deviation * given factor. \n" +"Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 +msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 +msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 +msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 +msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 +msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 +msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 +msgid "Rectification" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 +msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 +msgid "1st order" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 +msgid "2nd order" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 +msgid "3rd order" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 +msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 +msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" +#: ../gui/wxpython/gcp/manager.py:3285 +msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 +msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 +msgid "" +"RMS threshold factor is < 1\n" +"Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 +#, python-format +msgid "GCP Manager settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." +#: ../gui/wxpython/gcp/mapdisplay.py:268 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:272 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:264 +msgid "GCP Display toolbar" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." +#: ../gui/wxpython/gcp/mapdisplay.py:289 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:293 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:285 +msgid "GCP Manager toolbar" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" +#: ../gui/wxpython/gcp/mapdisplay.py:309 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:313 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:305 +msgid "GCP List" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" +#: ../gui/wxpython/gcp/mapdisplay.py:324 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:328 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:320 +msgid "Source Display" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gcp/mapdisplay.py:335 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:339 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:331 +msgid "Target Display" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 +#: ../gui/wxpython/wxplot/base.py:614 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 +#: ../gui/wxpython/mapdisp/frame.py:934 +#: ../gui/wxpython/modules/histogram.py:502 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 +#: ../gui/wxpython/psmap/toolbars.py:82 +msgid "Page setup" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" +#: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 +#: ../gui/wxpython/mapdisp/frame.py:938 +#: ../gui/wxpython/modules/histogram.py:506 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 +msgid "Print preview" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" +#: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 +#: ../gui/wxpython/gui_core/toolbars.py:68 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 +#: ../gui/wxpython/mapdisp/frame.py:942 +#: ../gui/wxpython/modules/histogram.py:510 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 +msgid "Print display" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" +#: ../gui/wxpython/gcp/mapdisplay.py:522 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:526 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:518 +msgid "Zoom to computational region (set with g.region)" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " +#: ../gui/wxpython/gcp/mapdisplay.py:527 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 +#: ../gui/wxpython/mapdisp/frame.py:1520 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 +msgid "Zoom to default region" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" +#: ../gui/wxpython/gcp/mapdisplay.py:531 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 +#: ../gui/wxpython/mapdisp/frame.py:1521 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 +msgid "Zoom to saved region" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" +#: ../gui/wxpython/gcp/mapdisplay.py:536 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:540 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:532 +msgid "Set computational region from display" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gcp/mapdisplay.py:542 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 +#: ../gui/wxpython/mapdisp/frame.py:1533 +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 +msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 +msgid "Pan to GCP by number" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 +msgid "Valid Range:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 +msgid "RMS error" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 +#, python-format +msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" +#: ../gui/wxpython/gcp/toolbars.py:40 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:40 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:40 +msgid "Add new GCP to the list" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" +#: ../gui/wxpython/gcp/toolbars.py:41 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:41 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:41 +msgid "Delete selected GCP" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" +#: ../gui/wxpython/gcp/toolbars.py:42 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:42 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:42 +msgid "Clear selected GCP" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" +#: ../gui/wxpython/gcp/toolbars.py:43 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:43 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:43 +msgid "Recalculate RMS error" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" +#: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 +#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:44 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 +msgid "Georectify" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gcp/toolbars.py:45 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:45 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:45 +msgid "Save GCPs to POINTS file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gcp/toolbars.py:47 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:47 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:47 +msgid "Reload GCPs from POINTS file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." +#: ../gui/wxpython/gcp/toolbars.py:117 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:117 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:117 +msgid " / Zoom to map" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/gcp/toolbars.py:134 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:134 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:134 +msgid "Update GCP coordinates" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/gcp/toolbars.py:135 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:135 +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:135 +msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +msgid "Define new GRASS project" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/location_wizard/wizard.py:198 +msgid "Change" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" +#: ../gui/wxpython/location_wizard/wizard.py:215 +#: ../gui/wxpython/gui_core/forms.py:1170 +msgid "This option is required" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" +#: ../gui/wxpython/location_wizard/wizard.py:218 +msgid "(optional)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 +msgid "Name" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" +#: ../gui/wxpython/location_wizard/wizard.py:229 +msgid "Name of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 +msgid "Description" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" +#: ../gui/wxpython/location_wizard/wizard.py:271 +msgid "Project will be created in GRASS database:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +"Name '{}' is not a valid name for project. Please use only ASCII characters " +"excluding characters {} and space." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 +#: ../gui/wxpython/modules/import_export.py:261 +msgid "Invalid name" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" +#: ../gui/wxpython/location_wizard/wizard.py:311 +msgid "" +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +#: ../gui/wxpython/location_wizard/wizard.py:346 +msgid "" +"Title of the project is limited only to one line and 256 characters. The " +"rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/location_wizard/wizard.py:357 +msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" +#: ../gui/wxpython/location_wizard/wizard.py:370 +msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 +msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" +#: ../gui/wxpython/location_wizard/wizard.py:384 +msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 +msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 +msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 +msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" +#: ../gui/wxpython/location_wizard/wizard.py:404 +msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +msgid "Code" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/location_wizard/wizard.py:536 +msgid "Projection code:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 +msgid "Search in description:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1116 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" +msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." +#: ../gui/wxpython/location_wizard/wizard.py:827 +msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." +#: ../gui/wxpython/location_wizard/wizard.py:846 +msgid "Select datum or ellipsoid (next page)" +msgstr "" + +#: ../gui/wxpython/location_wizard/wizard.py:857 +msgid "Datum with associated ellipsoid" +msgstr "" + +#: ../gui/wxpython/location_wizard/wizard.py:861 +msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format -msgid "Unable to open file <%s> for writing." +msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 +#, python-format +msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 +msgid "No" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 +msgid "Yes" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" +#: ../gui/wxpython/location_wizard/wizard.py:1052 +msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" +#: ../gui/wxpython/location_wizard/wizard.py:1077 +msgid "Ellipsoid" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" +#: ../gui/wxpython/location_wizard/wizard.py:1083 +msgid "Datum code:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" +#: ../gui/wxpython/location_wizard/wizard.py:1244 +msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" +#: ../gui/wxpython/location_wizard/wizard.py:1265 +msgid "Earth based" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" +#: ../gui/wxpython/location_wizard/wizard.py:1268 +msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" +#: ../gui/wxpython/location_wizard/wizard.py:1285 +msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" +#: ../gui/wxpython/location_wizard/wizard.py:1451 +msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" +#: ../gui/wxpython/location_wizard/wizard.py:1509 +msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" +#: ../gui/wxpython/location_wizard/wizard.py:1535 +msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" +#: ../gui/wxpython/location_wizard/wizard.py:1587 +msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" +#: ../gui/wxpython/location_wizard/wizard.py:1603 +msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" +#: ../gui/wxpython/location_wizard/wizard.py:1607 +msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/vnet/dialogs.py:384 +msgid "Parameters" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 +#, python-brace-format +msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" +#: ../gui/wxpython/location_wizard/wizard.py:1776 +msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" +#: ../gui/wxpython/location_wizard/wizard.py:1792 +msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" +#: ../gui/wxpython/location_wizard/wizard.py:1796 +msgid "IAU code:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" +#: ../gui/wxpython/location_wizard/wizard.py:1998 +msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" +#: ../gui/wxpython/location_wizard/wizard.py:2033 +#, python-brace-format +msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" +#: ../gui/wxpython/location_wizard/wizard.py:2068 +msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 +msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" +#: ../gui/wxpython/location_wizard/wizard.py:2181 +#: ../gui/wxpython/rlisetup/wizard.py:1954 +msgid "Summary" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -msgid "Run script" +#: ../gui/wxpython/location_wizard/wizard.py:2230 +msgid "GRASS Database:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2042 -msgid "Save the script to a file" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +msgid "Project Name:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +#: ../gui/wxpython/location_wizard/wizard.py:2248 +#: ../gui/wxpython/gmodeler/preferences.py:740 +msgid "Description:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" +#: ../gui/wxpython/location_wizard/wizard.py:2260 +msgid "Projection:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/location_wizard/wizard.py:2272 +msgid "" +"PROJ.4 definition:\n" +" (non-definitive)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -msgid "Python script type" +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 +msgid "custom" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2110 +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, python-format msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +"Unable to create new project. Project <%(loc)s> not created.\n" +"\n" +"Details: %(err)s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +msgid "Unable to create new project" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" +#: ../gui/wxpython/location_wizard/wizard.py:2666 +msgid "Project already exists in GRASS Database." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" +#: ../gui/wxpython/location_wizard/wizard.py:2683 +#, python-brace-format +msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/location_wizard/wizard.py:2722 +msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" +#: ../gui/wxpython/location_wizard/wizard.py:2734 +msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2200 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format -msgid "Unable to launch Python script. %s" +msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/location_wizard/wizard.py:2758 +msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 -msgid "&File" +#: ../gui/wxpython/location_wizard/dialogs.py:40 +msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/menustrings.py:4 ../gui/wxpython/lmgr/workspace.py:521 -msgid "Workspace" +#: ../gui/wxpython/location_wizard/dialogs.py:93 +msgid "&Set region" msgstr "" -#: ../gui/wxpython/menustrings.py:6 -msgid "Create new workspace" +#: ../gui/wxpython/location_wizard/dialogs.py:122 +msgid "Invalid location selected." msgstr "" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 -msgid "Open" +#: ../gui/wxpython/location_wizard/dialogs.py:140 +msgid "Invalid region" msgstr "" -#: ../gui/wxpython/menustrings.py:8 -msgid "Load workspace from file" +#: ../gui/wxpython/location_wizard/dialogs.py:172 +msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 -#: ../gui/wxpython/modules/colorrules.py:462 -msgid "Save" +#: ../gui/wxpython/location_wizard/dialogs.py:173 +msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/menustrings.py:10 ../gui/wxpython/lmgr/toolbars.py:68 -#: ../gui/wxpython/lmgr/workspace.py:389 ../gui/wxpython/lmgr/workspace.py:412 -msgid "Save workspace" +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 +#, python-format +msgid "Rows: %d" msgstr "" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 -msgid "Save as" +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 +#, python-format +msgid "Cols: %d" msgstr "" -#: ../gui/wxpython/menustrings.py:12 -msgid "Save workspace to file" +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 +#, python-format +msgid "Cells: %d" msgstr "" -#: ../gui/wxpython/menustrings.py:14 -msgid "Close workspace file" +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 +#, python-format +msgid "Depth: %d" msgstr "" -#: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 -msgid "Map display" +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 +#, python-format +msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/menustrings.py:16 -msgid "Add raster" +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 +msgid "Top" msgstr "" -#: ../gui/wxpython/menustrings.py:17 -msgid "Add raster map layer to current display" +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 +msgid "Bottom" msgstr "" -#: ../gui/wxpython/menustrings.py:18 -msgid "Add vector" +#: ../gui/wxpython/location_wizard/dialogs.py:275 +msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/menustrings.py:19 -msgid "Add vector map layer to current display" +#: ../gui/wxpython/location_wizard/dialogs.py:357 +msgid "North" msgstr "" -#: ../gui/wxpython/menustrings.py:20 -msgid "Add multiple rasters or vectors" +#: ../gui/wxpython/location_wizard/dialogs.py:374 +msgid "West" msgstr "" -#: ../gui/wxpython/menustrings.py:21 -msgid "Add multiple raster or vector map layers to current display" +#: ../gui/wxpython/location_wizard/dialogs.py:411 +msgid "East" msgstr "" -#: ../gui/wxpython/menustrings.py:22 -msgid "Add RGB raster layer" +#: ../gui/wxpython/location_wizard/dialogs.py:428 +msgid "South" msgstr "" -#: ../gui/wxpython/menustrings.py:23 -msgid "Add RGB raster map layer to current display" +#: ../gui/wxpython/location_wizard/dialogs.py:439 +msgid "N-S resolution" msgstr "" -#: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 -msgid "Add web service layer" +#: ../gui/wxpython/location_wizard/dialogs.py:456 +msgid "E-W resolution" msgstr "" -#: ../gui/wxpython/menustrings.py:26 -msgid "New map display window" +#: ../gui/wxpython/location_wizard/dialogs.py:555 +#, python-format +msgid "Invalid value: %s" msgstr "" -#: ../gui/wxpython/menustrings.py:27 -msgid "Open new map display window" +#: ../gui/wxpython/location_wizard/dialogs.py:659 +msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/menustrings.py:28 -msgid "Render all map displays" +#: ../gui/wxpython/location_wizard/dialogs.py:687 +msgid "Select from list of datum transformations" msgstr "" -#: ../gui/wxpython/menustrings.py:29 -msgid "Re-render maps in all open map display windows" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" msgstr "" -#: ../gui/wxpython/menustrings.py:30 ../gui/wxpython/menustrings.py:31 -msgid "Close current map display window" +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" msgstr "" -#: ../gui/wxpython/menustrings.py:32 ../gui/wxpython/menustrings.py:33 -msgid "Close all open map display windows" +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 -msgid "Simplified raster import with reprojection" +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" msgstr "" -#: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 -msgid "Imports raster data into a GRASS raster map using GDAL library." +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 -msgid "Import of common raster formats" +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 -msgid "ASCII x,y,z point import and gridding" +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 -msgid "" -"Creates a raster map from an assemblage of many coordinates using univariate " -"statistics." +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 -msgid "ASCII grid import" +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" msgstr "" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 -msgid "Converts a GRASS ASCII raster file to binary raster map." +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 -msgid "ASCII polygons, lines, and point import" +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 -msgid "Creates raster maps from ASCII polygon/line/point data files." +#: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 +msgid "Graphical Modeler - GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 -msgid "Raw binary array import" +#: ../gui/wxpython/gmodeler/preferences.py:31 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 +msgid "Modeler settings" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 -msgid "Import a binary raster file into a GRASS raster map layer." +#: ../gui/wxpython/gmodeler/preferences.py:50 +#: ../gui/wxpython/gui_core/preferences.py:273 +#: ../gui/wxpython/vdigit/preferences.py:129 +#: ../gui/wxpython/mapdisp/properties.py:381 +#: ../gui/wxpython/animation/dialogs.py:360 +#: ../gui/wxpython/animation/dialogs.py:1895 +msgid "General" msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 -msgid "GRIDATB.FOR import" +#: ../gui/wxpython/gmodeler/preferences.py:54 +msgid "Item properties" msgstr "" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 -msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." +#: ../gui/wxpython/gmodeler/preferences.py:61 +msgid "Disabled:" msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 -msgid "Matlab 2D array import" +#: ../gui/wxpython/gmodeler/preferences.py:88 +msgid "Python editor" msgstr "" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 -msgid "Imports a binary MAT-File(v4) to a GRASS raster." +#: ../gui/wxpython/gmodeler/preferences.py:95 +msgid "GRASS API:" msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 -msgid "PNG import" +#: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:196 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +msgid "Command" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 -msgid "Imports non-georeferenced PNG format image." +#: ../gui/wxpython/gmodeler/preferences.py:147 +#: ../gui/wxpython/gmodeler/preferences.py:466 +#: ../gui/wxpython/gmodeler/preferences.py:573 +msgid "Valid:" msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 -msgid "SPOT NDVI import" +#: ../gui/wxpython/gmodeler/preferences.py:168 +msgid "Invalid:" msgstr "" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 -msgid "Imports SPOT VGT NDVI data into a raster map." +#: ../gui/wxpython/gmodeler/preferences.py:189 +msgid "Running:" msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 -msgid "SRTM HGT import" +#: ../gui/wxpython/gmodeler/preferences.py:218 +#: ../gui/wxpython/gmodeler/preferences.py:388 +#: ../gui/wxpython/gmodeler/preferences.py:495 +#: ../gui/wxpython/gmodeler/preferences.py:600 +msgid "Shape size" msgstr "" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 -msgid "Imports SRTM HGT files into raster map." +#: ../gui/wxpython/gmodeler/preferences.py:289 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 +msgid "Type" msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 -msgid "Terra ASTER HDF import" +#: ../gui/wxpython/gmodeler/preferences.py:296 +msgid "Raster:" msgstr "" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 -msgid "" -"Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " -"using gdalwarp." +#: ../gui/wxpython/gmodeler/preferences.py:317 +msgid "3D raster:" msgstr "" -#: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 -msgid "LAS LiDAR points import" +#: ../gui/wxpython/gmodeler/preferences.py:338 +msgid "Vector:" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +#: ../gui/wxpython/gmodeler/preferences.py:359 +msgid "Table:" msgstr "" -#: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 -msgid "Point cloud (LAS LiDAR) import" +#: ../gui/wxpython/gmodeler/preferences.py:455 +msgid "Loop" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 -msgid "WMS/WMTS import" +#: ../gui/wxpython/gmodeler/preferences.py:562 +msgid "Comment" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 -msgid "" -"Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." +#: ../gui/wxpython/gmodeler/preferences.py:686 +#: ../gui/wxpython/menustrings.py:2095 +msgid "Model properties" msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 -msgid "Unpack raster map" +#: ../gui/wxpython/gmodeler/preferences.py:693 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 +msgid "Metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 -msgid "" -"Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " -"raster map" +#: ../gui/wxpython/gmodeler/preferences.py:695 +msgid "Commands" msgstr "" -#: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/gmodeler/preferences.py:707 +#: ../gui/wxpython/gui_core/preferences.py:1214 +#: ../gui/wxpython/modules/import_export.py:102 +#: ../gui/wxpython/modules/mcalc_builder.py:284 +msgid "Allow output files to overwrite existing files" msgstr "" -#: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/gmodeler/preferences.py:718 +msgid "Apply properties" msgstr "" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 -msgid "Simplified vector import with reprojection" +#: ../gui/wxpython/gmodeler/preferences.py:720 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 +#: ../gui/wxpython/vdigit/preferences.py:64 +#: ../gui/wxpython/psmap/dialogs.py:561 +msgid "Close dialog and ignore changes" msgstr "" -#: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 -msgid "Imports vector data into a GRASS vector map using OGR library." +#: ../gui/wxpython/gmodeler/preferences.py:730 +#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1653 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 +#: ../gui/wxpython/animation/dialogs.py:411 +msgid "Name:" msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 -msgid "Import of common vector formats" +#: ../gui/wxpython/gmodeler/preferences.py:750 +msgid "Author(s):" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 -msgid "ASCII points or GRASS ASCII format" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 -msgid "Creates a vector map from an ASCII points file or ASCII vector file." +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 -msgid "ASCII points as a vector lines" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" msgstr "" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 -msgid "Imports ASCII x,y[,z] coordinates as a series of lines." +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 -msgid "DXF import" +#: ../gui/wxpython/gmodeler/panels.py:189 +msgid "Script editor" msgstr "" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 -msgid "Converts files in DXF format to GRASS vector map format." +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 -msgid "WFS" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 -msgid "Imports GetFeature from a WFS server." +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 -msgid "ESRI e00 import" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 -msgid "Imports E00 file into a vector map." +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 -msgid "Geonames import" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 -msgid "Imports geonames.org country files into a vector points map." +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 -msgid "Matlab array or Mapgen format import" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 -msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 -msgid "Unpack vector map" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 msgid "" -"Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " -"vector map" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" msgstr "" -#: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 -msgid "Import 3D raster data" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 -msgid "ASCII 3D import" +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 -msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 -msgid "Raw binary array 3D import" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 -msgid "Imports a binary raster file into a GRASS 3D raster map." +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 -msgid "Vis5D import" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 -msgid "Import 3-dimensional Vis5D files." +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 -msgid "Import database table" +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" msgstr "" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 -msgid "Common import formats" +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 -msgid "Imports attribute tables in various formats." +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 -msgid "Export raster map" +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" msgstr "" -#: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 -msgid "Common export formats" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" msgstr "" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 -msgid "Exports GRASS raster maps into GDAL supported formats." +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 -msgid "ASCII grid export" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." msgstr "" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 -msgid "Converts a raster map layer into a GRASS ASCII text file." +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 -msgid "ASCII x,y,z points export" +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." msgstr "" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 -msgid "" -"Exports a raster map to a text file as x,y,z values based on cell centers." +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 -msgid "GRIDATB.FOR export" +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." msgstr "" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 -msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 -msgid "Matlab 2D array export" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 -msgid "Exports a GRASS raster to a binary MAT-File." +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 -msgid "Raw binary array export" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" msgstr "" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 -msgid "Exports a GRASS raster to a binary array." +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" msgstr "" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 -msgid "MPEG-1 export" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" msgstr "" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 -msgid "Converts raster map series to MPEG movie." +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 -msgid "PNG export" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" msgstr "" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 -msgid "Export a GRASS raster map as a non-georeferenced PNG image." +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 -msgid "PPM export" +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" msgstr "" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 -msgid "Converts a GRASS raster map to a PPM image file." +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 -msgid "PPM from RGB export" +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" msgstr "" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 -msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" msgstr "" -#: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 -msgid "POV-Ray export" +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" msgstr "" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 -msgid "Converts a raster map layer into a height-field file for POV-Ray." +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 -msgid "VRML export" +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" msgstr "" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 -msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" msgstr "" -#: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 -msgid "VTK export" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" msgstr "" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 -msgid "Converts raster maps into the VTK-ASCII format." +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 -msgid "Pack raster map" +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 -msgid "Exports a raster map as GRASS GIS specific archive file" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 -msgid "Export vector map" +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" msgstr "" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 -msgid "" -"Exports a vector map layer to any of the supported OGR vector formats. By " -"default a vector map layer is exported to OGC GeoPackage format." +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +msgid "Run script" msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 -msgid "ASCII points or GRASS ASCII vector export" +#: ../gui/wxpython/gmodeler/panels.py:1617 +msgid "Save the script to a file" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/gmodeler/panels.py:1622 msgid "" -"Exports a vector map to a GRASS ASCII vector representation. By default only " -"features with category are exported. To export all features use 'layer=-1'." +"Refresh the script based on the model.\n" +"It will discard all local changes." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 -msgid "DXF export" +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" msgstr "" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 -msgid "Exports vector map to DXF file format." +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 -msgid "PostGIS export" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 -msgid "Exports a vector map layer to PostGIS feature table." +#: ../gui/wxpython/gmodeler/panels.py:1654 +msgid "Python script type" msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 -msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 -msgid "SVG export" +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" msgstr "" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 -msgid "Exports a vector map to SVG file." +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 -msgid "Converts a vector map to VTK ASCII output." +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 -msgid "Pack vector map" +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 -msgid "Exports a vector map as GRASS GIS specific archive file" +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 -msgid "Export 3D raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" msgstr "" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 -msgid "ASCII 3D export" +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 -msgid "Converts a 3D raster map layer into a ASCII text file." +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 -msgid "Raw binary array 3D export" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 -msgid "Exports a GRASS 3D raster map to a binary array." +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 -msgid "Vis5D export" +#: ../gui/wxpython/gmodeler/toolbars.py:54 +msgid "Save current model to file" msgstr "" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 -msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 -msgid "Converts 3D raster maps into the VTK-ASCII format." +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 -msgid "Export database table" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 -msgid "Exports attribute tables into various formats." +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 -#: ../gui/wxpython/modules/import_export.py:414 -msgid "Link external raster data" +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 -msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 -msgid "Link external vector data" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 -msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 -msgid "Output format for raster data" +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 -msgid "" -"Redirects raster output to file utilizing GDAL library rather than storing " -"in GRASS raster format." +#: ../gui/wxpython/gmodeler/toolbars.py:81 +msgid "Set model properties" msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 -msgid "Output format for vector data" +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 -msgid "Defines vector output format utilizing OGR library." +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 -msgid "Manage maps" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" msgstr "" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 -#: ../gui/wxpython/gui_core/forms.py:630 -#: ../gui/wxpython/modules/mcalc_builder.py:176 -msgid "Copy" +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" msgstr "" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 -msgid "" -"Creates copies of maps and other elements Copies available data files in the " -"current mapset search path to the user's current mapset." +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 -msgid "List" +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 -msgid "" -"Lists available GRASS data base files of the user-specified data type " -"optionally using the search pattern." +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 -#: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 -msgid "Rename" +#: ../gui/wxpython/gmodeler/dialogs.py:308 +msgid "" +"Command not defined.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 -msgid "Renames data base element files in the user's current mapset." +#: ../gui/wxpython/gmodeler/dialogs.py:317 +#, python-format +msgid "" +"'%s' is not a GRASS tool.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 -msgid "" -"Removes data base element files from the user's current mapset using the " -"search pattern." +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" msgstr "" -#: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 -msgid "Map type conversions" +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" msgstr "" -#: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 -msgid "Raster to vector" +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" msgstr "" -#: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 -msgid "Converts a raster map into a vector map." +#: ../gui/wxpython/gmodeler/dialogs.py:431 +#, python-format +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 -msgid "Raster series to 3D raster" +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" msgstr "" -#: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 -msgid "Converts 2D raster map slices to one 3D raster volume map." +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" msgstr "" -#: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 -msgid "Raster 2.5D to 3D raster" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 -msgid "Creates a 3D volume map based on 2D elevation and value raster maps." +#: ../gui/wxpython/gmodeler/dialogs.py:473 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 -msgid "Vector to raster" +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 -msgid "Converts (rasterize) a vector map into a raster map." +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" msgstr "" -#: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 -msgid "Vector to 3D raster" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" msgstr "" -#: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 -msgid "Converts a vector map (only points) into a 3D raster map." +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" msgstr "" -#: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 -msgid "2D vector to 3D vector" +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" msgstr "" -#: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 -msgid "Performs transformation of 2D vector features to 3D." +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/menustrings.py:195 -msgid "3D raster to raster series" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 -msgid "Converts 3D raster maps to 2D raster maps" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 -msgid "Manage Ground Control Points for Georectification" +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 -msgid "Graphical modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" msgstr "" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 -msgid "Launch Graphical modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." msgstr "" -#: ../gui/wxpython/menustrings.py:202 -msgid "Run model prepared by Graphical modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" msgstr "" -#: ../gui/wxpython/menustrings.py:203 -msgid "3D image rendering" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" msgstr "" -#: ../gui/wxpython/menustrings.py:204 -msgid "" -"Creates a 3D rendering of GIS data. Renders surfaces (raster data), 2D/3D " -"vector data, and volumes (3D raster data) in 3D." +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 -msgid "Animation tool" +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 -msgid "Launch animation tool." +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" msgstr "" -#: ../gui/wxpython/menustrings.py:207 -msgid "Bearing/distance to coordinates" +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" msgstr "" -#: ../gui/wxpython/menustrings.py:208 -msgid "" -"A simple utility for converting bearing and distance measurements to " -"coordinates and vice versa. It assumes a cartesian coordinate system" +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 -#: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 -msgid "Cartographic Composer" +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" msgstr "" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 -msgid "Launch Cartographic Composer" +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 -msgid "Launch Map Swipe" +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." msgstr "" -#: ../gui/wxpython/menustrings.py:213 -msgid "Launch script" +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format +msgid "" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/menustrings.py:214 -msgid "Launches script file." +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" msgstr "" -#: ../gui/wxpython/menustrings.py:215 ../gui/wxpython/gui_core/pyedit.py:743 -msgid "Simple Python Editor" +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/menustrings.py:216 -msgid "Launches Simple Python Editor." +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 -msgid "Close GUI" +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:218 -msgid "Close graphical user interface." +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 -msgid "Quit GRASS GIS" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" msgstr "" -#: ../gui/wxpython/menustrings.py:220 -msgid "Close GUI and exit GRASS GIS shell." +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 -msgid "&Settings" +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 -msgid "Computational region" +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 -msgid "Show current region" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 -msgid "Shows the extent and resolution of the computational region." +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 -msgid "Show region using latitude and longitude" +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 -msgid "Show current region extent in Map Display" +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 -msgid "Shows the extent of the computational region in Map Display." +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 -msgid "Set region" +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" msgstr "" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 -msgid "Manages the boundary definitions for the geographic region." +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 +msgid "&File" msgstr "" -#: ../gui/wxpython/menustrings.py:231 -msgid "GRASS working environment" +#: ../gui/wxpython/menustrings.py:4 ../gui/wxpython/lmgr/workspace.py:521 +msgid "Workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:232 -msgid "Mapset access" +#: ../gui/wxpython/menustrings.py:6 +msgid "Create new workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 +msgid "Open" msgstr "" -#: ../gui/wxpython/menustrings.py:234 -msgid "User access" +#: ../gui/wxpython/menustrings.py:8 +msgid "Load workspace from file" msgstr "" -#: ../gui/wxpython/menustrings.py:235 -msgid "" -"Controls access to the current mapset for other users on the system. If no " -"option given, prints current status." +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/modules/colorrules.py:462 +msgid "Save" msgstr "" -#: ../gui/wxpython/menustrings.py:236 -msgid "Change working environment" +#: ../gui/wxpython/menustrings.py:10 ../gui/wxpython/lmgr/toolbars.py:68 +#: ../gui/wxpython/lmgr/workspace.py:389 ../gui/wxpython/lmgr/workspace.py:412 +msgid "Save workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:237 -msgid "" -"Changes/reports current mapset. Optionally create new mapset or list " -"available mapsets in given location." +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 +msgid "Save as" msgstr "" -#: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" +#: ../gui/wxpython/menustrings.py:12 +msgid "Save workspace to file" msgstr "" -#: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#: ../gui/wxpython/menustrings.py:14 +msgid "Close workspace file" msgstr "" -#: ../gui/wxpython/menustrings.py:240 -msgid "Change mapset" +#: ../gui/wxpython/menustrings.py:15 +#: ../gui/wxpython/web_services/dialogs.py:879 +msgid "Map display" msgstr "" -#: ../gui/wxpython/menustrings.py:241 -msgid "Change current mapset." +#: ../gui/wxpython/menustrings.py:16 +msgid "Add raster" msgstr "" -#: ../gui/wxpython/menustrings.py:242 ../gui/wxpython/menustrings.py:243 -msgid "Change working directory" +#: ../gui/wxpython/menustrings.py:17 +msgid "Add raster map layer to current display" msgstr "" -#: ../gui/wxpython/menustrings.py:244 -msgid "Show settings" +#: ../gui/wxpython/menustrings.py:18 +msgid "Add vector" msgstr "" -#: ../gui/wxpython/menustrings.py:245 -msgid "Outputs and modifies the user's current GRASS variable settings." +#: ../gui/wxpython/menustrings.py:19 +msgid "Add vector map layer to current display" msgstr "" -#: ../gui/wxpython/menustrings.py:246 -msgid "Change settings" +#: ../gui/wxpython/menustrings.py:20 +msgid "Add multiple rasters or vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:247 -msgid "" -"Outputs and modifies the user's current GRASS variable settings. Prints all " -"defined GRASS variables if no option is given." +#: ../gui/wxpython/menustrings.py:21 +msgid "Add multiple raster or vector map layers to current display" msgstr "" -#: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +#: ../gui/wxpython/menustrings.py:22 +msgid "Add RGB raster layer" msgstr "" -#: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +#: ../gui/wxpython/menustrings.py:23 +msgid "Add RGB raster map layer to current display" msgstr "" -#: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +#: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 +#: ../gui/wxpython/web_services/dialogs.py:529 +msgid "Add web service layer" msgstr "" -#: ../gui/wxpython/menustrings.py:252 -msgid "Map projections" +#: ../gui/wxpython/menustrings.py:26 +msgid "New map display window" msgstr "" -#: ../gui/wxpython/menustrings.py:253 -msgid "Display map projection" +#: ../gui/wxpython/menustrings.py:27 +msgid "Open new map display window" msgstr "" -#: ../gui/wxpython/menustrings.py:254 -msgid "" -"Converts co-ordinate system descriptions (i.e. projection information) " -"between various formats (including GRASS format)." +#: ../gui/wxpython/menustrings.py:28 +msgid "Render all map displays" msgstr "" -#: ../gui/wxpython/menustrings.py:255 -msgid "Manage projections" +#: ../gui/wxpython/menustrings.py:29 +msgid "Re-render maps in all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:256 -msgid "" -"Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +#: ../gui/wxpython/menustrings.py:30 ../gui/wxpython/menustrings.py:31 +msgid "Close current map display window" msgstr "" -#: ../gui/wxpython/menustrings.py:257 -msgid "Convert coordinates" +#: ../gui/wxpython/menustrings.py:32 ../gui/wxpython/menustrings.py:33 +msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:258 -msgid "Converts coordinates from one projection to another (cs2cs frontend)." +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 +msgid "Simplified raster import with reprojection" msgstr "" -#: ../gui/wxpython/menustrings.py:259 -msgid "Addons extensions" +#: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 +msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:260 -msgid "Install extension from addons" +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 +msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:261 -msgid "Installs new extension from GRASS AddOns repository." +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 +msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:262 -msgid "Manage installed extension" +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 +msgid "" +"Creates a raster map from an assemblage of many coordinates using univariate " +"statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:263 -msgid "Updates or removes installed GRASS AddOns extension(s)." +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 +msgid "ASCII grid import" msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 -msgid "Preferences" +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 +msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:265 -msgid "User GUI preferences (display font, commands, digitizer, etc.)" +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 +msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 -msgid "&Raster" +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 +msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 -msgid "Develop raster map" +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 +msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 -msgid "Compress/decompress" +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 +msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 -msgid "Compresses and decompresses raster maps." +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 +msgid "GRIDATB.FOR import" msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 -msgid "Region boundaries" +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 +msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 -msgid "Sets the boundary definitions for a raster map." +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 +msgid "Matlab 2D array import" msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 -msgid "Manage NULL values" +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 +msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 -msgid "Manages NULL-values of given raster map." +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 +msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 -msgid "Quantization" +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 +msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 -msgid "Produces the quantization file for a floating-point map." +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 +msgid "SPOT NDVI import" msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 -msgid "Timestamp" +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 +msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 -msgid "" -"Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " -"raster map." +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 +msgid "SRTM HGT import" msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 -msgid "Resample using aggregate statistics" +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 +msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 -msgid "Resamples raster map layers to a coarser grid using aggregation." +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 +msgid "Terra ASTER HDF import" msgstr "" -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 -msgid "Resample using multiple methods" +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 +msgid "" +"Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " +"using gdalwarp." msgstr "" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 -msgid "Resamples raster map to a finer grid using interpolation." +#: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 -msgid "Resample using nearest neighbor" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +msgid "Module not installed" msgstr "" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 -msgid "GRASS raster map layer data resampling capability." +#: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 +msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 -msgid "Resample using spline tension" +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 +msgid "WMS/WMTS import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" -"Reinterpolates and optionally computes topographic analysis from input " -"raster map to a new raster map (possibly with different resolution) using " -"regularized spline with tension and smoothing." +"Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 -msgid "Resample using bspline" +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 +msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" -"Performs bilinear or bicubic spline interpolation with Tykhonov " -"regularization." +"Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " +"raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 -msgid "Resample using analytic kernel" +#: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 -msgid "Resamples raster map layers using an analytic kernel." +#: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +msgid "Re-projects a raster map from given project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 -msgid "Support file maintenance" +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 +msgid "Simplified vector import with reprojection" msgstr "" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 -msgid "Allows creation and/or modification of raster map layer support files." +#: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 +msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 -msgid "Update map statistics" +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 +msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 -msgid "Update raster map statistics" +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 +msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 -msgid "Tiling" +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 +msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 -msgid "" -"Produces tilings of the source projection for use in the destination region " -"and projection." +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 +msgid "ASCII points as a vector lines" msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 -msgid "Build a VRT (Virtual Raster)" +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 +msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 -msgid "Build a VRT (Virtual Raster) from the list of input raster maps." +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 +msgid "DXF import" msgstr "" -#: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 -msgid "Manage colors" +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 +msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 -msgid "Color tables" +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 +msgid "WFS" msgstr "" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 -msgid "Creates/modifies the color table associated with a raster map." +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 +msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 -msgid "Color tables (stddev)" +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 +msgid "ESRI e00 import" msgstr "" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 -msgid "Sets color rules based on stddev from a raster map's mean value." +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 +msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 -msgid "Manage color rules interactively" +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 +msgid "Geonames import" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 -msgid "Interactive management of raster color tables." +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 +msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 -msgid "Export color table" +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 +msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 -msgid "Exports the color table associated with a raster map." +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 +msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 -msgid "Blend 2 color rasters" +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 +msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 -msgid "Blends color components of two raster maps by a given ratio." +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 +msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 -msgid "Create RGB" +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 +msgid "" +"Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " +"vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 -msgid "" -"Combines red, green and blue raster maps into a single composite raster map." +#: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +msgid "Reproject vector map from different GRASS project" msgstr "" -#: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 -msgid "RGB to HIS" +#: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +msgid "Re-projects a vector map from one project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 -msgid "" -"Generates red, green and blue (RGB) raster map layers combining hue, " -"intensity and saturation (HIS) values from user-specified input raster map " -"layers." +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 +msgid "Import 3D raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 -msgid "Query raster maps" +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 +msgid "ASCII 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 -msgid "Query values by coordinates" +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 +msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 -msgid "Queries raster maps on their category values and category labels." +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 +msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 -msgid "Query colors by value" +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 +msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 -msgid "Queries colors for a raster map layer." +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 +msgid "Vis5D import" msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 -msgid "Raster buffers and distance" +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 +msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 -msgid "Buffer rasters" +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 +msgid "Import database table" msgstr "" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 -msgid "" -"Creates a raster map showing buffer zones surrounding cells that contain non-" -"NULL category values." +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 +msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 -msgid "Concentric circles" +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 +msgid "Imports attribute tables in various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 -msgid "Creates a raster map containing concentric rings around a given point." +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 +msgid "Export raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 -msgid "Closest points" +#: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 +msgid "Common export formats" msgstr "" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 -msgid "Locates the closest points between objects in two raster maps." +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 +msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 -msgid "Grow by one cell" +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 +msgid "ASCII grid export" msgstr "" -#: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 -msgid "Generates a raster map layer with contiguous areas grown by one cell." +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 +msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 -msgid "Distance to features" +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 +msgid "ASCII x,y,z points export" msgstr "" -#: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" -"Generates a raster map containing distances to nearest raster features and/" -"or the value of the nearest non-null cell." +"Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 -msgid "Creates a MASK for limiting raster operation." +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 +msgid "GRIDATB.FOR export" msgstr "" -#: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 -msgid "Raster map calculator" +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 +msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 -msgid "Simplified raster map calculator" +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 +msgid "Matlab 2D array export" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 -msgid "Calculates a new raster map from a simple r.mapcalc expression." +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 +msgid "Exports a GRASS raster to a binary MAT-File." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 -msgid "Raster map calculator." +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 +msgid "Raw binary array export" msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 -msgid "Neighborhood analysis" +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 +msgid "Exports a GRASS raster to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 -#: ../gui/wxpython/rlisetup/wizard.py:985 -msgid "Moving window" +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 +msgid "MPEG-1 export" msgstr "" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 -msgid "" -"Makes each cell category value a function of the category values assigned to " -"the cells around it, and stores new cell values in an output raster map " -"layer." +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 +msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 -msgid "Neighborhood points" +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 +msgid "PNG export" msgstr "" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 -msgid "" -"Neighborhood analysis tool for vector point maps. 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 in an output raster map." +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 +msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 -msgid "Overlay rasters" +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 +msgid "PPM export" msgstr "" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 -msgid "Cross product" +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 +msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 -msgid "" -"Creates a cross product of the category values from multiple raster map " -"layers." +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 +msgid "PPM from RGB export" msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 -msgid "Patch raster maps" +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 +msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 -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." +#: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 +msgid "POV-Ray export" msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 -msgid "Raster series aggregation" +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 +msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 -msgid "" -"Makes each output cell value a function of the values assigned to the " -"corresponding cells in the input raster map layers." +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 +msgid "VRML export" msgstr "" -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 -msgid "Raster series accumulation" +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 +msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 -msgid "" -"Makes each output cell value a accumulationfunction of the values assigned " -"to the corresponding cells in the input raster map layers." +#: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 +msgid "VTK export" msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 -msgid "Statistical overlay" +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 +msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 -msgid "" -"Calculates category or object oriented statistics (accumulator-based " -"statistics)." +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 +msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 -msgid "Quantiles overlay" +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 +msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 -msgid "Compute category quantiles using two passes." +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 +msgid "Export vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 -msgid "Solar radiance and shadows" +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 +msgid "" +"Exports a vector map layer to any of the supported OGR vector formats. By " +"default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 -msgid "LatLong map" +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 +msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 -msgid "Creates a latitude/longitude raster map." +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 +msgid "" +"Exports a vector map to a GRASS ASCII vector representation. By default only " +"features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 -msgid "Solar irradiance and irradiation" +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 +msgid "DXF export" msgstr "" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 -msgid "" -"Solar irradiance and irradiation model. Computes direct (beam), diffuse and " -"reflected solar irradiation raster maps for given day, latitude, surface and " -"atmospheric conditions. Solar parameters (e.g. sunrise, sunset times, " -"declination, extraterrestrial irradiance, daylight length) are saved in the " -"map history file. Alternatively, a local time can be specified to compute " -"solar incidence angle and/or irradiance raster maps. The shadowing effect of " -"the topography is optionally incorporated." +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 +msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 -msgid "Shadows map" +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 +msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 -msgid "" -"Calculates cast shadow areas from sun position and elevation raster map. " -"Either exact sun position (A) is specified, or date/time to calculate the " -"sun position (B) by r.sunmask itself." +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 +msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 -msgid "Sunshine hours and solar angles" +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 +msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 -msgid "" -"Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " -"the angle between the direction of the geometric center of the sun's " -"apparent disk and the (idealized) horizon. Solar azimuth: the angle from due " -"north in clockwise direction." +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 +msgid "SVG export" msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 -msgid "Terrain analysis" +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 +msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 -msgid "Generate contour lines" +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 +msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 -msgid "Produces a vector map of specified contours from a raster map." +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 +msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 -msgid "Cost surface" +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 +msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 -msgid "" -"Creates a raster map showing the cumulative cost of moving between different " -"geographic locations on an input raster map whose cell category values " -"represent cost." +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 +msgid "Export 3D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 -msgid "Trace a path" +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 +msgid "ASCII 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 -msgid "Traces paths from starting points following input directions." +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 +msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 -msgid "Cumulative movement costs" +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 +msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 -msgid "" -"Creates a raster map showing the anisotropic cumulative cost of moving " -"between different geographic locations on an input raster map whose cell " -"category values represent cost." +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 +msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 -msgid "Least cost route or flow" +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 +msgid "Vis5D export" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 -msgid "" -"Traces a flow through an elevation model or cost surface on a raster map." +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 +msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 -msgid "Compute shaded relief" +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 +msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 -msgid "Creates shaded relief map from an elevation map (DEM). " +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 +msgid "Export database table" msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 -msgid "Apply shade to raster" +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 +msgid "Exports attribute tables into various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 -msgid "Drapes a color raster over an shaded relief or aspect map." +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 +#: ../gui/wxpython/modules/import_export.py:414 +msgid "Link external raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 -msgid "Slope and aspect" +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 +msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 -msgid "" -"Generates raster maps of slope, aspect, curvatures and partial derivatives " -"from an elevation raster map. Aspect is calculated counterclockwise from " -"east." +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 +msgid "Link external vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 -msgid "Landforms" +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 +msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 -msgid "" -"Calculates geomorphons (terrain forms) and associated geometry using machine " -"vision approach." +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 +msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 -msgid "Terrain parameters" +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 +msgid "" +"Redirects raster output to file utilizing GDAL library rather than storing " +"in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 -msgid "" -"Extracts terrain parameters from a DEM. Uses a multi-scale approach by " -"taking fitting quadratic parameters to any size window (via least squares)." +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 +msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 -msgid "Textural features" +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 +msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 -msgid "Generate images with textural features from a raster map." +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 +msgid "Manage maps" msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 -msgid "Visibility" +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 +#: ../gui/wxpython/gui_core/forms.py:630 +#: ../gui/wxpython/modules/mcalc_builder.py:176 +msgid "Copy" msgstr "" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" -"Computes the viewshed of a point on an elevation raster map. Default format: " -"NULL (invisible), vertical angle wrt viewpoint (visible)." +"Creates copies of maps and other elements Copies available data files in the " +"current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 -msgid "Horizon angle" +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 +msgid "List" msgstr "" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" -"Computes horizon angle height from a digital elevation model. The module has " -"two different modes of operation: 1. Computes the entire horizon around a " -"single point whose coordinates are given with the 'coord' option. The " -"horizon height (in radians). 2. Computes one or more raster maps of the " -"horizon height in a single direction. The input for this is the angle (in " -"degrees), which is measured counterclockwise with east=0, north=90 etc. The " -"output is the horizon height in radians." +"Lists available GRASS data base files of the user-specified data type " +"optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 -msgid "Transform features" +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 +msgid "Rename" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 -msgid "Clump" +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 +msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" -"Recategorizes data in a raster map by grouping cells that form physically " -"discrete areas into unique categories." +"Removes data base element files from the user's current mapset using the " +"search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 -msgid "Grow" +#: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 +msgid "Map type conversions" msgstr "" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 -msgid "Thin" +#: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 +#: ../gui/wxpython/menustrings.py:1286 +msgid "Raster to vector" msgstr "" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 -msgid "Thins non-null cells that denote linear features in a raster map layer." +#: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 +#: ../gui/wxpython/menustrings.py:1287 +msgid "Converts a raster map into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 -msgid "Hydrologic modeling" +#: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 +#: ../gui/wxpython/menustrings.py:1288 +msgid "Raster series to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 -msgid "Carve stream channels" +#: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 +#: ../gui/wxpython/menustrings.py:1289 +msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 -msgid "" -"Generates stream channels. Takes vector stream data, transforms it to raster " -"and subtracts depth from the output DEM." +#: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 +#: ../gui/wxpython/menustrings.py:1290 +msgid "Raster 2.5D to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 -msgid "Fill lake" +#: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 +#: ../gui/wxpython/menustrings.py:1291 +msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 -msgid "Fills lake at given point to given level." +#: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 +#: ../gui/wxpython/menustrings.py:1589 +msgid "Vector to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 -msgid "Depressionless map and flowlines" +#: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 +#: ../gui/wxpython/menustrings.py:1590 +msgid "Converts (rasterize) a vector map into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 -msgid "" -"Filters and generates a depressionless elevation map and a flow direction " -"map from a given elevation raster map." +#: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 +#: ../gui/wxpython/menustrings.py:1591 +msgid "Vector to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 -msgid "Flow accumulation" +#: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 +#: ../gui/wxpython/menustrings.py:1592 +msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 -msgid "Performs flow computation for massive grids." +#: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 +#: ../gui/wxpython/menustrings.py:1593 +msgid "2D vector to 3D vector" msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 -msgid "Flow lines" +#: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 +#: ../gui/wxpython/menustrings.py:1594 +msgid "Performs transformation of 2D vector features to 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 -msgid "" -"Constructs flowlines. Computes flowlines, flowpath lengths, and " -"flowaccumulation (contributing areas) from a elevation raster map." +#: ../gui/wxpython/menustrings.py:195 +msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 -msgid "Watershed analysis" +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 +msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 -msgid "Calculates hydrological parameters and RUSLE factors." +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 +msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 -msgid "Watershed subbasins" +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 +msgid "Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 -msgid "Generates watershed subbasins raster map." +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 +msgid "Launch Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 -msgid "Watershed basin creation" +#: ../gui/wxpython/menustrings.py:202 +msgid "Run model prepared by Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 -msgid "Creates watershed basins from a drainage direction map." +#: ../gui/wxpython/menustrings.py:203 +msgid "3D image rendering" msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 -msgid "Extraction of stream networks" +#: ../gui/wxpython/menustrings.py:204 +msgid "" +"Creates a 3D rendering of GIS data. Renders surfaces (raster data), 2D/3D " +"vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 -msgid "Performs stream network extraction." +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 +msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 -msgid "SIMWE Overland flow modeling" +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 +msgid "Launch animation tool." msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 -msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." +#: ../gui/wxpython/menustrings.py:207 +msgid "Bearing/distance to coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 -msgid "SIMWE Sediment flux modeling" +#: ../gui/wxpython/menustrings.py:208 +msgid "" +"A simple utility for converting bearing and distance measurements to " +"coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 -msgid "" -"Sediment transport and erosion/deposition simulation using path sampling " -"method (SIMWE)." +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 +msgid "Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 -msgid "Topographic index map" +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 +msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 -msgid "" -"Creates a topographic index (wetness index) raster map from an elevation " -"raster map." +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 +msgid "Launch Map Swipe" msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 -msgid "TOPMODEL simulation" +#: ../gui/wxpython/menustrings.py:213 +msgid "Launch script" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 -msgid "Simulates TOPMODEL which is a physically based hydrologic model." +#: ../gui/wxpython/menustrings.py:214 +msgid "Launches script file." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 -msgid "USLE K-factor" +#: ../gui/wxpython/menustrings.py:215 ../gui/wxpython/gui_core/pyedit.py:743 +msgid "Simple Python Editor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 -msgid "Computes USLE Soil Erodibility Factor (K)." +#: ../gui/wxpython/menustrings.py:216 +msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 -msgid "USLE R-factor" +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 +msgid "Close GUI" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 -msgid "Computes USLE R factor, Rainfall erosivity index." +#: ../gui/wxpython/menustrings.py:218 +msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 -msgid "Groundwater modeling" +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 +msgid "Quit GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 -msgid "Groundwater flow" +#: ../gui/wxpython/menustrings.py:220 +msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 -msgid "" -"Numerical calculation program for transient, confined and unconfined " -"groundwater flow in two dimensions." +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 +msgid "&Settings" msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 -msgid "Groundwater solute transport" +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 +msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 -msgid "" -"Numerical calculation program for transient, confined and unconfined solute " -"transport in two dimensions" +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 +msgid "Show current region" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 -msgid "Landscape patch analysis" +#: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 +msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 -msgid "Set up sampling and analysis framework" +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 +msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 -msgid "Configuration editor for r.li.'index'" +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 +msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 -msgid "Edge density" +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 +msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 -msgid "" -"Calculates edge density index on a raster map, using a 4 neighbour algorithm" +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 +msgid "Set region" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 -msgid "Contrast weighted edge density" +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 +msgid "Manages the boundary definitions for the geographic region." msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 -msgid "Calculates contrast weighted edge density index on a raster map" +#: ../gui/wxpython/menustrings.py:231 +msgid "GRASS working environment" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 -msgid "Patch area mean" +#: ../gui/wxpython/menustrings.py:232 +msgid "Mapset access" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 -msgid "" -"Calculates mean patch size index on a raster map, using a 4 neighbour " -"algorithm" +#: ../gui/wxpython/menustrings.py:233 +msgid "Set/unset access to other mapsets in current project" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 -msgid "Patch area range" +#: ../gui/wxpython/menustrings.py:234 +msgid "User access" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 -msgid "Calculates range of patch area size on a raster map" +#: ../gui/wxpython/menustrings.py:235 +msgid "" +"Controls access to the current mapset for other users on the system. If no " +"option given, prints current status." msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 -msgid "Patch area Std Dev" -msgstr "" - -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 -msgid "Calculates standard deviation of patch area a raster map" -msgstr "" - -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 -msgid "Patch area Coeff Var" -msgstr "" - -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 -msgid "Calculates coefficient of variation of patch area on a raster map" -msgstr "" - -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 -msgid "Patch density" +#: ../gui/wxpython/menustrings.py:236 +msgid "Change working environment" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:237 msgid "" -"Calculates patch density index on a raster map, using a 4 neighbour algorithm" +"Changes/reports current mapset. Optionally create new mapset or list " +"available mapsets in given location." msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 -msgid "Patch number" +#: ../gui/wxpython/menustrings.py:238 +msgid "Change project (location) and mapset" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 -msgid "" -"Calculates patch number index on a raster map, using a 4 neighbour algorithm." +#: ../gui/wxpython/menustrings.py:239 +msgid "Change current project and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 -msgid "Dominance's diversity" +#: ../gui/wxpython/menustrings.py:240 +msgid "Change mapset" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 -msgid "Calculates dominance's diversity index on a raster map" +#: ../gui/wxpython/menustrings.py:241 +msgid "Change current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 -msgid "Shannon's diversity" +#: ../gui/wxpython/menustrings.py:242 ../gui/wxpython/menustrings.py:243 +msgid "Change working directory" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 -msgid "Calculates Shannon's diversity index on a raster map" +#: ../gui/wxpython/menustrings.py:244 +msgid "Show settings" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 -msgid "Simpson's diversity" +#: ../gui/wxpython/menustrings.py:245 +msgid "Outputs and modifies the user's current GRASS variable settings." msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 -msgid "Calculates Simpson's diversity index on a raster map" +#: ../gui/wxpython/menustrings.py:246 +msgid "Change settings" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 -msgid "Richness" +#: ../gui/wxpython/menustrings.py:247 +msgid "" +"Outputs and modifies the user's current GRASS variable settings. Prints all " +"defined GRASS variables if no option is given." msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 -msgid "Calculates richness index on a raster map" +#: ../gui/wxpython/menustrings.py:248 +msgid "Create new project (location)" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 -msgid "Shape index" +#: ../gui/wxpython/menustrings.py:249 +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 -msgid "Calculates shape index on a raster map" +#: ../gui/wxpython/menustrings.py:251 +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 -msgid "Wildfire modeling" +#: ../gui/wxpython/menustrings.py:252 +msgid "Map projections" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 -msgid "Rate of spread" +#: ../gui/wxpython/menustrings.py:253 +msgid "Display map projection" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:254 msgid "" -"Generates rate of spread raster maps. Generates three, or four raster map " -"layers showing the base (perpendicular) rate of spread (ROS), the maximum " -"(forward) ROS, the direction of the maximum ROS, and optionally the maximum " -"potential spotting distance for fire spread simulation." +"Converts co-ordinate system descriptions (i.e. projection information) " +"between various formats (including GRASS format)." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 -msgid "Least-cost spread paths" +#: ../gui/wxpython/menustrings.py:255 +msgid "Manage projections" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:256 msgid "" -"Recursively traces the least cost path backwards to cells from which the " -"cumulative cost was determined." -msgstr "" - -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 -msgid "Anisotropic spread simulation" +"Prints or modifies GRASS projection information files (in various co-" +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 -msgid "" -"Simulates elliptically anisotropic spread. Generates a raster map of the " -"cumulative time of spread, given raster maps containing the rates of spread " -"(ROS), the ROS directions and the spread origins. It optionally produces " -"raster maps to contain backlink UTM coordinates for tracing spread paths. " -"Usable for fire spread simulations." +#: ../gui/wxpython/menustrings.py:257 +msgid "Convert coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 -msgid "Change category values and labels" +#: ../gui/wxpython/menustrings.py:258 +msgid "Converts coordinates from one projection to another (cs2cs frontend)." msgstr "" -#: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 -msgid "Manage category information" +#: ../gui/wxpython/menustrings.py:259 +msgid "Addons extensions" msgstr "" -#: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 -msgid "" -"Manages category values and labels associated with user-specified raster map " -"layers." +#: ../gui/wxpython/menustrings.py:260 +msgid "Install extension from addons" msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 -msgid "Interactively edit category values" +#: ../gui/wxpython/menustrings.py:261 +msgid "Installs new extension from GRASS AddOns repository." msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 -msgid "Edits cell values in a raster map." +#: ../gui/wxpython/menustrings.py:262 +msgid "Manage installed extension" msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 -msgid "Reclassify by size" +#: ../gui/wxpython/menustrings.py:263 +msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 -msgid "" -"Reclasses a raster map greater or less than user specified area size (in " -"hectares)." +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 +msgid "Preferences" msgstr "" -#: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 -msgid "Reclassify" +#: ../gui/wxpython/menustrings.py:265 +msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 -msgid "" -"Reclassify raster map based on category values. Creates a new raster map " -"whose category values are based upon a reclassification of the categories in " -"an existing raster map." +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 +msgid "&Raster" msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 -msgid "Recode" +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 +msgid "Develop raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 -msgid "Recodes categorical raster maps." +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 +msgid "Compress/decompress" msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 -msgid "Rescale" +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 +msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 -msgid "Rescales the range of category values in a raster map layer." +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 +msgid "Region boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 -msgid "Rescale with histogram" +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 +msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 -msgid "" -"Rescales histogram equalized the range of category values in a raster map " -"layer." +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 +msgid "Manage NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 -msgid "Generate random cells" +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 +msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 -msgid "Random cells" +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 +msgid "Quantization" msgstr "" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 -msgid "Generates random cell values with spatial dependence." +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 +msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 -msgid "Random cells and vector points" +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 +msgid "Timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" -"Creates randomly placed raster cells or vector points Creates a raster map " -"and vector point map containing randomly located cells and points." +"Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " +"raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 -msgid "Generate surfaces" +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 +msgid "Resample using aggregate statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 -msgid "Fractal surface" +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 +msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 -msgid "Creates a fractal surface of a given fractal dimension." +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 +msgid "Resample using multiple methods" msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 -msgid "Gaussian kernel density surface" +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 +msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 -msgid "" -"Generates a raster density map from vector points map. Density is computed " -"using a moving kernel. Optionally generates a vector density map on a vector " -"network." +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 +msgid "Resample using nearest neighbor" msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 -msgid "Gaussian deviates surface" +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 +msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 -msgid "" -"Generates a raster map using gaussian random number generator. Mean and " -"standard deviation of gaussian deviates can be expressed by the user." +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 +msgid "Resample using spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" -"Creates raster plane map given dip (inclination), aspect (azimuth) and one " -"point." +"Reinterpolates and optionally computes topographic analysis from input " +"raster map to a new raster map (possibly with different resolution) using " +"regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 -msgid "Random deviates surface" +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 +msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" -"Produces a raster surface map of uniform random deviates with defined range." +"Performs bilinear or bicubic spline interpolation with Tykhonov " +"regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 -msgid "Random surface with spatial dependence" +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 +msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 -msgid "Generates random surface(s) with spatial dependence." +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 +msgid "Resamples raster map layers using an analytic kernel." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 -msgid "Interpolate surfaces" +#: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 +msgid "Support file maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 -msgid "Bilinear and bicubic from vector points" +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 +msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 -msgid "" -"Performs bicubic or bilinear spline interpolation with Tykhonov " -"regularization." +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 +msgid "Update map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 -msgid "IDW from raster points" +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 +msgid "Update raster map statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 +msgid "Tiling" msgstr "" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" -"Provides surface interpolation from raster point data by Inverse Distance " -"Squared Weighting." +"Produces tilings of the source projection for use in the destination region " +"and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 -msgid "IDW from vector points" +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 +msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 -msgid "" -"Provides surface interpolation from vector point data by Inverse Distance " -"Squared Weighting." +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 +msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 -msgid "Raster contours" +#: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 +msgid "Manage colors" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 -msgid "Generates surface raster map from rasterized contours." +#: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 +msgid "Color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 -msgid "Regularized spline tension" +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 +msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 -msgid "" -"Performs surface interpolation from vector points map by splines. Spatial " -"approximation and topographic analysis from given point or isoline data in " -"vector format to floating point raster format using regularized spline with " -"tension." +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 +msgid "Color tables (stddev)" msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 -msgid "Raster series interpolation" +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 +msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 -msgid "" -"Interpolates raster maps located (temporal or spatial) in between input " -"raster maps at specific sampling positions." +#: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 -msgid "Fill NULL cells" +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 +msgid "Interactive management of raster color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 -msgid "Fills no-data areas in raster maps using spline interpolation." +#: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 +msgid "Export color table" msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 -msgid "Fill NULL cells using IDW" +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 +msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 -msgid "" -"Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " -"values (IDW)." +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 +msgid "Blend 2 color rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 -msgid "Reports and statistics" +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 +msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 -msgid "Basic raster metadata" +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 +msgid "Create RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 -msgid "Outputs basic information about a raster map." +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 +msgid "" +"Combines red, green and blue raster maps into a single composite raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 -msgid "General statistics" +#: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 +msgid "RGB to HIS" msgstr "" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 -msgid "Generates area statistics for raster map." +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 +msgid "" +"Generates red, green and blue (RGB) raster map layers combining hue, " +"intensity and saturation (HIS) values from user-specified input raster map " +"layers." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 -msgid "Quantiles for large data sets" +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 +msgid "Query raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 -msgid "Compute quantiles using two passes." +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 +msgid "Query values by coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 -msgid "Range of category values" +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 +msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 -msgid "Prints terse list of category values found in a raster map layer." +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 +msgid "Query colors by value" msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 -msgid "Sum area by raster map and category" +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 +msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 -msgid "Reports statistics for raster maps." +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 +msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 -msgid "Statistics for clumped cells" +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 +msgid "Buffer rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" -"Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " -"points map containing the calculated centroids of these clumps." +"Creates a raster map showing buffer zones surrounding cells that contain non-" +"NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 -msgid "Total corrected area" +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 +msgid "Concentric circles" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 -msgid "Prints estimation of surface area for raster map." +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 +msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 -msgid "Univariate raster statistics" +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 +msgid "Closest points" msgstr "" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 -msgid "" -"Calculates univariate statistics from the non-null cells of a raster map. " -"Statistics include number of cells counted, minimum and maximum cell values, " -"range, arithmetic mean, population variance, standard deviation, coefficient " -"of variation, and sum." +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 +msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 -msgid "Sample transects" +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 +msgid "Grow by one cell" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 -msgid "Outputs the raster map layer values lying on user-defined line(s)." +#: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 +msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 -msgid "Sample transects (bearing/distance)" +#: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 +msgid "Distance to features" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" -"Outputs raster map layer values lying along user defined transect line(s)." +"Generates a raster map containing distances to nearest raster features and/" +"or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 -msgid "Covariance/correlation" +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 +msgid "Creates a MASK for limiting raster operation." msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 -msgid "" -"Outputs a covariance/correlation matrix for user-specified raster map " -"layer(s)." +#: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 +msgid "Raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 -msgid "Linear regression" +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 +msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 -msgid "Calculates linear regression from two raster maps: y = a + b*x." +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 +msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 -msgid "Multiple regression" +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 +msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 -msgid "Calculates multiple linear regression from raster maps." +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 +msgid "Neighborhood analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 -msgid "Mutual category occurrences" +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/rlisetup/wizard.py:985 +msgid "Moving window" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" -"Tabulates the mutual occurrence (coincidence) of categories for two raster " -"map layers." -msgstr "" - -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 -msgid "&Vector" +"Makes each cell category value a function of the category values assigned to " +"the cells around it, and stores new cell values in an output raster map " +"layer." msgstr "" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 -msgid "Develop vector map" +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 +msgid "Neighborhood points" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 -msgid "Create new vector map" +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 +msgid "" +"Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 -msgid "Create new empty vector map" +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 +msgid "Overlay rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 -msgid "Edit vector map (non-interactively)" +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 +msgid "Cross product" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" -"Edits a vector map, allows adding, deleting and modifying selected vector " -"features." +"Creates a cross product of the category values from multiple raster map " +"layers." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 -msgid "Convert object types" +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 +msgid "Patch raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 -msgid "Changes type of vector features." +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 +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." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 -msgid "Parallel lines" +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 +msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 -msgid "Creates parallel line to input vector lines." +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 +msgid "" +"Makes each output cell value a function of the values assigned to the " +"corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 -msgid "Dissolve boundaries" +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 +msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " -"or attribute." -msgstr "" - -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 -msgid "Create 3D vector over raster" +"Makes each output cell value a accumulationfunction of the values assigned " +"to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 -msgid "Converts 2D vector features to 3D by sampling of elevation raster map." +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 +msgid "Statistical overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 -msgid "Extrude 3D vector map" +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 +msgid "" +"Calculates category or object oriented statistics (accumulator-based " +"statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 -msgid "" -"Extrudes flat vector features to 3D vector features with defined height. " -"Optionally the height can be derived from sampling of elevation raster map." +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 +msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 -msgid "Create labels" +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 +msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 -msgid "Creates paint labels for a vector map from attached attributes." +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 +msgid "Solar radiance and shadows" msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 -msgid "Reposition vector map" +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 +msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 -msgid "" -"Performs an affine transformation (shift, scale and rotate) on vector map." +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 +msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 -msgid "Rectify vector map" +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 +msgid "Solar irradiance and irradiation" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" -"Rectifies a vector by computing a coordinate transformation for each object " -"in the vector based on the control points." +"Solar irradiance and irradiation model. Computes direct (beam), diffuse and " +"reflected solar irradiation raster maps for given day, latitude, surface and " +"atmospheric conditions. Solar parameters (e.g. sunrise, sunset times, " +"declination, extraterrestrial irradiance, daylight length) are saved in the " +"map history file. Alternatively, a local time can be specified to compute " +"solar incidence angle and/or irradiance raster maps. The shadowing effect of " +"the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 -msgid "Updates vector map metadata." +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 +msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 -msgid "Topology maintenance" +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 +msgid "" +"Calculates cast shadow areas from sun position and elevation raster map. " +"Either exact sun position (A) is specified, or date/time to calculate the " +"sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 -msgid "Create or rebuild topology" +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 +msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" -"Creates topology for vector map. Optionally also checks for topological " -"errors." +"Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " +"the angle between the direction of the geometric center of the sun's " +"apparent disk and the (idealized) horizon. Solar azimuth: the angle from due " +"north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 -msgid "Rebuild topology on all vector maps" +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 +msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 -msgid "Rebuilds topology on all vector maps in the current mapset." +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 +msgid "Generate contour lines" msgstr "" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 -msgid "Build polylines" +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 +msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 -msgid "Builds polylines from lines or boundaries." +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 +msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 -msgid "Split lines" +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 +msgid "" +"Creates a raster map showing the cumulative cost of moving between different " +"geographic locations on an input raster map whose cell category values " +"represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 -msgid "Splits vector lines to shorter segments." +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 +msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 -msgid "Split polylines" +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 +msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 -msgid "Creates points/segments from input vector lines and positions." +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 +msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 -msgid "Clean vector map" +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 +msgid "" +"Creates a raster map showing the anisotropic cumulative cost of moving " +"between different geographic locations on an input raster map whose cell " +"category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 -msgid "Toolset for cleaning topology of vector map." +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 +msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 -msgid "Fill holes in areas" +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 +msgid "" +"Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 -msgid "Fill holes in areas by keeping only outer boundaries" +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 +msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 -msgid "Smooth or simplify" +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 +msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 -msgid "Performs vector based generalization." +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 +msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 -msgid "Add centroids" +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 +msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 -msgid "Adds missing centroids to closed boundaries." +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 +msgid "Slope and aspect" msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 -msgid "Creates/modifies the color table associated with a vector map." +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 +msgid "" +"Generates raster maps of slope, aspect, curvatures and partial derivatives " +"from an elevation raster map. Aspect is calculated counterclockwise from " +"east." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 -msgid "Interactive management of vector color tables." +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 +msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 -msgid "Exports the color table associated with a vector map." +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 +msgid "" +"Calculates geomorphons (terrain forms) and associated geometry using machine " +"vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 -msgid "Query vector map" +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 +msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 -msgid "Query with coordinate(s)" +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 +msgid "" +"Extracts terrain parameters from a DEM. Uses a multi-scale approach by " +"taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 -msgid "Queries a vector map at given locations." +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 +msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 -msgid "Query vector attribute data" +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 +msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 -msgid "Prints vector map attributes." +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 +msgid "Visibility" msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 -msgid "Feature selection" +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 +msgid "" +"Computes the viewshed of a point on an elevation raster map. Default format: " +"NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 -msgid "Select by attributes" +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 +msgid "Horizon angle" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" -"Selects vector features from an existing vector map and creates a new vector " -"map containing only the selected features." +"Computes horizon angle height from a digital elevation model. The module has " +"two different modes of operation: 1. Computes the entire horizon around a " +"single point whose coordinates are given with the 'coord' option. The " +"horizon height (in radians). 2. Computes one or more raster maps of the " +"horizon height in a single direction. The input for this is the angle (in " +"degrees), which is measured counterclockwise with east=0, north=90 etc. The " +"output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 -msgid "Select by another map" +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 +msgid "Transform features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 +msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" -"Selects features from vector map (A) by features from other vector map (B)." +"Recategorizes data in a raster map by grouping cells that form physically " +"discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 -msgid "Buffer vectors" +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 +msgid "Grow" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 -msgid "Creates a buffer around vector features of given type." +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 +msgid "Thin" msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 -msgid "Point analysis" +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 +msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 -msgid "Identify and remove outliers" +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 +msgid "Hydrologic modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 -msgid "Removes outliers from vector point data." +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 +msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 -msgid "Identify point clusters" +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 +msgid "" +"Generates stream channels. Takes vector stream data, transforms it to raster " +"and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 -msgid "Performs cluster identification." +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 +msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 -msgid "Indices for quadrat counts of vector point lists" +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 +msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 -msgid "Indices for quadrat counts of vector point lists." +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 +msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 -msgid "Perturb points" -msgstr "" - -#: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 -msgid "Random location perturbations of vector points." +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 +msgid "" +"Filters and generates a depressionless elevation map and a flow direction " +"map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 -msgid "Test/training point sets" +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 +msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 -msgid "Randomly partition points into test/train sets." +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 +msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 -msgid "Tests for normality for vector points" +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 +msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 -msgid "Tests for normality for vector points." +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 +msgid "" +"Constructs flowlines. Computes flowlines, flowpath lengths, and " +"flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 -msgid "Lidar analysis" +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 +msgid "Watershed analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 -msgid "Detect edges" +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 +msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 -msgid "Detects the object's edges from a LIDAR data set." +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 +msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 -msgid "Detect interiors" +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 +msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 -msgid "" -"Building contour determination and Region Growing algorithm for determining " -"the building inside" +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 +msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 -msgid "Correct and reclassify objects" +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 +msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 -msgid "" -"Corrects the v.lidar.growing output. It is the last of the three algorithms " -"for LIDAR filtering." +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 +msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 -msgid "Linear referencing" +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 +msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 -msgid "Create LRS" +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 +msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 -msgid "Creates a linear reference system." +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 +msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 -msgid "Create stationing" +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 +msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 -msgid "Creates stationing from input lines, and linear reference system." +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 +msgid "" +"Sediment transport and erosion/deposition simulation using path sampling " +"method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 -msgid "Create points/segments" +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 +msgid "Topographic index map" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" -"Creates points/segments from input lines, linear reference system and " -"positions read from stdin or a file." +"Creates a topographic index (wetness index) raster map from an elevation " +"raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 -msgid "Find line id and offset" +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 +msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 -msgid "" -"Finds line id and real km+offset for given points in vector map using linear " -"reference system." +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 +msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 -msgid "Nearest features" +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 +msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 -msgid "" -"Finds the nearest element in vector map 'to' for elements in vector map " -"'from'." +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 +msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 -msgid "Network analysis" +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 +msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 -#: ../gui/wxpython/mapdisp/toolbars.py:57 -msgid "Vector network analysis tool" +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 +msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 -msgid "Tool for interactive vector network analysis." +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 +msgid "Groundwater modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 -msgid "Network preparation" +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 +msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 -msgid "Performs network maintenance." +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 +msgid "" +"Numerical calculation program for transient, confined and unconfined " +"groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 -msgid "Allocate subnets" +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 +msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" -"Allocates subnets for nearest centers. Center node must be opened (costs >= " -"0). Costs of center node are used in calculation." +"Numerical calculation program for transient, confined and unconfined solute " +"transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 -msgid "Split net" +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 +msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 -msgid "" -"Splits subnets for nearest centers by cost isolines. Splits net to bands " -"between cost isolines (direction from center). Center node must be opened " -"(costs >= 0). Costs of center node are used in calculation." +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 +msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 -msgid "Shortest path" +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 +msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 -msgid "Finds shortest path on vector network." +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 +msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 -msgid "Shortest path for sets of features" +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 +msgid "" +"Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 -msgid "" -"Computes shortest distance via the network between the given sets of " -"features. Finds the shortest paths from each 'from' point to the nearest " -"'to' feature and various information about this relation are uploaded to the " -"attribute table." +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 +msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 -msgid "Shortest path using timetables" +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 +msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 -msgid "Finds shortest path using timetables." +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 +msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 -msgid "Shortest path for all pairs" +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 +msgid "" +"Calculates mean patch size index on a raster map, using a 4 neighbour " +"algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 -msgid "Computes the shortest path between all pairs of nodes in the network." +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 +msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 -msgid "Visibility network" +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 +msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 -msgid "Performs visibility graph construction." +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 +msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 -msgid "Bridges and articulation points" +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 +msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 -msgid "Computes bridges and articulation points in the network." +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 +msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 -msgid "Maximum flow" +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 +msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 -msgid "Computes the maximum flow between two sets of nodes in the network." +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 +msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 -msgid "Vertex connectivity" +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 +msgid "" +"Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 -msgid "Computes vertex connectivity between two sets of nodes in the network." +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 +msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 -msgid "Components" +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 +msgid "" +"Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 -msgid "Computes strongly and weakly connected components in the network." +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 +msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 -msgid "Centrality" +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 +msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 -msgid "" -"Computes degree, centrality, betweeness, closeness and eigenvector " -"centrality measures in the network." +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 +msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 -msgid "Steiner tree" +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 +msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 -msgid "" -"Creates Steiner tree for the network and given terminals. Note that 'Minimum " -"Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " -"module so the result may be sub optimal." +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 +msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 -msgid "Minimum spanning tree" +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 +msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 -msgid "Computes minimum spanning tree for the network." +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 +msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 -msgid "Traveling salesman analysis" +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 +msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 -msgid "" -"Creates a cycle connecting given nodes (Traveling salesman problem). Note " -"that TSP is NP-hard, heuristic algorithm is used by this module and created " -"cycle may be sub optimal" +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 +msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 -msgid "Overlay vector maps" +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 +msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 -msgid "Clip vector maps" +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 +msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 -msgid "Extracts features of input map which overlay features of clip map." +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 +msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" -"Overlays two vector maps offering clip, intersection, difference, " -"symmetrical difference, union operators." +"Generates rate of spread raster maps. Generates three, or four raster map " +"layers showing the base (perpendicular) rate of spread (ROS), the maximum " +"(forward) ROS, the direction of the maximum ROS, and optionally the maximum " +"potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 -msgid "Patch vector maps" +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 +msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 -msgid "Creates a new vector map by combining other vector maps." +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 +msgid "" +"Recursively traces the least cost path backwards to cells from which the " +"cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 -msgid "Manage categories" +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 +msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 -msgid "Change or report categories" +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 +msgid "" +"Simulates elliptically anisotropic spread. Generates a raster map of the " +"cumulative time of spread, given raster maps containing the rates of spread " +"(ROS), the ROS directions and the spread origins. It optionally produces " +"raster maps to contain backlink UTM coordinates for tracing spread paths. " +"Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 -msgid "Attaches, deletes or reports vector categories to/from/of map geometry." +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 +msgid "Change category values and labels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 +msgid "Manage category information" msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" -"Changes vector category values for an existing vector map according to " -"results of SQL queries or a value in attribute table column." +"Manages category values and labels associated with user-specified raster map " +"layers." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 -msgid "Update attributes" +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 +msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 -msgid "Update area attributes from raster" +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 +msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 -msgid "" -"Calculates univariate statistics from a raster map based on a vector map and " -"uploads statistics to new attribute columns." +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 +msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 -msgid "Update area attributes from vector" +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 +msgid "" +"Reclasses a raster map greater or less than user specified area size (in " +"hectares)." msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 -msgid "Count points in areas, calculate statistics from point attributes." +#: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 +msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 -msgid "Update point attributes from areas" +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 +msgid "" +"Reclassify raster map based on category values. Creates a new raster map " +"whose category values are based upon a reclassification of the categories in " +"an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 -msgid "Uploads vector values at positions of vector points to the table." +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 +msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 -msgid "Update database values from vector" +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 +msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 -msgid "Populates attribute values from vector features." +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 +msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 -msgid "Sample raster maps at point locations" +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 +msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 -msgid "Uploads raster values at positions of vector points to the table." +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 +msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 -msgid "Sample raster neighborhood around points" +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 +msgid "" +"Rescales histogram equalized the range of category values in a raster map " +"layer." msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 -msgid "Samples a raster map at vector point locations." +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 +msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 -msgid "Generate area for current region" +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 +msgid "Random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 -msgid "Creates a vector polygon from the current region extent." +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 +msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 -msgid "Generate areas from points" +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 +msgid "Random cells and vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 -msgid "Convex hull" +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 +msgid "" +"Creates randomly placed raster cells or vector points Creates a raster map " +"and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 -msgid "Produces a 2D/3D convex hull for a given vector map." +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 +msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 -msgid "Delaunay triangles" +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 +msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 -msgid "" -"Creates a Delaunay triangulation from an input vector map containing points " -"or centroids." +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 +msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 -msgid "Voronoi diagram/Thiessen polygons" +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 +msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" -"Creates a Voronoi diagram constrained to the extents of the current region " -"from an input vector map containing points or centroids." +"Generates a raster density map from vector points map. Density is computed " +"using a moving kernel. Optionally generates a vector density map on a vector " +"network." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 -msgid "Generate grid" +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 +msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 -msgid "Creates a vector map of a user-defined grid." +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 +msgid "" +"Generates a raster map using gaussian random number generator. Mean and " +"standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 -msgid "Generate points" +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 +msgid "" +"Creates raster plane map given dip (inclination), aspect (azimuth) and one " +"point." msgstr "" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 -msgid "Generate from database" +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 +msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" -"Creates new vector (points) map from database table containing coordinates." +"Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 -msgid "Generate points along lines" +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 +msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 -msgid "Creates points along input lines in new vector map with 2 layers." +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 +msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 -msgid "Generate random points" +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 +msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 -msgid "Generates random 2D/3D vector points." +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 +msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 -msgid "Remove outliers in point sets" +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 +msgid "" +"Performs bicubic or bilinear spline interpolation with Tykhonov " +"regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 -msgid "Basic vector metadata" +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 +msgid "IDW from raster points" msgstr "" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 -msgid "Outputs basic information about a vector map." +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 +msgid "" +"Provides surface interpolation from raster point data by Inverse Distance " +"Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 -msgid "Classify attribute data" +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 +msgid "IDW from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 -msgid "Classifies attribute data, e.g. for thematic mapping" +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 +msgid "" +"Provides surface interpolation from vector point data by Inverse Distance " +"Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 -msgid "Report topology by category" +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 +msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 -msgid "Reports geometry statistics for vector maps." +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 +msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 -msgid "Univariate attribute statistics for points" +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 +msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" -"Calculates univariate statistics of vector map features. Variance and " -"standard deviation is calculated only for points if specified." +"Performs surface interpolation from vector points map by splines. Spatial " +"approximation and topographic analysis from given point or isoline data in " +"vector format to floating point raster format using regularized spline with " +"tension." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 -msgid "Univariate statistics for attribute columns" +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 +msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" -"Calculates univariate statistics on selected table column for a GRASS vector " -"map." +"Interpolates raster maps located (temporal or spatial) in between input " +"raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 -msgid "Vector map profiling tool" +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 +msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 -msgid "Quadrat indices" +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 +msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 -msgid "Test normality" +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 +msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 -msgid "&Imagery" +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 +msgid "" +"Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " +"values (IDW)." msgstr "" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 -msgid "Develop images and groups" +#: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 +msgid "Reports and statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 -msgid "Create/edit group" +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 +msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 -msgid "Creates, edits, and lists groups of imagery files." +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 +msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 -msgid "Target group" +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 +msgid "General statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 -msgid "Targets an imagery group to a GRASS location and mapset." +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 +msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 -msgid "Mosaic images" +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 +msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 -msgid "Mosaics several images and extends colormap." +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 +msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 -msgid "Manage image colors" +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 +msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 -msgid "Color balance for RGB" +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 +msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 -msgid "Performs auto-balancing of colors for RGB images." +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 +msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 -msgid "HIS to RGB" +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 +msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 -msgid "" -"Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " -"RGB (Red-Green-Blue) color space." +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 +msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" -"Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" -"Intensity-Saturation) color space." +"Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " +"points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 -msgid "Rectify image or raster" +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 +msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 -msgid "" -"Rectifies an image by computing a coordinate transformation for each pixel " -"in the image based on the control points." +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 +msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 -msgid "Histogram" +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 +msgid "Univariate raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 -msgid "Generate histogram of image" +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 +msgid "" +"Calculates univariate statistics from the non-null cells of a raster map. " +"Statistics include number of cells counted, minimum and maximum cell values, " +"range, arithmetic mean, population variance, standard deviation, coefficient " +"of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 -msgid "Spectral response" +#: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 +msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 -msgid "" -"Displays spectral response at user specified locations in group or images." +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 +msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 -msgid "Pan sharpening" +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 +msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" -"Image fusion algorithms to sharpen multispectral with high-res panchromatic " -"channels" -msgstr "" - -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 -msgid "Classify image" +"Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 -msgid "Clustering input for unsupervised classification" +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 +msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" -"Generates spectral signatures for land cover types in an image using a " -"clustering algorithm. The resulting signature file is used as input for i." -"maxlik, to generate an unsupervised image classification." +"Outputs a covariance/correlation matrix for user-specified raster map " +"layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 -msgid "Input for supervised MLC" +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 +msgid "Linear regression" msgstr "" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 -msgid "Generates statistics for i.maxlik from raster map." +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 +msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 -msgid "Maximum likelihood classification (MLC)" +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 +msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 -msgid "" -"Classifies the cell spectral reflectances in imagery data. Classification is " -"based on the spectral signature information generated by either i.cluster, g." -"gui.iclass, or i.gensig." +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 +msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 -msgid "Interactive input for supervised classification" +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 +msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" -"Generates spectral signatures by allowing the user to outline training areas." +"Tabulates the mutual occurrence (coincidence) of categories for two raster " +"map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 -msgid "Input for supervised SMAP" +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 +msgid "&Vector" msgstr "" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 -msgid "Generates statistics for i.smap from raster map." +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 +msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 -msgid "Sequential maximum a posteriori classification (SMAP)" +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 +msgid "Create new vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 -msgid "" -"Performs contextual image classification using sequential maximum a " -"posteriori (SMAP) estimation." +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 +msgid "Create new empty vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 -msgid "Input for supervised SVM" +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 +msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 -msgid "Support Vector Machines classification (SVM)" +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 +msgid "" +"Edits a vector map, allows adding, deleting and modifying selected vector " +"features." msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 -msgid "Manage signature files" +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 +msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 -msgid "Manage imagery classification signature files" +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 +msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 -msgid "Object segmentation" +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 +msgid "Parallel lines" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 -msgid "Identifies segments (objects) from imagery data." +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 +msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 -msgid "Filter image" +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 +msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 -msgid "Edge detection" +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 +msgid "" +"Dissolves adjacent or overlaping features sharing a common category number " +"or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 -msgid "Zero-crossing \"edge detection\" raster function for image processing." +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 +msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 -msgid "Matrix/convolving filter" +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 +msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 -msgid "Performs raster map matrix filter." +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 +msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 -msgid "Transform image" +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 +msgid "" +"Extrudes flat vector features to 3D vector features with defined height. " +"Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 -msgid "Canonical correlation" +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 +msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 -msgid "Canonical components analysis (CCA) program for image processing." +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 +msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 -msgid "Principal components" +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 +msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 -msgid "Principal components analysis (PCA) for image processing." +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 +msgid "" +"Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 -msgid "Fast Fourier" +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 +msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 -msgid "Fast Fourier Transform (FFT) for image processing." +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 +msgid "" +"Rectifies a vector by computing a coordinate transformation for each object " +"in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 -msgid "Inverse Fast Fourier" +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 +msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 -msgid "Inverse Fast Fourier Transform (IFFT) for image processing." +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 +msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 -msgid "Satellite images tools" +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 +msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 -msgid "Aster DN to radiance/reflectance" +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 +msgid "" +"Creates topology for vector map. Optionally also checks for topological " +"errors." msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 -msgid "" -"Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " -"from ASTER DN." +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 +msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 -msgid "Landsat DN to radiance/reflectance" +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 +msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 -msgid "" -"Calculates top-of-atmosphere radiance or reflectance and temperature for " -"Landsat MSS/TM/ETM+/OLI" +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 +msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 -msgid "Landsat cloud cover assessment" +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 +msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 -msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 +msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 -msgid "Modis quality control" +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 +msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 -msgid "Extracts quality control parameters from MODIS QC layers." +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 +msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 -msgid "Atmospheric correction" +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 +msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 -msgid "" -"Performs atmospheric correction using the 6S algorithm. 6S - Second " -"Simulation of Satellite Signal in the Solar Spectrum." +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 +msgid "Clean vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 -msgid "Topographic correction" +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 +msgid "Toolset for cleaning topology of vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 -msgid "Computes topographic correction of reflectance." +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 +msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 -msgid "Orthophoto tools" +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 +msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 -msgid "Manage GCPs for 3D correction" +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 +msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 -msgid "Georectifies a map and allows managing GCP for 3D correction." +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 +msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 -msgid "Corrects scanning distortions" +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 +msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 -msgid "Corrects scanning distortions of a scanned aerial photo." +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 +msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 -msgid "Satellite images products" +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 +msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 -msgid "Vegetation indices" +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 +msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 -msgid "" -"Calculates different types of vegetation indices. Uses red and nir bands " -"mostly, and some indices require additional bands." +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 +msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 -msgid "Tasseled cap vegetation index" +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 +msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 -msgid "Performs Tasseled Cap (Kauth Thomas) transformation." +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 +msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 -msgid "Albedo" +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 +msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 -msgid "Computes broad band albedo from surface reflectance." +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 +msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 -msgid "Emissivity" +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 +msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 -msgid "Computes emissivity from NDVI, generic method for sparse land." +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 +msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 -msgid "Biomass growth" +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 +msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 -msgid "Computes biomass growth, precursor of crop yield calculation." +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 +msgid "" +"Selects vector features from an existing vector map and creates a new vector " +"map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 -msgid "Evapotranspiration calculation" +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 +msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 -msgid "Instantaneaous Net Radiation" +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 +msgid "" +"Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 -msgid "Net radiation approximation (Bastiaanssen, 1995)." +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 +msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 -msgid "Soil heat flux" +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 +msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 -msgid "Soil heat flux approximation (Bastiaanssen, 1995)." +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 +msgid "Point analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 -msgid "Sensible heat flux" +#: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 +msgid "Identify and remove outliers" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 -msgid "Computes sensible heat flux iteration SEBAL 01." +#: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 +msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 -msgid "Evaporative fraction" +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 +msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 -msgid "Computes evaporative fraction and root zone soil moisture." +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 +msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 -msgid "Actual Evapotranspiration" +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 +msgid "Indices for quadrat counts of vector point lists" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 -msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." +#: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 +msgid "Indices for quadrat counts of vector point lists." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 -msgid "Temporal integration of ETa" +#: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 +msgid "Perturb points" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 -msgid "" -"Computes temporal integration of satellite ET actual (ETa) following the " -"daily ET reference (ETo) from meteorological station(s)." +#: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 +msgid "Random location perturbations of vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 -msgid "Hargreaves methods Evapotranspiration" +#: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 +msgid "Test/training point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 -msgid "" -"Computes evapotranspiration calculation modified or original Hargreaves " -"formulation, 2001." +#: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 +msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 -msgid "Penman-Monteith Evapotranspiration" +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 +msgid "Tests for normality for vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 -msgid "" -"Computes potential evapotranspiration calculation with hourly Penman-" -"Monteith." +#: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 +msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 -msgid "Priestley-Taylor Evapotranspiration" +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 +msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 -msgid "" -"Computes evapotranspiration calculation Priestley and Taylor formulation, " -"1972." +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 +msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 -msgid "Kappa analysis" +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 +msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 -msgid "" -"Calculates error matrix and kappa parameter for accuracy assessment of " -"classification result." +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 +msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 -msgid "OIF for LandSat TM" +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 +msgid "" +"Building contour determination and Region Growing algorithm for determining " +"the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 -msgid "Calculates Optimum-Index-Factor table for spectral bands" +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 +msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 -msgid "3D r&aster" +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 +msgid "" +"Corrects the v.lidar.growing output. It is the last of the three algorithms " +"for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 -msgid "Develop 3D raster map" +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 +msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 -msgid "Manage 3D NULL values" +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 +msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 -msgid "Explicitly create the 3D NULL-value bitmap file." +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 +msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 -msgid "Manage timestamp" +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 +msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 -msgid "" -"Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " -"3D raster map." +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 +msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 -msgid "3D rasters to raster series" +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 +msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 -msgid "3D color tables" +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 +msgid "" +"Creates points/segments from input lines, linear reference system and " +"positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 -msgid "Creates/modifies the color table associated with a 3D raster map." +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 +msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 -msgid "Export 3D color table" +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 +msgid "" +"Finds line id and real km+offset for given points in vector map using linear " +"reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 -msgid "Exports the color table associated with a 3D raster map." +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 +msgid "Nearest features" msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 -msgid "3D mask" +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 +msgid "" +"Finds the nearest element in vector map 'to' for elements in vector map " +"'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 -msgid "Establishes the current working 3D raster mask." +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 +msgid "Network analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 -msgid "3D raster map calculator" +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/mapdisp/toolbars.py:57 +msgid "Vector network analysis tool" msgstr "" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 -msgid "Cross section" +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 +msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 -msgid "" -"Creates cross section 2D raster map from 3D raster map based on 2D elevation " -"map" +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 +msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 -msgid "" -"Numerical calculation program for transient, confined groundwater flow in " -"three dimensions." +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 +msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 -msgid "Interpolate 3D raster from points" +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 +msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" -"Interpolates point data to a 3D raster map using regularized spline with " -"tension (RST) algorithm." +"Allocates subnets for nearest centers. Center node must be opened (costs >= " +"0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 -msgid "Basic 3D raster metadata" +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 +msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 -msgid "Outputs basic information about a user-specified 3D raster map layer." +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 +msgid "" +"Splits subnets for nearest centers by cost isolines. Splits net to bands " +"between cost isolines (direction from center). Center node must be opened " +"(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 -msgid "3D raster statistics" +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 +msgid "Shortest path" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 -msgid "Generates volume statistics for 3D raster maps." +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 +msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 -msgid "Univariate statistics for 3D rasters" +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 +msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" -"Calculates univariate statistics from the non-null cells of a 3D raster map. " -"Statistics include number of cells counted, minimum and maximum cell values, " -"range, arithmetic mean, population variance, standard deviation, coefficient " -"of variation, and sum." +"Computes shortest distance via the network between the given sets of " +"features. Finds the shortest paths from each 'from' point to the nearest " +"'to' feature and various information about this relation are uploaded to the " +"attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 -msgid "&Database" +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 +msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 -msgid "Database information" +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 +msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 -msgid "List databases" +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 +msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 -msgid "Lists all databases for a given driver and location." +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 +msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 -msgid "List drivers" +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 +msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 -msgid "Lists all database drivers." +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 +msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 -msgid "List tables" +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 +msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 -msgid "Lists all tables for a given database." +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 +msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 -msgid "Describe table" +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 +msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 -msgid "Describes a table in detail." +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 +msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 -msgid "List columns" +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 +msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 -msgid "List all columns for a given table." +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 +msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 -msgid "Manage databases" +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 +msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 -msgid "Connect" +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 +msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 -msgid "Prints/sets general DB connection for current mapset." +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 +msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 -msgid "Login" +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 +msgid "" +"Computes degree, centrality, betweeness, closeness and eigenvector " +"centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 -msgid "Sets user/password for DB driver/database." +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 +msgid "Steiner tree" msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 -msgid "Create database" +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 +msgid "" +"Creates Steiner tree for the network and given terminals. Note that 'Minimum " +"Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " +"module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 -msgid "Creates an empty database." +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 +msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 -msgid "Drop database" +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 +msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 -msgid "Removes an existing database." +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 +msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 -msgid "Drop table" +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 +msgid "" +"Creates a cycle connecting given nodes (Traveling salesman problem). Note " +"that TSP is NP-hard, heuristic algorithm is used by this module and created " +"cycle may be sub optimal" msgstr "" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 -msgid "Drops an attribute table." +#: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 +msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 -msgid "Copy table" +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 +msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 -msgid "" -"Copy a table. Either 'from_table' (optionally with 'where') can be used or " -"'select' option, but not 'from_table' and 'select' at the same time." +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 +msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 -msgid "Drop column" +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 +msgid "" +"Overlays two vector maps offering clip, intersection, difference, " +"symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 -msgid "Drops a column from selected attribute table." +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 +msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 -msgid "Test" +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 +msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 -msgid "Test database driver, database must exist and set by db.connect." +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 +msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 -msgid "Query" +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 +msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 -msgid "Query any table" +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 +msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 -msgid "Selects data from attribute table. Performs SQL query statement(s)." +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 +msgid "" +"Changes vector category values for an existing vector map according to " +"results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 -msgid "SQL statement" +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 +msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 -msgid "Executes any SQL statement. For SELECT statements use 'db.select'." +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 +msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 -msgid "Vector database connections" +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 +msgid "" +"Calculates univariate statistics from a raster map based on a vector map and " +"uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 -msgid "New table" +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 +msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 -msgid "" -"Creates and connects a new attribute table to a given layer of an existing " -"vector map." +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 +msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 -msgid "Remove table" +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 +msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 -msgid "Removes existing attribute table of a vector map." +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 +msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 -msgid "Join table" +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 +msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 -msgid "Joins a database table to a vector map table." +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 +msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 -msgid "Add columns" +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 +msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 -msgid "" -"Adds one or more columns to the attribute table connected to a given vector " -"map." +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 +msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 -msgid "" -"Drops a column from the attribute table connected to a given vector map." +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 +msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 -msgid "Rename column" +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 +msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 -msgid "" -"Renames a column in the attribute table connected to a given vector map." +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 +msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 -msgid "Change values" +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 +msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 -msgid "Updates a column in the attribute table connected to a vector map." +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 +msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 -msgid "Drop row" +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 +msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 -msgid "Removes a vector feature from a vector map through attribute selection." +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 +msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 -msgid "Reconnect vectors to database" +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 +msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" -"Reconnects attribute tables for all vector maps from the current mapset to a " -"new database." +"Creates a Delaunay triangulation from an input vector map containing points " +"or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 -msgid "Set vector map - database connection" +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 +msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 -msgid "Prints/sets DB connection for a vector map to attribute table." +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 +msgid "" +"Creates a Voronoi diagram constrained to the extents of the current region " +"from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 -msgid "&Temporal" +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 +msgid "Generate grid" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 -msgid "Manage datasets" +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 +msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 -msgid "Connect temporal database" +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 +msgid "Generate points" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 -msgid "" -"Prints/sets general temporal GIS database connection for current mapset." +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 +msgid "Generate from database" msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 -#: ../gui/wxpython/rlisetup/frame.py:161 -msgid "Create" +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 +msgid "" +"Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 -msgid "Creates a space time dataset." +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 +msgid "Generate points along lines" msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 -msgid "Renames a space time dataset" +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 +msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 -msgid "Removes space time datasets from temporal database." +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 +msgid "Generate random points" msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 -msgid "Update metadata" +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 +msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 -msgid "Modifies the metadata of a space time dataset." +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 +msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 -msgid "Merge" +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 +msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 -msgid "Merges several space time datasets into a single space time dataset." +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 +msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 -msgid "Temporally shift" +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 +msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 -msgid "Shifts temporally the maps of a space time dataset." +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 +msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 -msgid "Snap maps of dataset" +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 +msgid "Report topology by category" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 -msgid "Snaps temporally the maps of a space time dataset." +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 +msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 -msgid "Lists space time datasets and maps registered in the temporal database." +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 +msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 -msgid "Manage maps in datasets" +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 +msgid "" +"Calculates univariate statistics of vector map features. Variance and " +"standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 -msgid "Register maps in datasets" +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 +msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" -"Assigns timestamps and registers raster, vector and raster3d maps in a space " -"time dataset." +"Calculates univariate statistics on selected table column for a GRASS vector " +"map." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 -msgid "Unregister maps from datasets" +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 +msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 -msgid "" -"Unregisters raster, vector and raster3d maps from the temporal database or a " -"specific space time dataset." +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 +msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 -msgid "List raster dataset maps" +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 +msgid "Test normality" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 -msgid "Lists registered maps of a space time raster dataset." +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 +msgid "&Imagery" msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 -msgid "List vector dataset maps" +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 +msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 -msgid "Lists registered maps of a space time vector dataset." +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 +msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 -msgid "List 3D raster dataset maps" +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 +msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 -msgid "Lists registered maps of a space time raster3d dataset." +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 +msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 -msgid "Import" +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 +msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 -msgid "Import raster dataset" +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 +msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 -msgid "Imports space time raster dataset." +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 +msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 -msgid "Import vector dataset" +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 +msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 -msgid "" -"Imports a space time vector dataset from a GRASS GIS specific archive file." +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 +msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 -msgid "Export raster dataset" +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 +msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 -msgid "Exports space time raster dataset." +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 +msgid "HIS to RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 -msgid "Export raster dataset as VTK time series" +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 +msgid "" +"Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " +"RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 -msgid "Exports space time raster dataset as VTK time series." +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 +msgid "" +"Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" +"Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 -msgid "Export vector dataset" +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 +msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 -msgid "Exports a space time vector dataset as GRASS GIS specific archive file." +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 +msgid "" +"Rectifies an image by computing a coordinate transformation for each pixel " +"in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 -msgid "Convert raster dataset to 3D raster" +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 +msgid "Histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 -msgid "Converts a space time raster dataset into a 3D raster map." +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 +msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 -msgid "Extraction" +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 +msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 -msgid "Extract subset of raster dataset" +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 +msgid "" +"Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 -msgid "Extracts a subset of a space time raster datasets." +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 +msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 -msgid "Extract subset of vector dataset" +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 +msgid "" +"Image fusion algorithms to sharpen multispectral with high-res panchromatic " +"channels" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 -msgid "Extracts a subset of a space time vector dataset." +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 +msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 -msgid "Extract subset of 3D raster dataset" +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 +msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 -msgid "Extracts a subset of a space time 3D raster dataset." +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 +msgid "" +"Generates spectral signatures for land cover types in an image using a " +"clustering algorithm. The resulting signature file is used as input for i." +"maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 -msgid "Query vector dataset attribute data" +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 +msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 -msgid "" -"Prints attributes of vector maps registered in a space time vector dataset." +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 +msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 -msgid "Raster dataset color table" +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 +msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" -"Creates/modifies the color table associated with each raster map of the " -"space time raster dataset." +"Classifies the cell spectral reflectances in imagery data. Classification is " +"based on the spectral signature information generated by either i.cluster, g." +"gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 -msgid "Raster calculations" +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 +msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" -"Performs spatio-temporal mapcalc expressions on temporally sampled maps of " -"space time raster datasets." +"Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 -msgid "3D raster calculations" +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 +msgid "Input for supervised SMAP" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 -msgid "" -"Performs r3.mapcalc expressions on maps of sampled space time 3D raster " -"datasets." +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 +msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 -msgid "Interpolate gaps in raster datasets" +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 +msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" -"Replaces gaps in a space time raster dataset with interpolated raster maps." +"Performs contextual image classification using sequential maximum a " +"posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 -msgid "Aggregation" +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 +msgid "Input for supervised SVM" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 -msgid "Neighborhood analysis in raster dataset" +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 +msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 -msgid "" -"Performs a neighborhood analysis for each map in a space time raster dataset." +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 +msgid "Manage signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 -msgid "Aggregation in raster datasets" +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 +msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 -msgid "" -"Performs different aggregation algorithms from r.series on all or a subset " -"of raster maps in a space time raster dataset." +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 +msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 -msgid "Temporal aggregation" +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 +msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 -msgid "" -"Aggregates temporally the maps of a space time raster dataset by a user " -"defined granularity." +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 +msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 -msgid "Temporal aggregation by dataset" +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 +msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 -msgid "" -"Aggregates data of an existing space time raster dataset using the time " -"intervals of a second space time dataset." +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 +msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 -msgid "Sampling" +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 +msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 -msgid "Sample a space time raster dataset at point coordinates" +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 +msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 -msgid "" -"Sample a space time raster dataset at specific vector point coordinates and " -"write the output to stdout using different layouts" +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 +msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 -msgid "Query raster dataset by vector points dataset" +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 +msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 -msgid "" -"Stores raster map values at spatial and temporal positions of vector points " -"as vector attributes." +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 +msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 -msgid "Observe specific locations in raster dataset" +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 +msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 -msgid "" -"Observes specific locations in a space time raster dataset over a period of " -"time using vector points." +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 +msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 -msgid "Temporal sampling" +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 +msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 -msgid "" -"Samples the input space time dataset(s) with a sample space time dataset and " -"print the result to stdout." +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 +msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 -msgid "Space time datasets metadata" +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 +msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 -msgid "Lists information about space time datasets and maps." -msgstr "" - -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 -msgid "Univariate raster dataset statistics" +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 +msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 -msgid "" -"Calculates univariate statistics from the non-null cells for each registered " -"raster map of a space time raster dataset." +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 +msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 -msgid "Univariate vector dataset statistics" +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 +msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" -"Calculates univariate statistics of attributes for each registered vector " -"map of a space time vector dataset" +"Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " +"from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 -msgid "Univariate 3D raster dataset statistics" +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 +msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" -"Calculates univariate statistics from the non-null cells for each registered " -"3D raster map of a space time 3D raster dataset." +"Calculates top-of-atmosphere radiance or reflectance and temperature for " +"Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 -msgid "Report temporal topology" +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 +msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 -msgid "Lists temporal topology of a space time dataset." +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 +msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 -msgid "GUI tools" +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 +msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 -msgid "Timeline tool" +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 +msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 -msgid "Plot temporal extents." +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 +msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 -msgid "Temporal plot tool" +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 +msgid "" +"Performs atmospheric correction using the 6S algorithm. 6S - Second " +"Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 -msgid "Plot temporal values." +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 +msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 -msgid "&Help" +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 +msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:1061 -msgid "GRASS help" +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 +msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 -msgid "Display the HTML man pages of GRASS GIS" +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 +msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 -msgid "GUI help" +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 +msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:1065 -msgid "About system" +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 +msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:1066 -msgid "Prints system information" +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 +msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 -#: ../gui/wxpython/gui_core/ghelp.py:60 -msgid "About GRASS GIS" +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 +msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:1071 -msgid "Import, export and link data" +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 +msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 -msgid "Attribute table manager" +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 +msgid "" +"Calculates different types of vegetation indices. Uses red and nir bands " +"mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:2032 -msgid "Launch Data Catalog." +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 +msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:2039 -msgid "Managing GCPs for 3D correction" +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 +msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 -msgid "Vector digitizer" +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 +msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 -msgid "Interactive editing and digitization of vector maps." +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 +msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 -msgid "Raster digitizer" +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 +msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 -msgid "Interactive editing and digitization of raster maps." +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 +msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 +msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 +msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:2063 -msgid "Save model to file" +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 +msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:2065 -msgid "Close model file" +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 +msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:2066 -msgid "Export to image" +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 +msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:2068 -msgid "Export to Python" +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 +msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:2070 -msgid "Quit modeler" +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 +msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:2071 -msgid "Close modeler window" +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 +msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 -msgid "&Model" +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 +msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:2076 -msgid "Add command" +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 +msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:2077 -msgid "Add action (GRASS command) to model" +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 +msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:2078 -msgid "Add data" +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 +msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 -msgid "Add data item to model" +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 +msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:2080 -msgid "Define relation" +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 +msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 -msgid "Define relation between data and action items" +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 +msgid "" +"Computes temporal integration of satellite ET actual (ETa) following the " +"daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:2082 -msgid "Add loop / series" +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 +msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 -msgid "Adds loop (series) to model" +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 +msgid "" +"Computes evapotranspiration calculation modified or original Hargreaves " +"formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:2084 -msgid "Add condition" +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 +msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 -msgid "Adds condition (if/else) to model" +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 +msgid "" +"Computes potential evapotranspiration calculation with hourly Penman-" +"Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:2087 -msgid "Adds comment to model" +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 +msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 -msgid "Remove item" +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 +msgid "" +"Computes evapotranspiration calculation Priestley and Taylor formulation, " +"1972." msgstr "" -#: ../gui/wxpython/menustrings.py:2089 -msgid "Remove action/data from model" +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 +msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:2091 -msgid "Model properties (name, purpose, etc.)" +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 +msgid "" +"Calculates error matrix and kappa parameter for accuracy assessment of " +"classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:2092 -msgid "Delete intermediate data" +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 +msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:2093 -msgid "Delete intermediate data defined in the model" +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 +msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:2095 -msgid "Run entire model" +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 +msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 -msgid "Validate entire model" +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 +msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2100 -msgid "Display the HTML man pages of Graphical modeler" +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 +msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 -msgid "About Graphical Modeler" +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 +msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:2102 -msgid "Display information about Graphical Modeler" +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 +msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 -msgid "Specify paper size, margins and orientation" +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 +msgid "" +"Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " +"3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:2108 -msgid "Load instruction file" +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 +msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 -msgid "Load text file with mapping instructions" +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 +msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 -msgid "Export instruction file" +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 +msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 -msgid "Generate text file with mapping instructions" +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 +msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 -msgid "Export to PostScript" +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 +msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 -msgid "Generate PostScript output" +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 +msgid "3D mask" msgstr "" -#: ../gui/wxpython/menustrings.py:2114 -msgid "Export to PDF" +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 +msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 -msgid "Generate PDF output" +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 +msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 -msgid "Launch ps.map dialog" +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 +msgid "Cross section" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 -#: ../gui/wxpython/lmgr/layertree.py:56 -msgid "Quit" +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 +msgid "" +"Creates cross section 2D raster map from 3D raster map based on 2D elevation " +"map" msgstr "" -#: ../gui/wxpython/menustrings.py:2119 -msgid "Close Cartographic Composer" +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 +msgid "" +"Numerical calculation program for transient, confined groundwater flow in " +"three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:2120 -msgid "&Insert" +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 +msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 -msgid "Map frame" +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 +msgid "" +"Interpolates point data to a 3D raster map using regularized spline with " +"tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:2122 -msgid "Add or edit map frame" +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 +msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 -msgid "Add or edit raster map" +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 +msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:2126 -msgid "Add or edit vector map" +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 +msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 -msgid "Map legend" +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 +msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2128 -msgid "Add or edit raster and vector legend" +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 +msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 -msgid "Map info" +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 +msgid "" +"Calculates univariate statistics from the non-null cells of a 3D raster map. " +"Statistics include number of cells counted, minimum and maximum cell values, " +"range, arithmetic mean, population variance, standard deviation, coefficient " +"of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:2130 -msgid "Add or edit map info" +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 +msgid "&Database" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 -msgid "Add or edit scale bar" +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 +msgid "Database information" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 -#: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 -msgid "Text" +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 +msgid "List databases" msgstr "" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 -#: ../gui/wxpython/animation/dialogs.py:1016 -msgid "Add text" +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 +msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:2135 -#: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 -msgid "Image" +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 +msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:2136 -#: ../gui/wxpython/animation/dialogs.py:1016 -msgid "Add image" +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 +msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 -msgid "Add north arrow" +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 +msgid "List tables" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 -msgid "Delete selected object" +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 +msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:2143 -msgid "Display the HTML man pages of Cartographic Composer" +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 +msgid "Describe table" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 -msgid "About Cartographic Composer" +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 +msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:2145 -msgid "Display information about Cartographic Composer" +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 +msgid "List columns" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 -msgid "GRASS Bivariate Scatterplot Tool" +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 +msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 -msgid "Bivariate Scatterplot" +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 +msgid "Manage databases" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 -#: ../gui/wxpython/wxplot/histogram.py:59 -#: ../gui/wxpython/wxplot/histogram.py:161 -msgid "Raster cell values" +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 +msgid "Connect" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 -msgid "Nothing to plot." +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 +msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 -msgid "At least 2 raster maps must be specified" +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 +msgid "Login" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 -msgid "Bivariate Scatterplot of " +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 +msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 -#, python-format -msgid "Raster <%s> cell values" +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 +msgid "Create database" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 -#, python-format -msgid ": %s" +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 +msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 -msgid "Regression Statistics for Scatterplot(s)" +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 +msgid "Drop database" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 -#, python-format -msgid "" -"Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" -"\n" +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 +msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/wxplot/base.py:35 -msgid "Draw/re-draw plot" +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 +msgid "Drop table" msgstr "" -#: ../gui/wxpython/wxplot/base.py:38 -msgid "Draw transect in map display window to profile" +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 +msgid "Drops an attribute table." msgstr "" -#: ../gui/wxpython/wxplot/base.py:41 -msgid "Plot statistics" +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 +msgid "Copy table" msgstr "" -#: ../gui/wxpython/wxplot/base.py:42 -msgid "Save profile data to CSV file" +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 +msgid "" +"Copy a table. Either 'from_table' (optionally with 'where') can be used or " +"'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/wxplot/base.py:484 -msgid "Left Mouse Down at Point:" +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 +msgid "Drop column" msgstr "" -#: ../gui/wxpython/wxplot/base.py:516 ../gui/wxpython/wxplot/base.py:583 -#: ../gui/wxpython/wxplot/dialogs.py:651 -msgid "Text settings" +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 +msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 -msgid "Plot settings" +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 +msgid "Test" msgstr "" -#: ../gui/wxpython/wxplot/base.py:533 -msgid "This feature is not yet functional" +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 +msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/wxplot/base.py:534 -msgid "Under Construction" +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 +msgid "Query" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:50 -msgid "Histogram Tool" +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 +msgid "Query any table" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:58 -msgid "Histogram of" +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 +msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:60 -#: ../gui/wxpython/wxplot/histogram.py:167 -msgid "Cell counts" +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 +msgid "SQL statement" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:147 -#, python-format -msgid "Histogram of image group <%s>" +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 +msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:150 -#, python-format -msgid "Histogram of raster map <%s>" +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 +msgid "Vector database connections" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:152 -msgid "Histogram of selected raster maps" +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 +msgid "New table" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:159 -#, python-format -msgid "Raster cell values %s" +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 +msgid "" +"Creates and connects a new attribute table to a given layer of an existing " +"vector map." msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:169 -msgid "Percent of total cells" +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 +msgid "Remove table" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:171 -msgid "Area" +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 +msgid "Removes existing attribute table of a vector map." msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:259 -msgid "Statistics for Map(s) Histogrammed" +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 +msgid "Join table" msgstr "" -#: ../gui/wxpython/wxplot/histogram.py:263 -#, python-format -msgid "Statistics for raster map <%s>" +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 +msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 -msgid "GRASS Profile Analysis Tool" +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 +msgid "Add columns" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 -msgid "Profile of" +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 +msgid "" +"Adds one or more columns to the attribute table connected to a given vector " +"map." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:103 -#, python-format -msgid "Distance (%s)" +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 +msgid "" +"Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:105 -msgid "Distance along transect" +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 +msgid "Rename column" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 -msgid "Cell values" +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 +msgid "" +"Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:174 -msgid "Not all points of profile lie inside computational region." +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 +msgid "Change values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 -msgid "Raster values" +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 +msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:312 -msgid "You must draw a transect to profile in the map display window." +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 +msgid "Drop row" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 -msgid "Nothing to profile" +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 +msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 -msgid "Choose prefix for file(s) where to save profile values..." +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 +msgid "Reconnect vectors to database" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 -msgid "Comma separated value (*.csv)|*.csv" +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 +msgid "" +"Reconnects attribute tables for all vector maps from the current mapset to a " +"new database." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:403 -msgid "Overwrite file?" +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 +msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 -#, python-format -msgid "" -"Unable to open file <%s> for writing.\n" -"Reason: %s" +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 +msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 -#, python-format -msgid "" -"%d files created:\n" -"%s" +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 +msgid "&Temporal" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 -msgid "No files generated." +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 +msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 -msgid "Statistics for Profile(s)" +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 +msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:51 -msgid "Select raster maps to profile" +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 +msgid "" +"Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:92 -msgid "Select raster map(s) to profile:" +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 +#: ../gui/wxpython/rlisetup/frame.py:161 +msgid "Create" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:140 -msgid "Select pairs of raster maps for scatterplots" +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 +msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:189 -msgid "Select pairs of raster maps for bivariate scatterplots:" +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 +msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:207 ../gui/wxpython/wxplot/dialogs.py:476 -msgid "Number of bins (for FP maps)" +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 +msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 -msgid "Statistics" +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 +msgid "Update metadata" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:356 -msgid "C&opy" +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 +msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:357 -msgid "Copy regression statistics the clipboard (Ctrl+C)" +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 +msgid "Merge" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:385 -msgid "Regression statistics copied to clipboard" +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 +msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:397 -msgid "Select raster map or imagery group to histogram" +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 +msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:426 -msgid "Histogram single raster" +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 +msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:430 -msgid "Histogram imagery group" +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 +msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:442 -#: ../gui/wxpython/modules/colorrules.py:419 -msgid "Select raster map:" +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 +msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:460 -msgid "Select image group:" +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 +msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:491 -msgid "Histogram type" +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 +msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:575 -msgid "Selected group must be in current mapset" +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 +msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 -#: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 -msgid "Invalid input" +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 +msgid "" +"Assigns timestamps and registers raster, vector and raster3d maps in a space " +"time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:658 -msgid "Profile title:" +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 +msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:669 -msgid "Title font size (pts):" +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 +msgid "" +"Unregisters raster, vector and raster3d maps from the temporal database or a " +"specific space time dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:687 -msgid "X-axis label:" +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 +msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:697 -msgid "Y-axis label:" +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 +msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:708 -msgid "Label font size (pts):" +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 +msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 -msgid "Font settings" +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 +msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:736 -msgid "Font family:" +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 +msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:755 -msgid "Style:" +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 +msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:774 -msgid "Weight:" +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 +msgid "Import" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 -msgid "Apply changes for the current session and close dialog" +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 +msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 -#, python-format -msgid "Plot text sizes saved to file '%s'." +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 +msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 -msgid "No map or image group selected to plot." +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 +msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 +msgid "" +"Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:983 -msgid "Map/image plotted" +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 +msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 -msgid "Settings for selected map" +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 +msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 -msgid "Line color" +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 +msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1021 -#: ../gui/wxpython/vdigit/preferences.py:141 -msgid "Line width" +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 +msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 -msgid "Line style" +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 +msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 -msgid "Legend" +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 +msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1066 -msgid "Transect segment marker settings" +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 +msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 -msgid "Size" +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 +msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 -msgid "Fill" +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 +msgid "Extraction" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 -msgid "Style" +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 +msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1128 -msgid "Scatterplot points" +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 +msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 -msgid "Axis settings" +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 +msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 -msgid "X-Axis" +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 +msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 -msgid "Y-Axis" +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 +msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1204 -msgid "Scale" +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 +msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 -msgid "" -"Automatic axis scaling, custom max and min, or scale matches data range (min)" +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 +msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 -msgid "Custom min" +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 +msgid "" +"Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 -msgid "Custom max" +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 +msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 -msgid "Log scale" +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 +msgid "" +"Creates/modifies the color table associated with each raster map of the " +"space time raster dataset." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1259 -msgid "Grid and Legend settings" +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 +msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 -msgid "Grid color" +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 +msgid "" +"Performs spatio-temporal mapcalc expressions on temporally sampled maps of " +"space time raster datasets." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1274 -msgid "Show grid" +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 +msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1280 -msgid "Legend font size" +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 +msgid "" +"Performs r3.mapcalc expressions on maps of sampled space time 3D raster " +"datasets." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1291 -msgid "Show legend" +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 +msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1492 -#, python-format -msgid "Plot settings saved to file '%s'." +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 +msgid "" +"Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 -msgid "Adva&nced search..." +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 +msgid "Aggregation" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 -#, python-format -msgid "Do advanced search using %s tool" +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 +msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 -msgid "&Run..." +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 +msgid "" +"Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 -msgid "Run selected tool from the tree" +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 +msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 -msgid "H&elp" +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 +msgid "" +"Performs different aggregation algorithms from r.series on all or a subset " +"of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 -msgid "Show manual for selected tool from the tree" +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 +msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 -#, python-format -msgid "Documentation for %s is now open in the web browser" +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 +msgid "" +"Aggregates temporally the maps of a space time raster dataset by a user " +"defined granularity." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 -msgid "&Recent Files" +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 +msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 -msgid "Not selectable element" +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 +msgid "" +"Aggregates data of an existing space time raster dataset using the time " +"intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 -msgid "Mapset" +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 +msgid "Sampling" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:571 -msgid "Type: " +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 +msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 -#, python-format -msgid "GSelect: invalid item: %s" +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 +msgid "" +"Sample a space time raster dataset at specific vector point coordinates and " +"write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 -#, python-format -msgid "" -"Temporal GIS error:\n" -"%s" +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 +msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 -#, python-format +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" -"Unable to import pyGRASS: %s\n" -"Some functionality will be not accessible" +"Stores raster map values at spatial and temporal positions of vector points " +"as vector attributes." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 -msgid "No table linked to layer <{}>." +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 +msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 -msgid "Choose GIS Data Directory" +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 +msgid "" +"Observes specific locations in a space time raster dataset over a period of " +"time using vector points." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1459 -msgid "Output settings" +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 +msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 -msgid "Source input" +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 +msgid "" +"Samples the input space time dataset(s) with a sample space time dataset and " +"print the result to stdout." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 -msgid "Native" +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 +msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 -#: ../gui/wxpython/lmgr/workspace.py:518 -msgid "File" +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 +msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 -msgid "Directory" +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 +msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 -msgid "Database" +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 +msgid "" +"Calculates univariate statistics from the non-null cells for each registered " +"raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1486 -msgid "Protocol" +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 +msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1497 -msgid "Output type" +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 +msgid "" +"Calculates univariate statistics of attributes for each registered vector " +"map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1499 -msgid "Source type" +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 +msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1520 -msgid "All files" +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 +msgid "" +"Calculates univariate statistics from the non-null cells for each registered " +"3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1550 -msgid "ZIP files" +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 +msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1551 -msgid "GZIP files" +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 +msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1552 -msgid "TAR files" +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 +msgid "GUI tools" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1556 -msgid "TARGZ files" +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 +msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1565 -msgid "File:" +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 +msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1566 -msgid "Choose file to import" +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 +msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 -#: ../gui/wxpython/animation/dialogs.py:1192 -msgid "Directory:" +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 +msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 -msgid "Choose input directory" +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 +msgid "&Help" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1604 -msgid "Extension:" +#: ../gui/wxpython/menustrings.py:1063 +msgid "GRASS help" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 -msgid "Choose file" +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 +msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 -msgid "Feature type:" +#: ../gui/wxpython/menustrings.py:1065 +msgid "GUI help" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 -msgid "simple features" +#: ../gui/wxpython/menustrings.py:1067 +msgid "About system" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 -msgid "topological" +#: ../gui/wxpython/menustrings.py:1068 +msgid "Prints system information" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 -msgid "Creation options:" +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 +#: ../gui/wxpython/gui_core/ghelp.py:60 +msgid "About GRASS GIS" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 -msgid "Format:" +#: ../gui/wxpython/menustrings.py:1073 +msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1911 -msgid "Protocol:" +#: ../gui/wxpython/menustrings.py:2030 +msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1940 -msgid "No settings available" +#: ../gui/wxpython/menustrings.py:2037 +msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 -#: ../gui/wxpython/web_services/dialogs.py:301 -msgid "No data source defined, settings are not saved." +#: ../gui/wxpython/menustrings.py:2044 +msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 -msgid "" -"PostgreSQL/PostGIS login was not set. Set it via module, please." +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 +msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 -#, python-brace-format -msgid "" -"Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " -"failed. {error}." +#: ../gui/wxpython/menustrings.py:2055 +msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 -#, python-brace-format -msgid "" -"Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " -"{error}." +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 +msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 -#, python-brace-format -msgid "" -"Getting list of tables columns data types from PostGIS DB <{db}>, host " -"<{host}> failed. {error}." +#: ../gui/wxpython/menustrings.py:2057 +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 -#, python-brace-format -msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." +#: ../gui/wxpython/menustrings.py:2068 +msgid "Save model to file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 -msgid "Point" +#: ../gui/wxpython/menustrings.py:2070 +msgid "Close model file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -msgid "LineString" +#: ../gui/wxpython/menustrings.py:2071 +msgid "Export to image" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -msgid "Polygon" +#: ../gui/wxpython/menustrings.py:2073 +msgid "Export to Python" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 -msgid "No vector map selected in layer manager. Operation canceled." +#: ../gui/wxpython/menustrings.py:2075 +msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 -msgid "Input vector map is not selected" +#: ../gui/wxpython/menustrings.py:2076 +msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 -#, python-format -msgid "" -"Input vector map <%s> and selected map <%s> in layer manager are different. " -"Operation canceled." +#: ../gui/wxpython/menustrings.py:2080 +msgid "&Model" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 -#, python-format -msgid "Unable to import C imagery library functions: %s\n" +#: ../gui/wxpython/menustrings.py:2081 +msgid "Add command" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 -msgid "No vector map selected" +#: ../gui/wxpython/menustrings.py:2082 +msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:76 -msgid "Info" +#: ../gui/wxpython/menustrings.py:2083 +msgid "Add data" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:77 -msgid "Copyright" +#: ../gui/wxpython/menustrings.py:2084 +msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:78 -msgid "License" +#: ../gui/wxpython/menustrings.py:2085 +msgid "Define relation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:79 -msgid "Citation" +#: ../gui/wxpython/menustrings.py:2086 +msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:80 -msgid "Authors" +#: ../gui/wxpython/menustrings.py:2087 +msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:81 -msgid "Contributors" +#: ../gui/wxpython/menustrings.py:2088 +msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:82 -msgid "Extra contributors" +#: ../gui/wxpython/menustrings.py:2089 +msgid "Add condition" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:83 -msgid "Translators" +#: ../gui/wxpython/menustrings.py:2090 +msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:84 -msgid "Translation status" +#: ../gui/wxpython/menustrings.py:2092 +msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 -msgid "Unable to get GRASS version\n" +#: ../gui/wxpython/menustrings.py:2093 +msgid "Remove item" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 -msgid "unknown version" +#: ../gui/wxpython/menustrings.py:2094 +msgid "Remove action/data from model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:143 -msgid "Official GRASS site:" +#: ../gui/wxpython/menustrings.py:2096 +msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:158 -msgid "Code Revision" +#: ../gui/wxpython/menustrings.py:2097 +msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:176 -msgid "Build Date" +#: ../gui/wxpython/menustrings.py:2098 +msgid "Delete intermediate data defined in the model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 -msgid "Language" +#: ../gui/wxpython/menustrings.py:2100 +msgid "Run entire model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 -#, python-format -msgid "%s file missing" +#: ../gui/wxpython/menustrings.py:2102 +msgid "Validate entire model" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:328 -#, python-brace-format -msgid "" -"Unable to provide citation suggestion, see GRASS GIS website instead. The " -"error was: {0}" +#: ../gui/wxpython/menustrings.py:2105 +msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 -#, python-format -msgid "Error when reading file '%s'." +#: ../gui/wxpython/menustrings.py:2106 +msgid "About Graphical Modeler" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 -msgid "Lines:" +#: ../gui/wxpython/menustrings.py:2107 +msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 -msgid "E-mail" +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 +msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 -msgid "Country" +#: ../gui/wxpython/menustrings.py:2113 +msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:438 -msgid "OSGeo_ID" +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 +msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:439 -msgid "ORCID" +#: ../gui/wxpython/menustrings.py:2115 +msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 -msgid "Nation" +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 +msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 -#, python-format -msgid " %d translated" +#: ../gui/wxpython/menustrings.py:2117 +msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 -#, python-format -msgid " %d fuzzy" +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 +msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 -#, python-format -msgid " %d untranslated" +#: ../gui/wxpython/menustrings.py:2119 +msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 -#, python-format -msgid "%d translated" +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 +msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 -#, python-format -msgid "File <%s> not found" +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 +msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:851 -msgid "&Next" +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/lmgr/layertree.py:56 +msgid "Quit" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:853 -msgid "&Previous" +#: ../gui/wxpython/menustrings.py:2124 +msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:161 -msgid "Clear prompt and output window" +#: ../gui/wxpython/menustrings.py:2125 +msgid "&Insert" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 -msgid "Save output to a file" +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 +msgid "Map frame" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:165 -msgid "Abort running command" +#: ../gui/wxpython/menustrings.py:2127 +msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 -#, python-format -msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" +#: ../gui/wxpython/menustrings.py:2129 +msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 -#, python-format -msgid "" -"Unable to write file '%(path)s'.\n" -"\n" -"Details: %(error)s" +#: ../gui/wxpython/menustrings.py:2131 +msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 -#, python-format -msgid "Command output saved into '%s'" +#: ../gui/wxpython/menustrings.py:2132 +msgid "Map legend" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:309 -msgid "Permission denied <{}>. Please change file permission for reading." +#: ../gui/wxpython/menustrings.py:2133 +msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:317 -msgid "Couldn't read file <{}>." +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 +msgid "Map info" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:337 -msgid "Permission denied <{}>. Please change file permission for writing.{}" +#: ../gui/wxpython/menustrings.py:2135 +msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:349 -msgid "Couldn't write file <{}>.{}" +#: ../gui/wxpython/menustrings.py:2137 +msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:472 -msgid "Open file" +#: ../gui/wxpython/menustrings.py:2138 +#: ../gui/wxpython/animation/dialogs.py:1520 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 +msgid "Text" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:514 -msgid "File <{}> doesn't exist.It was probably moved or deleted." +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/animation/dialogs.py:1016 +msgid "Add text" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:582 -msgid "Replace the content by the template?" +#: ../gui/wxpython/menustrings.py:2140 +#: ../gui/wxpython/animation/dialogs.py:1520 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 +msgid "Image" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:584 -msgid "Replace the content by the example?" +#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/animation/dialogs.py:1016 +msgid "Add image" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:586 -msgid "Replace the current content by the file content?" +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 +msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:593 -msgid "Replace content" +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 +msgid "Delete selected object" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:606 -msgid "Set parameters for the script" +#: ../gui/wxpython/menustrings.py:2148 +msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:608 -msgid "Specify command line parameters for the script separated by spaces:" +#: ../gui/wxpython/menustrings.py:2149 +msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:657 -msgid "Open (Ctrl+O)" +#: ../gui/wxpython/menustrings.py:2150 +msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:658 -msgid "Save (Ctrl+S)" +#: ../gui/wxpython/wxplot/scatter.py:51 +msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:659 -msgid "Run (Ctrl+R)" +#: ../gui/wxpython/wxplot/scatter.py:58 +msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:661 -msgid "Activate overwrite" +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 +#: ../gui/wxpython/wxplot/histogram.py:59 +#: ../gui/wxpython/wxplot/histogram.py:161 +msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:662 -msgid "Deactivate overwrite" +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 +msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/gui_core/mapdisp.py:135 -#: ../gui/wxpython/mapdisp/test_mapdisp.py:93 -#, python-format -msgid "GRASS module '%s' not found. Unable to start map display window." +#: ../gui/wxpython/wxplot/scatter.py:119 +msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:45 -msgid "category" +#: ../gui/wxpython/wxplot/scatter.py:141 +msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 -msgid "type" +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 +#, python-format +msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:70 -msgid "Select features" +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 +#, python-format +msgid ": %s" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:133 -msgid "Create a new map" +#: ../gui/wxpython/wxplot/scatter.py:270 +msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:269 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format -msgid "Selected map <%s> has been disabled for rendering. Operation canceled." +msgid "" +"Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" +"\n" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:281 -msgid "No vector map layer selected. Operation canceled." +#: ../gui/wxpython/wxplot/base.py:35 +msgid "Draw/re-draw plot" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 -msgid "No map layer selected. Operation canceled." +#: ../gui/wxpython/wxplot/base.py:38 +msgid "Draw transect in map display window to profile" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:310 -#, python-format -msgid "Failed to query vector map(s) <%s>." +#: ../gui/wxpython/wxplot/base.py:41 +msgid "Plot statistics" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:335 -msgid "No features selected" +#: ../gui/wxpython/wxplot/base.py:42 +msgid "Save profile data to CSV file" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:372 -#, python-format -msgid "Vector map <%s> was created" +#: ../gui/wxpython/wxplot/base.py:484 +msgid "Left Mouse Down at Point:" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:375 -#, python-format -msgid "" -"Unable to create a new vector map.\n" -"\n" -"Reason: %s" +#: ../gui/wxpython/wxplot/base.py:516 ../gui/wxpython/wxplot/base.py:583 +#: ../gui/wxpython/wxplot/dialogs.py:651 +msgid "Text settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 -msgid "User settings" +#: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 +#: ../gui/wxpython/wxplot/dialogs.py:964 +msgid "Plot settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:98 -msgid "Set to default" +#: ../gui/wxpython/wxplot/base.py:533 +msgid "This feature is not yet functional" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:106 -msgid "Revert settings to default" +#: ../gui/wxpython/wxplot/base.py:534 +msgid "Under Construction" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 -msgid "Apply changes for the current session only and close" +#: ../gui/wxpython/wxplot/histogram.py:50 +msgid "Histogram Tool" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 -msgid "Save for this session only" +#: ../gui/wxpython/wxplot/histogram.py:58 +msgid "Histogram of" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 -msgid "Settings applied to current session but not saved" +#: ../gui/wxpython/wxplot/histogram.py:60 +#: ../gui/wxpython/wxplot/histogram.py:167 +msgid "Cell counts" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 -msgid "Key column cannot be empty string." +#: ../gui/wxpython/wxplot/histogram.py:147 +#, python-format +msgid "Histogram of image group <%s>" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:250 -msgid "GUI Settings" +#: ../gui/wxpython/wxplot/histogram.py:150 +#, python-format +msgid "Histogram of raster map <%s>" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:278 -msgid "Layer Manager settings" +#: ../gui/wxpython/wxplot/histogram.py:152 +msgid "Histogram of selected raster maps" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:291 -msgid "Ask when removing map layer from layer tree" +#: ../gui/wxpython/wxplot/histogram.py:159 +#, python-format +msgid "Raster cell values %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 -msgid "Ask when quitting wxGUI or closing display" +#: ../gui/wxpython/wxplot/histogram.py:169 +msgid "Percent of total cells" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/wxplot/histogram.py:171 +msgid "Area" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 -msgid "History" +#: ../gui/wxpython/wxplot/histogram.py:259 +msgid "Statistics for Map(s) Histogrammed" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" +#: ../gui/wxpython/wxplot/histogram.py:263 +#, python-format +msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:387 -msgid "Data Catalog settings" +#: ../gui/wxpython/wxplot/profile.py:63 +msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 -msgid "At startup load maps from current mapset only (in the Data tab)" +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 +msgid "Profile of" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 -msgid "Workspace settings" +#: ../gui/wxpython/wxplot/profile.py:111 +#, python-format +msgid "Distance (%s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:417 -msgid "Suppress positioning Map Display Window(s)" +#: ../gui/wxpython/wxplot/profile.py:113 +msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 -msgid "Suppress positioning Layer Manager window" +#: ../gui/wxpython/wxplot/profile.py:114 +msgid "Cell values" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" +#: ../gui/wxpython/wxplot/profile.py:184 +msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." +#: ../gui/wxpython/wxplot/profile.py:277 +msgid "Raster values" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:475 -msgid "Region settings" +#: ../gui/wxpython/wxplot/profile.py:341 +msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 -msgid "Align region to resolution" +#: ../gui/wxpython/wxplot/profile.py:343 +msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 -msgid "Window layout settings" +#: ../gui/wxpython/wxplot/profile.py:414 +msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:522 -msgid "Use single-window mode (requires GUI restart)" +#: ../gui/wxpython/wxplot/profile.py:416 +msgid "Comma separated value (*.csv)|*.csv" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 -msgid "Use single-window mode instead of multi-window mode" +#: ../gui/wxpython/wxplot/profile.py:432 +msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 -msgid "Font for command output:" +#: ../gui/wxpython/wxplot/profile.py:446 +#, python-format +msgid "" +"Unable to open file <%s> for writing.\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 -#: ../gui/wxpython/animation/dialogs.py:1076 -msgid "Set font" +#: ../gui/wxpython/wxplot/profile.py:460 +#, python-format +msgid "" +"%d files created:\n" +"%s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:560 -msgid "Font for manual pages:" +#: ../gui/wxpython/wxplot/profile.py:462 +msgid "No files generated." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:576 -msgid "Language settings" +#: ../gui/wxpython/wxplot/profile.py:469 +msgid "Statistics for Profile(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 -msgid "Choose language (requires to save and GRASS restart):" +#: ../gui/wxpython/wxplot/dialogs.py:51 +msgid "Select raster maps to profile" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 -msgid "Appearance settings" +#: ../gui/wxpython/wxplot/dialogs.py:92 +msgid "Select raster map(s) to profile:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 -msgid "Element list:" +#: ../gui/wxpython/wxplot/dialogs.py:140 +msgid "Select pairs of raster maps for scatterplots" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:668 -msgid "Menu style (requires to save and GUI restart):" +#: ../gui/wxpython/wxplot/dialogs.py:189 +msgid "Select pairs of raster maps for bivariate scatterplots:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 -msgid "Height of map selection popup window (in pixels):" +#: ../gui/wxpython/wxplot/dialogs.py:207 ../gui/wxpython/wxplot/dialogs.py:476 +msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 -msgid "Icon theme (requires GUI restart):" +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 +msgid "Statistics" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 -msgid "Tool dialog style:" +#: ../gui/wxpython/wxplot/dialogs.py:356 +msgid "C&opy" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 -msgid "Map Display" +#: ../gui/wxpython/wxplot/dialogs.py:357 +msgid "Copy regression statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 -msgid "Default font for GRASS displays:" +#: ../gui/wxpython/wxplot/dialogs.py:385 +msgid "Regression statistics copied to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 -msgid "Default display settings" +#: ../gui/wxpython/wxplot/dialogs.py:397 +msgid "Select raster map or imagery group to histogram" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 -msgid "Display driver:" +#: ../gui/wxpython/wxplot/dialogs.py:426 +msgid "Histogram single raster" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 -msgid "Statusbar mode:" +#: ../gui/wxpython/wxplot/dialogs.py:430 +msgid "Histogram imagery group" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 -#: ../gui/wxpython/mapdisp/properties.py:114 -msgid "Align region extent based on display size" +#: ../gui/wxpython/wxplot/dialogs.py:442 +#: ../gui/wxpython/modules/colorrules.py:419 +msgid "Select raster map:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 -#: ../gui/wxpython/mapdisp/properties.py:152 -msgid "Constrain display resolution to computational settings" +#: ../gui/wxpython/wxplot/dialogs.py:460 +msgid "Select image group:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 -#: ../gui/wxpython/mapdisp/properties.py:81 -msgid "Enable auto-rendering" +#: ../gui/wxpython/wxplot/dialogs.py:491 +msgid "Histogram type" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 -msgid "Enable auto-zooming to selected map layer" +#: ../gui/wxpython/wxplot/dialogs.py:575 +msgid "Selected group must be in current mapset" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1013 -msgid "Show computational region extent" +#: ../gui/wxpython/wxplot/dialogs.py:576 +#: ../gui/wxpython/animation/controller.py:309 +#: ../gui/wxpython/animation/dialogs.py:753 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 +msgid "Invalid input" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 -msgid "Mouse wheel action:" +#: ../gui/wxpython/wxplot/dialogs.py:658 +msgid "Profile title:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1053 -msgid "Mouse scrolling direction:" +#: ../gui/wxpython/wxplot/dialogs.py:669 +msgid "Title font size (pts):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 -msgid "Advanced display settings" +#: ../gui/wxpython/wxplot/dialogs.py:687 +msgid "X-axis label:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 -msgid "3D view depth buffer (possible values are 16, 24, 32):" +#: ../gui/wxpython/wxplot/dialogs.py:697 +msgid "Y-axis label:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 -msgid "Tool dialog settings" +#: ../gui/wxpython/wxplot/dialogs.py:708 +msgid "Label font size (pts):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 -msgid "Close dialog when completed successfully" +#: ../gui/wxpython/wxplot/dialogs.py:729 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 +msgid "Font settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 -msgid "Add created map into layer tree" +#: ../gui/wxpython/wxplot/dialogs.py:736 +msgid "Font family:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1208 -msgid "Allow interactive input" +#: ../gui/wxpython/wxplot/dialogs.py:755 +msgid "Style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1220 -msgid "Verbosity level:" +#: ../gui/wxpython/wxplot/dialogs.py:774 +msgid "Weight:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 -msgid "Number of threads for parallel computing (supported tools only):" +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 +msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 -msgid "Maximum memory in MB to be used (supported tools only):" +#: ../gui/wxpython/wxplot/dialogs.py:876 +#, python-format +msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 -msgid "Layers" +#: ../gui/wxpython/wxplot/dialogs.py:942 +msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 -msgid "Default raster settings" +#: ../gui/wxpython/wxplot/dialogs.py:984 +msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1322 -msgid "Make null cells opaque" +#: ../gui/wxpython/wxplot/dialogs.py:997 +msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 -msgid "Default color table" +#: ../gui/wxpython/wxplot/dialogs.py:1013 +msgid "Line color" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1373 -msgid "Default vector settings" +#: ../gui/wxpython/wxplot/dialogs.py:1022 +#: ../gui/wxpython/vdigit/preferences.py:141 +msgid "Line width" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1380 -msgid "Display:" +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 +msgid "Line style" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 -msgid "Feature color:" +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 +msgid "Legend" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 -msgid "Transparent" +#: ../gui/wxpython/wxplot/dialogs.py:1067 +msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1434 -msgid "Area fill color:" +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 +msgid "Size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 -msgid "Random colors according to category number " +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 +msgid "Fill" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 -msgid "Symbol:" +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 +msgid "Style" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 -msgid "Attributes" +#: ../gui/wxpython/wxplot/dialogs.py:1129 +msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 -msgid "Highlight selected features" +#: ../gui/wxpython/wxplot/dialogs.py:1191 +msgid "Axis settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1591 -msgid "Line width (in pixels):" +#: ../gui/wxpython/wxplot/dialogs.py:1197 +msgid "X-Axis" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1610 -msgid "Automatically highlight selected features in map display" +#: ../gui/wxpython/wxplot/dialogs.py:1197 +msgid "Y-Axis" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 -msgid "Data browser" +#: ../gui/wxpython/wxplot/dialogs.py:1205 +msgid "Scale" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1634 -msgid "Left mouse double click:" +#: ../gui/wxpython/wxplot/dialogs.py:1213 +msgid "" +"Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 -msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" +#: ../gui/wxpython/wxplot/dialogs.py:1221 +msgid "Custom min" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 -msgid "Ask when deleting data record(s) from table" +#: ../gui/wxpython/wxplot/dialogs.py:1229 +msgid "Custom max" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 -msgid "Create table" +#: ../gui/wxpython/wxplot/dialogs.py:1237 +msgid "Log scale" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 -msgid "Key column:" +#: ../gui/wxpython/wxplot/dialogs.py:1261 +msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1734 -msgid "Projection" +#: ../gui/wxpython/wxplot/dialogs.py:1267 +msgid "Grid color" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1744 -msgid "Projection statusbar settings" +#: ../gui/wxpython/wxplot/dialogs.py:1276 +msgid "Show grid" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 -msgid "" -"\n" -"Note: This only controls the coordinates displayed in the lower-left of the " -"Map Display\n" -"window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" -"menu located at the bottom of the Map Display window.\n" +#: ../gui/wxpython/wxplot/dialogs.py:1282 +msgid "Legend font size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 -msgid "EPSG code:" +#: ../gui/wxpython/wxplot/dialogs.py:1293 +msgid "Show legend" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1786 -msgid "PROJ string (required):" +#: ../gui/wxpython/wxplot/dialogs.py:1495 +#, python-format +msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1806 -msgid "EPSG file:" +#: ../gui/wxpython/gui_core/menu.py:207 +msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1826 -msgid "" -"Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." +#: ../gui/wxpython/gui_core/menu.py:210 +#, python-format +msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1833 -msgid "&Load EPSG codes" +#: ../gui/wxpython/gui_core/menu.py:217 +msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1844 -msgid "Coordinates format" +#: ../gui/wxpython/gui_core/menu.py:218 +msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1855 -msgid "Lat/long projections" +#: ../gui/wxpython/gui_core/menu.py:219 +msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 -msgid "Precision:" +#: ../gui/wxpython/gui_core/menu.py:220 +msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format -msgid "Unable to read EPSG codes: %s" +msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 -#, python-format -msgid "EPSG code %s not found" +#: ../gui/wxpython/gui_core/menu.py:407 +msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2045 -msgid "Select default display font" +#: ../gui/wxpython/gui_core/gselect.py:523 +msgid "Not selectable element" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 -msgid "Failed to set default display font. Try different font." +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 +msgid "Mapset" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 -msgid "Select default output font" +#: ../gui/wxpython/gui_core/gselect.py:572 +msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 -msgid "Manage access to mapsets" +#: ../gui/wxpython/gui_core/gselect.py:596 +#, python-format +msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/gselect.py:789 +#, python-format msgid "" -"Check a mapset to make it accessible, uncheck it to hide it.\n" -" Notes:\n" -" - The current mapset is always accessible.\n" -" - You may only write to the current mapset.\n" -" - You may only write to mapsets which you own." +"Temporal GIS error:\n" +"%s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 -msgid "Owner" +#: ../gui/wxpython/gui_core/gselect.py:795 +#, python-format +msgid "" +"Unable to import pyGRASS: %s\n" +"Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:112 -msgid "Toolbar" +#: ../gui/wxpython/gui_core/gselect.py:926 +msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:157 -msgid "Copy map names to clipboard (top to bottom)" +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 +msgid "Choose GIS Data Directory" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:158 -msgid "Copy map names to clipboard (bottom to top)" +#: ../gui/wxpython/gui_core/gselect.py:1460 +msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 -#, python-format -msgid "Set opacity of <%s>" +#: ../gui/wxpython/gui_core/gselect.py:1462 +msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:516 -msgid "Remove selected map(s) from list" +#: ../gui/wxpython/gui_core/gselect.py:1469 +msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:519 -msgid "Layer up" +#: ../gui/wxpython/gui_core/gselect.py:1475 +#: ../gui/wxpython/lmgr/workspace.py:518 +msgid "File" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:519 -msgid "Move selected layer(s) up" +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 +msgid "Directory" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:522 -msgid "Layer down" +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 +msgid "Database" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:522 -msgid "Move selected layer(s) down" +#: ../gui/wxpython/gui_core/gselect.py:1487 +msgid "Protocol" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:526 -#: ../gui/wxpython/gui_core/simplelmgr.py:527 -msgid "Edit layer properties" +#: ../gui/wxpython/gui_core/gselect.py:1498 +msgid "Output type" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:530 -msgid "Change opacity" +#: ../gui/wxpython/gui_core/gselect.py:1500 +msgid "Source type" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:530 -msgid "Change layer opacity" +#: ../gui/wxpython/gui_core/gselect.py:1521 +msgid "All files" msgstr "" -#: ../gui/wxpython/gui_core/simplelmgr.py:534 -#: ../gui/wxpython/gui_core/simplelmgr.py:535 -#: ../gui/wxpython/lmgr/layertree.py:80 -msgid "Add 3D raster map layer" +#: ../gui/wxpython/gui_core/gselect.py:1551 +msgid "ZIP files" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:37 -msgid "Display map" +#: ../gui/wxpython/gui_core/gselect.py:1552 +msgid "GZIP files" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:37 -msgid "Re-render modified map layers only" +#: ../gui/wxpython/gui_core/gselect.py:1553 +msgid "TAR files" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:41 -msgid "Render map" +#: ../gui/wxpython/gui_core/gselect.py:1557 +msgid "TARGZ files" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:42 -msgid "Force re-rendering all map layers" +#: ../gui/wxpython/gui_core/gselect.py:1566 +msgid "File:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:46 -msgid "Erase display" +#: ../gui/wxpython/gui_core/gselect.py:1567 +msgid "Choose file to import" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:47 -msgid "Erase display canvas with given background color" +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/animation/dialogs.py:1192 +msgid "Directory:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:49 -msgid "Pointer" +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 +msgid "Choose input directory" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:51 -msgid "Zoom in" +#: ../gui/wxpython/gui_core/gselect.py:1605 +msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:51 -msgid "Drag or click mouse to zoom" +#: ../gui/wxpython/gui_core/gselect.py:1637 +msgid "Choose file" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:54 -msgid "Zoom out" +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 +msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:54 -msgid "Drag or click mouse to unzoom" +#: ../gui/wxpython/gui_core/gselect.py:1659 +msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:56 -msgid "Return to previous zoom" +#: ../gui/wxpython/gui_core/gselect.py:1659 +msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:59 -msgid "Various zoom options" +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 +msgid "Creation options:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:60 -msgid "Zoom to default or saved region, save to named region, ..." +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 +msgid "Format:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:62 -msgid "Zoom to selected map layer(s)" +#: ../gui/wxpython/gui_core/gselect.py:1912 +msgid "Protocol:" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:64 -msgid "Zoom to computational region extent" +#: ../gui/wxpython/gui_core/gselect.py:1941 +msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:66 -msgid "Pan" +#: ../gui/wxpython/gui_core/gselect.py:2075 +#: ../gui/wxpython/web_services/dialogs.py:301 +msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:66 -msgid "Drag with mouse to pan" +#: ../gui/wxpython/gui_core/gselect.py:2107 +msgid "" +"PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:67 -msgid "Save display to file" +#: ../gui/wxpython/gui_core/gselect.py:2262 +#, python-brace-format +msgid "" +"Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " +"failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:69 -#: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 -msgid "Select font" +#: ../gui/wxpython/gui_core/gselect.py:2537 +#, python-brace-format +msgid "" +"Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " +"{error}." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:70 -msgid "Show manual" +#: ../gui/wxpython/gui_core/gselect.py:2628 +#, python-brace-format +msgid "" +"Getting list of tables columns data types from PostGIS DB <{db}>, host " +"<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:72 ../gui/wxpython/lmgr/layertree.py:57 -msgid "Add raster map layer" +#: ../gui/wxpython/gui_core/gselect.py:2659 +#, python-brace-format +msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:73 ../gui/wxpython/lmgr/layertree.py:65 -msgid "Add vector map layer" +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:76 -msgid "Add map elements" +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 +msgid "Point" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:77 -msgid "Overlay elements like scale and legend onto map" +#: ../gui/wxpython/gui_core/gselect.py:2799 +msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:80 -msgid "Create histogram with d.histogram" +#: ../gui/wxpython/gui_core/gselect.py:2799 +msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:84 -#: ../gui/wxpython/mapdisp/properties.py:337 -msgid "Map Display Settings" +#: ../gui/wxpython/gui_core/gselect.py:3013 +msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +#: ../gui/wxpython/gui_core/gselect.py:3030 +msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/wrap.py:258 -msgid "Clear" +#: ../gui/wxpython/gui_core/gselect.py:3034 +#, python-format +msgid "" +"Input vector map <%s> and selected map <%s> in layer manager are different. " +"Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/wrap.py:260 -msgid "&Clear" +#: ../gui/wxpython/gui_core/gselect.py:3163 +#, python-format +msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/wrap.py:273 -msgid "&Cancel" +#: ../gui/wxpython/gui_core/gselect.py:3241 +msgid "No vector map selected" msgstr "" -#: ../gui/wxpython/gui_core/wrap.py:286 -msgid "&Close" +#: ../gui/wxpython/gui_core/ghelp.py:76 +msgid "Info" msgstr "" -#: ../gui/wxpython/gui_core/wrap.py:297 -msgid "Apply" +#: ../gui/wxpython/gui_core/ghelp.py:77 +msgid "Copyright" msgstr "" -#: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 -msgid "&Apply" +#: ../gui/wxpython/gui_core/ghelp.py:78 +msgid "License" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:579 -msgid "Enter parameters for '" +#: ../gui/wxpython/gui_core/ghelp.py:79 +msgid "Citation" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:591 -msgid "Close this window without executing the command (Ctrl+Q)" +#: ../gui/wxpython/gui_core/ghelp.py:80 +msgid "Authors" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:618 -msgid "Run the command (Ctrl+R)" +#: ../gui/wxpython/gui_core/ghelp.py:81 +msgid "Contributors" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:632 -#: ../gui/wxpython/modules/mcalc_builder.py:177 -msgid "Copy the current command string to the clipboard" +#: ../gui/wxpython/gui_core/ghelp.py:82 +msgid "Extra contributors" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:641 -msgid "Show manual page of the command (Ctrl+H)" +#: ../gui/wxpython/gui_core/ghelp.py:83 +msgid "Translators" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:679 -msgid "Add created map(s) into layer tree" +#: ../gui/wxpython/gui_core/ghelp.py:84 +msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:701 -#: ../gui/wxpython/modules/import_export.py:113 -msgid "Close dialog on finish" +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 +msgid "Unable to get GRASS version\n" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:708 -msgid "" -"Close dialog when command is successfully finished. Change this settings in " -"Preferences dialog ('Command' tab)." -msgstr "" - -#: ../gui/wxpython/gui_core/forms.py:911 -#, python-format -msgid "'%s' copied to clipboard" -msgstr "" - -#: ../gui/wxpython/gui_core/forms.py:1011 -#: ../gui/wxpython/gui_core/forms.py:1026 -msgid "Required" +#: ../gui/wxpython/gui_core/ghelp.py:130 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 +msgid "unknown version" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1014 -#: ../gui/wxpython/gui_core/forms.py:1027 -msgid "Optional" +#: ../gui/wxpython/gui_core/ghelp.py:143 +msgid "Official GRASS site:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 -msgid "Parameterized in model" +#: ../gui/wxpython/gui_core/ghelp.py:158 +msgid "Code Revision" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1188 -msgid "[multiple]" +#: ../gui/wxpython/gui_core/ghelp.py:176 +msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1250 -msgid "valid range" +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 +msgid "Language" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 +#, python-format +msgid "%s file missing" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 -msgid "Select Color" +#: ../gui/wxpython/gui_core/ghelp.py:338 +#, python-brace-format +msgid "" +"Unable to provide citation suggestion, see GRASS GIS website instead. The " +"error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format -msgid "Choose %s" +msgid "Error when reading file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 -#: ../gui/wxpython/modules/mcalc_builder.py:174 -msgid "&Load" +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 +msgid "Lines:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2075 -msgid "Load and edit content of a file" +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 +msgid "E-mail" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 -msgid "&Save as" +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 +msgid "Country" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 -msgid "Save content to a file for further use" +#: ../gui/wxpython/gui_core/ghelp.py:448 +msgid "OSGeo_ID" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 -msgid "or enter values directly:" +#: ../gui/wxpython/gui_core/ghelp.py:449 +msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 -msgid "" -"Enter file content directly instead of specifying a file. Temporary file " -"will be automatically created." +#: ../gui/wxpython/gui_core/ghelp.py:527 +msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 -#: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 -msgid "Layer id" +#: ../gui/wxpython/gui_core/ghelp.py:570 +#, python-format +msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2266 -#: ../gui/wxpython/modules/import_export.py:81 -msgid "Layer name" +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 +#, python-format +msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2267 -#: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 -msgid "Feature type" +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 +#, python-format +msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2268 -#: ../gui/wxpython/modules/import_export.py:86 -#: ../gui/wxpython/modules/import_export.py:88 -msgid "Projection match" +#: ../gui/wxpython/gui_core/ghelp.py:590 +#, python-format +msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 -msgid "Manual" +#: ../gui/wxpython/gui_core/ghelp.py:665 +#, python-format +msgid "File <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2568 -msgid "Nothing to load." +#: ../gui/wxpython/gui_core/ghelp.py:862 +msgid "&Next" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 -#, python-format -msgid "" -"Unable to load file.\n" -"\n" -"Reason: %s" +#: ../gui/wxpython/gui_core/ghelp.py:864 +msgid "&Previous" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 -#: ../gui/wxpython/modules/colorrules.py:686 -msgid "Nothing to save." +#: ../gui/wxpython/gui_core/goutput.py:141 +msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2609 -msgid "Save input as..." +#: ../gui/wxpython/gui_core/goutput.py:143 +msgid "Save output to a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 -msgid "No dataset given." +#: ../gui/wxpython/gui_core/goutput.py:145 +msgid "Abort running command" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format -msgid "Error in %s" +msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format -msgid "Unable to parse command '%s'" +msgid "" +"Unable to write file '%(path)s'.\n" +"\n" +"Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format -msgid "%(cmd)s: parameter '%(key)s' not available" +msgid "Command output saved into '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 -msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." +#: ../gui/wxpython/gui_core/pyedit.py:309 +msgid "Permission denied <{}>. Please change file permission for reading." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 -msgid "Query results" +#: ../gui/wxpython/gui_core/pyedit.py:317 +msgid "Couldn't read file <{}>." msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 -msgid "Right click to copy selected values to clipboard." +#: ../gui/wxpython/gui_core/pyedit.py:337 +msgid "Permission denied <{}>. Please change file permission for writing.{}" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 -msgid "Feature" +#: ../gui/wxpython/gui_core/pyedit.py:349 +msgid "Couldn't write file <{}>.{}" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 -msgid "Value" +#: ../gui/wxpython/gui_core/pyedit.py:472 +msgid "Open file" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 -msgid "Copy all to clipboard" +#: ../gui/wxpython/gui_core/pyedit.py:514 +msgid "File <{}> doesn't exist.It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 -msgid "Redirect to console" +#: ../gui/wxpython/gui_core/pyedit.py:582 +msgid "Replace the content by the template?" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 -#, python-format -msgid "Copy from '%s' column" +#: ../gui/wxpython/gui_core/pyedit.py:584 +msgid "Replace the content by the example?" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 -msgid "Copy selected lines" +#: ../gui/wxpython/gui_core/pyedit.py:586 +msgid "Replace the current content by the file content?" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 -#, python-format -msgid "Copy '%s'" +#: ../gui/wxpython/gui_core/pyedit.py:593 +msgid "Replace content" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 -msgid "Copy line" +#: ../gui/wxpython/gui_core/pyedit.py:606 +msgid "Set parameters for the script" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 -msgid "Query results:" +#: ../gui/wxpython/gui_core/pyedit.py:608 +msgid "Specify command line parameters for the script separated by spaces:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 -msgid " " +#: ../gui/wxpython/gui_core/pyedit.py:657 +msgid "Open (Ctrl+O)" msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 -msgid "east, north" +#: ../gui/wxpython/gui_core/pyedit.py:658 +msgid "Save (Ctrl+S)" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 -msgid "Nothing found" +#: ../gui/wxpython/gui_core/pyedit.py:659 +msgid "Run (Ctrl+R)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:93 -msgid "Required item is not set." +#: ../gui/wxpython/gui_core/pyedit.py:661 +msgid "Activate overwrite" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/pyedit.py:662 +msgid "Deactivate overwrite" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/mapdisp.py:135 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:93 +#, python-format +msgid "GRASS module '%s' not found. Unable to start map display window." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/vselect.py:45 +msgid "category" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 -msgid "Name of mapset:" +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 +msgid "type" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/vselect.py:70 +msgid "Select features" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:211 -msgid "Name of mapset is missing." +#: ../gui/wxpython/gui_core/vselect.py:133 +msgid "Create a new map" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 -msgid "Select vector map" +#: ../gui/wxpython/gui_core/vselect.py:269 +#, python-format +msgid "Selected map <%s> has been disabled for rendering. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:249 -msgid "Name of vector map is missing." +#: ../gui/wxpython/gui_core/vselect.py:281 +msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:321 -msgid "Create attribute table" +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 +msgid "No map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:354 -msgid "Name of new vector map is missing." +#: ../gui/wxpython/gui_core/vselect.py:310 +#, python-format +msgid "Failed to query vector map(s) <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 -msgid "Name for new vector map:" +#: ../gui/wxpython/gui_core/vselect.py:335 +msgid "No features selected" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/vselect.py:372 #, python-format -msgid "Unable to create vector map <%s>." +msgid "Vector map <%s> was created" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/vselect.py:375 #, python-format msgid "" -"Invalid or empty key column.\n" -"Unable to create vector map <%s>." +"Unable to create a new vector map.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:532 -#, python-format -msgid "" -"Vector map <%s> already exists in the current mapset. Do you want to " -"overwrite it?" +#: ../gui/wxpython/gui_core/preferences.py:76 +msgid "User settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:616 -msgid "Load region:" +#: ../gui/wxpython/gui_core/preferences.py:99 +msgid "Set to default" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:621 -msgid "Save region:" +#: ../gui/wxpython/gui_core/preferences.py:107 +msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:675 -msgid "" -"Name cannot begin with '.' and must not contain space, quotes, '/', ''', " -"'@', ',', '=', '*', and all other non-alphanumeric characters." +#: ../gui/wxpython/gui_core/preferences.py:110 +msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 -msgid "Create or edit imagery groups" +#: ../gui/wxpython/gui_core/preferences.py:112 +msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 -msgid "Apply changes to selected group and close dialog" +#: ../gui/wxpython/gui_core/preferences.py:181 +msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 -msgid "Apply changes to selected group" +#: ../gui/wxpython/gui_core/preferences.py:233 +msgid "Key column cannot be empty string." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 -msgid "Close dialog, changes are not applied" +#: ../gui/wxpython/gui_core/preferences.py:252 +msgid "GUI Settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 -msgid "" -"Put here a regular expression. Characters '.*' stand for anything, character " -"'^' stands for the beginning and '$' for the end." +#: ../gui/wxpython/gui_core/preferences.py:280 +msgid "Layer Manager settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 -msgid "Select existing group or enter name of new group:" +#: ../gui/wxpython/gui_core/preferences.py:293 +msgid "Ask when removing map layer from layer tree" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 -msgid "Edit/create subgroup" +#: ../gui/wxpython/gui_core/preferences.py:307 +msgid "Ask when quitting wxGUI or closing display" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 -msgid "Select existing subgroup or enter name of new subgroup:" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 -msgid "Select all" +#: ../gui/wxpython/gui_core/preferences.py:348 +msgid "Layout settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 -msgid "Pattern:" +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 -msgid "List of maps:" +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:881 -msgid "Select map layers and add them to the list." +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 -msgid "Remove selected layer(s) from list." +#: ../gui/wxpython/gui_core/preferences.py:392 +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 -msgid "Check maps from group to be included into subgroup." +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 -msgid "Add selected map layers into group" +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 +msgid "History" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 -#, python-format -msgid "Group <%s> was changed, do you want to apply changes?" +#: ../gui/wxpython/gui_core/preferences.py:457 +msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 -msgid "Unapplied changes" +#: ../gui/wxpython/gui_core/preferences.py:462 +msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 -#, python-format -msgid "Subgroup <%s> was changed, do you want to apply changes?" +#: ../gui/wxpython/gui_core/preferences.py:477 +msgid "Workspace settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 -msgid "No raster maps selected." +#: ../gui/wxpython/gui_core/preferences.py:487 +msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 -#, python-format -msgid "No changes to apply in group <%s>." +#: ../gui/wxpython/gui_core/preferences.py:503 +msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 -#, python-format -msgid "Group <%s> was successfully created." +#: ../gui/wxpython/gui_core/preferences.py:522 +msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 -#, python-format -msgid "Group <%s> was successfully changed." +#: ../gui/wxpython/gui_core/preferences.py:531 +msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 -#, python-format -msgid "Creating of new group <%s> failed." +#: ../gui/wxpython/gui_core/preferences.py:563 +msgid "Window layout settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 -#, python-format -msgid "Changing of group <%s> failed." +#: ../gui/wxpython/gui_core/preferences.py:569 +msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 -msgid "No group selected." +#: ../gui/wxpython/gui_core/preferences.py:573 +msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 -msgid "No subgroup selected." +#: ../gui/wxpython/gui_core/preferences.py:595 +msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 -msgid "Use fully-qualified map names" +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 +#: ../gui/wxpython/animation/dialogs.py:1076 +msgid "Set font" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 -msgid "Map type:" +#: ../gui/wxpython/gui_core/preferences.py:607 +msgid "Font for manual pages:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1533 -msgid "Select toggle" +#: ../gui/wxpython/gui_core/preferences.py:623 +msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 -msgid "Mapset:" +#: ../gui/wxpython/gui_core/preferences.py:636 +msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1628 -msgid "Invert selection" +#: ../gui/wxpython/gui_core/preferences.py:669 +msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 -msgid "Deselect all" +#: ../gui/wxpython/gui_core/preferences.py:680 +msgid "Element list:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1770 -#, python-format -msgid "Dynamic series (%s)" +#: ../gui/wxpython/gui_core/preferences.py:715 +msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 -msgid "Set Map Layer Opacity" +#: ../gui/wxpython/gui_core/preferences.py:751 +msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 -msgid "transparent" +#: ../gui/wxpython/gui_core/preferences.py:788 +msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1835 -msgid "opaque" +#: ../gui/wxpython/gui_core/preferences.py:818 +msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1932 -msgid "Set image size" +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 +msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1944 -msgid "Image size" +#: ../gui/wxpython/gui_core/preferences.py:886 +msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1997 -msgid "Template:" +#: ../gui/wxpython/gui_core/preferences.py:904 +msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2033 -msgid "SQL Query Utility" +#: ../gui/wxpython/gui_core/preferences.py:915 +msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 -msgid " SQL statement " +#: ../gui/wxpython/gui_core/preferences.py:941 +msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2094 -msgid "Symbols" +#: ../gui/wxpython/gui_core/preferences.py:992 +#: ../gui/wxpython/mapdisp/properties.py:114 +msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2124 -msgid "Symbol directory:" +#: ../gui/wxpython/gui_core/preferences.py:1009 +#: ../gui/wxpython/mapdisp/properties.py:152 +msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 -msgid "Symbol name:" +#: ../gui/wxpython/gui_core/preferences.py:1026 +#: ../gui/wxpython/mapdisp/properties.py:81 +msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 -msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" +#: ../gui/wxpython/gui_core/preferences.py:1043 +msgid "Enable auto-zooming to selected map layer" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 -msgid "Do you want to quit GRASS GIS?" +#: ../gui/wxpython/gui_core/preferences.py:1060 +msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 -msgid "Select font:" +#: ../gui/wxpython/gui_core/preferences.py:1075 +msgid "Mouse wheel action:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2489 -msgid "Character encoding:" +#: ../gui/wxpython/gui_core/preferences.py:1100 +msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 -msgid "Font size:" +#: ../gui/wxpython/gui_core/preferences.py:1147 +msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2549 -msgid "Example" +#: ../gui/wxpython/gui_core/preferences.py:1157 +msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 -msgid " (...)" +#: ../gui/wxpython/gui_core/preferences.py:1200 +msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 -#, python-format -msgid "" -"Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " -"characters excluding %(chars)s and space." +#: ../gui/wxpython/gui_core/preferences.py:1228 +msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 -msgid "Fulltext search" +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 +msgid "Add created map into layer tree" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 -msgid "Type to search in all tools. Press Enter for next match." +#: ../gui/wxpython/gui_core/preferences.py:1255 +msgid "Allow interactive input" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 -msgid "Searching, please type more characters." +#: ../gui/wxpython/gui_core/preferences.py:1267 +msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 -msgid "{} tools matched" +#: ../gui/wxpython/gui_core/preferences.py:1294 +msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 -msgid "Profiles" +#: ../gui/wxpython/gui_core/preferences.py:1319 +msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 -msgid "Save current settings" +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 +msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 -msgid "Delete currently selected settings" +#: ../gui/wxpython/gui_core/preferences.py:1356 +msgid "Default raster settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 -msgid "Load:" +#: ../gui/wxpython/gui_core/preferences.py:1369 +msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 -#, python-format -msgid "Settings <%s> not found" +#: ../gui/wxpython/gui_core/preferences.py:1382 +msgid "Default color table" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 -msgid "Save settings" +#: ../gui/wxpython/gui_core/preferences.py:1420 +msgid "Default vector settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1453 -msgid "Name not given, settings is not saved." +#: ../gui/wxpython/gui_core/preferences.py:1427 +msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 -#, python-format -msgid "Settings <%s> already exists. Do you want to overwrite the settings?" +#: ../gui/wxpython/gui_core/preferences.py:1447 +msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 -msgid "No settings is defined. Operation canceled." +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 +msgid "Transparent" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 -msgid "Unable to save settings" +#: ../gui/wxpython/gui_core/preferences.py:1481 +msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 -msgid "Type command here and press Enter" +#: ../gui/wxpython/gui_core/preferences.py:1534 +msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/vdigit/g.gui.vdigit.py:116 -#, python-format -msgid "Vector digitizer not available. %s" +#: ../gui/wxpython/gui_core/preferences.py:1564 +msgid "Symbol:" msgstr "" -#: ../gui/wxpython/vdigit/g.gui.vdigit.py:124 -#, python-format -msgid "" -"Vector map <%s> not found in current mapset. New vector map can be created " -"by providing '-c' flag." +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 +msgid "Attributes" msgstr "" -#: ../gui/wxpython/vdigit/g.gui.vdigit.py:130 -#, python-format -msgid "New vector map <%s> created" +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 +msgid "Highlight selected features" msgstr "" -#: ../gui/wxpython/vdigit/g.gui.vdigit.py:136 -#, python-format -msgid "Unable to create new vector map <%s>" +#: ../gui/wxpython/gui_core/preferences.py:1638 +msgid "Line width (in pixels):" msgstr "" -#: ../gui/wxpython/vdigit/g.gui.vdigit.py:151 -msgid "Vector Digitizer - GRASS GIS" +#: ../gui/wxpython/gui_core/preferences.py:1657 +msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/vdigit/mapwindow.py:552 -msgid "Update categories" +#: ../gui/wxpython/gui_core/preferences.py:1674 +msgid "Data browser" msgstr "" -#: ../gui/wxpython/vdigit/mapwindow.py:695 -#: ../gui/wxpython/vdigit/mapwindow.py:1107 -msgid "No vector map selected for editing." +#: ../gui/wxpython/gui_core/preferences.py:1681 +msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/vdigit/mapwindow.py:705 -msgid "Nothing to do. Choose appropriate tool from digitizer toolbar." +#: ../gui/wxpython/gui_core/preferences.py:1706 +msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/vdigit/mapwindow.py:1261 -msgid "Z bulk-labeling dialog" +#: ../gui/wxpython/gui_core/preferences.py:1724 +msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:33 -msgid "Digitization settings" +#: ../gui/wxpython/gui_core/preferences.py:1747 +msgid "Create table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:59 -msgid "Apply changes for this session" +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 +msgid "Key column:" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:62 -msgid "Close dialog and save changes to user settings file" +#: ../gui/wxpython/gui_core/preferences.py:1781 +msgid "Projection" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:174 -msgid "Snapping" +#: ../gui/wxpython/gui_core/preferences.py:1791 +msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:180 -msgid "Snapping threshold" +#: ../gui/wxpython/gui_core/preferences.py:1803 +msgid "" +"\n" +"Note: This only controls the coordinates displayed in the lower-left of the " +"Map Display\n" +"window's status bar. It is purely cosmetic and does not affect the working " +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" +"menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:196 -msgid "screen pixels" +#: ../gui/wxpython/gui_core/preferences.py:1817 +msgid "EPSG code:" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:196 ../gui/wxpython/core/units.py:34 -msgid "map units" +#: ../gui/wxpython/gui_core/preferences.py:1833 +msgid "PROJ string (required):" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:215 -msgid "Snap also to vertex" +#: ../gui/wxpython/gui_core/preferences.py:1853 +msgid "EPSG file:" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 -#, python-format -msgid "Snapping threshold is %(value).1f %(units)s" +#: ../gui/wxpython/gui_core/preferences.py:1873 +msgid "" +"Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:245 -msgid "Select vector features" +#: ../gui/wxpython/gui_core/preferences.py:1880 +msgid "&Load EPSG codes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:264 -msgid "Select threshold" +#: ../gui/wxpython/gui_core/preferences.py:1891 +msgid "Coordinates format" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:298 -msgid "Select only features inside of selection bounding box" +#: ../gui/wxpython/gui_core/preferences.py:1902 +msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:305 -msgid "" -"By default are selected all features overlapping selection bounding box " +#: ../gui/wxpython/gui_core/preferences.py:1921 +msgid "Precision:" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 -msgid "Check for duplicates" +#: ../gui/wxpython/gui_core/preferences.py:2043 +#, python-format +msgid "Unable to read EPSG codes: %s" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:330 -msgid "Digitize lines/boundaries" +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 +#, python-format +msgid "EPSG code %s not found" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 -msgid "Break lines at intersection" +#: ../gui/wxpython/gui_core/preferences.py:2110 +msgid "Select default display font" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:351 -msgid "Digitize areas" +#: ../gui/wxpython/gui_core/preferences.py:2127 +msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 -msgid "Close boundary (snap to the start node)" +#: ../gui/wxpython/gui_core/preferences.py:2149 +msgid "Select default output font" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 -msgid "Save changes" +#: ../gui/wxpython/gui_core/preferences.py:2332 +msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:376 -msgid "Save changes on exit" +#: ../gui/wxpython/gui_core/preferences.py:2351 +msgid "" +"Check a mapset to make it accessible, uncheck it to hide it.\n" +" Notes:\n" +" - The current mapset is always accessible.\n" +" - You may only write to the current mapset.\n" +" - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:395 -msgid "Query tool" -msgstr "" - -#: ../gui/wxpython/vdigit/preferences.py:403 -msgid "Choose query tool" -msgstr "" - -#: ../gui/wxpython/vdigit/preferences.py:409 -msgid "Select by box" +#: ../gui/wxpython/gui_core/preferences.py:2423 +msgid "Owner" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 -msgid "length" +#: ../gui/wxpython/gui_core/simplelmgr.py:112 +msgid "Toolbar" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:425 -msgid "Select lines" +#: ../gui/wxpython/gui_core/simplelmgr.py:157 +msgid "Copy map names to clipboard (top to bottom)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 -msgid "shorter than" +#: ../gui/wxpython/gui_core/simplelmgr.py:158 +msgid "Copy map names to clipboard (bottom to top)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 -msgid "longer than" +#: ../gui/wxpython/gui_core/simplelmgr.py:303 +#: ../gui/wxpython/lmgr/layertree.py:1284 +#, python-format +msgid "Set opacity of <%s>" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:458 -msgid "dangle" +#: ../gui/wxpython/gui_core/simplelmgr.py:516 +msgid "Remove selected map(s) from list" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:463 -msgid "Select dangles" +#: ../gui/wxpython/gui_core/simplelmgr.py:519 +msgid "Layer up" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:512 -msgid "Digitize new feature" +#: ../gui/wxpython/gui_core/simplelmgr.py:519 +msgid "Move selected layer(s) up" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:518 -msgid "Add new record into table" +#: ../gui/wxpython/gui_core/simplelmgr.py:522 +msgid "Layer down" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 -#: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 -msgid "Layer" +#: ../gui/wxpython/gui_core/simplelmgr.py:522 +msgid "Move selected layer(s) down" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 -msgid "Category" +#: ../gui/wxpython/gui_core/simplelmgr.py:526 +#: ../gui/wxpython/gui_core/simplelmgr.py:527 +msgid "Edit layer properties" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -msgid "Mode" +#: ../gui/wxpython/gui_core/simplelmgr.py:530 +msgid "Change opacity" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 -msgid "Next to use" +#: ../gui/wxpython/gui_core/simplelmgr.py:530 +msgid "Change layer opacity" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 -msgid "Category number" +#: ../gui/wxpython/gui_core/simplelmgr.py:534 +#: ../gui/wxpython/gui_core/simplelmgr.py:535 +#: ../gui/wxpython/lmgr/layertree.py:80 +msgid "Add 3D raster map layer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:559 -msgid "Category mode" +#: ../gui/wxpython/gui_core/toolbars.py:37 +msgid "Display map" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 -msgid "Manual entry" +#: ../gui/wxpython/gui_core/toolbars.py:37 +msgid "Re-render modified map layers only" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 -msgid "No category" +#: ../gui/wxpython/gui_core/toolbars.py:41 +msgid "Render map" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:583 -msgid "Delete existing feature(s)" +#: ../gui/wxpython/gui_core/toolbars.py:42 +msgid "Force re-rendering all map layers" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:589 -msgid "Delete record from table" +#: ../gui/wxpython/gui_core/toolbars.py:46 +msgid "Erase display" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:606 -msgid "Geometry attributes" +#: ../gui/wxpython/gui_core/toolbars.py:47 +msgid "Erase display canvas with given background color" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 -msgid "area" +#: ../gui/wxpython/gui_core/toolbars.py:49 +msgid "Pointer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:613 -msgid "perimeter" +#: ../gui/wxpython/gui_core/toolbars.py:51 +msgid "Zoom in" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:694 -msgid "" -"Note: These settings are stored in the workspace not in the vector digitizer " -"preferences." +#: ../gui/wxpython/gui_core/toolbars.py:51 +msgid "Drag or click mouse to zoom" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 -msgid "Digitize new line segment" +#: ../gui/wxpython/gui_core/toolbars.py:54 +msgid "Zoom out" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 -msgid "Digitize new line/boundary" +#: ../gui/wxpython/gui_core/toolbars.py:54 +msgid "Drag or click mouse to unzoom" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 -msgid "Highlight" +#: ../gui/wxpython/gui_core/toolbars.py:56 +msgid "Return to previous zoom" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:733 -msgid "Highlight (duplicates)" +#: ../gui/wxpython/gui_core/toolbars.py:59 +msgid "Various zoom options" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:735 -#: ../gui/wxpython/psmap/toolbars.py:104 -msgid "Line" +#: ../gui/wxpython/gui_core/toolbars.py:60 +msgid "Zoom to default or saved region, save to named region, ..." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:736 -msgid "Boundary (no area)" +#: ../gui/wxpython/gui_core/toolbars.py:62 +msgid "Zoom to selected map layer(s)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:737 -msgid "Boundary (one area)" +#: ../gui/wxpython/gui_core/toolbars.py:64 +msgid "Zoom to computational region extent" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:738 -msgid "Boundary (two areas)" +#: ../gui/wxpython/gui_core/toolbars.py:66 +msgid "Pan" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:739 -msgid "Centroid (in area)" +#: ../gui/wxpython/gui_core/toolbars.py:66 +msgid "Drag with mouse to pan" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:740 -msgid "Centroid (outside area)" +#: ../gui/wxpython/gui_core/toolbars.py:67 +msgid "Save display to file" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:741 -msgid "Centroid (duplicate in area)" +#: ../gui/wxpython/gui_core/toolbars.py:69 +#: ../gui/wxpython/gui_core/forms.py:1399 +#: ../gui/wxpython/gui_core/forms.py:2997 +msgid "Select font" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:742 -msgid "Node (one line)" +#: ../gui/wxpython/gui_core/toolbars.py:70 +msgid "Show manual" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:743 -msgid "Node (two lines)" +#: ../gui/wxpython/gui_core/toolbars.py:72 ../gui/wxpython/lmgr/layertree.py:57 +msgid "Add raster map layer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:744 -msgid "Vertex" +#: ../gui/wxpython/gui_core/toolbars.py:73 ../gui/wxpython/lmgr/layertree.py:65 +msgid "Add vector map layer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:745 -msgid "Area (closed boundary + centroid)" +#: ../gui/wxpython/gui_core/toolbars.py:76 +msgid "Add map elements" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:746 -msgid "Direction" +#: ../gui/wxpython/gui_core/toolbars.py:77 +msgid "Overlay elements like scale and legend onto map" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:816 -msgid "Snapping disabled" +#: ../gui/wxpython/gui_core/toolbars.py:80 +msgid "Create histogram with d.histogram" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:820 -#, python-format -msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" +#: ../gui/wxpython/gui_core/toolbars.py:84 +#: ../gui/wxpython/mapdisp/properties.py:337 +msgid "Map Display Settings" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 -#, python-format -msgid "Vector digitizer settings saved to file <%s>." +#: ../gui/wxpython/gui_core/toolbars.py:86 +msgid "(Un)dock" msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:361 -msgid "" -"WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " -"it." +#: ../gui/wxpython/gui_core/wrap.py:258 +msgid "Clear" msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:1017 -#, python-format -msgid "" -"Topology for vector map <%s> is not available. Topology is required by " -"digitizer. Do you want to rebuild topology (takes some time) and open the " -"vector map for editing?" +#: ../gui/wxpython/gui_core/wrap.py:260 +msgid "&Clear" msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:1023 -msgid "Topology missing" +#: ../gui/wxpython/gui_core/wrap.py:273 +msgid "&Cancel" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 -msgid "Select area/boundary/centroid tool" +#: ../gui/wxpython/gui_core/wrap.py:286 +msgid "&Close" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 -msgid "Digitize new point (Ctrl+P)" +#: ../gui/wxpython/gui_core/wrap.py:297 +msgid "Apply" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 -msgid "Left: new point" +#: ../gui/wxpython/gui_core/wrap.py:299 +#: ../gui/wxpython/web_services/dialogs.py:694 +msgid "&Apply" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:155 -msgid "Digitize new line (Ctrl+L)" +#: ../gui/wxpython/gui_core/forms.py:579 +msgid "Enter parameters for '" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 -msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" +#: ../gui/wxpython/gui_core/forms.py:591 +msgid "Close this window without executing the command (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:162 -msgid "Digitize new boundary (Ctrl+B)" +#: ../gui/wxpython/gui_core/forms.py:618 +msgid "Run the command (Ctrl+R)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:169 -msgid "Digitize new centroid (Ctrl+C)" +#: ../gui/wxpython/gui_core/forms.py:632 +#: ../gui/wxpython/modules/mcalc_builder.py:177 +msgid "Copy the current command string to the clipboard" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:174 -msgid "Digitize new area (boundary without category) (Ctrl+A)" +#: ../gui/wxpython/gui_core/forms.py:641 +msgid "Show manual page of the command (Ctrl+H)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 -msgid "Add new vertex to line or boundary (Ctrl+V)" +#: ../gui/wxpython/gui_core/forms.py:679 +msgid "Add created map(s) into layer tree" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 -msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" +#: ../gui/wxpython/gui_core/forms.py:701 +#: ../gui/wxpython/modules/import_export.py:113 +msgid "Close dialog on finish" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/gui_core/forms.py:708 msgid "" -"Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" +"Close dialog when command is successfully finished. Change this settings in " +"Preferences dialog ('Command' tab)." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:191 -msgid "Delete selected area(s) (Ctrl+F)" +#: ../gui/wxpython/gui_core/forms.py:911 +#, python-format +msgid "'%s' copied to clipboard" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:196 -msgid "Display/update attributes (Ctrl+K)" +#: ../gui/wxpython/gui_core/forms.py:1011 +#: ../gui/wxpython/gui_core/forms.py:1026 +msgid "Required" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 -msgid "Left: Select" +#: ../gui/wxpython/gui_core/forms.py:1014 +#: ../gui/wxpython/gui_core/forms.py:1027 +msgid "Optional" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:201 -msgid "Display/update categories (Ctrl+J)" +#: ../gui/wxpython/gui_core/forms.py:1101 +#: ../gui/wxpython/gui_core/forms.py:2343 +msgid "Parameterized in model" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:206 -msgid "Edit selected line/boundary (Ctrl+E)" +#: ../gui/wxpython/gui_core/forms.py:1188 +msgid "[multiple]" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:214 -msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" +#: ../gui/wxpython/gui_core/forms.py:1250 +msgid "valid range" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:220 -msgid "Move selected vertex (Ctrl+G)" +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 -msgid "Remove selected vertex (Ctrl+X)" +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 +msgid "Select Color" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:229 -msgid "Settings (Ctrl+T)" +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 +#, python-format +msgid "Choose %s" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:232 -msgid "Quit (Ctrl+Q)" +#: ../gui/wxpython/gui_core/forms.py:2094 +#: ../gui/wxpython/modules/mcalc_builder.py:174 +msgid "&Load" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 -msgid "Quit digitizer and save changes" +#: ../gui/wxpython/gui_core/forms.py:2096 +msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:236 -msgid "Show manual (Ctrl+H)" +#: ../gui/wxpython/gui_core/forms.py:2099 +msgid "&Save as" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:237 -msgid "Show Vector Digitizer manual" +#: ../gui/wxpython/gui_core/forms.py:2101 +msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:241 -msgid "Additional tools (copy, flip, connect, etc.)" +#: ../gui/wxpython/gui_core/forms.py:2107 +msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:246 -msgid "Undo (Ctrl+Z)" +#: ../gui/wxpython/gui_core/forms.py:2111 +msgid "" +"Enter file content directly instead of specifying a file. Temporary file " +"will be automatically created." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 -msgid "Undo previous change" +#: ../gui/wxpython/gui_core/forms.py:2286 +#: ../gui/wxpython/modules/import_export.py:80 +#: ../gui/wxpython/modules/import_export.py:956 +msgid "Layer id" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:251 -msgid "Redo (Ctrl+Y)" +#: ../gui/wxpython/gui_core/forms.py:2287 +#: ../gui/wxpython/modules/import_export.py:81 +msgid "Layer name" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 -msgid "Redo previous change" +#: ../gui/wxpython/gui_core/forms.py:2288 +#: ../gui/wxpython/modules/import_export.py:85 +#: ../gui/wxpython/psmap/dialogs.py:2257 +msgid "Feature type" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:438 -msgid "" -"No vector map is open for editing. Please select firsta vector map from the " -"combo box." +#: ../gui/wxpython/gui_core/forms.py:2289 +#: ../gui/wxpython/modules/import_export.py:86 +#: ../gui/wxpython/modules/import_export.py:88 +msgid "Projection match" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 -msgid "Break selected lines/boundaries at intersection" +#: ../gui/wxpython/gui_core/forms.py:2549 +msgid "Manual" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:720 -msgid "Connect selected lines/boundaries" +#: ../gui/wxpython/gui_core/forms.py:2589 +msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:725 -msgid "Copy categories" +#: ../gui/wxpython/gui_core/forms.py:2599 +#, python-format +msgid "" +"Unable to load file.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:727 -msgid "Copy features from (background) vector map" +#: ../gui/wxpython/gui_core/forms.py:2625 +#: ../gui/wxpython/modules/colorrules.py:686 +msgid "Nothing to save." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:732 -msgid "Copy attributes" +#: ../gui/wxpython/gui_core/forms.py:2630 +msgid "Save input as..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 -msgid "Feature type conversion" +#: ../gui/wxpython/gui_core/forms.py:2981 +msgid "No dataset given." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:740 -msgid "Flip selected lines/boundaries" +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 +#, python-format +msgid "Error in %s" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:746 -msgid "Merge selected lines/boundaries" +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 +#, python-format +msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:752 -msgid "Snap selected lines/boundaries (only to nodes)" +#: ../gui/wxpython/gui_core/forms.py:3174 +#, python-format +msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:757 -msgid "Split line/boundary" +#: ../gui/wxpython/gui_core/forms.py:3260 +msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:758 -msgid "Query features" +#: ../gui/wxpython/gui_core/query.py:32 +msgid "Query results" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:760 -msgid "Z bulk-labeling of 3D lines" +#: ../gui/wxpython/gui_core/query.py:47 +msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 -msgid "Select background vector map" +#: ../gui/wxpython/gui_core/query.py:54 +msgid "Feature" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 -msgid "Vector map is not 3D. Operation canceled." +#: ../gui/wxpython/gui_core/query.py:54 +msgid "Value" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1055 -#, python-format -msgid "" -"Topology for vector map <%s> is not available. Topology is required by " -"digitizer.\n" -"Do you want to rebuild topology (takes some time) and open the vector map " -"for editing?" +#: ../gui/wxpython/gui_core/query.py:75 +msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 -msgid "Digitizer error" +#: ../gui/wxpython/gui_core/query.py:78 +msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format -msgid "Please wait, opening vector map <%s> for editing..." +msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1139 -#, python-format -msgid "" -"Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." +#: ../gui/wxpython/gui_core/query.py:132 +msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format -msgid "Do you want to save changes in vector map <%s>?" -msgstr "" - -#: ../gui/wxpython/vdigit/toolbars.py:1212 -msgid "Save changes?" +msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1222 -#, python-format -msgid "Please wait, closing and rebuilding topology of vector map <%s>..." +#: ../gui/wxpython/gui_core/query.py:140 +msgid "Copy line" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1241 -#, python-format -msgid "Editing of vector map <%s> successfully finished" +#: ../gui/wxpython/gui_core/query.py:164 +msgid "Query results:" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 -msgid "New vector map" +#: ../gui/wxpython/gui_core/query.py:167 +msgid " " msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:93 -msgid "List of categories - right-click to delete" +#: ../gui/wxpython/gui_core/query.py:251 +msgid "east, north" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:126 -msgid "Add new category" +#: ../gui/wxpython/gui_core/query.py:262 +msgid "Nothing found" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 -msgid "Apply changes" +#: ../gui/wxpython/gui_core/dialogs.py:93 +msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:174 -msgid "Ignore changes and close dialog" +#: ../gui/wxpython/gui_core/dialogs.py:123 +msgid "Select GRASS project and mapset" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 -msgid "Apply changes and close dialog" +#: ../gui/wxpython/gui_core/dialogs.py:143 +msgid "Project or mapset is not defined." msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 -msgid "Feature id:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +msgid "Name of GRASS project:" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:266 ../gui/wxpython/vdigit/dialogs.py:480 -#, python-format -msgid "" -"Unable to add new layer/category <%(layer)s/%(category)s>.\n" -"Layer and category number must be integer.\n" -"Layer number must be greater than zero." +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 +msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:455 -msgid "Unable to update vector map." +#: ../gui/wxpython/gui_core/dialogs.py:194 +msgid "Select mapset in GRASS project" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:617 -#, python-format -msgid "%d lines selected for z bulk-labeling" +#: ../gui/wxpython/gui_core/dialogs.py:212 +msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:621 -msgid "Set value" +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 +msgid "Select vector map" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:627 -msgid "Starting value" +#: ../gui/wxpython/gui_core/dialogs.py:250 +msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:633 -msgid "Step" +#: ../gui/wxpython/gui_core/dialogs.py:323 +msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:667 -msgid "List of duplicates" +#: ../gui/wxpython/gui_core/dialogs.py:356 +msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:761 -msgid "Feature id" +#: ../gui/wxpython/gui_core/dialogs.py:377 +msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:762 -msgid "Layer (Categories)" +#: ../gui/wxpython/gui_core/dialogs.py:490 +#, python-format +msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:55 -msgid "Digitization Error" +#: ../gui/wxpython/gui_core/dialogs.py:497 +#, python-format +msgid "" +"Invalid or empty key column.\n" +"Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format -msgid "Unable to open vector map <%s>." +msgid "" +"Vector map <%s> already exists in the current mapset. Do you want to " +"overwrite it?" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:62 -msgid "No vector map open for editing." +#: ../gui/wxpython/gui_core/dialogs.py:618 +msgid "Load region:" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 -msgid "Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:623 +msgid "Save region:" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:73 -#, python-format +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" -"Writing new feature failed. Operation canceled.\n" -"\n" -"Reason: %s" +"Name cannot begin with '.' and must not contain space, quotes, '/', ''', " +"'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 -#, python-format -msgid "Reading feature id %d failed. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:699 +msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 -#, python-format -msgid "Database link %d not available. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 -#, python-format -msgid "Unable to start database driver <%s>. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:735 +msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 -#, python-format -msgid "" -"Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:736 +msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 -#, python-format -msgid "Unable to execute SQL query '%s'. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 +msgid "" +"Put here a regular expression. Characters '.*' stand for anything, character " +"'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 -#, python-format -msgid "Feature id %d is marked as dead. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:797 +msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 -#, python-format -msgid "Unsupported feature type %d. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:813 +msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 -#, python-format -msgid "Unknown feature type '%s'" +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:508 -msgid "Not enough points for line" +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 +msgid "Select all" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 -msgid "" -"Please install Python Imaging Library (PIL)\n" -"for better control of legend and other decorations." +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 +msgid "Pattern:" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 -msgid "Remove text" +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 +msgid "List of maps:" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 -msgid "Text properties" +#: ../gui/wxpython/gui_core/dialogs.py:883 +msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 -msgid "Remove scale bar" +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 -msgid "Scale bar properties" +#: ../gui/wxpython/gui_core/dialogs.py:934 +msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 -msgid "Remove north arrow" +#: ../gui/wxpython/gui_core/dialogs.py:1093 +msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 -msgid "North arrow properties" +#: ../gui/wxpython/gui_core/dialogs.py:1235 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 -msgid "Remove legend" +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 +msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 -msgid "Vector legend properties" +#: ../gui/wxpython/gui_core/dialogs.py:1250 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 -msgid "Raster legend properties" +#: ../gui/wxpython/gui_core/dialogs.py:1306 +msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format -msgid "Property does not exist: %s" +msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/mapwin/base.py:228 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format -msgid "" -"Error occurred during calling of handler: %s \n" -"Handler was unregistered." +msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format -msgid "" -"Error occurred during unregistration of handler: %s \n" -" Handler was unregistered." +msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format -msgid "Handler: %s was not registered" +msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format -msgid "" -"Error occurred during unregistration of handler: %s \n" -" Handler was unregistered" -msgstr "" - -#: ../gui/wxpython/mapwin/buffered.py:278 -msgid "Copy coordinates to clipboard" +msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:312 -msgid "Resize and move legend" +#: ../gui/wxpython/gui_core/dialogs.py:1375 +msgid "No group selected." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:724 -msgid "Please wait, exporting image..." +#: ../gui/wxpython/gui_core/dialogs.py:1379 +msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:1035 -msgid "Unable to draw registered graphics. The graphics was unregistered." +#: ../gui/wxpython/gui_core/dialogs.py:1488 +msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 -msgid "Zoom to saved region extents" +#: ../gui/wxpython/gui_core/dialogs.py:1520 +msgid "Map type:" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2102 -msgid "Set compulational region from named region" +#: ../gui/wxpython/gui_core/dialogs.py:1535 +msgid "Select toggle" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 -#, python-format -msgid "Region <%s> not found. Operation canceled." +#: ../gui/wxpython/gui_core/dialogs.py:1541 +msgid "Mapset:" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 -msgid "Save display extents to region file" +#: ../gui/wxpython/gui_core/dialogs.py:1630 +msgid "Invert selection" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2144 -msgid "Save computational region to region file" +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 +msgid "Deselect all" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format -msgid "Region file <%s> already exists. Do you want to overwrite it?" +msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:227 -#: ../gui/wxpython/mapwin/analysis.py:362 -msgid "Measuring finished" +#: ../gui/wxpython/gui_core/dialogs.py:1805 +msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:245 -#: ../gui/wxpython/mapwin/analysis.py:374 -#, python-format -msgid "" -"Click and drag with left mouse button to measure.%sDouble click with left " -"button to clear." +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 +msgid "transparent" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:253 -msgid "Measuring distance" +#: ../gui/wxpython/gui_core/dialogs.py:1837 +msgid "opaque" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:255 -msgid "Measuring distance:" +#: ../gui/wxpython/gui_core/dialogs.py:1934 +msgid "Set image size" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:266 -#, python-format -msgid "" -"Geodesic distance calculation is not available.\n" -"Reason: %s" +#: ../gui/wxpython/gui_core/dialogs.py:1946 +msgid "Image size" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:303 -#: ../gui/wxpython/mapwin/analysis.py:316 -msgid "segment" +#: ../gui/wxpython/gui_core/dialogs.py:1999 +msgid "Template:" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:306 -#: ../gui/wxpython/mapwin/analysis.py:319 -msgid "total distance" +#: ../gui/wxpython/gui_core/dialogs.py:2035 +msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:309 -msgid "bearing" +#: ../gui/wxpython/gui_core/dialogs.py:2048 +msgid " SQL statement " msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:311 -msgid "degrees (clockwise from grid-north)" +#: ../gui/wxpython/gui_core/dialogs.py:2096 +msgid "Symbols" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:380 -msgid "Measuring area:" +#: ../gui/wxpython/gui_core/dialogs.py:2126 +msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:397 -msgid "Units not recognized, measurement failed." +#: ../gui/wxpython/gui_core/dialogs.py:2135 +msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/mapwin/analysis.py:402 -#: ../gui/wxpython/mapwin/analysis.py:404 -#, python-brace-format -msgid "Area: {area} {unit}\n" +#: ../gui/wxpython/gui_core/dialogs.py:2382 +msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:105 -msgid " Server settings " +#: ../gui/wxpython/gui_core/dialogs.py:2386 +msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:108 -msgid "Server:" +#: ../gui/wxpython/gui_core/dialogs.py:2459 +msgid "Select font:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:111 -msgid "&Connect" +#: ../gui/wxpython/gui_core/dialogs.py:2491 +msgid "Character encoding:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:112 -msgid "Connect to the server" +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 +msgid "Font size:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:116 -msgid "Show advanced connection settings" +#: ../gui/wxpython/gui_core/dialogs.py:2551 +msgid "Example" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:117 -msgid "Hide advanced connection settings" +#: ../gui/wxpython/gui_core/widgets.py:128 +msgid " (...)" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:134 -msgid " Layer Manager Settings " +#: ../gui/wxpython/gui_core/widgets.py:891 +#, python-format +msgid "" +"Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " +"characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:138 -msgid "Output layer name:" +#: ../gui/wxpython/gui_core/widgets.py:1244 +msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:264 -msgid "Username:" +#: ../gui/wxpython/gui_core/widgets.py:1246 +msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:267 -msgid "Password:" +#: ../gui/wxpython/gui_core/widgets.py:1308 +msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:381 -#, python-format -msgid "Connecting to <%s>..." +#: ../gui/wxpython/gui_core/widgets.py:1319 +msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 -msgid "Available web services" +#: ../gui/wxpython/gui_core/widgets.py:1390 +msgid "Profiles" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 -#, python-format -msgid "Connected to <%s>" +#: ../gui/wxpython/gui_core/widgets.py:1397 +msgid "Save current settings" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 -#, python-format -msgid "Unable to connect to <%s>" +#: ../gui/wxpython/gui_core/widgets.py:1400 +msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 -msgid "&Add layer" +#: ../gui/wxpython/gui_core/widgets.py:1419 +msgid "Load:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:538 -msgid "Add selected web service layers as map layer into layer tree" +#: ../gui/wxpython/gui_core/widgets.py:1435 +#, python-format +msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 -msgid "Web service layer properties" +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 +msgid "Save settings" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 -msgid "&OK" +#: ../gui/wxpython/gui_core/widgets.py:1454 +msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 -msgid "Name for output raster map:" +#: ../gui/wxpython/gui_core/widgets.py:1467 +#, python-format +msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 -msgid "Export region" +#: ../gui/wxpython/gui_core/widgets.py:1519 +msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 -msgid "Named region" +#: ../gui/wxpython/gui_core/widgets.py:1555 +msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 -msgid "Extent and resolution are based on Map Display geometry." +#: ../gui/wxpython/gui_core/prompt.py:284 +msgid "Type command here and press Enter" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 -msgid "Extent and resolution are based on computational region." +#: ../gui/wxpython/vdigit/g.gui.vdigit.py:116 +#, python-format +msgid "Vector digitizer not available. %s" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 -msgid "Extent and resolution are based on named region." +#: ../gui/wxpython/vdigit/g.gui.vdigit.py:124 +#, python-format +msgid "" +"Vector map <%s> not found in current mapset. New vector map can be created " +"by providing '-c' flag." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 -msgid "Overwrite existing raster map" +#: ../gui/wxpython/vdigit/g.gui.vdigit.py:130 +#, python-format +msgid "New vector map <%s> created" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 -msgid "Choose named region:" +#: ../gui/wxpython/vdigit/g.gui.vdigit.py:136 +#, python-format +msgid "Unable to create new vector map <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 -msgid "&Save layer" +#: ../gui/wxpython/vdigit/g.gui.vdigit.py:151 +msgid "Vector Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 -msgid "Save web service layer as raster map" +#: ../gui/wxpython/vdigit/mapwindow.py:552 +msgid "Update categories" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 -msgid "Missing output raster." +#: ../gui/wxpython/vdigit/mapwindow.py:695 +#: ../gui/wxpython/vdigit/mapwindow.py:1107 +msgid "No vector map selected for editing." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 -msgid "Output map can be added only to current mapset." +#: ../gui/wxpython/vdigit/mapwindow.py:705 +msgid "Nothing to do. Choose appropriate tool from digitizer toolbar." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 -#, python-format -msgid "Output map <%s> already exists" +#: ../gui/wxpython/vdigit/mapwindow.py:1261 +msgid "Z bulk-labeling dialog" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 -#, python-format -msgid "Region <%s> does not exist." +#: ../gui/wxpython/vdigit/preferences.py:33 +msgid "Digitization settings" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 -msgid "Downloading data..." +#: ../gui/wxpython/vdigit/preferences.py:59 +msgid "Apply changes for this session" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 -msgid "Unable to fetch data.\n" +#: ../gui/wxpython/vdigit/preferences.py:62 +msgid "Close dialog and save changes to user settings file" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:136 -msgid " Requested data settings " +#: ../gui/wxpython/vdigit/preferences.py:174 +msgid "Snapping" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:164 -msgid "Request" +#: ../gui/wxpython/vdigit/preferences.py:180 +msgid "Snapping threshold" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:169 -msgid "List of layers " +#: ../gui/wxpython/vdigit/preferences.py:196 +msgid "screen pixels" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:187 -msgid "Source projection:" +#: ../gui/wxpython/vdigit/preferences.py:196 ../gui/wxpython/core/units.py:34 +msgid "map units" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:249 -msgid "Advanced request settings" +#: ../gui/wxpython/vdigit/preferences.py:215 +msgid "Snap also to vertex" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:259 -msgid "Order of layers in raster" +#: ../gui/wxpython/vdigit/preferences.py:225 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 +#, python-format +msgid "Snapping threshold is %(value).1f %(units)s" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 -msgid "Up" +#: ../gui/wxpython/vdigit/preferences.py:245 +msgid "Select vector features" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 -msgid "Down" +#: ../gui/wxpython/vdigit/preferences.py:264 +msgid "Select threshold" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:274 -msgid "Reprojection method:" +#: ../gui/wxpython/vdigit/preferences.py:298 +msgid "Select only features inside of selection bounding box" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:282 -msgid "Nearest neighbor" +#: ../gui/wxpython/vdigit/preferences.py:305 +msgid "" +"By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/web_services/widgets.py:283 -msgid "Linear interpolation" +#: ../gui/wxpython/vdigit/preferences.py:311 +msgid "Check for duplicates" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:284 -msgid "Cubic interpolation" +#: ../gui/wxpython/vdigit/preferences.py:331 +msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:285 -msgid "Cubic spline interpolation" +#: ../gui/wxpython/vdigit/preferences.py:335 +msgid "Break lines at intersection" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:292 -msgid "Maximum columns to request from server at time:" +#: ../gui/wxpython/vdigit/preferences.py:352 +msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:301 -msgid "Maximum rows to request from server at time:" +#: ../gui/wxpython/vdigit/preferences.py:356 +msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:321 -msgid "Do not request transparent data" +#: ../gui/wxpython/vdigit/preferences.py:374 +msgid "Save changes" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:341 -msgid "Additional query parameters for server:" +#: ../gui/wxpython/vdigit/preferences.py:377 +msgid "Save changes on exit" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:542 -#, python-format -msgid "" -"Unable to download %s capabilities file\n" -"from <%s>:\n" +#: ../gui/wxpython/vdigit/preferences.py:396 +msgid "Query tool" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:561 -#, python-format -msgid "" -"%s web service was not found in fetched capabilities file from <%s>:\n" -"%s\n" +#: ../gui/wxpython/vdigit/preferences.py:404 +msgid "Choose query tool" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:834 -msgid "Source image format" +#: ../gui/wxpython/vdigit/preferences.py:410 +msgid "Select by box" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:875 -msgid "Select layer in layer list.\n" +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 +msgid "length" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:882 -msgid "Select source image format.\n" +#: ../gui/wxpython/vdigit/preferences.py:426 +msgid "Select lines" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:886 -msgid "Select source projection.\n" +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 +msgid "shorter than" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:890 -msgid "Choose output layer name.\n" +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 +msgid "longer than" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 -msgid "Add default" +#: ../gui/wxpython/vdigit/preferences.py:459 +msgid "dangle" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 -#, python-format -msgid "" -"User defined server with same name as default server <%s> already exists.\n" -"Keeping user defined server" +#: ../gui/wxpython/vdigit/preferences.py:464 +msgid "Select dangles" msgstr "" -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:50 -msgid "GRASS GIS Manage Ground Control Points" +#: ../gui/wxpython/vdigit/preferences.py:513 +msgid "Digitize new feature" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 -msgid "Select group:" +#: ../gui/wxpython/vdigit/preferences.py:519 +msgid "Add new record into table" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 -msgid "Writing CONTROL_POINTS file failed" +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 +#: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 +msgid "Layer" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 -#, python-format -msgid "CONTROL_POINTS file saved for group <%s>" +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 +msgid "Category" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 -msgid "Reading CONTROL_POINTS file failed" +#: ../gui/wxpython/vdigit/preferences.py:528 +msgid "Mode" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 -msgid "" -"Could not calculate RMS Error.\n" -"Possible error with i.ortho.transform." +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 +msgid "Next to use" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 -msgid "" -"Could not calculate new extends.\n" -"Possible error with i.ortho.transform." +#: ../gui/wxpython/vdigit/preferences.py:540 +msgid "Category number" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 -msgid "source Z" +#: ../gui/wxpython/vdigit/preferences.py:560 +msgid "Category mode" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 -msgid "target Z" +#: ../gui/wxpython/vdigit/preferences.py:565 +msgid "Manual entry" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 -msgid "source Z:" +#: ../gui/wxpython/vdigit/preferences.py:565 +msgid "No category" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 -msgid "target Z:" +#: ../gui/wxpython/vdigit/preferences.py:584 +msgid "Delete existing feature(s)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:121 -msgid "1. Select GRASS GIS database directory" +#: ../gui/wxpython/vdigit/preferences.py:590 +msgid "Delete record from table" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:126 -msgid "2. Select GRASS Location" +#: ../gui/wxpython/vdigit/preferences.py:607 +msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:129 -msgid "3. Select GRASS Mapset" +#: ../gui/wxpython/vdigit/preferences.py:613 +msgid "area" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 -msgid "GRASS GIS database directory contains Locations." +#: ../gui/wxpython/vdigit/preferences.py:614 +msgid "perimeter" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" -"All data in one Location is in the same coordinate reference system " -"(projection). One Location can be one project. Location contains Mapsets." +"Note: These settings are stored in the workspace not in the vector digitizer " +"preferences." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 -msgid "" -"Mapset contains GIS data related to one project, task within one project, " -"subregion or user." +#: ../gui/wxpython/vdigit/preferences.py:732 +msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 -msgid "Start &GRASS session" +#: ../gui/wxpython/vdigit/preferences.py:733 +msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 -msgid "&Browse" +#: ../gui/wxpython/vdigit/preferences.py:734 +msgid "Highlight" msgstr "" -#. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 -msgid "&New" +#: ../gui/wxpython/vdigit/preferences.py:735 +msgid "Highlight (duplicates)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 -msgid "Create a new Mapset in selected Location" +#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/psmap/toolbars.py:104 +msgid "Line" msgstr "" -#. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 -msgid "N&ew" +#: ../gui/wxpython/vdigit/preferences.py:738 +msgid "Boundary (no area)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 -msgid "" -"Create a new location using location wizard. After location is created " -"successfully, GRASS session is started." +#: ../gui/wxpython/vdigit/preferences.py:739 +msgid "Boundary (one area)" msgstr "" -#. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 -msgid "Ren&ame" +#: ../gui/wxpython/vdigit/preferences.py:740 +msgid "Boundary (two areas)" msgstr "" -#. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 -msgid "De&lete" +#: ../gui/wxpython/vdigit/preferences.py:741 +msgid "Centroid (in area)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 -msgid "Delete selected location" +#: ../gui/wxpython/vdigit/preferences.py:742 +msgid "Centroid (outside area)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 -msgid "Delete selected mapset" +#: ../gui/wxpython/vdigit/preferences.py:743 +msgid "Centroid (duplicate in area)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 -#, python-format -msgid "GRASS GIS %s startup%s" +#: ../gui/wxpython/vdigit/preferences.py:744 +msgid "Node (one line)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 -msgid "Enter GRASS session" +#: ../gui/wxpython/vdigit/preferences.py:745 +msgid "Node (two lines)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 -msgid "Unable to set GRASS database. Check your locale settings." +#: ../gui/wxpython/vdigit/preferences.py:746 +msgid "Vertex" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 -#, python-format -msgid "ERROR: Location <%s> not found\n" +#: ../gui/wxpython/vdigit/preferences.py:747 +msgid "Area (closed boundary + centroid)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 -#, python-format -msgid "ERROR: Mapset <%s> not found\n" +#: ../gui/wxpython/vdigit/preferences.py:748 +msgid "Direction" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 -#, python-format -msgid "Invalid line in GISRC file (%s):%s\n" +#: ../gui/wxpython/vdigit/preferences.py:818 +msgid "Snapping disabled" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format -msgid "Do you want to import <%(name)s> to the newly created location?" +msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 -msgid "New mapset:" +#: ../gui/wxpython/vdigit/preferences.py:880 +#, python-format +msgid "Vector digitizer settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" -"Mapset is required for valid GRASS location.\n" -"\n" -"This mapset cannot be renamed." +"WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " +"it." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/vdigit/wxdisplay.py:1017 #, python-format msgid "" -"Current name: %s\n" -"\n" -"Enter new name:" +"Topology for vector map <%s> is not available. Topology is required by " +"digitizer. Do you want to rebuild topology (takes some time) and open the " +"vector map for editing?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 -msgid "Message" +#: ../gui/wxpython/vdigit/wxdisplay.py:1023 +msgid "Topology missing" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 -#, python-format -msgid "" -"Unable to rename mapset.\n" -"\n" -"Mapset <%s> already exists in location." +#: ../gui/wxpython/vdigit/toolbars.py:124 +msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 -#, python-format -msgid "" -"Unable to rename mapset.\n" -"\n" -"%s" +#: ../gui/wxpython/vdigit/toolbars.py:151 +msgid "Digitize new point (Ctrl+P)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 -#, python-format -msgid "" -"Unable to rename location.\n" -"\n" -"Location <%s> already exists in GRASS database." +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 +msgid "Left: new point" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 -#, python-format -msgid "" -"Unable to rename location.\n" -"\n" -"%s" +#: ../gui/wxpython/vdigit/toolbars.py:156 +msgid "Digitize new line (Ctrl+L)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 -msgid "" -"Mapset is required for valid GRASS location.\n" -"\n" -"This mapset cannot be deleted." +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 +msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 -#, python-format -msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" -"\n" -"ALL MAPS included in this mapset will be PERMANENTLY DELETED!" +#: ../gui/wxpython/vdigit/toolbars.py:163 +msgid "Digitize new boundary (Ctrl+B)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 -msgid "Unable to delete mapset" +#: ../gui/wxpython/vdigit/toolbars.py:170 +msgid "Digitize new centroid (Ctrl+C)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 -#, python-format -msgid "" -"Do you want to continue with deleting location <%s>?\n" -"\n" -"ALL MAPS included in this location will be PERMANENTLY DELETED!" +#: ../gui/wxpython/vdigit/toolbars.py:175 +msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 -msgid "Unable to delete location" +#: ../gui/wxpython/vdigit/toolbars.py:180 +msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 -#, python-brace-format -msgid "Unicode error detected. Check your locale settings. Details: {0}" +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 +msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 -#, python-format +#: ../gui/wxpython/vdigit/toolbars.py:186 msgid "" -"No GRASS Location found in '%s'. Create a new Location or choose different " -"GRASS database directory." -msgstr "" - -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 -#, python-format -msgid "Path '%s' doesn't exist." +"Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 -msgid "Enter name for new mapset:" +#: ../gui/wxpython/vdigit/toolbars.py:193 +msgid "Delete selected area(s) (Ctrl+F)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 -#, python-format -msgid "Mapset <%s> already exists." +#: ../gui/wxpython/vdigit/toolbars.py:198 +msgid "Display/update attributes (Ctrl+K)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 -#, python-format -msgid "" -"Mapset <%s> is reserved for direct read access to OGR layers. Please " -"consider to use another name for your mapset.\n" -"\n" -"Are you really sure that you want to create this mapset?" +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 +msgid "Left: Select" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 -msgid "Reserved mapset name" +#: ../gui/wxpython/vdigit/toolbars.py:203 +msgid "Display/update categories (Ctrl+J)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 -#, python-format -msgid "Unable to create new mapset: %s" +#: ../gui/wxpython/vdigit/toolbars.py:208 +msgid "Edit selected line/boundary (Ctrl+E)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 -#, python-format -msgid "" -"GRASS is already running in selected mapset <%(mapset)s>\n" -"(file %(lock)s found).\n" -"\n" -"Concurrent use not allowed.\n" -"\n" -"Do you want to try to remove .gislock (note that you need permission for " -"this operation) and continue?" +#: ../gui/wxpython/vdigit/toolbars.py:216 +msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 -msgid "Lock file found" +#: ../gui/wxpython/vdigit/toolbars.py:223 +msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 -msgid "" -"ARE YOU REALLY SURE?\n" -"\n" -"If you really are running another GRASS session doing this could corrupt " -"your data. Have another look in the processor manager just to be sure..." +#: ../gui/wxpython/vdigit/toolbars.py:228 +msgid "Remove selected vertex (Ctrl+X)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 -#, python-format -msgid "" -"Unable to remove '%(lock)s'.\n" -"\n" -"Details: %(reason)s" +#: ../gui/wxpython/vdigit/toolbars.py:232 +msgid "Settings (Ctrl+T)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 -#, python-format -msgid "" -"Name <%(name)s> is not a valid name for location or mapset. Please use only " -"ASCII characters excluding %(chars)s and space." +#: ../gui/wxpython/vdigit/toolbars.py:235 +msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 -msgid "" -"GRASS needs a directory (GRASS database) in which to store its data. Create " -"one now if you have not already done so. A popular choice is \"grassdata\", " -"located in your home directory. Press Browse button to select the directory." +#: ../gui/wxpython/vdigit/toolbars.py:236 +msgid "Quit digitizer and save changes" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 -#, python-format -msgid "Module <%s> does not support turns costs." +#: ../gui/wxpython/vdigit/toolbars.py:239 +msgid "Show manual (Ctrl+H)" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 -#, python-format -msgid "Vector map '%s' does not exist." +#: ../gui/wxpython/vdigit/toolbars.py:240 +msgid "Show Vector Digitizer manual" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 -msgid "Vector map was not chosen." +#: ../gui/wxpython/vdigit/toolbars.py:244 +msgid "Additional tools (copy, flip, connect, etc.)" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 -msgid "arc layer" +#: ../gui/wxpython/vdigit/toolbars.py:249 +msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 -msgid "node layer" +#: ../gui/wxpython/vdigit/toolbars.py:250 +msgid "Undo previous change" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 -msgid "turntable layer" +#: ../gui/wxpython/vdigit/toolbars.py:254 +msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 -msgid "unique categories layer" +#: ../gui/wxpython/vdigit/toolbars.py:255 +msgid "Redo previous change" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 -#, python-format -msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" +#: ../gui/wxpython/vdigit/toolbars.py:441 +msgid "" +"No vector map is open for editing. Please select firsta vector map from the " +"combo box." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 -#, python-format -msgid "Choose existing %s.\n" +#: ../gui/wxpython/vdigit/toolbars.py:717 +msgid "Break selected lines/boundaries at intersection" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 -#, python-format -msgid "" -"Chosen column '%s' does not exist in attribute table of layer '%s' of vector " -"map '%s'.\n" +#: ../gui/wxpython/vdigit/toolbars.py:723 +msgid "Connect selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 -msgid "topology" +#: ../gui/wxpython/vdigit/toolbars.py:728 +msgid "Copy categories" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 -msgid "Start point" +#: ../gui/wxpython/vdigit/toolbars.py:730 +msgid "Copy features from (background) vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 -msgid "End Point" +#: ../gui/wxpython/vdigit/toolbars.py:735 +msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 -msgid "new point" +#: ../gui/wxpython/vdigit/toolbars.py:737 +msgid "Feature type conversion" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:715 -msgid "Arc forward/both direction(s) cost column:" +#: ../gui/wxpython/vdigit/toolbars.py:743 +msgid "Flip selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 -msgid "arc forward/both" +#: ../gui/wxpython/vdigit/toolbars.py:749 +msgid "Merge selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 -msgid "Arc backward direction cost column:" +#: ../gui/wxpython/vdigit/toolbars.py:755 +msgid "Snap selected lines/boundaries (only to nodes)" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 -msgid "arc backward" +#: ../gui/wxpython/vdigit/toolbars.py:760 +msgid "Split line/boundary" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 -msgid "Arcs' cost column (for both directions):" +#: ../gui/wxpython/vdigit/toolbars.py:761 +msgid "Query features" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 -msgid "arc" +#: ../gui/wxpython/vdigit/toolbars.py:763 +msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 -msgid "Node cost column:" +#: ../gui/wxpython/vdigit/toolbars.py:794 +msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 -msgid "node" +#: ../gui/wxpython/vdigit/toolbars.py:952 +msgid "Vector map is not 3D. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format -msgid "Shortest path %s" +msgid "" +"Topology for vector map <%s> is not available. Topology is required by " +"digitizer.\n" +"Do you want to rebuild topology (takes some time) and open the vector map " +"for editing?" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 -msgid "End point" +#: ../gui/wxpython/vdigit/toolbars.py:1064 +msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format -msgid "Traveling salesman %s" +msgid "Please wait, opening vector map <%s> for editing..." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format -msgid "Maximum flow %s" +msgid "" +"Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 -msgid "Source point" +#: ../gui/wxpython/vdigit/toolbars.py:1213 +#, python-format +msgid "Do you want to save changes in vector map <%s>?" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 -msgid "Sink point" +#: ../gui/wxpython/vdigit/toolbars.py:1215 +msgid "Save changes?" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format -msgid "Subnets for nearest centers %s" +msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format -msgid "Steiner tree for the network and given terminals %s" +msgid "Editing of vector map <%s> successfully finished" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 -#, python-format -msgid "Shortest distance via the network %s" +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 +msgid "New vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 -#, python-format -msgid "Cost isolines %s" +#: ../gui/wxpython/vdigit/dialogs.py:93 +msgid "List of categories - right-click to delete" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 -msgid "Overwrite map layer" +#: ../gui/wxpython/vdigit/dialogs.py:126 +msgid "Add new category" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:108 -msgid "Unable to perform analysis." +#: ../gui/wxpython/vdigit/dialogs.py:172 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 +msgid "Apply changes" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 -#, python-format -msgid "" -"Temporary map '%s' with result was changed outside vector network analysis " -"tool.\n" -"Showed result may not correspond original analysis result." +#: ../gui/wxpython/vdigit/dialogs.py:174 +msgid "Ignore changes and close dialog" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 -msgid "Result changed outside" +#: ../gui/wxpython/vdigit/dialogs.py:176 +#: ../gui/wxpython/web_services/dialogs.py:700 +msgid "Apply changes and close dialog" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 -msgid "Map can be created only in current mapset" +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 +msgid "Feature id:" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vdigit/dialogs.py:266 ../gui/wxpython/vdigit/dialogs.py:480 #, python-format -msgid "Vector map %s already exists. Do you want to overwrite it?" +msgid "" +"Unable to add new layer/category <%(layer)s/%(category)s>.\n" +"Layer and category number must be integer.\n" +"Layer number must be greater than zero." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 -msgid "Overwrite vector map" +#: ../gui/wxpython/vdigit/dialogs.py:455 +msgid "Unable to update vector map." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 -msgid "Creation of turntable failed." +#: ../gui/wxpython/vdigit/dialogs.py:617 +#, python-format +msgid "%d lines selected for z bulk-labeling" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 -msgid "Vector map with analysis result does not exist." +#: ../gui/wxpython/vdigit/dialogs.py:621 +msgid "Set value" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 -msgid "Map can be saved only to currently set mapset" +#: ../gui/wxpython/vdigit/dialogs.py:627 +msgid "Starting value" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 -#, python-format -msgid "Please choose '%s' and '%s' point." +#: ../gui/wxpython/vdigit/dialogs.py:633 +msgid "Step" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 -msgid "Please choose at least two points." +#: ../gui/wxpython/vdigit/dialogs.py:667 +msgid "List of duplicates" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 -#, python-format -msgid "" -"Input map '%s' for analysis was changed outside vector network analysis " -"tool.\n" -"Topology column may not correspond to changed situation." +#: ../gui/wxpython/vdigit/dialogs.py:761 +msgid "Feature id" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 -msgid "Input changed outside" +#: ../gui/wxpython/vdigit/dialogs.py:762 +msgid "Layer (Categories)" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 -#, python-format -msgid "" -"Temporary map %s already exists.\n" -"Do you want to continue in analysis and overwrite it?" +#: ../gui/wxpython/vdigit/wxdigit.py:54 +msgid "Digitization Error" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 -msgid "Unable to use ctypes. \n" +#: ../gui/wxpython/vdigit/wxdigit.py:59 +#, python-format +msgid "Unable to open vector map <%s>." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 -msgid "Snapping mode can not be activated." +#: ../gui/wxpython/vdigit/wxdigit.py:61 +msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 -msgid "Do you really want to activate snapping and overwrite it?" +#: ../gui/wxpython/vdigit/wxdigit.py:63 +msgid "Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" -"Temporary map '%s' was changed outside vector analysis tool.\n" -"Do you really want to activate snapping and overwrite it? " +"Writing new feature failed. Operation canceled.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 -msgid "Overwrite map" +#: ../gui/wxpython/vdigit/wxdigit.py:82 +#, python-format +msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:50 -msgid "Insert points from Map Display" +#: ../gui/wxpython/vdigit/wxdigit.py:90 +#, python-format +msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:52 -msgid "Activate snapping to nodes" +#: ../gui/wxpython/vdigit/wxdigit.py:99 +#, python-format +msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:54 -msgid "Activate mode for turns editing" +#: ../gui/wxpython/vdigit/wxdigit.py:109 +#, python-format +msgid "" +"Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:57 -msgid "Activate mode for global turns editing" +#: ../gui/wxpython/vdigit/wxdigit.py:120 +#, python-format +msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:59 -msgid "Add new point" +#: ../gui/wxpython/vdigit/wxdigit.py:128 +#, python-format +msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:60 -msgid "Delete selected point" +#: ../gui/wxpython/vdigit/wxdigit.py:136 +#, python-format +msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:123 -msgid "Execute analysis" +#: ../gui/wxpython/vdigit/wxdigit.py:508 +#, python-format +msgid "Unknown feature type '%s'" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:124 -msgid "Go to previous analysis result" +#: ../gui/wxpython/vdigit/wxdigit.py:513 +msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:125 -msgid "Go to next analysis result" +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 +msgid "" +"Please install Python Imaging Library (PIL)\n" +"for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:126 -msgid "Show analysis result" +#: ../gui/wxpython/mapwin/decorations.py:203 +msgid "Remove text" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:128 -msgid "Save temporary result" +#: ../gui/wxpython/mapwin/decorations.py:204 +msgid "Text properties" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:144 -msgid "Previous analysis result" +#: ../gui/wxpython/mapwin/decorations.py:226 +msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:149 -msgid "Next analysis result" +#: ../gui/wxpython/mapwin/decorations.py:227 +msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:223 -msgid "Available analyses" +#: ../gui/wxpython/mapwin/decorations.py:238 +msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:88 -msgid "Vector Network Analysis Tool" +#: ../gui/wxpython/mapwin/decorations.py:239 +msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:200 -msgid "Point list toolbar" +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 +msgid "Remove legend" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:213 -msgid "Analysis toolbar" +#: ../gui/wxpython/mapwin/decorations.py:251 +msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:253 -msgid "Points for analysis:" +#: ../gui/wxpython/mapwin/decorations.py:263 +msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:257 -msgid "Analysis settings:" +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 +#, python-format +msgid "Property does not exist: %s" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:261 -msgid "Points" +#: ../gui/wxpython/mapwin/base.py:228 +#, python-format +msgid "" +"Error occurred during calling of handler: %s \n" +"Handler was unregistered." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:275 -msgid "Maximum distance of point to the network:" +#: ../gui/wxpython/mapwin/base.py:316 +#, python-format +msgid "" +"Error occurred during unregistration of handler: %s \n" +" Handler was unregistered." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:294 -msgid "Iso lines:" +#: ../gui/wxpython/mapwin/base.py:349 +#, python-format +msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:368 -#: ../gui/wxpython/modules/mcalc_builder.py:155 -msgid "Output" +#: ../gui/wxpython/mapwin/base.py:355 +#, python-format +msgid "" +"Error occurred during unregistration of handler: %s \n" +" Handler was unregistered" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:422 -msgid "Add vector map into layer tree" +#: ../gui/wxpython/mapwin/buffered.py:278 +msgid "Copy coordinates to clipboard" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 -msgid "Input tables" +#: ../gui/wxpython/mapwin/buffered.py:312 +msgid "Resize and move legend" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 -msgid "Result tables" +#: ../gui/wxpython/mapwin/buffered.py:724 +msgid "Please wait, exporting image..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 -msgid "Loading tables..." +#: ../gui/wxpython/mapwin/buffered.py:1036 +msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 -msgid "Creating turntable..." +#: ../gui/wxpython/mapwin/buffered.py:2101 +msgid "Zoom to saved region extents" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 -msgid "Input vector map does not exist." +#: ../gui/wxpython/mapwin/buffered.py:2103 +msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 -msgid "Analysing..." +#: ../gui/wxpython/mapwin/buffered.py:2114 +#, python-format +msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1040 -msgid "Computing nodes..." +#: ../gui/wxpython/mapwin/buffered.py:2143 +msgid "Save display extents to region file" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1244 -msgid "Other settings" +#: ../gui/wxpython/mapwin/buffered.py:2145 +msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1248 -msgid "Point style:" +#: ../gui/wxpython/mapwin/buffered.py:2157 +#, python-format +msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1252 -msgid "Analysis result style:" +#: ../gui/wxpython/mapwin/analysis.py:227 +#: ../gui/wxpython/mapwin/analysis.py:362 +msgid "Measuring finished" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/mapwin/analysis.py:245 +#: ../gui/wxpython/mapwin/analysis.py:374 #, python-format -msgid "Color table style %s:" +msgid "" +"Click and drag with left mouse button to measure.%sDouble click with left " +"button to clear." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 -#, python-format -msgid "Invert colors %s:" +#: ../gui/wxpython/mapwin/analysis.py:253 +msgid "Measuring distance" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 -msgid "Line color:" +#: ../gui/wxpython/mapwin/analysis.py:255 +msgid "Measuring distance:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1286 -msgid "Color for unused point:" +#: ../gui/wxpython/mapwin/analysis.py:266 +#, python-format +msgid "" +"Geodesic distance calculation is not available.\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 -msgid "Color for Start/From/Source/Used point:" +#: ../gui/wxpython/mapwin/analysis.py:303 +#: ../gui/wxpython/mapwin/analysis.py:316 +msgid "segment" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 -msgid "Color for End/To/Sink point:" +#: ../gui/wxpython/mapwin/analysis.py:306 +#: ../gui/wxpython/mapwin/analysis.py:319 +msgid "total distance" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 -msgid "Color for selected point:" +#: ../gui/wxpython/mapwin/analysis.py:309 +msgid "bearing" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 -msgid "Point size:" +#: ../gui/wxpython/mapwin/analysis.py:311 +msgid "degrees (clockwise from grid-north)" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 -msgid "Point width:" +#: ../gui/wxpython/mapwin/analysis.py:380 +msgid "Measuring area:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 -msgid "Snapping threshold in pixels:" +#: ../gui/wxpython/mapwin/analysis.py:397 +msgid "Units not recognized, measurement failed." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 -msgid "Maximum number of results in history:" +#: ../gui/wxpython/mapwin/analysis.py:402 +#: ../gui/wxpython/mapwin/analysis.py:404 +#, python-brace-format +msgid "Area: {area} {unit}\n" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 -msgid "New vector map with turntable" +#: ../gui/wxpython/web_services/dialogs.py:105 +msgid " Server settings " msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 -msgid "Save analysis result" +#: ../gui/wxpython/web_services/dialogs.py:108 +msgid "Server:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 -msgid "Edit intersection turns costs" +#: ../gui/wxpython/web_services/dialogs.py:111 +msgid "&Connect" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 -msgid "Define Global Turn Costs" +#: ../gui/wxpython/web_services/dialogs.py:112 +msgid "Connect to the server" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 -msgid "Invalid value inserted. Operation canceled." +#: ../gui/wxpython/web_services/dialogs.py:116 +msgid "Show advanced connection settings" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 -msgid "Edit point" +#: ../gui/wxpython/web_services/dialogs.py:117 +msgid "Hide advanced connection settings" msgstr "" -#: ../gui/wxpython/rdigit/g.gui.rdigit.py:195 -msgid "Raster map <{}> not found in current mapset." +#: ../gui/wxpython/web_services/dialogs.py:134 +msgid " Layer Manager Settings " msgstr "" -#: ../gui/wxpython/rdigit/g.gui.rdigit.py:212 -msgid "Base raster map <{}> not found in current mapset." +#: ../gui/wxpython/web_services/dialogs.py:138 +msgid "Output layer name:" msgstr "" -#: ../gui/wxpython/rdigit/g.gui.rdigit.py:237 -msgid "Raster Digitizer - GRASS GIS" +#: ../gui/wxpython/web_services/dialogs.py:264 +msgid "Username:" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 -msgid "Please select first the raster map" +#: ../gui/wxpython/web_services/dialogs.py:267 +msgid "Password:" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 -msgid "Right click to finish area" +#: ../gui/wxpython/web_services/dialogs.py:381 +#, python-format +msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 -msgid "Right click to finish line" +#: ../gui/wxpython/web_services/dialogs.py:452 +msgid "Available web services" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 -msgid "Do you want to save changes?" +#: ../gui/wxpython/web_services/dialogs.py:467 +#, python-format +msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 -msgid "Save raster map changes" +#: ../gui/wxpython/web_services/dialogs.py:474 +#, python-format +msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 -msgid "Failed to create backup copy of edited raster map." +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 +msgid "&Add layer" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 -msgid "Failed to create new raster map." +#: ../gui/wxpython/web_services/dialogs.py:540 +msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 -msgid "Rasterizing..." +#: ../gui/wxpython/web_services/dialogs.py:650 +msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 -msgid "Failed to set default color table for edited raster map" +#: ../gui/wxpython/web_services/dialogs.py:699 +msgid "&OK" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:28 -msgid "Digitize area" +#: ../gui/wxpython/web_services/dialogs.py:862 +msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:29 -msgid "Digitize line" +#: ../gui/wxpython/web_services/dialogs.py:873 +msgid "Export region" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:30 -msgid "Digitize point" +#: ../gui/wxpython/web_services/dialogs.py:884 +msgid "Named region" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:31 -msgid "Save raster map" +#: ../gui/wxpython/web_services/dialogs.py:886 +msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:32 -msgid "Undo" -msgstr "" - -#: ../gui/wxpython/rdigit/toolbars.py:47 -msgid "Select raster map" -msgstr "" - -#: ../gui/wxpython/rdigit/toolbars.py:56 -msgid "Set drawing color (not raster cell color)" +#: ../gui/wxpython/web_services/dialogs.py:889 +msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:73 -msgid "Cell value:" +#: ../gui/wxpython/web_services/dialogs.py:892 +msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:86 -msgid "" -"Width of currently digitized line or diameter of a digitized point in map " -"units." +#: ../gui/wxpython/web_services/dialogs.py:897 +msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 -msgid "New raster map" +#: ../gui/wxpython/web_services/dialogs.py:902 +msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:34 -msgid "Create new raster map" +#: ../gui/wxpython/web_services/dialogs.py:916 +msgid "&Save layer" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:54 -msgid "Name for new raster map:" +#: ../gui/wxpython/web_services/dialogs.py:917 +msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:61 -msgid "Optionally select background raster map:" +#: ../gui/wxpython/web_services/dialogs.py:1023 +msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:68 -msgid "New raster map type:" +#: ../gui/wxpython/web_services/dialogs.py:1026 +msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:101 -msgid "Please specify name for a new raster map" +#: ../gui/wxpython/web_services/dialogs.py:1032 +#, python-format +msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:109 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format -msgid "" -"Raster map <%s> already exists in the current mapset. Do you want to " -"overwrite it?" +msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 -msgid "meters" +#: ../gui/wxpython/web_services/dialogs.py:1079 +msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 -msgid "kilometers" +#: ../gui/wxpython/web_services/dialogs.py:1100 +msgid "Unable to fetch data.\n" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 -msgid "miles" +#: ../gui/wxpython/web_services/widgets.py:136 +msgid " Requested data settings " msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 -msgid "feet" +#: ../gui/wxpython/web_services/widgets.py:164 +msgid "Request" msgstr "" -#: ../gui/wxpython/core/units.py:42 -msgid "sq map units" +#: ../gui/wxpython/web_services/widgets.py:169 +msgid "List of layers " msgstr "" -#: ../gui/wxpython/core/units.py:43 -msgid "sq meters" +#: ../gui/wxpython/web_services/widgets.py:187 +msgid "Source projection:" msgstr "" -#: ../gui/wxpython/core/units.py:44 -msgid "sq kilometers" +#: ../gui/wxpython/web_services/widgets.py:249 +msgid "Advanced request settings" msgstr "" -#: ../gui/wxpython/core/units.py:45 -msgid "acres" +#: ../gui/wxpython/web_services/widgets.py:259 +msgid "Order of layers in raster" msgstr "" -#: ../gui/wxpython/core/units.py:46 -msgid "hectares" +#: ../gui/wxpython/web_services/widgets.py:267 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 +msgid "Up" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 -msgid "Unable to parse user toolboxes XML files. Default files will be loaded." +#: ../gui/wxpython/web_services/widgets.py:268 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 +msgid "Down" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 -msgid "Unable to create toolboxes directory." +#: ../gui/wxpython/web_services/widgets.py:274 +msgid "Reprojection method:" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 -msgid "Custom toolboxes" +#: ../gui/wxpython/web_services/widgets.py:282 +msgid "Nearest neighbor" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 -#, python-format -msgid "" -"List of addons cannot be obtained because g.extension failed. Details: %s" +#: ../gui/wxpython/web_services/widgets.py:283 +msgid "Linear interpolation" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 -msgid "Addons" +#: ../gui/wxpython/web_services/widgets.py:284 +msgid "Cubic interpolation" msgstr "" -#: ../gui/wxpython/core/gcmd.py:109 -msgid "Reason" +#: ../gui/wxpython/web_services/widgets.py:285 +msgid "Cubic spline interpolation" msgstr "" -#: ../gui/wxpython/core/gcmd.py:412 -msgid "Execution failed:" +#: ../gui/wxpython/web_services/widgets.py:292 +msgid "Maximum columns to request from server at time:" msgstr "" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 -msgid "Details:" +#: ../gui/wxpython/web_services/widgets.py:301 +msgid "Maximum rows to request from server at time:" msgstr "" -#: ../gui/wxpython/core/gcmd.py:418 ../gui/wxpython/core/gcmd.py:425 -msgid "Error: " +#: ../gui/wxpython/web_services/widgets.py:321 +msgid "Do not request transparent data" msgstr "" -#: ../gui/wxpython/core/gcmd.py:504 -#, python-format -msgid "Unable to exectute command: '%s'" +#: ../gui/wxpython/web_services/widgets.py:341 +msgid "Additional query parameters for server:" msgstr "" -#: ../gui/wxpython/core/utils.py:50 +#: ../gui/wxpython/web_services/widgets.py:542 #, python-format -msgid "Syntax error: %s" +msgid "" +"Unable to download %s capabilities file\n" +"from <%s>:\n" msgstr "" -#: ../gui/wxpython/core/utils.py:340 +#: ../gui/wxpython/web_services/widgets.py:561 #, python-format -msgid "Vector map <%(map)s>: %(msg)s\n" +msgid "" +"%s web service was not found in fetched capabilities file from <%s>:\n" +"%s\n" msgstr "" -#: ../gui/wxpython/core/utils.py:806 -#, python-format -msgid "ERROR: Unable to determine GRASS version. Details: %s" +#: ../gui/wxpython/web_services/widgets.py:834 +msgid "Source image format" msgstr "" -#: ../gui/wxpython/core/utils.py:844 -#, python-format -msgid "Unable to open file '%s'\n" +#: ../gui/wxpython/web_services/widgets.py:875 +msgid "Select layer in layer list.\n" msgstr "" -#: ../gui/wxpython/core/utils.py:852 -#, python-format -msgid "" -"%s: line skipped - unable to parse '%s'\n" -"Reason: %s\n" +#: ../gui/wxpython/web_services/widgets.py:882 +msgid "Select source image format.\n" msgstr "" -#: ../gui/wxpython/core/utils.py:858 -#, python-format -msgid "Duplicated key: %s\n" +#: ../gui/wxpython/web_services/widgets.py:886 +msgid "Select source projection.\n" msgstr "" -#: ../gui/wxpython/core/utils.py:874 -#, python-format -msgid "Unable to create file '%s'\n" +#: ../gui/wxpython/web_services/widgets.py:890 +msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 -#, python-format -msgid "" -"Unable to run command:\n" -"%(cmd)s\n" -"\n" -"Option <%(opt)s>: read from standard input is not supported by wxGUI" +#: ../gui/wxpython/web_services/widgets.py:1154 +msgid "Add default" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format -msgid "Module <%s> not found." +msgid "" +"User defined server with same name as default server <%s> already exists.\n" +"Keeping user defined server" msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 -msgid "" -"Please note that the data are left in inconsistent state and may be corrupted" +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:50 +msgid "GRASS GIS Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 -msgid "Command aborted" +#: ../gui/wxpython/image2target/ii2t_manager.py:586 +msgid "Select group:" msgstr "" -#: ../gui/wxpython/core/gconsole.py:733 -#, python-brace-format -msgid "Command ended with non-zero return code {returncode}" +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 +msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/core/menutree.py:155 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format -msgid "Unknow tag %s" +msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/core/debug.py:46 -#, python-brace-format -msgid "Wx debug level {0}." +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 +msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/core/debug.py:51 -#, python-brace-format +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" -"WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" +"Could not calculate RMS Error.\n" +"Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/core/settings.py:434 -msgid "Segment break" +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 +msgid "" +"Could not calculate new extends.\n" +"Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/core/settings.py:500 -msgid "Data point" +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 +msgid "source Z" msgstr "" -#: ../gui/wxpython/core/settings.py:577 -msgid "animation" +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 +msgid "target Z" msgstr "" -#: ../gui/wxpython/core/settings.py:781 -msgid "Collapse all except PERMANENT and current" +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 +msgid "source Z:" msgstr "" -#: ../gui/wxpython/core/settings.py:782 -msgid "Collapse all except PERMANENT" +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 +msgid "target Z:" msgstr "" -#: ../gui/wxpython/core/settings.py:783 -msgid "Collapse all except current" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:121 +msgid "1. Select GRASS GIS database directory" msgstr "" -#: ../gui/wxpython/core/settings.py:784 -msgid "Collapse all" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:126 +msgid "2. Select GRASS Location" msgstr "" -#: ../gui/wxpython/core/settings.py:785 -msgid "Expand all" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:129 +msgid "3. Select GRASS Mapset" msgstr "" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 -msgid "Edit selected record" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 +msgid "GRASS GIS database directory contains Locations." msgstr "" -#: ../gui/wxpython/core/settings.py:791 -msgid "Display selected" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 +msgid "" +"All data in one Location is in the same coordinate reference system " +"(projection). One Location can be one project. Location contains Mapsets." msgstr "" -#: ../gui/wxpython/core/settings.py:802 -msgid "Classic (labels only)" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 +msgid "" +"Mapset contains GIS data related to one project, task within one project, " +"subregion or user." msgstr "" -#: ../gui/wxpython/core/settings.py:803 -msgid "Combined (labels and tool names)" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 +msgid "Start &GRASS session" msgstr "" -#: ../gui/wxpython/core/settings.py:804 -msgid "Expert (tool names only)" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 +msgid "&Browse" msgstr "" -#: ../gui/wxpython/core/settings.py:810 -msgid "Basic top" +#. GTC New mapset +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 +msgid "&New" msgstr "" -#: ../gui/wxpython/core/settings.py:811 -msgid "Basic left" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 +msgid "Create a new Mapset in selected Location" msgstr "" -#: ../gui/wxpython/core/settings.py:812 -msgid "List left" +#. GTC New location +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 +msgid "N&ew" msgstr "" -#: ../gui/wxpython/core/settings.py:820 -msgid "Zoom and recenter" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 +msgid "" +"Create a new location using location wizard. After location is created " +"successfully, GRASS session is started." msgstr "" -#: ../gui/wxpython/core/settings.py:821 -msgid "Zoom to mouse cursor" +#. GTC Rename location +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 +msgid "Ren&ame" msgstr "" -#: ../gui/wxpython/core/settings.py:822 -msgid "Nothing" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" msgstr "" -#: ../gui/wxpython/core/settings.py:825 -msgid "Scroll forward to zoom in" +#. GTC Delete location +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 +msgid "De&lete" msgstr "" -#: ../gui/wxpython/core/settings.py:826 -msgid "Scroll back to zoom in" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 +msgid "Delete selected location" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 -msgid "box" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 +msgid "Delete selected mapset" msgstr "" -#: ../gui/wxpython/core/settings.py:862 -msgid "sphere" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 +#, python-format +msgid "GRASS GIS %s startup%s" msgstr "" -#: ../gui/wxpython/core/settings.py:863 -msgid "cube" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 +msgid "Enter GRASS session" msgstr "" -#: ../gui/wxpython/core/settings.py:864 -msgid "diamond" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 +msgid "Unable to set GRASS database. Check your locale settings." msgstr "" -#: ../gui/wxpython/core/settings.py:865 -msgid "aster" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 +#, python-format +msgid "ERROR: Location <%s> not found\n" msgstr "" -#: ../gui/wxpython/core/settings.py:866 -msgid "gyro" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 +#, python-format +msgid "ERROR: Mapset <%s> not found\n" msgstr "" -#: ../gui/wxpython/core/settings.py:867 -msgid "histogram" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 +#, python-format +msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/core/settings.py:874 -msgid "cross" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 +#, python-format +msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/core/settings.py:876 -msgid "circle" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 +msgid "New mapset:" msgstr "" -#: ../gui/wxpython/core/settings.py:880 -msgid "Script package" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." msgstr "" -#: ../gui/wxpython/core/settings.py:881 -msgid "PyGRASS" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 +msgid "" +"Mapset is required for valid GRASS location.\n" +"\n" +"This mapset cannot be renamed." msgstr "" -#: ../gui/wxpython/core/settings.py:926 -#, python-brace-format +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 +#, python-format msgid "" -"Unable to read settings file <{path}>:\n" -"{err}" +"Current name: %s\n" +"\n" +"Enter new name:" msgstr "" -#: ../gui/wxpython/core/settings.py:944 -#, python-format -msgid "Unable to read settings file <%s>\n" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 +msgid "Message" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" -"Error: Reading settings from file <%(file)s> failed.\n" -"\t\tDetails: %(detail)s\n" -"\t\tLine: '%(line)s'\n" -msgstr "" - -#: ../gui/wxpython/core/settings.py:992 -msgid "Unable to create settings directory" +"Unable to rename mapset.\n" +"\n" +"Mapset <%s> already exists in location." msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" -"Writing settings to file <%(file)s> failed.\n" +"Unable to rename mapset.\n" "\n" -"Details: %(detail)s" +"%s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 -msgid "Unable to set " +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 +#, python-format +msgid "" +"Unable to rename location.\n" +"\n" +"Location <%s> already exists in GRASS database." msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format -msgid "Unable to parse settings '%s'" +msgid "" +"Unable to rename location.\n" +"\n" +"%s" msgstr "" -======= ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/core/render.py:186 -#, python-format -msgid "<%(name)s>: layer type <%(type)s> is not supported" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 +msgid "" +"Mapset is required for valid GRASS location.\n" +"\n" +"This mapset cannot be deleted." msgstr "" -#: ../gui/wxpython/core/render.py:205 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format -msgid "Command '%s' failed\n" +msgid "" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" +"\n" +"ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/core/render.py:206 -#, python-format -msgid "Details: %s\n" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 +msgid "Unable to delete mapset" msgstr "" -#: ../gui/wxpython/core/render.py:296 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format -msgid "Unsupported map layer type '%s'" +msgid "" +"Do you want to continue with deleting location <%s>?\n" +"\n" +"ALL MAPS included in this location will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/core/render.py:711 -#, python-format -msgid "Rendering failed: %s" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 +msgid "Unable to delete location" msgstr "" -#: ../gui/wxpython/core/render.py:760 -msgid "Rendering aborted" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 +#, python-brace-format +msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/core/render.py:792 -msgid "Downloading data " +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 +#, python-format +msgid "" +"No GRASS Location found in '%s'. Create a new Location or choose different " +"GRASS database directory." msgstr "" -#: ../gui/wxpython/core/render.py:802 -msgid "Rendering & " +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 +#, python-format +msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/core/render.py:804 -msgid "Rendering..." +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 +msgid "Enter name for new mapset:" msgstr "" -#: ../gui/wxpython/core/render.py:847 -msgid "Trying to recover from default region..." +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 +#, python-format +msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/core/render.py:872 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format -msgid "GRASS tool '%s' not found. Unable to start map display window." +msgid "" +"Mapset <%s> is reserved for direct read access to OGR layers. Please " +"consider to use another name for your mapset.\n" +"\n" +"Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/core/render.py:907 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 +msgid "Reserved mapset name" +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format -msgid "Error: Unable to open '%(file)s'. Reason: %(ret)s. wxGUI exited.\n" +msgid "Unable to create new mapset: %s" msgstr "" -#: ../gui/wxpython/core/render.py:916 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" +"GRASS is already running in selected mapset <%(mapset)s>\n" +"(file %(lock)s found).\n" "\n" -"ERROR: Unable to read WIND file: %s\n" +"Concurrent use not allowed.\n" +"\n" +"Do you want to try to remove .gislock (note that you need permission for " +"this operation) and continue?" msgstr "" -#: ../gui/wxpython/core/render.py:1111 -#, python-format -msgid "Unable to zoom to raster map <%s>." +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 +msgid "Lock file found" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> 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:" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 +msgid "" +"ARE YOU REALLY SURE?\n" +"\n" +"If you really are running another GRASS session doing this could corrupt " +"your data. Have another look in the processor manager just to be sure..." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format -msgid "Unable to zoom to vector map <%s>." +msgid "" +"Unable to remove '%(lock)s'.\n" +"\n" +"Details: %(reason)s" msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format -msgid "Unable to zoom to 3d raster map <%s>." +msgid "" +"Name <%(name)s> is not a valid name for location or mapset. Please use only " +"ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -"Unable to get current geographic extent. Force quitting wxGUI. Please " -"manually run g.region to fix the problem." +"GRASS needs a directory (GRASS database) in which to store its data. Create " +"one now if you have not already done so. A popular choice is \"grassdata\", " +"located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/core/workspace.py:1753 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -"Unable to get current geographic extent. Force quiting wxGUI. Please " -"manually run g.region to fix the problem." +#: ../gui/wxpython/vnet/vnet_data.py:157 +#, python-format +msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/core/gcmd.py:101 ../gui/wxpython/core/workspace.py:1710 -#: ../gui/wxpython/gmodeler/frame.py:1178 -#: ../gui/wxpython/location_wizard/wizard.py:736 -#: ../gui/wxpython/location_wizard/wizard.py:920 -#: ../gui/wxpython/location_wizard/wizard.py:2118 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/lmgr/layertree.py:967 -#: ../gui/wxpython/startup/guiutils.py:251 -#: ../gui/wxpython/startup/guiutils.py:304 -#: ../gui/wxpython/gui_core/preferences.py:240 -#: ../gui/wxpython/gui_core/preferences.py:1882 -#: ../gui/wxpython/gui_core/preferences.py:1914 -#: ../gui/wxpython/gui_core/preferences.py:1926 -#: ../gui/wxpython/gui_core/preferences.py:1938 -#: ../gui/wxpython/vdigit/dialogs.py:275 ../gui/wxpython/vdigit/dialogs.py:457 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 -#: ../gui/wxpython/psmap/dialogs.py:5545 -msgid "Error" +#: ../gui/wxpython/vnet/vnet_data.py:164 +#, python-format +msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/core/gcmd.py:114 -msgid "Reason" +#: ../gui/wxpython/vnet/vnet_data.py:166 +msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/core/gcmd.py:124 ../gui/wxpython/core/workspace.py:1731 -#: ../gui/wxpython/mapwin/buffered.py:2159 -#: ../gui/wxpython/wxplot/dialogs.py:945 -msgid "Warning" +#: ../gui/wxpython/vnet/vnet_data.py:174 +msgid "arc layer" msgstr "" -#: ../gui/wxpython/core/gcmd.py:131 ../gui/wxpython/lmgr/frame.py:2305 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 -#: ../gui/wxpython/main_window/frame.py:2346 -msgid "Message" +#: ../gui/wxpython/vnet/vnet_data.py:175 +msgid "node layer" msgstr "" -#: ../gui/wxpython/core/gcmd.py:417 -msgid "Execution failed:" +#: ../gui/wxpython/vnet/vnet_data.py:176 +msgid "turntable layer" msgstr "" -#: ../gui/wxpython/core/gcmd.py:423 ../gui/wxpython/core/gcmd.py:430 -msgid "Error: " +#: ../gui/wxpython/vnet/vnet_data.py:177 +msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/core/gcmd.py:509 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format -msgid "Unable to exectute command: '%s'" +msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/core/gcmd.py:754 ../gui/wxpython/gui_core/forms.py:2982 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format -msgid "Error in %s" +msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 -msgid "Segment break" +#: ../gui/wxpython/vnet/vnet_data.py:197 +#, python-format +msgid "" +"Chosen column '%s' does not exist in attribute table of layer '%s' of vector " +"map '%s'.\n" msgstr "" -#: ../gui/wxpython/core/settings.py:500 -msgid "Data point" +#: ../gui/wxpython/vnet/vnet_data.py:254 +msgid "topology" msgstr "" -#: ../gui/wxpython/core/settings.py:577 -msgid "animation" +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 +msgid "Start point" msgstr "" -#: ../gui/wxpython/core/settings.py:780 -msgid "Collapse all except PERMANENT and current" +#: ../gui/wxpython/vnet/vnet_data.py:256 +msgid "End Point" msgstr "" -#: ../gui/wxpython/core/settings.py:781 -msgid "Collapse all except PERMANENT" +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 +msgid "new point" msgstr "" -#: ../gui/wxpython/core/settings.py:782 -msgid "Collapse all except current" +#: ../gui/wxpython/vnet/vnet_data.py:719 +msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/core/settings.py:783 -msgid "Collapse all" +#: ../gui/wxpython/vnet/vnet_data.py:720 +msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/core/settings.py:784 -msgid "Expand all" +#: ../gui/wxpython/vnet/vnet_data.py:723 +msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/core/settings.py:789 ../gui/wxpython/dbmgr/base.py:1430 -msgid "Edit selected record" +#: ../gui/wxpython/vnet/vnet_data.py:724 +msgid "arc backward" msgstr "" -#: ../gui/wxpython/core/settings.py:790 -msgid "Display selected" +#: ../gui/wxpython/vnet/vnet_data.py:727 +msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/core/settings.py:801 -msgid "Classic (labels only)" +#: ../gui/wxpython/vnet/vnet_data.py:728 +msgid "arc" msgstr "" -#: ../gui/wxpython/core/settings.py:802 -msgid "Combined (labels and tool names)" +#: ../gui/wxpython/vnet/vnet_data.py:731 +msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/core/settings.py:803 -msgid "Expert (tool names only)" +#: ../gui/wxpython/vnet/vnet_data.py:731 +msgid "node" msgstr "" -#: ../gui/wxpython/core/settings.py:809 -msgid "Basic top" +#: ../gui/wxpython/vnet/vnet_data.py:736 +#, python-format +msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/core/settings.py:810 -msgid "Basic left" +#: ../gui/wxpython/vnet/vnet_data.py:738 +msgid "End point" msgstr "" -#: ../gui/wxpython/core/settings.py:811 -msgid "List left" +#: ../gui/wxpython/vnet/vnet_data.py:749 +#, python-format +msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/core/settings.py:819 -msgid "Zoom and recenter" +#: ../gui/wxpython/vnet/vnet_data.py:758 +#, python-format +msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/core/settings.py:820 -msgid "Zoom to mouse cursor" +#: ../gui/wxpython/vnet/vnet_data.py:761 +msgid "Source point" msgstr "" -#: ../gui/wxpython/core/settings.py:821 -msgid "Nothing" +#: ../gui/wxpython/vnet/vnet_data.py:762 +msgid "Sink point" msgstr "" -#: ../gui/wxpython/core/settings.py:824 -msgid "Scroll forward to zoom in" +#: ../gui/wxpython/vnet/vnet_data.py:770 +#, python-format +msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/core/settings.py:825 -msgid "Scroll back to zoom in" +#: ../gui/wxpython/vnet/vnet_data.py:779 +#, python-format +msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/core/settings.py:860 ../gui/wxpython/core/settings.py:874 -msgid "box" +#: ../gui/wxpython/vnet/vnet_data.py:791 +#, python-format +msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/core/settings.py:861 -msgid "sphere" +#: ../gui/wxpython/vnet/vnet_data.py:800 +#, python-format +msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/core/settings.py:862 -msgid "cube" +#: ../gui/wxpython/vnet/vnet_data.py:881 +msgid "Overwrite map layer" msgstr "" -#: ../gui/wxpython/core/settings.py:863 -msgid "diamond" +#: ../gui/wxpython/vnet/vnet_core.py:108 +msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/core/settings.py:864 -msgid "aster" +#: ../gui/wxpython/vnet/vnet_core.py:227 +#, python-format +msgid "" +"Temporary map '%s' with result was changed outside vector network analysis " +"tool.\n" +"Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/core/settings.py:865 -msgid "gyro" +#: ../gui/wxpython/vnet/vnet_core.py:233 +msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/core/settings.py:866 -msgid "histogram" +#: ../gui/wxpython/vnet/vnet_core.py:271 +msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/core/settings.py:873 -msgid "cross" +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 +#, python-format +msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/core/settings.py:875 -msgid "circle" +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 +msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/core/settings.py:920 -#, python-brace-format -msgid "" -"Unable to read settings file <{path}>:\n" -"{err}" +#: ../gui/wxpython/vnet/vnet_core.py:308 +msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/core/settings.py:938 -#, python-format -msgid "Unable to read settings file <%s>\n" +#: ../gui/wxpython/vnet/vnet_core.py:328 +msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/core/settings.py:965 +#: ../gui/wxpython/vnet/vnet_core.py:348 +msgid "Map can be saved only to currently set mapset" +msgstr "" + +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format -msgid "" -"Error: Reading settings from file <%(file)s> failed.\n" -"\t\tDetails: %(detail)s\n" -"\t\tLine: '%(line)s'\n" +msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/core/settings.py:986 -msgid "Unable to create settings directory" +#: ../gui/wxpython/vnet/vnet_core.py:662 +msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/core/settings.py:996 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" -"Writing settings to file <%(file)s> failed.\n" -"\n" -"Details: %(detail)s" +"Input map '%s' for analysis was changed outside vector network analysis " +"tool.\n" +"Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/core/settings.py:1105 -msgid "Unable to set " +#: ../gui/wxpython/vnet/vnet_core.py:958 +msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/core/settings.py:1143 ../gui/wxpython/core/settings.py:1164 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format -msgid "Unable to parse settings '%s'" +msgid "" +"Temporary map %s already exists.\n" +"Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/core/utils.py:51 -#, python-format -msgid "Syntax error: %s" +#: ../gui/wxpython/vnet/vnet_core.py:1053 +msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/core/utils.py:338 -#, python-format -msgid "Vector map <%(map)s>: %(msg)s\n" +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 +msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/core/utils.py:802 -#, python-format -msgid "ERROR: Unable to determine GRASS version. Details: %s" +#: ../gui/wxpython/vnet/vnet_core.py:1087 +msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/core/utils.py:840 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format -msgid "Unable to open file '%s'\n" +msgid "" +"Temporary map '%s' was changed outside vector analysis tool.\n" +"Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/core/utils.py:848 -#, python-format -msgid "" -"%s: line skipped - unable to parse '%s'\n" -"Reason: %s\n" +#: ../gui/wxpython/vnet/vnet_core.py:1101 +msgid "Overwrite map" msgstr "" -#: ../gui/wxpython/core/utils.py:854 -#, python-format -msgid "Duplicated key: %s\n" +#: ../gui/wxpython/vnet/toolbars.py:50 +msgid "Insert points from Map Display" msgstr "" -#: ../gui/wxpython/core/utils.py:870 -#, python-format -msgid "Unable to create file '%s'\n" +#: ../gui/wxpython/vnet/toolbars.py:52 +msgid "Activate snapping to nodes" msgstr "" -#: ../gui/wxpython/core/utils.py:955 ../gui/wxpython/gui_core/forms.py:1910 -msgid "Select Color" +#: ../gui/wxpython/vnet/toolbars.py:54 +msgid "Activate mode for turns editing" msgstr "" -#: ../gui/wxpython/core/gconsole.py:532 -#, python-format -msgid "" -"Unable to run command:\n" -"%(cmd)s\n" -"\n" -"Option <%(opt)s>: read from standard input is not supported by wxGUI" +#: ../gui/wxpython/vnet/toolbars.py:57 +msgid "Activate mode for global turns editing" msgstr "" -#: ../gui/wxpython/core/gconsole.py:556 -#, python-format -msgid "Module <%s> not found." +#: ../gui/wxpython/vnet/toolbars.py:59 +msgid "Add new point" msgstr "" -#: ../gui/wxpython/core/gconsole.py:698 ../gui/wxpython/gmodeler/frame.py:294 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/vnet/toolbars.py:60 +msgid "Delete selected point" msgstr "" -#: ../gui/wxpython/core/gconsole.py:701 ../gui/wxpython/gmodeler/frame.py:297 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/vnet/toolbars.py:123 +msgid "Execute analysis" msgstr "" -#: ../gui/wxpython/core/gconsole.py:707 ../gui/wxpython/gmodeler/model.py:1145 -#: ../gui/wxpython/gmodeler/model.py:1252 ../gui/wxpython/gmodeler/frame.py:303 -#: ../gui/wxpython/startup/guiutils.py:582 -#: ../gui/wxpython/gui_core/ghelp.py:244 -msgid "unknown" +#: ../gui/wxpython/vnet/toolbars.py:124 +msgid "Go to previous analysis result" msgstr "" -#: ../gui/wxpython/core/gconsole.py:713 -msgid "" -"Please note that the data are left in inconsistent state and may be corrupted" +#: ../gui/wxpython/vnet/toolbars.py:125 +msgid "Go to next analysis result" msgstr "" -#: ../gui/wxpython/core/gconsole.py:717 -msgid "Command aborted" +#: ../gui/wxpython/vnet/toolbars.py:126 +msgid "Show analysis result" msgstr "" -#: ../gui/wxpython/core/gconsole.py:719 ../gui/wxpython/gmodeler/frame.py:310 -msgid "Command finished" +#: ../gui/wxpython/vnet/toolbars.py:128 +msgid "Save temporary result" msgstr "" -#: ../gui/wxpython/core/gconsole.py:821 -#, python-format -msgid "" -"Unable to write file '%(filePath)s'.\n" -"\n" -"Details: %(error)s" +#: ../gui/wxpython/vnet/toolbars.py:144 +msgid "Previous analysis result" msgstr "" -#: ../gui/wxpython/core/workspace.py:1709 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#, python-format -msgid "Unable to open file <%s> for reading." +#: ../gui/wxpython/vnet/toolbars.py:149 +msgid "Next analysis result" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/core/workspace.py:1726 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/core/workspace.py:1770 -======= -#: ../gui/wxpython/core/workspace.py:1726 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/core/workspace.py:1726 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-format -msgid "" -"Some lines were skipped when reading settings from file <%(file)s>.\n" -"See 'Command output' window for details.\n" -"\n" -"Number of skipped lines: %(line)d" +#: ../gui/wxpython/vnet/toolbars.py:223 +msgid "Available analyses" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/core/workspace.py:1976 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/core/workspace.py:2019 -======= -#: ../gui/wxpython/core/workspace.py:1976 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/core/workspace.py:1976 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-format -msgid " row %d:" +#: ../gui/wxpython/vnet/dialogs.py:88 +msgid "Vector Network Analysis Tool" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/mapdisp/main.py:190 -#, python-format -msgid "Unsupported command %s." +#: ../gui/wxpython/vnet/dialogs.py:200 +msgid "Point list toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 -#, python-format -msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" +#: ../gui/wxpython/vnet/dialogs.py:213 +msgid "Analysis toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 -#, python-format -msgid "Starting map display <%s>..." +#: ../gui/wxpython/vnet/dialogs.py:253 +msgid "Points for analysis:" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 -#, python-format -msgid "Unable to create file <%s>" +#: ../gui/wxpython/vnet/dialogs.py:257 +msgid "Analysis settings:" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:674 -#, python-format -msgid "Stopping map display <%s>..." +#: ../gui/wxpython/vnet/dialogs.py:261 +msgid "Points" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:145 -msgid "Map window test frame" +#: ../gui/wxpython/vnet/dialogs.py:275 +msgid "Maximum distance of point to the network:" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 -msgid "Map display test" +#: ../gui/wxpython/vnet/dialogs.py:294 +msgid "Iso lines:" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 -msgid "Map window API test frame" +#: ../gui/wxpython/vnet/dialogs.py:368 +#: ../gui/wxpython/modules/mcalc_builder.py:155 +msgid "Output" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 -msgid "Map window distance measurement test frame" +#: ../gui/wxpython/vnet/dialogs.py:423 +msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 -msgid "Map window profile tool test frame" +#: ../gui/wxpython/vnet/dialogs.py:544 +msgid "Input tables" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 -msgid "Map window rlisetup test frame" +#: ../gui/wxpython/vnet/dialogs.py:573 +msgid "Result tables" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 -#, python-format -msgid "Unknown value %s of test parameter." +#: ../gui/wxpython/vnet/dialogs.py:589 +msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 -msgid "Enable/disable auto-rendering" +#: ../gui/wxpython/vnet/dialogs.py:724 +msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:120 -msgid "" -"Align region extent based on display size from center point. Default value " -"for new map displays can be set up in 'User GUI settings' dialog." +#: ../gui/wxpython/vnet/dialogs.py:900 +msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:158 -msgid "" -"Constrain display resolution to computational region settings. Default value " -"for new map displays can be set up in 'User GUI settings' dialog." +#: ../gui/wxpython/vnet/dialogs.py:927 +msgid "Analysing..." msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:196 -msgid "Show computational extent" +#: ../gui/wxpython/vnet/dialogs.py:1047 +msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:202 -msgid "" -"Show/hide computational region extent (set with g.region). Display region " -"drawn as a blue box inside the computational region, computational region " -"inside a display region as a red box)." +#: ../gui/wxpython/vnet/dialogs.py:1251 +msgid "Other settings" msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:243 -msgid "Display coordinates in different CRS" +#: ../gui/wxpython/vnet/dialogs.py:1255 +msgid "Point style:" msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:249 -msgid "" -"Reproject coordinates displayed in the statusbar. Coordinate reference " -"system can be specified in GUI preferences dialog (tab 'Projection')" +#: ../gui/wxpython/vnet/dialogs.py:1259 +msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:274 -#, python-brace-format -msgid "{label} (EPSG: {epsg})" +#: ../gui/wxpython/vnet/dialogs.py:1268 +#, python-format +msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/mapdisp/properties.py:433 -msgid "Status bar" +#: ../gui/wxpython/vnet/dialogs.py:1284 +#, python-format +msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:399 -msgid "Render" +#: ../gui/wxpython/vnet/dialogs.py:1292 +msgid "Line color:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:437 -msgid "Map scale" +#: ../gui/wxpython/vnet/dialogs.py:1293 +msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:461 -msgid "" -"As everyone's monitors and resolutions are set differently these values are " -"not true map scales, but should get you into the right neighborhood." +#: ../gui/wxpython/vnet/dialogs.py:1294 +msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 -msgid "Go to XY coordinates" +#: ../gui/wxpython/vnet/dialogs.py:1295 +msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 -msgid "Projection not defined (check the settings)" +#: ../gui/wxpython/vnet/dialogs.py:1296 +msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 -msgid "Error in projection (check the settings)" +#: ../gui/wxpython/vnet/dialogs.py:1308 +msgid "Point size:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:706 -msgid "Display geometry" +#: ../gui/wxpython/vnet/dialogs.py:1309 +msgid "Point width:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:735 -msgid "Coordinates" +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 +msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:825 -msgid "Display extent" -msgstr "" - -#: ../gui/wxpython/mapdisp/toolbars.py:34 -msgid "Select vector feature(s)" -msgstr "" - -#: ../gui/wxpython/mapdisp/toolbars.py:35 -msgid "Select features interactively from vector map" -msgstr "" - -#: ../gui/wxpython/mapdisp/toolbars.py:37 -msgid "Add scale bar" -msgstr "" - -#: ../gui/wxpython/mapdisp/toolbars.py:38 -msgid "Add raster legend" +#: ../gui/wxpython/vnet/dialogs.py:1311 +msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:39 -msgid "Add vector legend" +#: ../gui/wxpython/vnet/dialogs.py:1513 +msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:43 -msgid "Analyze map" +#: ../gui/wxpython/vnet/dialogs.py:1670 +msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:44 -msgid "Measuring, profiling, histogramming, ..." +#: ../gui/wxpython/vnet/dialogs.py:1785 +msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:46 -msgid "Measure distance" +#: ../gui/wxpython/vnet/dialogs.py:1825 +msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:47 -msgid "Measure area" +#: ../gui/wxpython/vnet/widgets.py:402 +msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:48 -msgid "Profile surface map" +#: ../gui/wxpython/vnet/widgets.py:559 +msgid "Edit point" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:51 -msgid "Create bivariate scatterplot of raster maps" +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:195 +msgid "Raster map <{}> not found in current mapset." msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:55 -msgid "Create histogram of raster map" +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:212 +msgid "Base raster map <{}> not found in current mapset." msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:63 -msgid "Rotate 3D scene" +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:237 +msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:64 -msgid "Drag with mouse to rotate 3D scene" +#: ../gui/wxpython/rdigit/controller.py:122 +msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:70 -msgid "" -"Drag with mouse, hold Ctrl down for different mode or Shift to accelerate" +#: ../gui/wxpython/rdigit/controller.py:155 +msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:74 -msgid "Click mouse to zoom" +#: ../gui/wxpython/rdigit/controller.py:160 +msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:75 -msgid "Click mouse to unzoom" +#: ../gui/wxpython/rdigit/controller.py:294 +msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 -msgid "2D view" +#: ../gui/wxpython/rdigit/controller.py:295 +msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 -msgid "3D view" +#: ../gui/wxpython/rdigit/controller.py:383 +msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:107 -msgid "3D view mode not available" +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 +msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:108 -#: ../gui/wxpython/mapdisp/toolbars.py:120 -#, python-format -msgid "Reason: %s" +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 +msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:119 -msgid "Vector digitizer not available" +#: ../gui/wxpython/rdigit/controller.py:619 +msgid "Failed to set default color table for edited raster map" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:123 -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 " -"can use \"v.edit\" for non-interactive editing from the Develop vector map " -"menu." +#: ../gui/wxpython/rdigit/toolbars.py:28 +msgid "Digitize area" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 -#, python-format -msgid "" -"Failed to run command '%(command)s'. Details:\n" -"%(error)s" +#: ../gui/wxpython/rdigit/toolbars.py:29 +msgid "Digitize line" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 -msgid "Hide toolbars" +#: ../gui/wxpython/rdigit/toolbars.py:30 +msgid "Digitize point" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 -msgid "Show toolbars" +#: ../gui/wxpython/rdigit/toolbars.py:31 +msgid "Save raster map" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 -msgid "Hide statusbar" +#: ../gui/wxpython/rdigit/toolbars.py:32 +msgid "Undo" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 -msgid "Show statusbar" +#: ../gui/wxpython/rdigit/toolbars.py:47 +msgid "Select raster map" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 -#, python-format -msgid "" -"Unable to start wxGUI vector digitizer.\n" -"Details: %s" +#: ../gui/wxpython/rdigit/toolbars.py:56 +msgid "Set drawing color (not raster cell color)" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 -msgid "Vector Digitizer Toolbar" +#: ../gui/wxpython/rdigit/toolbars.py:73 +msgid "Cell value:" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 -#, python-format +#: ../gui/wxpython/rdigit/toolbars.py:86 msgid "" -"Unable to switch to 3D display mode.\n" -"The Nviz python extension was not found or loaded properly.\n" -"Switching back to 2D display mode.\n" -"\n" -"Details: %s" +"Width of currently digitized line or diameter of a digitized point in map " +"units." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:473 -msgid "Starting 3D view mode..." +#: ../gui/wxpython/rdigit/toolbars.py:168 +msgid "New raster map" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:475 -msgid "Please wait, loading data..." +#: ../gui/wxpython/rdigit/dialogs.py:34 +msgid "Create new raster map" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:564 -msgid "Please wait, unloading data..." +#: ../gui/wxpython/rdigit/dialogs.py:54 +msgid "Name for new raster map:" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 -msgid "Switching back to 2D view mode..." +#: ../gui/wxpython/rdigit/dialogs.py:61 +msgid "Optionally select background raster map:" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 -msgid "Failed to run d.to.rast:\n" +#: ../gui/wxpython/rdigit/dialogs.py:68 +msgid "New raster map type:" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 -msgid "d.to.rast can be used only in 2D mode." +#: ../gui/wxpython/rdigit/dialogs.py:101 +msgid "Please specify name for a new raster map" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/rdigit/dialogs.py:109 #, python-format -msgid "Vector map <%s> opened for editing - skipped." +msgid "" +"Raster map <%s> already exists in the current mapset. Do you want to " +"overwrite it?" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 -#, python-brace-format -msgid "" -"Failed to query vector map(s) <{maps}>. Check database settings and topology." +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 +msgid "meters" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 -msgid "Set computational region extent from display" +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 +msgid "kilometers" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 -msgid "Set computational region extent interactively" +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 +msgid "miles" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 -msgid "Set computational region from named region" +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 +msgid "feet" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 -msgid "Save computational region to named region" +#: ../gui/wxpython/core/units.py:42 +msgid "sq map units" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 -msgid "Raster Digitizer Toolbar" +#: ../gui/wxpython/core/units.py:43 +msgid "sq meters" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:88 -msgid "Check all" +#: ../gui/wxpython/core/units.py:44 +msgid "sq kilometers" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:91 -msgid "Clear all" +#: ../gui/wxpython/core/units.py:45 +msgid "acres" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:151 -msgid "Enter vector attribute values" +#: ../gui/wxpython/core/units.py:46 +msgid "hectares" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:319 -msgid "Bad color format. Use color format '0:0:0'" +#: ../gui/wxpython/core/toolboxes.py:199 +msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:421 -msgid "Select vector map:" +#: ../gui/wxpython/core/toolboxes.py:251 +msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:439 -msgid "Import or export color table:" +#: ../gui/wxpython/core/toolboxes.py:469 +msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:448 -msgid "Choose file to load color table" +#: ../gui/wxpython/core/toolboxes.py:497 +#, python-format +msgid "" +"List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:449 -msgid "Load" +#: ../gui/wxpython/core/toolboxes.py:557 +msgid "Addons" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:450 -msgid "Type filename or click to choose file and load color table" +#: ../gui/wxpython/core/gcmd.py:109 +msgid "Reason" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:460 -msgid "Choose file to save color table" +#: ../gui/wxpython/core/gcmd.py:412 +msgid "Execution failed:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:461 -msgid "Type filename or click to choose file and save color table" +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 +msgid "Details:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:475 -msgid "&Set" +#: ../gui/wxpython/core/gcmd.py:418 ../gui/wxpython/core/gcmd.py:425 +msgid "Error: " msgstr "" -#: ../gui/wxpython/modules/colorrules.py:484 -msgid "Load color table:" +#: ../gui/wxpython/core/gcmd.py:504 +#, python-format +msgid "Unable to exectute command: '%s'" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:491 -msgid "Load color table from file:" +#: ../gui/wxpython/core/utils.py:50 +#, python-format +msgid "Syntax error: %s" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:497 -msgid "Save color table to file:" +#: ../gui/wxpython/core/utils.py:340 +#, python-format +msgid "Vector map <%(map)s>: %(msg)s\n" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:527 -msgid "Reload default table" +#: ../gui/wxpython/core/utils.py:806 +#, python-format +msgid "ERROR: Unable to determine GRASS version. Details: %s" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:587 -msgid "Show preview of map (current Map Display extent is used)." +#: ../gui/wxpython/core/utils.py:844 +#, python-format +msgid "Unable to open file '%s'\n" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:622 -#: ../gui/wxpython/modules/colorrules.py:1938 -msgid "No valid color rules given." +#: ../gui/wxpython/core/utils.py:852 +#, python-format +msgid "" +"%s: line skipped - unable to parse '%s'\n" +"Reason: %s\n" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:671 +#: ../gui/wxpython/core/utils.py:858 #, python-format -msgid "File <%s> already already exists. Do you want to overwrite it?" +msgid "Duplicated key: %s\n" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:718 -msgid "Invalid color table format" +#: ../gui/wxpython/core/utils.py:874 +#, python-format +msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:795 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format -msgid "Invalid rule value '%s'. Unable to apply color table." +msgid "" +"Unable to run command:\n" +"%(cmd)s\n" +"\n" +"Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:885 -msgid "Create new color table for raster map" +#: ../gui/wxpython/core/gconsole.py:602 +#, python-format +msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:979 -msgid "Enter raster category values or percents" +#: ../gui/wxpython/core/gconsole.py:757 +msgid "" +"Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:983 -#: ../gui/wxpython/modules/colorrules.py:1685 -#: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 -msgid "range" +#: ../gui/wxpython/core/gconsole.py:761 +msgid "Command aborted" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:985 -msgid "fp range" +#: ../gui/wxpython/core/gconsole.py:764 +#, python-brace-format +msgid "Command ended with non-zero return code {returncode}" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:987 +#: ../gui/wxpython/core/menutree.py:155 #, python-format -msgid "Enter raster category values or percents (%(range)s = %(min)d-%(max)d)" +msgid "Unknow tag %s" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1094 -msgid "Create new color rules for vector map" +#: ../gui/wxpython/core/debug.py:46 +#, python-brace-format +msgid "Wx debug level {0}." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1106 -#: ../gui/wxpython/modules/colorrules.py:1704 -msgid "Enter vector attribute values or percents:" +#: ../gui/wxpython/core/debug.py:51 +#, python-brace-format +msgid "" +"WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1108 -#: ../gui/wxpython/modules/colorrules.py:1706 -msgid "Enter vector attribute values:" +#: ../gui/wxpython/core/settings.py:438 +msgid "Segment break" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1119 -msgid "Select vector columns" +#: ../gui/wxpython/core/settings.py:504 +msgid "Data point" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1121 -msgid "Layer:" +#: ../gui/wxpython/core/settings.py:581 +msgid "animation" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1122 -msgid "Attribute column:" +#: ../gui/wxpython/core/settings.py:785 +msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1125 -msgid "Load color from column:" +#: ../gui/wxpython/core/settings.py:786 +msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1125 -msgid "Save color to column:" +#: ../gui/wxpython/core/settings.py:787 +msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1127 -msgid "Load size from column:" +#: ../gui/wxpython/core/settings.py:788 +msgid "Collapse all" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1127 -msgid "Save size to column:" +#: ../gui/wxpython/core/settings.py:789 +msgid "Expand all" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1129 -msgid "Load width from column:" +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 +msgid "Edit selected record" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1129 -msgid "Save width to column:" +#: ../gui/wxpython/core/settings.py:795 +msgid "Display selected" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1135 -msgid "Use color column instead of color table:" +#: ../gui/wxpython/core/settings.py:806 +msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 -msgid "Add column" +#: ../gui/wxpython/core/settings.py:807 +msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1148 -msgid "Add GRASSRGB column to current attribute table." +#: ../gui/wxpython/core/settings.py:808 +msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1195 -#: ../gui/wxpython/modules/colorrules.py:1244 -msgid "Import or export color table" +#: ../gui/wxpython/core/settings.py:814 +msgid "Basic top" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1260 -#, python-format -msgid "" -"Database connection for vector map <%s> is not defined in DB file. Do you " -"want to create and connect new attribute table?" +#: ../gui/wxpython/core/settings.py:815 +msgid "Basic left" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1265 -msgid "No database connection defined" +#: ../gui/wxpython/core/settings.py:816 +msgid "List left" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1341 -#, python-format -msgid "" -"Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " -"table cannot be edited." +#: ../gui/wxpython/core/settings.py:824 +msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1536 -#, python-format -msgid "%s column already exists." +#: ../gui/wxpython/core/settings.py:825 +msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1575 -msgid "Please wait, loading data from attribute table..." +#: ../gui/wxpython/core/settings.py:826 +msgid "Nothing" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1640 -#, python-format -msgid "" -"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?" +#: ../gui/wxpython/core/settings.py:829 +msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1646 -msgid "Too many records" +#: ../gui/wxpython/core/settings.py:830 +msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1698 -#, python-format -msgid "Enter vector attribute values or percents %s:" +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 +msgid "box" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1701 -#, python-format -msgid "Enter vector attribute values %s:" +#: ../gui/wxpython/core/settings.py:866 +msgid "sphere" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1843 -msgid "Please select column to save values to." +#: ../gui/wxpython/core/settings.py:867 +msgid "cube" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1880 -msgid "No color column defined. Operation canceled." +#: ../gui/wxpython/core/settings.py:868 +msgid "diamond" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1923 -msgid "Thematic mapping for vector map in 3D view" -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/core/menutree.py:162 -#, python-format -msgid "Unknow tag %s" +#: ../gui/wxpython/core/settings.py:869 +msgid "aster" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/vdigit/preferences.py:197 -msgid "map units" +#: ../gui/wxpython/core/settings.py:870 +msgid "gyro" msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 -msgid "meters" +#: ../gui/wxpython/core/settings.py:871 +msgid "histogram" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 -msgid "kilometers" +#: ../gui/wxpython/core/settings.py:878 +msgid "cross" msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:111 -msgid "miles" +#: ../gui/wxpython/core/settings.py:880 +msgid "circle" msgstr "" -#: ../gui/wxpython/core/units.py:39 ../gui/wxpython/psmap/utils.py:110 -msgid "feet" +#: ../gui/wxpython/core/settings.py:884 +msgid "Script package" msgstr "" -#: ../gui/wxpython/core/units.py:43 -msgid "sq map units" +#: ../gui/wxpython/core/settings.py:885 +msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/units.py:44 -msgid "sq meters" +#: ../gui/wxpython/core/settings.py:930 +#, python-brace-format +msgid "" +"Unable to read settings file <{path}>:\n" +"{err}" msgstr "" -#: ../gui/wxpython/core/units.py:45 -msgid "sq kilometers" +#: ../gui/wxpython/core/settings.py:948 +#, python-format +msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/units.py:46 -msgid "acres" +#: ../gui/wxpython/core/settings.py:975 +#, python-format +msgid "" +"Error: Reading settings from file <%(file)s> failed.\n" +"\t\tDetails: %(detail)s\n" +"\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/units.py:47 -msgid "hectares" +#: ../gui/wxpython/core/settings.py:996 +msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:198 -msgid "Unable to parse user toolboxes XML files. Default files will be loaded." +#: ../gui/wxpython/core/settings.py:1006 +#, python-format +msgid "" +"Writing settings to file <%(file)s> failed.\n" +"\n" +"Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:247 -msgid "Unable to create toolboxes directory." +#: ../gui/wxpython/core/settings.py:1115 +msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/toolboxes.py:472 -msgid "Custom toolboxes" +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 +#, python-format +msgid "Unable to parse settings '%s'" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:498 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/core/render.py:186 #, python-format -msgid "" -"List of addons cannot be obtained because g.extension failed. Details: %s" +msgid "<%(name)s>: layer type <%(type)s> is not supported" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:558 -msgid "Addons" +#: ../gui/wxpython/core/render.py:205 +#, python-format +msgid "Command '%s' failed\n" msgstr "" -#: ../gui/wxpython/core/debug.py:46 -#, python-brace-format -msgid "Wx debug level {0}." +#: ../gui/wxpython/core/render.py:206 +#, python-format +msgid "Details: %s\n" msgstr "" -#: ../gui/wxpython/core/debug.py:51 -#, python-brace-format -msgid "" -"WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" +#: ../gui/wxpython/core/render.py:296 +#, python-format +msgid "Unsupported map layer type '%s'" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:45 -#: ../gui/wxpython/lmgr/workspace.py:178 +#: ../gui/wxpython/core/render.py:711 #, python-format -msgid "" -"Reading workspace file <%s> failed.\n" -"Invalid file, unable to parse XML document." +msgid "Rendering failed: %s" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:58 -#, python-format -msgid "No 3d view information in workspace file <%s>." +#: ../gui/wxpython/core/render.py:760 +msgid "Rendering aborted" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:314 -msgid "Please add only one layer in the list." +#: ../gui/wxpython/core/render.py:792 +msgid "Downloading data " msgstr "" -#: ../gui/wxpython/animation/nviztask.py:320 -msgid "No map series nor space-time dataset is added." +#: ../gui/wxpython/core/render.py:802 +msgid "Rendering & " msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 -msgid "Change animation speed" +#: ../gui/wxpython/core/render.py:804 +msgid "Rendering..." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 -msgid "Play forward" +#: ../gui/wxpython/core/render.py:847 +msgid "Trying to recover from default region..." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 -msgid "Play back" -msgstr "" - -#: ../gui/wxpython/animation/toolbars.py:30 ../gui/wxpython/nviz/tools.py:513 -msgid "Stop" -msgstr "" - -#: ../gui/wxpython/animation/toolbars.py:31 ../gui/wxpython/nviz/tools.py:511 -msgid "Pause" -msgstr "" - -#: ../gui/wxpython/animation/toolbars.py:32 -msgid "Repeat" -msgstr "" - -#: ../gui/wxpython/animation/toolbars.py:34 -msgid "Play back and forward" -msgstr "" - -#: ../gui/wxpython/animation/toolbars.py:37 -#: ../gui/wxpython/animation/dialogs.py:349 -msgid "Add new animation" +#: ../gui/wxpython/core/render.py:872 +#, python-format +msgid "GRASS tool '%s' not found. Unable to start map display window." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 -#: ../gui/wxpython/animation/toolbars.py:42 -msgid "Add, edit or remove animation" +#: ../gui/wxpython/core/render.py:907 +#, python-format +msgid "Error: Unable to open '%(file)s'. Reason: %(ret)s. wxGUI exited.\n" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 -#: ../gui/wxpython/animation/dialogs.py:932 -msgid "Export animation" +#: ../gui/wxpython/core/render.py:916 +#, python-format +msgid "" +"\n" +"ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 -msgid "Add space-time dataset or series of map layers" +#: ../gui/wxpython/core/render.py:1112 +#, python-format +msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 -msgid "Add space-time dataset or series of map layers for animation" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +#: ../gui/wxpython/core/render.py:1119 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> 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:" msgstr "" -#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 -#: ../gui/wxpython/animation/temporal_manager.py:247 -#: ../gui/wxpython/timeline/frame.py:485 ../gui/wxpython/tplot/frame.py:1167 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 -msgid "Space time dataset <%s> not found." +msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 -#: ../gui/wxpython/lmgr/layertree.py:2076 ../gui/wxpython/mapswipe/frame.py:460 +#: ../gui/wxpython/core/render.py:1126 #, python-format -msgid "Map <%s> not found." -msgstr "" - -#: ../gui/wxpython/animation/utils.py:188 -msgid "The number of maps in space-time datasets has to be the same." +msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/animation/utils.py:194 +#: ../gui/wxpython/core/render.py:1133 msgid "" -"The temporal type (absolute/relative) of space-time datasets has to be the " -"same." +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +"Unable to get current geographic extent. Force quitting wxGUI. Please " +"manually run g.region to fix the problem." msgstr "" -#: ../gui/wxpython/animation/utils.py:202 -msgid "" -"The map type (point/interval) of space-time datasets has to be the same." +#: ../gui/wxpython/core/workspace.py:1753 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +"Unable to get current geographic extent. Force quiting wxGUI. Please " +"manually run g.region to fix the problem." msgstr "" -#: ../gui/wxpython/animation/utils.py:210 -msgid "" -"The temporal extents of maps in space-time datasets have to be the same." +#: ../gui/wxpython/core/gcmd.py:101 ../gui/wxpython/core/workspace.py:1710 +#: ../gui/wxpython/gmodeler/frame.py:1178 +#: ../gui/wxpython/location_wizard/wizard.py:736 +#: ../gui/wxpython/location_wizard/wizard.py:920 +#: ../gui/wxpython/location_wizard/wizard.py:2118 +#: ../gui/wxpython/location_wizard/dialogs.py:122 +#: ../gui/wxpython/location_wizard/dialogs.py:140 +#: ../gui/wxpython/location_wizard/dialogs.py:543 +#: ../gui/wxpython/lmgr/layertree.py:967 +#: ../gui/wxpython/startup/guiutils.py:251 +#: ../gui/wxpython/startup/guiutils.py:304 +#: ../gui/wxpython/gui_core/preferences.py:240 +#: ../gui/wxpython/gui_core/preferences.py:1882 +#: ../gui/wxpython/gui_core/preferences.py:1914 +#: ../gui/wxpython/gui_core/preferences.py:1926 +#: ../gui/wxpython/gui_core/preferences.py:1938 +#: ../gui/wxpython/vdigit/dialogs.py:275 ../gui/wxpython/vdigit/dialogs.py:457 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/psmap/dialogs.py:5545 +msgid "Error" msgstr "" -#: ../gui/wxpython/animation/utils.py:222 -msgid "The number of maps to animate has to be the same for each map series." +#: ../gui/wxpython/core/gcmd.py:114 +msgid "Reason" msgstr "" -#: ../gui/wxpython/animation/utils.py:230 -msgid "" -"The number of maps to animate has to be the same as the number of maps in " -"temporal dataset." +#: ../gui/wxpython/core/gcmd.py:124 ../gui/wxpython/core/workspace.py:1731 +#: ../gui/wxpython/mapwin/buffered.py:2159 +#: ../gui/wxpython/wxplot/dialogs.py:945 +msgid "Warning" msgstr "" -#: ../gui/wxpython/animation/g.gui.animation.py:93 -#, python-format -msgid "%s=, %s=, %s= and %s= are mutually exclusive." +#: ../gui/wxpython/core/gcmd.py:131 ../gui/wxpython/lmgr/frame.py:2305 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/main_window/frame.py:2346 +msgid "Message" msgstr "" -#: ../gui/wxpython/animation/g.gui.animation.py:137 -msgid "Animation Tool - GRASS GIS" +#: ../gui/wxpython/core/gcmd.py:417 +msgid "Execution failed:" msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:109 -msgid "" -"It is not allowed to display data with different temporal types (absolute " -"and relative)." +#: ../gui/wxpython/core/gcmd.py:423 ../gui/wxpython/core/gcmd.py:430 +msgid "Error: " msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:125 +#: ../gui/wxpython/core/gcmd.py:509 #, python-format -msgid "It is not allowed to display data with different units (%s)." -msgstr "" - -#: ../gui/wxpython/animation/temporal_manager.py:138 -msgid "" -"You are going to display data with different temporal types of maps " -"(interval and point). It is recommended to use data of one temporal type to " -"avoid confusion." +msgid "Unable to exectute command: '%s'" msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:349 +#: ../gui/wxpython/core/gcmd.py:754 ../gui/wxpython/gui_core/forms.py:2982 #, python-format -msgid "Topology of Space time dataset %s is invalid." +msgid "Error in %s" msgstr "" -#: ../gui/wxpython/animation/data.py:66 -msgid "No animation name selected." +#: ../gui/wxpython/core/settings.py:434 +msgid "Segment break" msgstr "" -#: ../gui/wxpython/animation/data.py:133 -msgid "No workspace file selected." +#: ../gui/wxpython/core/settings.py:500 +msgid "Data point" msgstr "" -#: ../gui/wxpython/animation/data.py:136 -#, python-format -msgid "File %s not found" +#: ../gui/wxpython/core/settings.py:577 +msgid "animation" msgstr "" -#: ../gui/wxpython/animation/data.py:145 -#, python-format -msgid "Animation %d" +#: ../gui/wxpython/core/settings.py:780 +msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:83 -msgid "Adjust speed of animation" +#: ../gui/wxpython/core/settings.py:781 +msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:136 -msgid "Simple mode" +#: ../gui/wxpython/core/settings.py:782 +msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:141 -msgid "Frame duration:" +#: ../gui/wxpython/core/settings.py:783 +msgid "Collapse all" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:142 -#: ../gui/wxpython/animation/dialogs.py:177 -msgid "ms" +#: ../gui/wxpython/core/settings.py:784 +msgid "Expand all" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:168 -msgid "Temporal mode" +#: ../gui/wxpython/core/settings.py:789 ../gui/wxpython/dbmgr/base.py:1430 +msgid "Edit selected record" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:173 -msgid "Time unit:" +#: ../gui/wxpython/core/settings.py:790 +msgid "Display selected" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:175 -msgid "Duration of time unit:" +#: ../gui/wxpython/core/settings.py:801 +msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:241 -msgid "year" +#: ../gui/wxpython/core/settings.py:802 +msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:242 -msgid "month" +#: ../gui/wxpython/core/settings.py:803 +msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:243 -msgid "day" +#: ../gui/wxpython/core/settings.py:809 +msgid "Basic top" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:244 -msgid "hour" +#: ../gui/wxpython/core/settings.py:810 +msgid "Basic left" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:245 -msgid "minute" +#: ../gui/wxpython/core/settings.py:811 +msgid "List left" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:246 -msgid "second" +#: ../gui/wxpython/core/settings.py:819 +msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:311 -msgid "Animation speed is too high." +#: ../gui/wxpython/core/settings.py:820 +msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:351 -msgid "Edit animation" +#: ../gui/wxpython/core/settings.py:821 +msgid "Nothing" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:363 -msgid "Advanced" +#: ../gui/wxpython/core/settings.py:824 +msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:389 -msgid "top left" +#: ../gui/wxpython/core/settings.py:825 +msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:390 -msgid "top right" +#: ../gui/wxpython/core/settings.py:860 ../gui/wxpython/core/settings.py:874 +msgid "box" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:391 -msgid "bottom left" +#: ../gui/wxpython/core/settings.py:861 +msgid "sphere" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:392 -msgid "bottom right" +#: ../gui/wxpython/core/settings.py:862 +msgid "cube" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:408 -msgid "Select 2D or 3D view" +#: ../gui/wxpython/core/settings.py:863 +msgid "diamond" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:413 -#: ../gui/wxpython/gmodeler/preferences.py:689 -#: ../gui/wxpython/vnet/dialogs.py:1696 -#: ../gui/wxpython/gui_core/gselect.py:1640 -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:1658 -#: ../gui/wxpython/gui_core/widgets.py:1421 -msgid "Name:" +#: ../gui/wxpython/core/settings.py:864 +msgid "aster" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:418 -msgid "Window position:" +#: ../gui/wxpython/core/settings.py:865 +msgid "gyro" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:423 -msgid "View mode:" +#: ../gui/wxpython/core/settings.py:866 +msgid "histogram" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:431 -msgid "" -"For 3D animation, please select only one space-time dataset\n" -"or one series of map layers." +#: ../gui/wxpython/core/settings.py:873 +msgid "cross" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:462 -#: ../gui/wxpython/psmap/dialogs.py:3392 -msgid "Show raster legend" +#: ../gui/wxpython/core/settings.py:875 +msgid "circle" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:464 -#: ../gui/wxpython/lmgr/layertree.py:83 -msgid "Set options" +#: ../gui/wxpython/core/settings.py:920 +#, python-brace-format +msgid "" +"Unable to read settings file <{path}>:\n" +"{err}" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:481 -msgid "3D view parameters" +#: ../gui/wxpython/core/settings.py:938 +#, python-format +msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:490 -msgid "Workspace file:" +#: ../gui/wxpython/core/settings.py:965 +#, python-format +msgid "" +"Error: Reading settings from file <%(file)s> failed.\n" +"\t\tDetails: %(detail)s\n" +"\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:491 -msgid "Choose workspace file to import 3D view parameters" +#: ../gui/wxpython/core/settings.py:986 +msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:492 -#: ../gui/wxpython/animation/dialogs.py:1094 -#: ../gui/wxpython/animation/dialogs.py:1196 -#: ../gui/wxpython/animation/dialogs.py:1224 -#: ../gui/wxpython/animation/dialogs.py:1247 -#: ../gui/wxpython/animation/dialogs.py:1278 -#: ../gui/wxpython/location_wizard/wizard.py:1454 -#: ../gui/wxpython/location_wizard/wizard.py:1808 -#: ../gui/wxpython/tplot/frame.py:374 ../gui/wxpython/nviz/tools.py:610 -#: ../gui/wxpython/modules/import_export.py:821 -#: ../gui/wxpython/gui_core/gselect.py:1240 -#: ../gui/wxpython/gui_core/gselect.py:1572 -#: ../gui/wxpython/gui_core/gselect.py:1589 -#: ../gui/wxpython/gui_core/gselect.py:1642 -#: ../gui/wxpython/gui_core/gselect.py:1677 -#: ../gui/wxpython/gui_core/forms.py:2005 -#: ../gui/wxpython/gui_core/forms.py:2111 ../gui/wxpython/psmap/dialogs.py:2693 -#: ../gui/wxpython/psmap/dialogs.py:2993 ../gui/wxpython/psmap/dialogs.py:5745 -msgid "Browse" +#: ../gui/wxpython/core/settings.py:996 +#, python-format +msgid "" +"Writing settings to file <%(file)s> failed.\n" +"\n" +"Details: %(detail)s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:500 -msgid "Parameter for animation:" +#: ../gui/wxpython/core/settings.py:1105 +msgid "Unable to set " msgstr "" -#: ../gui/wxpython/animation/dialogs.py:525 -msgid "Set spatial extent in 2D view" +#: ../gui/wxpython/core/settings.py:1143 ../gui/wxpython/core/settings.py:1164 +#, python-format +msgid "Unable to parse settings '%s'" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:529 -msgid "Use saved region:" +#: ../gui/wxpython/core/utils.py:51 +#, python-format +msgid "Syntax error: %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:538 -msgid "Animate region change" +#: ../gui/wxpython/core/utils.py:338 +#, python-format +msgid "Vector map <%(map)s>: %(msg)s\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:547 -msgid "End region:" +#: ../gui/wxpython/core/utils.py:802 +#, python-format +msgid "ERROR: Unable to determine GRASS version. Details: %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:553 -msgid "Zoom value:" +#: ../gui/wxpython/core/utils.py:840 +#, python-format +msgid "Unable to open file '%s'\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:555 -msgid "N-S/E-W distances in map units used to gradually reduce region." +#: ../gui/wxpython/core/utils.py:848 +#, python-format +msgid "" +"%s: line skipped - unable to parse '%s'\n" +"Reason: %s\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:563 -msgid "N-S:" +#: ../gui/wxpython/core/utils.py:854 +#, python-format +msgid "Duplicated key: %s\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:570 -msgid "E-W:" +#: ../gui/wxpython/core/utils.py:870 +#, python-format +msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:683 -msgid "Only one series or space-time dataset is accepted for 3D mode." +#: ../gui/wxpython/core/utils.py:955 ../gui/wxpython/gui_core/forms.py:1910 +msgid "Select Color" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:691 -msgid "No map series or space-time dataset added." +#: ../gui/wxpython/core/gconsole.py:532 +#, python-format +msgid "" +"Unable to run command:\n" +"%(cmd)s\n" +"\n" +"Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:733 -#: ../gui/wxpython/animation/dialogs.py:744 -msgid "Region information is not complete" +#: ../gui/wxpython/core/gconsole.py:556 +#, python-format +msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:755 -#: ../gui/wxpython/animation/controller.py:308 -#: ../gui/wxpython/wxplot/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:657 -#: ../gui/wxpython/psmap/dialogs.py:1455 ../gui/wxpython/psmap/dialogs.py:1487 -#: ../gui/wxpython/psmap/dialogs.py:1546 ../gui/wxpython/psmap/dialogs.py:5073 -msgid "Invalid input" +#: ../gui/wxpython/core/gconsole.py:698 ../gui/wxpython/gmodeler/frame.py:294 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:765 -msgid "Add, edit or remove animations" +#: ../gui/wxpython/core/gconsole.py:701 ../gui/wxpython/gmodeler/frame.py:297 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:774 -msgid "List of animations" +#: ../gui/wxpython/core/gconsole.py:707 ../gui/wxpython/gmodeler/model.py:1145 +#: ../gui/wxpython/gmodeler/model.py:1252 ../gui/wxpython/gmodeler/frame.py:303 +#: ../gui/wxpython/startup/guiutils.py:582 +#: ../gui/wxpython/gui_core/ghelp.py:244 +msgid "unknown" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:786 ../gui/wxpython/dbmgr/base.py:2425 -#: ../gui/wxpython/psmap/dialogs.py:1784 -msgid "Add" +#: ../gui/wxpython/core/gconsole.py:713 +msgid "" +"Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:788 -msgid "Edit" +#: ../gui/wxpython/core/gconsole.py:717 +msgid "Command aborted" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:790 -#: ../gui/wxpython/animation/dialogs.py:1032 -#: ../gui/wxpython/gmodeler/frame.py:1544 ../gui/wxpython/lmgr/layertree.py:448 -#: ../gui/wxpython/rlisetup/frame.py:155 ../gui/wxpython/menustrings.py:958 -#: ../gui/wxpython/menustrings.py:1909 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -msgid "Remove" +#: ../gui/wxpython/core/gconsole.py:719 ../gui/wxpython/gmodeler/frame.py:310 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:858 -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/core/gconsole.py:821 #, python-format -msgid "Maximum number of animations is %d." -msgstr "" - -#: ../gui/wxpython/animation/dialogs.py:911 -#: ../gui/wxpython/animation/controller.py:269 msgid "" -"More animations are using one window. Please select different window for " -"each animation." -msgstr "" - -#: ../gui/wxpython/animation/dialogs.py:950 -#: ../gui/wxpython/psmap/dialogs.py:579 -msgid "Format" +"Unable to write file '%(filePath)s'.\n" +"\n" +"Details: %(error)s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:952 ../gui/wxpython/nviz/tools.py:781 -msgid "Decorations" -msgstr "" - -#: ../gui/wxpython/animation/dialogs.py:957 ../gui/wxpython/tplot/frame.py:394 -#: ../gui/wxpython/lmgr/layertree.py:734 ../gui/wxpython/menustrings.py:986 -#: ../gui/wxpython/menustrings.py:1937 -msgid "Export" -msgstr "" - -#: ../gui/wxpython/animation/dialogs.py:1018 -msgid "Add time stamp" +#: ../gui/wxpython/core/workspace.py:1709 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" -#: ../gui/wxpython/animation/dialogs.py:1018 -#: ../gui/wxpython/menustrings.py:2112 -msgid "Add image" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/core/workspace.py:1726 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/core/workspace.py:1770 +======= +#: ../gui/wxpython/core/workspace.py:1726 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/core/workspace.py:1726 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-format +msgid "" +"Some lines were skipped when reading settings from file <%(file)s>.\n" +"See 'Command output' window for details.\n" +"\n" +"Number of skipped lines: %(line)d" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1049 -msgid "Add time stamp, image or text decoration by one of the buttons above." +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/core/workspace.py:1976 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/core/workspace.py:2019 +======= +#: ../gui/wxpython/core/workspace.py:1976 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/core/workspace.py:1976 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-format +msgid " row %d:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1052 -msgid "Add image or text decoration by one of the buttons above." +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/mapdisp/main.py:190 +#, python-format +msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1066 -msgid "Font settings:" +#: ../gui/wxpython/mapdisp/main.py:289 +#, python-format +msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1071 -msgid "Sample text" +#: ../gui/wxpython/mapdisp/main.py:655 +#, python-format +msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1078 -#: ../gui/wxpython/gui_core/preferences.py:536 -#: ../gui/wxpython/gui_core/preferences.py:812 -msgid "Set font" +#: ../gui/wxpython/mapdisp/main.py:661 +#, python-format +msgid "Unable to create file <%s>" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1092 -msgid "Image file:" +#: ../gui/wxpython/mapdisp/main.py:675 +#, python-format +msgid "Stopping map display <%s>..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1093 -msgid "Choose image file" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:145 +msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1106 -msgid "Text:" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 +msgid "Map display test" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1126 -msgid "Placement as percentage of screen coordinates (X: 0, Y: 0 is top left):" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 +msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1142 -#: ../gui/wxpython/psmap/dialogs.py:286 -msgid "X:" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 +msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1147 -#: ../gui/wxpython/psmap/dialogs.py:287 -msgid "Y:" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 +msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1161 -msgid "image sequence" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 +msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1161 -msgid "animated GIF" +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 +#, python-format +msgid "Unknown value %s of test parameter." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1161 -msgid "SWF" +#: ../gui/wxpython/mapdisp/properties.py:84 +#: ../gui/wxpython/mapdisp/statusbar.py:406 +msgid "Enable/disable auto-rendering" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1161 -msgid "AVI" +#: ../gui/wxpython/mapdisp/properties.py:120 +msgid "" +"Align region extent based on display size from center point. Default value " +"for new map displays can be set up in 'User GUI settings' dialog." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1168 -msgid "Export to:" +#: ../gui/wxpython/mapdisp/properties.py:158 +msgid "" +"Constrain display resolution to computational region settings. Default value " +"for new map displays can be set up in 'User GUI settings' dialog." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1185 ../gui/wxpython/nviz/tools.py:614 -msgid "File prefix:" +#: ../gui/wxpython/mapdisp/properties.py:196 +msgid "Show computational extent" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1186 -msgid "animation_" +#: ../gui/wxpython/mapdisp/properties.py:202 +msgid "" +"Show/hide computational region extent (set with g.region). Display region " +"drawn as a blue box inside the computational region, computational region " +"inside a display region as a red box)." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1187 ../gui/wxpython/nviz/tools.py:626 -msgid "File format:" +#: ../gui/wxpython/mapdisp/properties.py:243 +msgid "Display coordinates in different CRS" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1194 -#: ../gui/wxpython/gui_core/gselect.py:1587 -#: ../gui/wxpython/gui_core/gselect.py:1675 -msgid "Directory:" +#: ../gui/wxpython/mapdisp/properties.py:249 +msgid "" +"Reproject coordinates displayed in the statusbar. Coordinate reference " +"system can be specified in GUI preferences dialog (tab 'Projection')" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1195 -msgid "Choose directory for export" +#: ../gui/wxpython/mapdisp/properties.py:274 +#, python-brace-format +msgid "{label} (EPSG: {epsg})" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1222 -msgid "GIF file:" +#: ../gui/wxpython/mapdisp/properties.py:433 +msgid "Status bar" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1223 -#: ../gui/wxpython/animation/dialogs.py:1246 -#: ../gui/wxpython/animation/dialogs.py:1277 -msgid "Choose file to save animation" +#: ../gui/wxpython/mapdisp/statusbar.py:401 +msgid "Render" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1245 -msgid "SWF file:" +#: ../gui/wxpython/mapdisp/statusbar.py:439 +msgid "Map scale" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1267 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" -"Program 'ffmpeg' was not found.\n" -"Please install it first and make sure\n" -"it's in the PATH variable." -msgstr "" - -#: ../gui/wxpython/animation/dialogs.py:1276 -msgid "AVI file:" +"As everyone's monitors and resolutions are set differently these values are " +"not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1283 -msgid "Video codec:" +#: ../gui/wxpython/mapdisp/statusbar.py:518 +msgid "Go to XY coordinates" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1286 -msgid "Additional options:" +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 +msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1290 -msgid "" -"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " -"Options depend on ffmpeg version." +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 +msgid "Error in projection (check the settings)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1322 -#, python-format -msgid "Current frame rate: %.2f fps" +#: ../gui/wxpython/mapdisp/statusbar.py:709 +msgid "Display geometry" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1449 -#, python-format -msgid "File %s not found." +#: ../gui/wxpython/mapdisp/statusbar.py:738 +msgid "Coordinates" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1453 -msgid "Decoration image file is missing." +#: ../gui/wxpython/mapdisp/statusbar.py:829 +msgid "Display extent" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1461 -#, python-format -msgid "Directory %s not found." +#: ../gui/wxpython/mapdisp/toolbars.py:34 +msgid "Select vector feature(s)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1463 -msgid "Export directory is missing." +#: ../gui/wxpython/mapdisp/toolbars.py:35 +msgid "Select features interactively from vector map" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1522 -msgid "Time stamp" +#: ../gui/wxpython/mapdisp/toolbars.py:37 +msgid "Add scale bar" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1522 -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:101 -#: ../gui/wxpython/psmap/dialogs.py:5668 ../gui/wxpython/psmap/dialogs.py:5731 -msgid "Image" +#: ../gui/wxpython/mapdisp/toolbars.py:38 +msgid "Add raster legend" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1522 -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:97 -#: ../gui/wxpython/psmap/dialogs.py:5160 ../gui/wxpython/psmap/dialogs.py:5165 -msgid "Text" +#: ../gui/wxpython/mapdisp/toolbars.py:39 +msgid "Add vector legend" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1546 -#, python-brace-format -msgid "Exported file directory '{base_dir}' does not exist." +#: ../gui/wxpython/mapdisp/toolbars.py:43 +msgid "Analyze map" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1549 -msgid "Export file is missing." +#: ../gui/wxpython/mapdisp/toolbars.py:44 +msgid "Measuring, profiling, histogramming, ..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1570 -#, python-brace-format -msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" +#: ../gui/wxpython/mapdisp/toolbars.py:46 +msgid "Measure distance" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1656 -msgid "Add space-time dataset layer" +#: ../gui/wxpython/mapdisp/toolbars.py:47 +msgid "Measure area" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1678 -msgid "Multiple raster maps" +#: ../gui/wxpython/mapdisp/toolbars.py:48 +msgid "Profile surface map" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1679 -msgid "Multiple vector maps" +#: ../gui/wxpython/mapdisp/toolbars.py:51 +msgid "Create bivariate scatterplot of raster maps" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1680 -msgid "Multiple 3D raster maps" +#: ../gui/wxpython/mapdisp/toolbars.py:55 +msgid "Create histogram of raster map" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1681 -msgid "Space time raster dataset" +#: ../gui/wxpython/mapdisp/toolbars.py:63 +msgid "Rotate 3D scene" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1682 -msgid "Space time vector dataset" +#: ../gui/wxpython/mapdisp/toolbars.py:64 +msgid "Drag with mouse to rotate 3D scene" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1683 -msgid "Space time 3D raster dataset" +#: ../gui/wxpython/mapdisp/toolbars.py:70 +msgid "" +"Drag with mouse, hold Ctrl down for different mode or Shift to accelerate" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1722 -msgid "Input data type:" +#: ../gui/wxpython/mapdisp/toolbars.py:74 +msgid "Click mouse to zoom" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1799 -msgid "Select raster/vector maps." +#: ../gui/wxpython/mapdisp/toolbars.py:75 +msgid "Click mouse to unzoom" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1827 -msgid "Please select maps or dataset first." +#: ../gui/wxpython/mapdisp/toolbars.py:96 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 +msgid "2D view" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1857 -msgid "Animation Tool settings" +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 +msgid "3D view" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1905 -#: ../gui/wxpython/nviz/preferences.py:230 ../gui/wxpython/nviz/tools.py:451 -#: ../gui/wxpython/web_services/widgets.py:330 -#: ../gui/wxpython/gui_core/preferences.py:891 -msgid "Background color:" +#: ../gui/wxpython/mapdisp/toolbars.py:107 +msgid "3D view mode not available" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1921 -msgid "Number of parallel processes:" +#: ../gui/wxpython/mapdisp/toolbars.py:108 +#: ../gui/wxpython/mapdisp/toolbars.py:120 +#, python-format +msgid "Reason: %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1942 -msgid "Text foreground color:" +#: ../gui/wxpython/mapdisp/toolbars.py:119 +msgid "Vector digitizer not available" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1958 -msgid "Text background color:" +#: ../gui/wxpython/mapdisp/toolbars.py:123 +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 " +"can use \"v.edit\" for non-interactive editing from the Develop vector map " +"menu." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1983 -#: ../gui/wxpython/timeline/frame.py:318 -msgid "Time" +#: ../gui/wxpython/mapdisp/frame.py:163 +#, python-format +msgid "" +"Failed to run command '%(command)s'. Details:\n" +"%(error)s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1991 -msgid "Absolute time format:" +#: ../gui/wxpython/mapdisp/frame.py:268 +msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2009 -msgid "" -"Click and then press key up or down to preview different date and time " -"formats. Type custom format string." +#: ../gui/wxpython/mapdisp/frame.py:268 +msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2027 -msgid "Learn more about formatting options" +#: ../gui/wxpython/mapdisp/frame.py:282 +msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2041 -msgid "Display instances with no data" +#: ../gui/wxpython/mapdisp/frame.py:282 +msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2044 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 +#, python-format msgid "" -"When animating instant-based data which have irregular timestamps you can " -"display 'no data frame' (checked option) or keep last frame." +"Unable to start wxGUI vector digitizer.\n" +"Details: %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2075 -msgid "Invalid" +#: ../gui/wxpython/mapdisp/frame.py:379 +msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:50 -msgid "Animation Tool" +#: ../gui/wxpython/mapdisp/frame.py:412 +#, python-format +msgid "" +"Unable to switch to 3D display mode.\n" +"The Nviz python extension was not found or loaded properly.\n" +"Switching back to 2D display mode.\n" +"\n" +"Details: %s" msgstr "" -#: ../gui/wxpython/animation/frame.py:174 ../gui/wxpython/mapswipe/frame.py:265 -msgid "Main Toolbar" +#: ../gui/wxpython/mapdisp/frame.py:458 +msgid "Starting 3D view mode..." msgstr "" -#: ../gui/wxpython/animation/frame.py:193 -msgid "Animation Toolbar" +#: ../gui/wxpython/mapdisp/frame.py:460 +msgid "Please wait, loading data..." msgstr "" -#: ../gui/wxpython/animation/frame.py:213 ../gui/wxpython/lmgr/frame.py:178 -#: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:554 -msgid "Misc Toolbar" +#: ../gui/wxpython/mapdisp/frame.py:549 +msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/animation/frame.py:322 -msgid "Loading data" +#: ../gui/wxpython/mapdisp/frame.py:557 +msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/animation/frame.py:331 -#, python-brace-format -msgid " ({c} out of {p})" +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 +msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/animation/frame.py:638 -#: ../gui/wxpython/animation/controller.py:592 -#, python-format -msgid "%(from)s %(dash)s %(to)s" +#: ../gui/wxpython/mapdisp/frame.py:882 +msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/animation/frame.py:644 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format -msgid "to %(to)s" +msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/animation/controller.py:449 -msgid "Failed to display legend." +#: ../gui/wxpython/mapdisp/frame.py:1103 +#, python-brace-format +msgid "" +"Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 -msgid "Inconsistent number of maps, please check input data." +#: ../gui/wxpython/mapdisp/frame.py:1524 +msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/animation/controller.py:506 -msgid "No animation to export." +#: ../gui/wxpython/mapdisp/frame.py:1528 +msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/animation/controller.py:542 -msgid "Preparing export, please wait..." +#: ../gui/wxpython/mapdisp/frame.py:1531 +msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 -#, python-format -msgid "%(start)s %(unit)s" +#: ../gui/wxpython/mapdisp/frame.py:1534 +msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 -msgid "Exporting animation, please wait..." +#: ../gui/wxpython/mapdisp/frame.py:1645 +msgid "Raster Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/animation/provider.py:444 -msgid "Rendering map layers" +#: ../gui/wxpython/modules/colorrules.py:88 +msgid "Check all" msgstr "" -#: ../gui/wxpython/animation/provider.py:560 -msgid "Overlaying map layers" +#: ../gui/wxpython/modules/colorrules.py:91 +msgid "Clear all" msgstr "" -#: ../gui/wxpython/animation/provider.py:790 -#, python-brace-format -msgid "Directory {t} not removed." +#: ../gui/wxpython/modules/colorrules.py:151 +msgid "Enter vector attribute values" msgstr "" -#: ../gui/wxpython/iscatt/core_c.py:25 -msgid "Loading ctypes libs failed" +#: ../gui/wxpython/modules/colorrules.py:319 +msgid "Bad color format. Use color format '0:0:0'" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:42 ../gui/wxpython/iclass/toolbars.py:36 -#: ../gui/wxpython/iclass/dialogs.py:56 -msgid "Select imagery group" +#: ../gui/wxpython/modules/colorrules.py:421 +msgid "Select vector map:" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:47 -msgid "Add scatter plot" +#: ../gui/wxpython/modules/colorrules.py:439 +msgid "Import or export color table:" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:49 -msgid "Select area with polygon" +#: ../gui/wxpython/modules/colorrules.py:448 +msgid "Choose file to load color table" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:50 -msgid "Pan mode for scatter plots" +#: ../gui/wxpython/modules/colorrules.py:449 +msgid "Load" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:53 -msgid "Zoom mode for scatter plots (left mouse button, wheel)" +#: ../gui/wxpython/modules/colorrules.py:450 +msgid "Type filename or click to choose file and load color table" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:58 -msgid "" -"Zoom to scatter plot data extend mode (click on scatter plot for zooming to " -"extend)" +#: ../gui/wxpython/modules/colorrules.py:460 +msgid "Choose file to save color table" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 -msgid "Show/hide class manager" +#: ../gui/wxpython/modules/colorrules.py:461 +msgid "Type filename or click to choose file and save color table" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:171 ../gui/wxpython/nviz/tools.py:2354 -#: ../gui/wxpython/vnet/dialogs.py:985 ../gui/wxpython/gui_core/toolbars.py:81 -msgid "Settings" +#: ../gui/wxpython/modules/colorrules.py:475 +msgid "&Set" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:199 -#: ../gui/wxpython/iscatt/toolbars.py:200 -msgid "Include selected area to class" +#: ../gui/wxpython/modules/colorrules.py:484 +msgid "Load color table:" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:204 -#: ../gui/wxpython/iscatt/toolbars.py:205 -msgid "Exclude selected area from class" +#: ../gui/wxpython/modules/colorrules.py:491 +msgid "Load color table from file:" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:209 -msgid "Add new vertex" +#: ../gui/wxpython/modules/colorrules.py:497 +msgid "Save color table to file:" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:210 -msgid "Add new vertex to polygon boundary scatter plot" +#: ../gui/wxpython/modules/colorrules.py:527 +msgid "Reload default table" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:214 -msgid "Create selection polygon" +#: ../gui/wxpython/modules/colorrules.py:587 +msgid "Show preview of map (current Map Display extent is used)." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:215 -msgid "Add new vertex between last and first points of the boundary" +#: ../gui/wxpython/modules/colorrules.py:622 +#: ../gui/wxpython/modules/colorrules.py:1938 +msgid "No valid color rules given." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:219 -msgid "Move vertex" +#: ../gui/wxpython/modules/colorrules.py:671 +#, python-format +msgid "File <%s> already already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:220 -msgid "Move boundary vertex" +#: ../gui/wxpython/modules/colorrules.py:718 +msgid "Invalid color table format" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:224 -msgid "Remove vertex" +#: ../gui/wxpython/modules/colorrules.py:795 +#, python-format +msgid "Invalid rule value '%s'. Unable to apply color table." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:225 -msgid "Remove boundary vertex" +#: ../gui/wxpython/modules/colorrules.py:885 +msgid "Create new color table for raster map" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:230 -msgid "Remove polygon (click on scatter plot for removing it's polygon)" +#: ../gui/wxpython/modules/colorrules.py:979 +msgid "Enter raster category values or percents" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:331 -msgid "Add class" +#: ../gui/wxpython/modules/colorrules.py:983 +#: ../gui/wxpython/modules/colorrules.py:1685 +#: ../gui/wxpython/modules/colorrules.py:1691 +#: ../gui/wxpython/psmap/dialogs.py:3547 +msgid "range" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:333 -msgid "Remove selected class" +#: ../gui/wxpython/modules/colorrules.py:985 +msgid "fp range" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:179 -msgid "Loading data..." +#: ../gui/wxpython/modules/colorrules.py:987 +#, python-format +msgid "Enter raster category values or percents (%(range)s = %(min)d-%(max)d)" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:214 -msgid "No data set." +#: ../gui/wxpython/modules/colorrules.py:1094 +msgid "Create new color rules for vector map" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:233 -#, python-format -msgid "" -"Interactive Scatter Plot Tool can not be used.\n" -"Number of cells (rows*cols) <%d> in current regionis higher than maximum " -"limit <%d>.\n" -"\n" -"You can reduce number of cells in current region using command." +#: ../gui/wxpython/modules/colorrules.py:1106 +#: ../gui/wxpython/modules/colorrules.py:1704 +msgid "Enter vector attribute values or percents:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:246 -#, python-format -msgid "" -"Number of cells (rows*cols) <%d> in current region is higher than " -"recommended threshold <%d>.\n" -"It is strongly advised to reduce number of cells in current region below " -"recommend threshold.\n" -" It can be done by command.\n" -"\n" -"Do you want to continue using Interactive Scatter Plot Tool with this region?" +#: ../gui/wxpython/modules/colorrules.py:1108 +#: ../gui/wxpython/modules/colorrules.py:1706 +msgid "Enter vector attribute values:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:307 -msgid "" -"Scatter plot with same band combination (regardless x y order) is already " -"displayed." +#: ../gui/wxpython/modules/colorrules.py:1119 +msgid "Select vector columns" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:322 -#, python-format -msgid "Band <%s> is not CELL (integer) type.\n" +#: ../gui/wxpython/modules/colorrules.py:1121 +msgid "Layer:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:326 -msgid "Scatter plot cannot be added.\n" +#: ../gui/wxpython/modules/colorrules.py:1122 +msgid "Attribute column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:335 -#, python-format -msgid "" -"Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +#: ../gui/wxpython/modules/colorrules.py:1125 +msgid "Load color from column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:353 -#, python-format -msgid "" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " -"limit <%d>.\n" -"It is strongly advised to reduce range extend of bands(e. g. using r." -"rescale) below recommended threshold.\n" -"\n" -"Do you really want to add this scatter plot?" +#: ../gui/wxpython/modules/colorrules.py:1125 +msgid "Save color to column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:453 -msgid "" -"In order to select arrea in scatter plot, you have to select class first.\n" -"\n" -"There is no class yet, do you want to create one?" +#: ../gui/wxpython/modules/colorrules.py:1127 +msgid "Load size from column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:458 ../gui/wxpython/iclass/digit.py:82 -msgid "No class selected" +#: ../gui/wxpython/modules/colorrules.py:1127 +msgid "Save size to column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:493 -#, python-format -msgid "" -"Error occurred during computation of scatter plot category:\n" -"%s" +#: ../gui/wxpython/modules/colorrules.py:1129 +msgid "Load width from column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:801 -#, python-format -msgid "Export scatter plot raster of class <%s>" +#: ../gui/wxpython/modules/colorrules.py:1129 +msgid "Save width to column:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:821 -#, python-format -msgid "Scatter plot raster of class <%s> exported to raster map <%s>." +#: ../gui/wxpython/modules/colorrules.py:1135 +msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:826 -#, python-format -msgid "" -"Export of scatter plot raster of class <%s> to map <%s> failed.\n" -"%s" +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 +msgid "Add column" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:38 -msgid "Add scatter plots" +#: ../gui/wxpython/modules/colorrules.py:1148 +msgid "Add GRASSRGB column to current attribute table." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:56 -msgid "x axis:" +#: ../gui/wxpython/modules/colorrules.py:1195 +#: ../gui/wxpython/modules/colorrules.py:1244 +msgid "Import or export color table" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:66 -msgid "y axis:" +#: ../gui/wxpython/modules/colorrules.py:1260 +#, python-format +msgid "" +"Database connection for vector map <%s> is not defined in DB file. Do you " +"want to create and connect new attribute table?" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:114 -msgid "Bands of scatter plots to be added (x y):" +#: ../gui/wxpython/modules/colorrules.py:1265 +msgid "No database connection defined" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:161 -msgid "No scatter plots selected." +#: ../gui/wxpython/modules/colorrules.py:1341 +#, python-format +msgid "" +"Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " +"table cannot be edited." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:201 -msgid "Select both x and y bands." +#: ../gui/wxpython/modules/colorrules.py:1536 +#, python-format +msgid "%s column already exists." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:204 -msgid "Selected bands must be different." +#: ../gui/wxpython/modules/colorrules.py:1575 +msgid "Please wait, loading data from attribute table..." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:211 +#: ../gui/wxpython/modules/colorrules.py:1640 +#, python-format msgid "" -"Scatter plot with same bands combination (regardless x y order) has been " -"already added into the list." +"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?" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:285 ../gui/wxpython/iclass/dialogs.py:777 -msgid "Enter name of new vector map:" +#: ../gui/wxpython/modules/colorrules.py:1646 +msgid "Too many records" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:335 +#: ../gui/wxpython/modules/colorrules.py:1698 #, python-format -msgid "Raster map <%s> already exists. Do you want to overwrite it?" +msgid "Enter vector attribute values or percents %s:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:338 +#: ../gui/wxpython/modules/colorrules.py:1701 #, python-format -msgid "Raster <%s> exists" +msgid "Enter vector attribute values %s:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:371 -msgid "Show confidence ellipses" +#: ../gui/wxpython/modules/colorrules.py:1843 +msgid "Please select column to save values to." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:379 -msgid "Selection polygon color:" +#: ../gui/wxpython/modules/colorrules.py:1880 +msgid "No color column defined. Operation canceled." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:380 -msgid "Color of selection polygon vertex:" +#: ../gui/wxpython/modules/colorrules.py:1923 +msgid "Thematic mapping for vector map in 3D view" +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/core/menutree.py:162 +#, python-format +msgid "Unknow tag %s" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:381 -msgid "Selected area color:" +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/vdigit/preferences.py:197 +msgid "map units" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:392 ../gui/wxpython/vnet/dialogs.py:1317 -msgid "Snapping threshold in pixels:" +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 +msgid "meters" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:393 -msgid "Selected area opacity:" +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +msgid "kilometers" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:410 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 -#: ../gui/wxpython/vnet/dialogs.py:1335 ../gui/wxpython/wxplot/dialogs.py:813 -#: ../gui/wxpython/wxplot/dialogs.py:1325 ../gui/wxpython/gcp/manager.py:2982 -#: ../gui/wxpython/image2target/ii2t_manager.py:2915 -msgid "Apply changes for the current session" +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:111 +msgid "miles" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:414 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2051 -#: ../gui/wxpython/vnet/dialogs.py:1339 ../gui/wxpython/wxplot/dialogs.py:820 -#: ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/gcp/manager.py:2986 -#: ../gui/wxpython/image2target/ii2t_manager.py:2919 -msgid "" -"Apply and save changes to user settings file (default for next sessions)" +#: ../gui/wxpython/core/units.py:39 ../gui/wxpython/psmap/utils.py:110 +msgid "feet" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:418 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2055 -#: ../gui/wxpython/vnet/dialogs.py:1343 -#: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:721 -#: ../gui/wxpython/web_services/dialogs.py:155 -#: ../gui/wxpython/web_services/dialogs.py:925 -#: ../gui/wxpython/gcp/manager.py:2990 -#: ../gui/wxpython/image2target/ii2t_manager.py:2923 -msgid "Close dialog" +#: ../gui/wxpython/core/units.py:43 +msgid "sq map units" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:428 -msgid "Selection style:" +#: ../gui/wxpython/core/units.py:44 +msgid "sq meters" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:463 -msgid "Ellipses settings:" +#: ../gui/wxpython/core/units.py:45 +msgid "sq kilometers" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:45 -#, python-brace-format -msgid "" -"The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " -"be installed. {0}" +#: ../gui/wxpython/core/units.py:46 +msgid "acres" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:615 -msgid "Zoom to scatter plot extend" +#: ../gui/wxpython/core/units.py:47 +msgid "hectares" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:141 ../gui/wxpython/iclass/dialogs.py:309 -msgid "Classes" +#: ../gui/wxpython/core/toolboxes.py:198 +msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:164 -msgid "Interactive Scatter Plot Tool" +#: ../gui/wxpython/core/toolboxes.py:247 +msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:398 -msgid "scatter plot" +#: ../gui/wxpython/core/toolboxes.py:472 +msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:418 ../gui/wxpython/iclass/dialogs.py:396 -msgid "Class name" +#: ../gui/wxpython/core/toolboxes.py:498 +#, python-format +msgid "" +"List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:455 ../gui/wxpython/iclass/dialogs.py:428 -msgid "Please use only ASCII characters." +#: ../gui/wxpython/core/toolboxes.py:558 +msgid "Addons" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:480 -msgid "Maximum limit of categories number was reached." +#: ../gui/wxpython/core/debug.py:46 +#, python-brace-format +msgid "Wx debug level {0}." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:576 -msgid "Rename class" +#: ../gui/wxpython/core/debug.py:51 +#, python-brace-format +msgid "" +"WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:579 -msgid "Set color" +#: ../gui/wxpython/animation/nviztask.py:45 +#: ../gui/wxpython/lmgr/workspace.py:178 +#, python-format +msgid "" +"Reading workspace file <%s> failed.\n" +"Invalid file, unable to parse XML document." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:582 ../gui/wxpython/lmgr/layertree.py:498 -msgid "Change opacity level" +#: ../gui/wxpython/animation/nviztask.py:58 +#, python-format +msgid "No 3d view information in workspace file <%s>." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:586 -msgid "Hide" +#: ../gui/wxpython/animation/nviztask.py:314 +msgid "Please add only one layer in the list." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:588 -msgid "Show" +#: ../gui/wxpython/animation/nviztask.py:320 +msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:599 -msgid "Move to top" +#: ../gui/wxpython/animation/toolbars.py:27 +msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:604 -msgid "Move to bottom" +#: ../gui/wxpython/animation/toolbars.py:28 +msgid "Play forward" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:611 -msgid "Move category up" +#: ../gui/wxpython/animation/toolbars.py:29 +msgid "Play back" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:616 -msgid "Move category down" +#: ../gui/wxpython/animation/toolbars.py:30 ../gui/wxpython/nviz/tools.py:513 +msgid "Stop" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:623 -msgid "Export class raster" +#: ../gui/wxpython/animation/toolbars.py:31 ../gui/wxpython/nviz/tools.py:511 +msgid "Pause" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:695 -#, python-format -msgid "Change opacity of class <%s>" +#: ../gui/wxpython/animation/toolbars.py:32 +msgid "Repeat" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:719 -msgid "Empty name was inserted." +#: ../gui/wxpython/animation/toolbars.py:34 +msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:103 -#: ../gui/wxpython/iscatt/iscatt_core.py:153 -msgid "Select category for editing." +#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/dialogs.py:349 +msgid "Add new animation" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:146 -msgid "Computing of scatter plots failed." +#: ../gui/wxpython/animation/toolbars.py:41 +#: ../gui/wxpython/animation/toolbars.py:42 +msgid "Add, edit or remove animation" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:284 -msgid "Patching category raster conditions file failed." +#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/dialogs.py:932 +msgid "Export animation" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:307 -#, python-format -msgid "" -"v.build failed:\n" -"%s" +#: ../gui/wxpython/animation/toolbars.py:55 +msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:327 -#, python-format -msgid "" -"v.to.rast failed:\n" -"%s" +#: ../gui/wxpython/animation/toolbars.py:56 +msgid "Add space-time dataset or series of map layers for animation" msgstr "" -#: ../gui/wxpython/timeline/g.gui.timeline.py:64 -msgid "Timeline Tool - GRASS GIS" +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 +#: ../gui/wxpython/animation/temporal_manager.py:247 +#: ../gui/wxpython/timeline/frame.py:485 ../gui/wxpython/tplot/frame.py:1167 +#, python-format +msgid "Space time dataset <%s> not found." msgstr "" -#: ../gui/wxpython/timeline/frame.py:42 -msgid "" -"The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some " -"systems also python-matplotlib-wx) package(s) to be installed. {}" +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 +#: ../gui/wxpython/lmgr/layertree.py:2076 ../gui/wxpython/mapswipe/frame.py:460 +#, python-format +msgid "Map <%s> not found." msgstr "" -#: ../gui/wxpython/timeline/frame.py:78 -msgid "Timeline Tool" +#: ../gui/wxpython/animation/utils.py:188 +msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/timeline/frame.py:141 ../gui/wxpython/tplot/frame.py:400 -#: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/nviz/tools.py:850 -#: ../gui/wxpython/nviz/tools.py:1945 -msgid "Draw" +#: ../gui/wxpython/animation/utils.py:194 +msgid "" +"The temporal type (absolute/relative) of space-time datasets has to be the " +"same." msgstr "" -#: ../gui/wxpython/timeline/frame.py:143 ../gui/wxpython/tplot/frame.py:402 -#: ../gui/wxpython/menustrings.py:2075 ../gui/wxpython/menustrings.py:2118 -msgid "Help" +#: ../gui/wxpython/animation/utils.py:202 +msgid "" +"The map type (point/interval) of space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/timeline/frame.py:146 -msgid "3D plot of spatio-temporal extents" +#: ../gui/wxpython/animation/utils.py:210 +msgid "" +"The temporal extents of maps in space-time datasets have to be the same." msgstr "" -#: ../gui/wxpython/timeline/frame.py:151 -msgid "3D plot of spatio-temporal extents (matplotlib >= 1.0.0)" +#: ../gui/wxpython/animation/utils.py:222 +msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/timeline/frame.py:157 -msgid "Select space time dataset(s):" +#: ../gui/wxpython/animation/utils.py:230 +msgid "" +"The number of maps to animate has to be the same as the number of maps in " +"temporal dataset." msgstr "" -#: ../gui/wxpython/timeline/frame.py:187 ../gui/wxpython/tplot/frame.py:433 -#: ../gui/wxpython/tplot/frame.py:570 +#: ../gui/wxpython/animation/g.gui.animation.py:93 #, python-format -msgid "Dataset <%s> not found in temporal database" +msgid "%s=, %s=, %s= and %s= are mutually exclusive." msgstr "" -#: ../gui/wxpython/timeline/frame.py:203 ../gui/wxpython/tplot/frame.py:454 -#: ../gui/wxpython/tplot/frame.py:594 -msgid "" -"Datasets have different temporal type (absolute x relative), which is not " -"allowed." +#: ../gui/wxpython/animation/g.gui.animation.py:137 +msgid "Animation Tool - GRASS GIS" msgstr "" -#: ../gui/wxpython/timeline/frame.py:224 ../gui/wxpython/tplot/frame.py:476 -#: ../gui/wxpython/tplot/frame.py:607 -msgid "Datasets have different time unit which is not allowed." +#: ../gui/wxpython/animation/temporal_manager.py:109 +msgid "" +"It is not allowed to display data with different temporal types (absolute " +"and relative)." msgstr "" -#: ../gui/wxpython/timeline/frame.py:248 -#, python-brace-format -msgid "Dataset <{name}> is empty" +#: ../gui/wxpython/animation/temporal_manager.py:125 +#, python-format +msgid "It is not allowed to display data with different units (%s)." msgstr "" -#: ../gui/wxpython/timeline/frame.py:309 -#, python-format -msgid "X [%s]" +#: ../gui/wxpython/animation/temporal_manager.py:138 +msgid "" +"You are going to display data with different temporal types of maps " +"(interval and point). It is recommended to use data of one temporal type to " +"avoid confusion." msgstr "" -#: ../gui/wxpython/timeline/frame.py:310 +#: ../gui/wxpython/animation/temporal_manager.py:349 #, python-format -msgid "Y [%s]" +msgid "Topology of Space time dataset %s is invalid." msgstr "" -#: ../gui/wxpython/timeline/frame.py:312 -msgid "X" +#: ../gui/wxpython/animation/data.py:66 +msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/timeline/frame.py:313 -msgid "Y" +#: ../gui/wxpython/animation/data.py:133 +msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/timeline/frame.py:395 ../gui/wxpython/tplot/frame.py:747 +#: ../gui/wxpython/animation/data.py:136 #, python-format -msgid "Time [%s]" +msgid "File %s not found" msgstr "" -#: ../gui/wxpython/timeline/frame.py:505 ../gui/wxpython/tplot/frame.py:1188 +#: ../gui/wxpython/animation/data.py:145 #, python-format -msgid "Please specify the space time dataset <%s>." -msgstr "" - -#: ../gui/wxpython/timeline/frame.py:506 ../gui/wxpython/tplot/frame.py:1190 -msgid "Ambiguous dataset name" +msgid "Animation %d" msgstr "" -#: ../gui/wxpython/timeline/frame.py:599 ../gui/wxpython/tplot/frame.py:1365 -#, python-format -msgid "Space time raster dataset: %s" +#: ../gui/wxpython/animation/dialogs.py:83 +msgid "Adjust speed of animation" msgstr "" -#: ../gui/wxpython/timeline/frame.py:601 ../gui/wxpython/tplot/frame.py:1367 -#, python-format -msgid "Space time vector dataset: %s" +#: ../gui/wxpython/animation/dialogs.py:136 +msgid "Simple mode" msgstr "" -#: ../gui/wxpython/timeline/frame.py:603 ../gui/wxpython/tplot/frame.py:1369 -#, python-format -msgid "Space time 3D raster dataset: %s" +#: ../gui/wxpython/animation/dialogs.py:141 +msgid "Frame duration:" msgstr "" -#: ../gui/wxpython/timeline/frame.py:605 -#, python-format -msgid "Mapset: %s" +#: ../gui/wxpython/animation/dialogs.py:142 +#: ../gui/wxpython/animation/dialogs.py:177 +msgid "ms" msgstr "" -#: ../gui/wxpython/timeline/frame.py:606 -#, python-format -msgid "Map name: %s" +#: ../gui/wxpython/animation/dialogs.py:168 +msgid "Temporal mode" msgstr "" -#: ../gui/wxpython/timeline/frame.py:607 -#, python-format -msgid "Start time: %s" +#: ../gui/wxpython/animation/dialogs.py:173 +msgid "Time unit:" msgstr "" -#: ../gui/wxpython/timeline/frame.py:608 -#, python-format -msgid "End time: %s" +#: ../gui/wxpython/animation/dialogs.py:175 +msgid "Duration of time unit:" msgstr "" -#: ../gui/wxpython/timeline/frame.py:611 -msgid "WARNING: invalid topology" +#: ../gui/wxpython/animation/dialogs.py:241 +msgid "year" msgstr "" -#: ../gui/wxpython/timeline/frame.py:613 -msgid "" -"\n" -"Press Del to dismiss." +#: ../gui/wxpython/animation/dialogs.py:242 +msgid "month" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/animation/dialogs.py:243 +msgid "day" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/animation/dialogs.py:244 +msgid "hour" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/animation/dialogs.py:245 +msgid "minute" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2043 -msgid "Export model to image" +#: ../gui/wxpython/animation/dialogs.py:246 +msgid "second" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2045 -msgid "Export model to Python script" +#: ../gui/wxpython/animation/dialogs.py:311 +msgid "Animation speed is too high." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" +#: ../gui/wxpython/animation/dialogs.py:351 +msgid "Edit animation" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/animation/dialogs.py:363 +msgid "Advanced" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/animation/dialogs.py:389 +msgid "top left" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/animation/dialogs.py:390 +msgid "top right" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/animation/dialogs.py:391 +msgid "bottom left" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:199 -#: ../gui/wxpython/menustrings.py:2070 -msgid "Run model" +#: ../gui/wxpython/animation/dialogs.py:392 +msgid "bottom right" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2072 -msgid "Validate model" +#: ../gui/wxpython/animation/dialogs.py:408 +msgid "Select 2D or 3D view" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/animation/dialogs.py:413 +#: ../gui/wxpython/gmodeler/preferences.py:689 +#: ../gui/wxpython/vnet/dialogs.py:1696 +#: ../gui/wxpython/gui_core/gselect.py:1640 +#: ../gui/wxpython/gui_core/gselect.py:1657 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/widgets.py:1421 +msgid "Name:" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/animation/dialogs.py:418 +msgid "Window position:" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/animation/dialogs.py:423 +msgid "View mode:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "model" +#: ../gui/wxpython/animation/dialogs.py:431 +msgid "" +"For 3D animation, please select only one space-time dataset\n" +"or one series of map layers." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:76 -msgid "Script generated by wxGUI Graphical Modeler." +#: ../gui/wxpython/animation/dialogs.py:462 +#: ../gui/wxpython/psmap/dialogs.py:3392 +msgid "Show raster legend" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:513 ../gui/wxpython/gmodeler/model.py:577 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/animation/dialogs.py:464 +#: ../gui/wxpython/lmgr/layertree.py:83 +msgid "Set options" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:610 -msgid "Running model..." +#: ../gui/wxpython/animation/dialogs.py:481 +msgid "3D view parameters" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:631 -msgid "Model is empty. Nothing to run." +#: ../gui/wxpython/animation/dialogs.py:490 +msgid "Workspace file:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:640 ../gui/wxpython/gmodeler/frame.py:681 -msgid "Validating model..." +#: ../gui/wxpython/animation/dialogs.py:491 +msgid "Choose workspace file to import 3D view parameters" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:648 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" +#: ../gui/wxpython/animation/dialogs.py:492 +#: ../gui/wxpython/animation/dialogs.py:1094 +#: ../gui/wxpython/animation/dialogs.py:1196 +#: ../gui/wxpython/animation/dialogs.py:1224 +#: ../gui/wxpython/animation/dialogs.py:1247 +#: ../gui/wxpython/animation/dialogs.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1454 +#: ../gui/wxpython/location_wizard/wizard.py:1808 +#: ../gui/wxpython/tplot/frame.py:374 ../gui/wxpython/nviz/tools.py:610 +#: ../gui/wxpython/modules/import_export.py:821 +#: ../gui/wxpython/gui_core/gselect.py:1240 +#: ../gui/wxpython/gui_core/gselect.py:1572 +#: ../gui/wxpython/gui_core/gselect.py:1589 +#: ../gui/wxpython/gui_core/gselect.py:1642 +#: ../gui/wxpython/gui_core/gselect.py:1677 +#: ../gui/wxpython/gui_core/forms.py:2005 +#: ../gui/wxpython/gui_core/forms.py:2111 ../gui/wxpython/psmap/dialogs.py:2693 +#: ../gui/wxpython/psmap/dialogs.py:2993 ../gui/wxpython/psmap/dialogs.py:5745 +msgid "Browse" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:651 -msgid "Run model?" +#: ../gui/wxpython/animation/dialogs.py:500 +msgid "Parameter for animation:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:686 -msgid "Variables below not defined:" +#: ../gui/wxpython/animation/dialogs.py:525 +msgid "Set spatial extent in 2D view" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:799 -msgid "Raster maps" +#: ../gui/wxpython/animation/dialogs.py:529 +msgid "Use saved region:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:802 -msgid "3D raster maps" +#: ../gui/wxpython/animation/dialogs.py:538 +msgid "Animate region change" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:805 ../gui/wxpython/psmap/dialogs.py:1751 -msgid "Vector maps" +#: ../gui/wxpython/animation/dialogs.py:547 +msgid "End region:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1541 -msgid "" +#: ../gui/wxpython/animation/dialogs.py:553 +msgid "Zoom value:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1669 -msgid "Condition: " +#: ../gui/wxpython/animation/dialogs.py:555 +msgid "N-S/E-W distances in map units used to gradually reduce region." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1671 -msgid "Condition: not defined" +#: ../gui/wxpython/animation/dialogs.py:563 +msgid "N-S:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1813 -msgid "if-else" +#: ../gui/wxpython/animation/dialogs.py:570 +msgid "E-W:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1919 -msgid "empty" +#: ../gui/wxpython/animation/dialogs.py:683 +msgid "Only one series or space-time dataset is accepted for 3D mode." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1920 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/animation/dialogs.py:691 +msgid "No map series or space-time dataset added." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2932 -msgid "Model parameters" +#: ../gui/wxpython/animation/dialogs.py:733 +#: ../gui/wxpython/animation/dialogs.py:744 +msgid "Region information is not complete" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2953 -msgid "Delete intermediate data when finish" +#: ../gui/wxpython/animation/dialogs.py:755 +#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/wxplot/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:657 +#: ../gui/wxpython/psmap/dialogs.py:1455 ../gui/wxpython/psmap/dialogs.py:1487 +#: ../gui/wxpython/psmap/dialogs.py:1546 ../gui/wxpython/psmap/dialogs.py:5073 +msgid "Invalid input" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2961 -#: ../gui/wxpython/gmodeler/frame.py:1999 ../gui/wxpython/modules/vclean.py:174 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -#: ../gui/wxpython/gui_core/forms.py:621 -msgid "&Run" +#: ../gui/wxpython/animation/dialogs.py:765 +msgid "Add, edit or remove animations" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3009 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" +#: ../gui/wxpython/animation/dialogs.py:774 +msgid "List of animations" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2050 -msgid "Modeler settings" +#: ../gui/wxpython/animation/dialogs.py:786 ../gui/wxpython/dbmgr/base.py:2425 +#: ../gui/wxpython/psmap/dialogs.py:1784 +msgid "Add" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:55 -msgid "Item properties" +#: ../gui/wxpython/animation/dialogs.py:788 +msgid "Edit" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:62 -msgid "Disabled:" +#: ../gui/wxpython/animation/dialogs.py:790 +#: ../gui/wxpython/animation/dialogs.py:1032 +#: ../gui/wxpython/gmodeler/frame.py:1544 ../gui/wxpython/lmgr/layertree.py:448 +#: ../gui/wxpython/rlisetup/frame.py:155 ../gui/wxpython/menustrings.py:958 +#: ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +msgid "Remove" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:95 -#: ../gui/wxpython/gmodeler/dialogs.py:197 -#: ../gui/wxpython/gmodeler/dialogs.py:537 -#: ../gui/wxpython/gmodeler/dialogs.py:663 -#: ../gui/wxpython/gmodeler/frame.py:1912 -msgid "Command" +#: ../gui/wxpython/animation/dialogs.py:858 +#: ../gui/wxpython/animation/controller.py:243 +#, python-format +msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:99 -#: ../gui/wxpython/gmodeler/preferences.py:418 -#: ../gui/wxpython/gmodeler/preferences.py:525 -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2912 -#: ../gui/wxpython/wxplot/dialogs.py:1075 -#: ../gui/wxpython/wxplot/dialogs.py:1137 ../gui/wxpython/iclass/dialogs.py:396 -#: ../gui/wxpython/psmap/dialogs.py:6284 ../gui/wxpython/psmap/dialogs.py:6564 -msgid "Color" +#: ../gui/wxpython/animation/dialogs.py:911 +#: ../gui/wxpython/animation/controller.py:269 +msgid "" +"More animations are using one window. Please select different window for " +"each animation." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:106 -#: ../gui/wxpython/gmodeler/preferences.py:425 -#: ../gui/wxpython/gmodeler/preferences.py:532 -msgid "Valid:" +#: ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/psmap/dialogs.py:579 +msgid "Format" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:127 -msgid "Invalid:" +#: ../gui/wxpython/animation/dialogs.py:952 ../gui/wxpython/nviz/tools.py:781 +msgid "Decorations" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:148 -msgid "Running:" +#: ../gui/wxpython/animation/dialogs.py:957 ../gui/wxpython/tplot/frame.py:394 +#: ../gui/wxpython/lmgr/layertree.py:734 ../gui/wxpython/menustrings.py:986 +#: ../gui/wxpython/menustrings.py:1937 +msgid "Export" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:177 -#: ../gui/wxpython/gmodeler/preferences.py:347 -#: ../gui/wxpython/gmodeler/preferences.py:454 -#: ../gui/wxpython/gmodeler/preferences.py:559 -msgid "Shape size" +#: ../gui/wxpython/animation/dialogs.py:1018 +msgid "Add time stamp" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:184 -#: ../gui/wxpython/gmodeler/preferences.py:354 -#: ../gui/wxpython/gmodeler/preferences.py:461 -#: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/nviz/preferences.py:569 -#: ../gui/wxpython/rdigit/toolbars.py:89 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/psmap/dialogs.py:3745 -msgid "Width:" +#: ../gui/wxpython/animation/dialogs.py:1018 +#: ../gui/wxpython/menustrings.py:2112 +msgid "Add image" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:207 -#: ../gui/wxpython/gmodeler/preferences.py:377 -#: ../gui/wxpython/gmodeler/preferences.py:484 -#: ../gui/wxpython/gmodeler/preferences.py:589 -#: ../gui/wxpython/nviz/tools.py:354 ../gui/wxpython/nviz/tools.py:1333 -#: ../gui/wxpython/nviz/tools.py:2174 ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3766 ../gui/wxpython/psmap/dialogs.py:3994 -#: ../gui/wxpython/psmap/dialogs.py:4836 -msgid "Height:" +#: ../gui/wxpython/animation/dialogs.py:1049 +msgid "Add time stamp, image or text decoration by one of the buttons above." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:244 -#: ../gui/wxpython/nviz/tools.py:113 ../gui/wxpython/lmgr/frame.py:595 -msgid "Data" +#: ../gui/wxpython/animation/dialogs.py:1052 +msgid "Add image or text decoration by one of the buttons above." msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:248 -#: ../gui/wxpython/dbmgr/base.py:2403 ../gui/wxpython/dbmgr/dialogs.py:821 -msgid "Type" +#: ../gui/wxpython/animation/dialogs.py:1066 +msgid "Font settings:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:255 -msgid "Raster:" +#: ../gui/wxpython/animation/dialogs.py:1071 +msgid "Sample text" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:276 -msgid "3D raster:" +#: ../gui/wxpython/animation/dialogs.py:1078 +#: ../gui/wxpython/gui_core/preferences.py:536 +#: ../gui/wxpython/gui_core/preferences.py:812 +msgid "Set font" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:297 -msgid "Vector:" +#: ../gui/wxpython/animation/dialogs.py:1092 +msgid "Image file:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:318 -msgid "Table:" +#: ../gui/wxpython/animation/dialogs.py:1093 +msgid "Choose image file" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:414 -msgid "Loop" +#: ../gui/wxpython/animation/dialogs.py:1106 +msgid "Text:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:521 -msgid "Comment" +#: ../gui/wxpython/animation/dialogs.py:1126 +msgid "Placement as percentage of screen coordinates (X: 0, Y: 0 is top left):" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:645 -#: ../gui/wxpython/menustrings.py:2066 -msgid "Model properties" +#: ../gui/wxpython/animation/dialogs.py:1142 +#: ../gui/wxpython/psmap/dialogs.py:286 +msgid "X:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:652 -#: ../gui/wxpython/lmgr/layertree.py:722 ../gui/wxpython/lmgr/layertree.py:817 -#: ../gui/wxpython/lmgr/layertree.py:843 -msgid "Metadata" +#: ../gui/wxpython/animation/dialogs.py:1147 +#: ../gui/wxpython/psmap/dialogs.py:287 +msgid "Y:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:654 -msgid "Commands" +#: ../gui/wxpython/animation/dialogs.py:1161 +msgid "image sequence" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:666 -#: ../gui/wxpython/modules/import_export.py:102 -#: ../gui/wxpython/modules/vclean.py:151 -#: ../gui/wxpython/modules/mcalc_builder.py:284 -#: ../gui/wxpython/gui_core/preferences.py:1135 -msgid "Allow output files to overwrite existing files" +#: ../gui/wxpython/animation/dialogs.py:1161 +msgid "animated GIF" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:677 -msgid "Apply properties" +#: ../gui/wxpython/animation/dialogs.py:1161 +msgid "SWF" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:679 -#: ../gui/wxpython/wxplot/dialogs.py:823 ../gui/wxpython/wxplot/dialogs.py:1332 -#: ../gui/wxpython/gui_core/preferences.py:120 -#: ../gui/wxpython/vdigit/preferences.py:65 -#: ../gui/wxpython/psmap/dialogs.py:537 -msgid "Close dialog and ignore changes" +#: ../gui/wxpython/animation/dialogs.py:1161 +msgid "AVI" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:699 -#: ../gui/wxpython/location_wizard/wizard.py:2249 -msgid "Description:" +#: ../gui/wxpython/animation/dialogs.py:1168 +msgid "Export to:" msgstr "" -#: ../gui/wxpython/gmodeler/preferences.py:709 -msgid "Author(s):" +#: ../gui/wxpython/animation/dialogs.py:1185 ../gui/wxpython/nviz/tools.py:614 +msgid "File prefix:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:56 -msgid "Data properties" +#: ../gui/wxpython/animation/dialogs.py:1186 +msgid "animation_" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:94 ../gui/wxpython/iclass/dialogs.py:268 -msgid "Name of raster map:" +#: ../gui/wxpython/animation/dialogs.py:1187 ../gui/wxpython/nviz/tools.py:626 +msgid "File format:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:96 ../gui/wxpython/iclass/dialogs.py:270 -#: ../gui/wxpython/gui_core/dialogs.py:265 -msgid "Name of vector map:" +#: ../gui/wxpython/animation/dialogs.py:1194 +#: ../gui/wxpython/gui_core/gselect.py:1587 +#: ../gui/wxpython/gui_core/gselect.py:1675 +msgid "Directory:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:99 -#: ../gui/wxpython/gmodeler/dialogs.py:116 -msgid "Name of element:" +#: ../gui/wxpython/animation/dialogs.py:1195 +msgid "Choose directory for export" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:108 -msgid "Type of element:" +#: ../gui/wxpython/animation/dialogs.py:1222 +msgid "GIF file:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:174 -msgid "Add GRASS command to the model" +#: ../gui/wxpython/animation/dialogs.py:1223 +#: ../gui/wxpython/animation/dialogs.py:1246 +#: ../gui/wxpython/animation/dialogs.py:1277 +msgid "Choose file to save animation" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:200 -msgid "Label and comment" +#: ../gui/wxpython/animation/dialogs.py:1245 +msgid "SWF file:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:243 -#: ../gui/wxpython/gmodeler/frame.py:1633 -msgid "Label:" +#: ../gui/wxpython/animation/dialogs.py:1267 +msgid "" +"Program 'ffmpeg' was not found.\n" +"Please install it first and make sure\n" +"it's in the PATH variable." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:249 -#: ../gui/wxpython/gmodeler/frame.py:906 ../gui/wxpython/gmodeler/frame.py:1649 -msgid "Comment:" +#: ../gui/wxpython/animation/dialogs.py:1276 +msgid "AVI file:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:309 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/animation/dialogs.py:1283 +msgid "Video codec:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:318 -#, python-format +#: ../gui/wxpython/animation/dialogs.py:1286 +msgid "Additional options:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1290 msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." +"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " +"Options depend on ffmpeg version." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:360 -msgid "Relation properties" +#: ../gui/wxpython/animation/dialogs.py:1322 +#, python-format +msgid "Current frame rate: %.2f fps" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:381 -msgid "From" +#: ../gui/wxpython/animation/dialogs.py:1449 +#, python-format +msgid "File %s not found." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:383 ../gui/wxpython/dbmgr/base.py:2469 -msgid "To" +#: ../gui/wxpython/animation/dialogs.py:1453 +msgid "Decoration image file is missing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:432 +#: ../gui/wxpython/animation/dialogs.py:1461 #, python-format -msgid "Data: %s" +msgid "Directory %s not found." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:441 -msgid "Command:" +#: ../gui/wxpython/animation/dialogs.py:1463 +msgid "Export directory is missing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:449 -msgid "Option:" +#: ../gui/wxpython/animation/dialogs.py:1522 +msgid "Time stamp" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:464 -msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +#: ../gui/wxpython/animation/dialogs.py:1522 +#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:101 +#: ../gui/wxpython/psmap/dialogs.py:5668 ../gui/wxpython/psmap/dialogs.py:5731 +msgid "Image" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:474 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/animation/dialogs.py:1522 +#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:97 +#: ../gui/wxpython/psmap/dialogs.py:5160 ../gui/wxpython/psmap/dialogs.py:5165 +msgid "Text" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:489 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/animation/dialogs.py:1546 +#, python-brace-format +msgid "Exported file directory '{base_dir}' does not exist." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:529 -msgid "Condition" +#: ../gui/wxpython/animation/dialogs.py:1549 +msgid "Export file is missing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:537 -#: ../gui/wxpython/gmodeler/dialogs.py:663 -#: ../gui/wxpython/gmodeler/frame.py:1912 ../gui/wxpython/psmap/dialogs.py:3586 -msgid "Label" -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:565 -msgid "Loop properties" +#: ../gui/wxpython/animation/dialogs.py:1570 +#, python-brace-format +msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:572 -msgid "List of items in loop" +#: ../gui/wxpython/animation/dialogs.py:1656 +msgid "Add space-time dataset layer" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Series" +#: ../gui/wxpython/animation/dialogs.py:1678 +msgid "Multiple raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:576 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/animation/dialogs.py:1679 +msgid "Multiple vector maps" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:619 -msgid "Define series of maps" +#: ../gui/wxpython/animation/dialogs.py:1680 +msgid "Multiple 3D raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:642 -msgid "If-else properties" +#: ../gui/wxpython/animation/dialogs.py:1681 +msgid "Space time raster dataset" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:651 -msgid "List of items in 'if' block" +#: ../gui/wxpython/animation/dialogs.py:1682 +msgid "Space time vector dataset" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:659 -msgid "List of items in 'else' block" +#: ../gui/wxpython/animation/dialogs.py:1683 +msgid "Space time 3D raster dataset" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:840 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +#: ../gui/wxpython/animation/dialogs.py:1722 +msgid "Input data type:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Do you want to delete all variables from the model?" +#: ../gui/wxpython/animation/dialogs.py:1799 +msgid "Select raster/vector maps." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:874 -msgid "Delete variables" +#: ../gui/wxpython/animation/dialogs.py:1827 +msgid "Please select maps or dataset first." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/gmodeler/dialogs.py:1080 -#: ../gui/wxpython/vdigit/dialogs.py:305 -msgid "Delete selected" +#: ../gui/wxpython/animation/dialogs.py:1857 +msgid "Animation Tool settings" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:915 -#: ../gui/wxpython/vdigit/dialogs.py:309 -msgid "Delete all" +#: ../gui/wxpython/animation/dialogs.py:1905 +#: ../gui/wxpython/nviz/preferences.py:230 ../gui/wxpython/nviz/tools.py:451 +#: ../gui/wxpython/web_services/widgets.py:330 +#: ../gui/wxpython/gui_core/preferences.py:891 +msgid "Background color:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:921 -#: ../gui/wxpython/gmodeler/dialogs.py:1084 ../gui/wxpython/dbmgr/base.py:1463 -#: ../gui/wxpython/dbmgr/base.py:2662 ../gui/wxpython/vdigit/dialogs.py:311 -msgid "Reload" +#: ../gui/wxpython/animation/dialogs.py:1921 +msgid "Number of parallel processes:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:984 -#: ../gui/wxpython/location_wizard/wizard.py:989 -#: ../gui/wxpython/gui_core/gselect.py:2217 -msgid "No" +#: ../gui/wxpython/animation/dialogs.py:1942 +msgid "Text foreground color:" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:986 -#: ../gui/wxpython/location_wizard/wizard.py:989 -#: ../gui/wxpython/gui_core/gselect.py:2219 -msgid "Yes" +#: ../gui/wxpython/animation/dialogs.py:1958 +msgid "Text background color:" msgstr "" -#: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 -msgid "Graphical Modeler - GRASS GIS" +#: ../gui/wxpython/animation/dialogs.py:1983 +#: ../gui/wxpython/timeline/frame.py:318 +msgid "Time" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/lmgr/toolbars.py:208 -#: ../gui/wxpython/gui_core/forms.py:1526 -msgid "Graphical Modeler" +#: ../gui/wxpython/animation/dialogs.py:1991 +msgid "Absolute time format:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" +#: ../gui/wxpython/animation/dialogs.py:2009 +msgid "" +"Click and then press key up or down to preview different date and time " +"formats. Type custom format string." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" +#: ../gui/wxpython/animation/dialogs.py:2027 +msgid "Learn more about formatting options" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:176 -msgid "Python editor" +#: ../gui/wxpython/animation/dialogs.py:2041 +msgid "Display instances with no data" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2493 -msgid "Command output" +#: ../gui/wxpython/animation/dialogs.py:2044 +msgid "" +"When animating instant-based data which have irregular timestamps you can " +"display 'no data frame' (checked option) or keep last frame." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:249 ../gui/wxpython/gui_core/pystc.py:263 -msgid "Python script contains local modifications" +#: ../gui/wxpython/animation/dialogs.py:2075 +msgid "Invalid" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 ../gui/wxpython/gmodeler/frame.py:2166 -msgid "Python script is up-to-date" +#: ../gui/wxpython/animation/frame.py:50 +msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:267 -msgid "Redrawing model..." +#: ../gui/wxpython/animation/frame.py:174 ../gui/wxpython/mapswipe/frame.py:265 +msgid "Main Toolbar" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:323 -msgid "Model computation finished" +#: ../gui/wxpython/animation/frame.py:193 +msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:340 -msgid "Do you want to save changes in the model?" +#: ../gui/wxpython/animation/frame.py:213 ../gui/wxpython/lmgr/frame.py:178 +#: ../gui/wxpython/mapswipe/frame.py:309 +#: ../gui/wxpython/main_window/frame.py:554 +msgid "Misc Toolbar" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:343 -msgid "Do you want to store current model settings to model file?" +#: ../gui/wxpython/animation/frame.py:322 +msgid "Loading data" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:350 -msgid "Quit Graphical Modeler" +#: ../gui/wxpython/animation/frame.py:331 +#, python-brace-format +msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:419 +#: ../gui/wxpython/animation/frame.py:638 +#: ../gui/wxpython/animation/controller.py:592 #, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:428 -msgid "No intermediate data to delete." +msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:433 +#: ../gui/wxpython/animation/frame.py:644 #, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:434 -msgid "Delete intermediate data?" +msgid "to %(to)s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:456 ../gui/wxpython/gmodeler/frame.py:606 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +#: ../gui/wxpython/animation/controller.py:449 +msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:460 ../gui/wxpython/gmodeler/frame.py:610 -msgid "Create new model?" +#: ../gui/wxpython/animation/controller.py:481 +msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:500 -msgid "Choose model file" +#: ../gui/wxpython/animation/controller.py:506 +msgid "No animation to export." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:502 ../gui/wxpython/gmodeler/frame.py:558 -#: ../gui/wxpython/lmgr/frame.py:814 ../gui/wxpython/main_window/frame.py:897 -msgid "GRASS Model File (*.gxm)|*.gxm" +#: ../gui/wxpython/animation/controller.py:542 +msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:520 +#: ../gui/wxpython/animation/controller.py:604 #, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 ../gui/wxpython/gmodeler/frame.py:576 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/animation/controller.py:626 +msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:538 ../gui/wxpython/menustrings.py:2037 -msgid "Save model" +#: ../gui/wxpython/animation/provider.py:444 +msgid "Rendering map layers" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:546 ../gui/wxpython/gmodeler/frame.py:592 -#, python-format -msgid "File <%s> saved" +#: ../gui/wxpython/animation/provider.py:560 +msgid "Overlaying map layers" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:556 -msgid "Choose file to save current model" +#: ../gui/wxpython/animation/provider.py:790 +#, python-brace-format +msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:580 ../gui/wxpython/iclass/frame.py:1229 -msgid "File already exists" +#: ../gui/wxpython/iscatt/core_c.py:25 +msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:678 -msgid "Model is empty. Nothing to validate." +#: ../gui/wxpython/iscatt/toolbars.py:42 ../gui/wxpython/iclass/toolbars.py:36 +#: ../gui/wxpython/iclass/dialogs.py:56 +msgid "Select imagery group" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:687 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/iscatt/toolbars.py:47 +msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:690 -msgid "Model is valid." +#: ../gui/wxpython/iscatt/toolbars.py:49 +msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:751 ../gui/wxpython/gmodeler/frame.py:758 -#, python-format -msgid "Model exported to <%s>" +#: ../gui/wxpython/iscatt/toolbars.py:50 +msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:907 ../gui/wxpython/menustrings.py:2062 -msgid "Add comment" +#: ../gui/wxpython/iscatt/toolbars.py:53 +msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:915 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/iscatt/toolbars.py:58 +msgid "" +"Zoom to scatter plot data extend mode (click on scatter plot for zooming to " +"extend)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:952 -msgid "wxGUI Graphical Modeler" +#: ../gui/wxpython/iscatt/toolbars.py:62 +msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1088 -#, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" +#: ../gui/wxpython/iscatt/toolbars.py:171 ../gui/wxpython/nviz/tools.py:2354 +#: ../gui/wxpython/vnet/dialogs.py:985 ../gui/wxpython/gui_core/toolbars.py:81 +msgid "Settings" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1099 -msgid "Please wait, loading model..." +#: ../gui/wxpython/iscatt/toolbars.py:199 +#: ../gui/wxpython/iscatt/toolbars.py:200 +msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1165 -msgid "Writing current settings to model file failed." +#: ../gui/wxpython/iscatt/toolbars.py:204 +#: ../gui/wxpython/iscatt/toolbars.py:205 +msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1177 ../gui/wxpython/lmgr/workspace.py:436 -#, python-format -msgid "Unable to open file <%s> for writing." +#: ../gui/wxpython/iscatt/toolbars.py:209 +msgid "Add new vertex" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1548 -msgid "Disable" +#: ../gui/wxpython/iscatt/toolbars.py:210 +msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1551 -msgid "Enable" +#: ../gui/wxpython/iscatt/toolbars.py:214 +msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1556 -#: ../gui/wxpython/gmodeler/frame.py:1634 -msgid "Set label" +#: ../gui/wxpython/iscatt/toolbars.py:215 +msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1559 -#: ../gui/wxpython/gmodeler/frame.py:1650 -msgid "Set comment" +#: ../gui/wxpython/iscatt/toolbars.py:219 +msgid "Move vertex" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1564 -msgid "Add control point" +#: ../gui/wxpython/iscatt/toolbars.py:220 +msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1566 -msgid "Remove control point" +#: ../gui/wxpython/iscatt/toolbars.py:224 +msgid "Remove vertex" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1580 -msgid "Intermediate" +#: ../gui/wxpython/iscatt/toolbars.py:225 +msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1591 ../gui/wxpython/nviz/tools.py:1609 -#: ../gui/wxpython/nviz/tools.py:1842 ../gui/wxpython/vdigit/preferences.py:137 -msgid "Display" +#: ../gui/wxpython/iscatt/toolbars.py:230 +msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1609 ../gui/wxpython/lmgr/layertree.py:510 -msgid "Properties" +#: ../gui/wxpython/iscatt/toolbars.py:331 +msgid "Add class" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1753 -msgid "List of variables - right-click to delete" +#: ../gui/wxpython/iscatt/toolbars.py:333 +msgid "Remove selected class" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1758 -#: ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/location_wizard/wizard.py:228 -#: ../gui/wxpython/gui_core/ghelp.py:428 ../gui/wxpython/gui_core/ghelp.py:431 -#: ../gui/wxpython/gui_core/ghelp.py:504 -msgid "Name" +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:179 +msgid "Loading data..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1758 -#: ../gui/wxpython/gmodeler/frame.py:1814 ../gui/wxpython/dbmgr/base.py:2973 -msgid "Data type" +#: ../gui/wxpython/iscatt/controllers.py:214 +msgid "No data set." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1758 -#: ../gui/wxpython/gmodeler/frame.py:1820 -msgid "Default value" +#: ../gui/wxpython/iscatt/controllers.py:233 +#, python-format +msgid "" +"Interactive Scatter Plot Tool can not be used.\n" +"Number of cells (rows*cols) <%d> in current regionis higher than maximum " +"limit <%d>.\n" +"\n" +"You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1758 -#: ../gui/wxpython/gmodeler/frame.py:1826 -#: ../gui/wxpython/location_wizard/wizard.py:250 -#: ../gui/wxpython/location_wizard/wizard.py:531 -#: ../gui/wxpython/location_wizard/wizard.py:1078 -#: ../gui/wxpython/location_wizard/wizard.py:1279 -#: ../gui/wxpython/location_wizard/wizard.py:1617 -#: ../gui/wxpython/location_wizard/wizard.py:1815 -msgid "Description" +#: ../gui/wxpython/iscatt/controllers.py:246 +#, python-format +msgid "" +"Number of cells (rows*cols) <%d> in current region is higher than " +"recommended threshold <%d>.\n" +"It is strongly advised to reduce number of cells in current region below " +"recommend threshold.\n" +" It can be done by command.\n" +"\n" +"Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1764 -msgid "Add new variable" +#: ../gui/wxpython/iscatt/controllers.py:307 +msgid "" +"Scatter plot with same band combination (regardless x y order) is already " +"displayed." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1772 -msgid "integer" +#: ../gui/wxpython/iscatt/controllers.py:322 +#, python-format +msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1773 -msgid "float" +#: ../gui/wxpython/iscatt/controllers.py:326 +msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1774 -msgid "string" +#: ../gui/wxpython/iscatt/controllers.py:335 +#, python-format +msgid "" +"Scatter plot cannot be added.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" +"%d>.\n" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1775 -#: ../gui/wxpython/gui_core/dialogs.py:1504 -#: ../gui/wxpython/gui_core/dialogs.py:1746 ../gui/wxpython/gcp/manager.py:422 -#: ../gui/wxpython/image2target/ii2t_manager.py:427 -#: ../gui/wxpython/psmap/dialogs.py:971 -msgid "raster" +#: ../gui/wxpython/iscatt/controllers.py:353 +#, python-format +msgid "" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " +"limit <%d>.\n" +"It is strongly advised to reduce range extend of bands(e. g. using r." +"rescale) below recommended threshold.\n" +"\n" +"Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1776 -#: ../gui/wxpython/gui_core/dialogs.py:1504 ../gui/wxpython/gcp/manager.py:422 -#: ../gui/wxpython/image2target/ii2t_manager.py:427 -#: ../gui/wxpython/psmap/dialogs.py:974 -msgid "vector" +#: ../gui/wxpython/iscatt/controllers.py:453 +msgid "" +"In order to select arrea in scatter plot, you have to select class first.\n" +"\n" +"There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1777 -msgid "region" +#: ../gui/wxpython/iscatt/controllers.py:458 ../gui/wxpython/iclass/digit.py:82 +msgid "No class selected" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1778 -msgid "mapset" +#: ../gui/wxpython/iscatt/controllers.py:493 +#, python-format +msgid "" +"Error occurred during computation of scatter plot category:\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1779 -#: ../gui/wxpython/gui_core/forms.py:2004 -msgid "file" +#: ../gui/wxpython/iscatt/controllers.py:801 +#, python-format +msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1780 -msgid "dir" +#: ../gui/wxpython/iscatt/controllers.py:821 +#, python-format +msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1789 -msgid "Add new variable to the model" +#: ../gui/wxpython/iscatt/controllers.py:826 +#, python-format +msgid "" +"Export of scatter plot raster of class <%s> to map <%s> failed.\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1907 -msgid "List of items - right-click to delete" +#: ../gui/wxpython/iscatt/dialogs.py:38 +msgid "Add scatter plots" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1912 -msgid "In loop" +#: ../gui/wxpython/iscatt/dialogs.py:56 +msgid "x axis:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1912 -msgid "Parameterized" +#: ../gui/wxpython/iscatt/dialogs.py:66 +msgid "y axis:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1960 -msgid "No items to selected." +#: ../gui/wxpython/iscatt/dialogs.py:114 +msgid "Bands of scatter plots to be added (x y):" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "Python script" +#: ../gui/wxpython/iscatt/dialogs.py:161 +msgid "No scatter plots selected." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2000 -msgid "Run python script" +#: ../gui/wxpython/iscatt/dialogs.py:201 +msgid "Select both x and y bands." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2003 -msgid "Save python script to file" +#: ../gui/wxpython/iscatt/dialogs.py:204 +msgid "Selected bands must be different." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2008 +#: ../gui/wxpython/iscatt/dialogs.py:211 msgid "" -"Refresh python script based on the model.\n" -"It will discards all local changes." -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, python-format -msgid "Unable to launch Python script. %s" +"Scatter plot with same bands combination (regardless x y order) has been " +"already added into the list." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2079 -#: ../gui/wxpython/gui_core/pyedit.py:404 -msgid "Choose file to save" +#: ../gui/wxpython/iscatt/dialogs.py:285 ../gui/wxpython/iclass/dialogs.py:777 +msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2082 -#: ../gui/wxpython/gui_core/pyedit.py:406 -#: ../gui/wxpython/gui_core/pyedit.py:477 -msgid "Python script (*.py)|*.py" +#: ../gui/wxpython/iscatt/dialogs.py:335 +#, python-format +msgid "Raster map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2100 ../gui/wxpython/wxplot/profile.py:400 -#: ../gui/wxpython/gui_core/pyedit.py:424 +#: ../gui/wxpython/iscatt/dialogs.py:338 #, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" +msgid "Raster <%s> exists" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2103 -#: ../gui/wxpython/gui_core/pyedit.py:427 -msgid "Save file" +#: ../gui/wxpython/iscatt/dialogs.py:371 +msgid "Show confidence ellipses" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2141 -msgid "" -"Python script is locally modificated. Refresh will discard all changes. Do " -"you really want to continue?" +#: ../gui/wxpython/iscatt/dialogs.py:379 +msgid "Selection polygon color:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2145 -msgid "Update" +#: ../gui/wxpython/iscatt/dialogs.py:380 +msgid "Color of selection polygon vertex:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:184 -#: ../gui/wxpython/location_wizard/wizard.py:2435 -msgid "Define new GRASS Location" +#: ../gui/wxpython/iscatt/dialogs.py:381 +msgid "Selected area color:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:198 -msgid "Change" +#: ../gui/wxpython/iscatt/dialogs.py:392 ../gui/wxpython/vnet/dialogs.py:1317 +msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:215 -#: ../gui/wxpython/gui_core/forms.py:1174 -msgid "This option is required" +#: ../gui/wxpython/iscatt/dialogs.py:393 +msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:218 -msgid "(optional)" +#: ../gui/wxpython/iscatt/dialogs.py:410 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 +#: ../gui/wxpython/vnet/dialogs.py:1335 ../gui/wxpython/wxplot/dialogs.py:813 +#: ../gui/wxpython/wxplot/dialogs.py:1325 ../gui/wxpython/gcp/manager.py:2982 +#: ../gui/wxpython/image2target/ii2t_manager.py:2915 +msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:229 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2051 +#: ../gui/wxpython/vnet/dialogs.py:1339 ../gui/wxpython/wxplot/dialogs.py:820 +#: ../gui/wxpython/wxplot/dialogs.py:1329 +#: ../gui/wxpython/gui_core/preferences.py:115 +#: ../gui/wxpython/gcp/manager.py:2986 +#: ../gui/wxpython/image2target/ii2t_manager.py:2919 +msgid "" +"Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:251 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/iscatt/dialogs.py:418 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2055 +#: ../gui/wxpython/vnet/dialogs.py:1343 +#: ../gui/wxpython/modules/import_export.py:124 +#: ../gui/wxpython/modules/import_export.py:721 +#: ../gui/wxpython/web_services/dialogs.py:155 +#: ../gui/wxpython/web_services/dialogs.py:925 +#: ../gui/wxpython/gcp/manager.py:2990 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +msgid "Close dialog" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:271 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/iscatt/dialogs.py:428 +msgid "Selection style:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:297 -msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " -"excluding characters {} and space." +#: ../gui/wxpython/iscatt/dialogs.py:463 +msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:301 -#: ../gui/wxpython/modules/import_export.py:262 -#: ../gui/wxpython/gui_core/widgets.py:866 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 -msgid "Invalid name" +#: ../gui/wxpython/iscatt/plots.py:45 +#, python-brace-format +msgid "" +"The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " +"be installed. {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:311 -msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +#: ../gui/wxpython/iscatt/plots.py:615 +msgid "Zoom to scatter plot extend" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:314 -msgid "Existing location path" +#: ../gui/wxpython/iscatt/frame.py:141 ../gui/wxpython/iclass/dialogs.py:309 +msgid "Classes" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:347 -msgid "" -"Title of the location is limited only to one line and 256 characters. The " -"rest of the text will be ignored." +#: ../gui/wxpython/iscatt/frame.py:164 +msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:358 -msgid "Select Coordinate Reference System (CRS)" +#: ../gui/wxpython/iscatt/frame.py:398 +msgid "scatter plot" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:371 -msgid "Select CRS from a list by EPSG or description" +#: ../gui/wxpython/iscatt/frame.py:418 ../gui/wxpython/iclass/dialogs.py:396 +msgid "Class name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:380 -#: ../gui/wxpython/location_wizard/wizard.py:1442 -msgid "Read CRS from a georeferenced data file" +#: ../gui/wxpython/iscatt/frame.py:455 ../gui/wxpython/iclass/dialogs.py:428 +msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:385 -msgid "Create a generic cartesian coordinate system (XY)" +#: ../gui/wxpython/iscatt/frame.py:480 +msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:388 -#: ../gui/wxpython/location_wizard/wizard.py:1525 -msgid "Specify CRS using WKT string" +#: ../gui/wxpython/iscatt/frame.py:576 +msgid "Rename class" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:391 -#: ../gui/wxpython/location_wizard/wizard.py:2053 -msgid "Specify CRS using PROJ.4 string" +#: ../gui/wxpython/iscatt/frame.py:579 +msgid "Set color" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:394 -#: ../gui/wxpython/location_wizard/wizard.py:509 -msgid "Define custom CRS" +#: ../gui/wxpython/iscatt/frame.py:582 ../gui/wxpython/lmgr/layertree.py:498 +msgid "Change opacity level" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:405 -msgid "Additional methods:" +#: ../gui/wxpython/iscatt/frame.py:586 +msgid "Hide" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:531 -#: ../gui/wxpython/location_wizard/wizard.py:1078 -#: ../gui/wxpython/location_wizard/wizard.py:1279 -#: ../gui/wxpython/location_wizard/wizard.py:1617 -#: ../gui/wxpython/location_wizard/wizard.py:1815 -msgid "Code" +#: ../gui/wxpython/iscatt/frame.py:588 +msgid "Show" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:537 -msgid "Projection code:" +#: ../gui/wxpython/iscatt/frame.py:599 +msgid "Move to top" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:547 -#: ../gui/wxpython/location_wizard/wizard.py:1097 -#: ../gui/wxpython/location_wizard/wizard.py:1305 -msgid "Search in description:" +#: ../gui/wxpython/iscatt/frame.py:604 +msgid "Move to bottom" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:735 -#, python-format -msgid "Unable to read list: %s" +#: ../gui/wxpython/iscatt/frame.py:611 +msgid "Move category up" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:828 -msgid "Choose projection parameters" +#: ../gui/wxpython/iscatt/frame.py:616 +msgid "Move category down" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:847 -msgid "Select datum or ellipsoid (next page)" +#: ../gui/wxpython/iscatt/frame.py:623 +msgid "Export class raster" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:858 -msgid "Datum with associated ellipsoid" +#: ../gui/wxpython/iscatt/frame.py:695 +#, python-format +msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:862 -msgid "Ellipsoid only" +#: ../gui/wxpython/iscatt/frame.py:719 +msgid "Empty name was inserted." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:919 -#, python-format -msgid "You must enter a value for %s" +#: ../gui/wxpython/iscatt/iscatt_core.py:103 +#: ../gui/wxpython/iscatt/iscatt_core.py:153 +msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:937 -#: ../gui/wxpython/location_wizard/wizard.py:956 -#, python-format -msgid " Enter parameters for %s projection " +#: ../gui/wxpython/iscatt/iscatt_core.py:146 +msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1053 -msgid "Specify geodetic datum" +#: ../gui/wxpython/iscatt/iscatt_core.py:284 +msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1078 -msgid "Ellipsoid" +#: ../gui/wxpython/iscatt/iscatt_core.py:307 +#, python-format +msgid "" +"v.build failed:\n" +"%s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1084 -msgid "Datum code:" +#: ../gui/wxpython/iscatt/iscatt_core.py:327 +#, python-format +msgid "" +"v.to.rast failed:\n" +"%s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1245 -msgid "Specify ellipsoid" +#: ../gui/wxpython/timeline/g.gui.timeline.py:64 +msgid "Timeline Tool - GRASS GIS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1266 -msgid "Earth based" +#: ../gui/wxpython/timeline/frame.py:42 +msgid "" +"The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some " +"systems also python-matplotlib-wx) package(s) to be installed. {}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1269 -msgid "Planetary bodies" +#: ../gui/wxpython/timeline/frame.py:78 +msgid "Timeline Tool" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1286 -msgid "Ellipsoid code:" +#: ../gui/wxpython/timeline/frame.py:141 ../gui/wxpython/tplot/frame.py:400 +#: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/nviz/tools.py:850 +#: ../gui/wxpython/nviz/tools.py:1945 +msgid "Draw" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1452 -msgid "Georeferenced file:" +#: ../gui/wxpython/timeline/frame.py:143 ../gui/wxpython/tplot/frame.py:402 +#: ../gui/wxpython/menustrings.py:2075 ../gui/wxpython/menustrings.py:2118 +msgid "Help" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1510 -msgid "Select georeferenced file" +#: ../gui/wxpython/timeline/frame.py:146 +msgid "3D plot of spatio-temporal extents" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1536 -msgid "Enter WKT parameters string:" +#: ../gui/wxpython/timeline/frame.py:151 +msgid "3D plot of spatio-temporal extents (matplotlib >= 1.0.0)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1588 -msgid "Select CRS from a list" +#: ../gui/wxpython/timeline/frame.py:157 +msgid "Select space time dataset(s):" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1604 -msgid "Filter by EPSG code or description:" +#: ../gui/wxpython/timeline/frame.py:187 ../gui/wxpython/tplot/frame.py:433 +#: ../gui/wxpython/tplot/frame.py:570 +#, python-format +msgid "Dataset <%s> not found in temporal database" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1608 -msgid "Find more information at:" +#: ../gui/wxpython/timeline/frame.py:203 ../gui/wxpython/tplot/frame.py:454 +#: ../gui/wxpython/tplot/frame.py:594 +msgid "" +"Datasets have different temporal type (absolute x relative), which is not " +"allowed." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1617 -#: ../gui/wxpython/location_wizard/wizard.py:1815 -#: ../gui/wxpython/vnet/dialogs.py:390 -msgid "Parameters" +#: ../gui/wxpython/timeline/frame.py:224 ../gui/wxpython/tplot/frame.py:476 +#: ../gui/wxpython/tplot/frame.py:607 +msgid "Datasets have different time unit which is not allowed." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1758 -#: ../gui/wxpython/gui_core/preferences.py:1873 +#: ../gui/wxpython/timeline/frame.py:248 #, python-brace-format -msgid "Unable to read EPGS codes: {0}" +msgid "Dataset <{name}> is empty" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1777 -msgid "Choose IAU Code" +#: ../gui/wxpython/timeline/frame.py:309 +#, python-format +msgid "X [%s]" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1793 -msgid "Path to the IAU-codes file:" +#: ../gui/wxpython/timeline/frame.py:310 +#, python-format +msgid "Y [%s]" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1797 -msgid "IAU code:" +#: ../gui/wxpython/timeline/frame.py:312 +msgid "X" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1999 -msgid "Choose IAU codes file" +#: ../gui/wxpython/timeline/frame.py:313 +msgid "Y" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2034 -#, python-brace-format -msgid "Unable to read IAU codes: {0}" +#: ../gui/wxpython/timeline/frame.py:395 ../gui/wxpython/tplot/frame.py:747 +#, python-format +msgid "Time [%s]" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2069 -msgid "Enter PROJ.4 parameters string:" +#: ../gui/wxpython/timeline/frame.py:505 ../gui/wxpython/tplot/frame.py:1188 +#, python-format +msgid "Please specify the space time dataset <%s>." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2134 -#: ../gui/wxpython/location_wizard/wizard.py:2138 -msgid "Datum transform is required." +#: ../gui/wxpython/timeline/frame.py:506 ../gui/wxpython/tplot/frame.py:1190 +msgid "Ambiguous dataset name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2182 -#: ../gui/wxpython/rlisetup/wizard.py:1962 -msgid "Summary" +#: ../gui/wxpython/timeline/frame.py:599 ../gui/wxpython/tplot/frame.py:1365 +#, python-format +msgid "Space time raster dataset: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2231 -msgid "GRASS Database:" +#: ../gui/wxpython/timeline/frame.py:601 ../gui/wxpython/tplot/frame.py:1367 +#, python-format +msgid "Space time vector dataset: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2240 -msgid "Location Name:" +#: ../gui/wxpython/timeline/frame.py:603 ../gui/wxpython/tplot/frame.py:1369 +#, python-format +msgid "Space time 3D raster dataset: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2261 -msgid "Projection:" +#: ../gui/wxpython/timeline/frame.py:605 +#, python-format +msgid "Mapset: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2273 -msgid "" -"PROJ.4 definition:\n" -" (non-definitive)" +#: ../gui/wxpython/timeline/frame.py:606 +#, python-format +msgid "Map name: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2392 -#: ../gui/wxpython/psmap/dialogs.py:744 ../gui/wxpython/psmap/dialogs.py:767 -msgid "custom" +#: ../gui/wxpython/timeline/frame.py:607 +#, python-format +msgid "Start time: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2534 +#: ../gui/wxpython/timeline/frame.py:608 #, python-format +msgid "End time: %s" +msgstr "" + +#: ../gui/wxpython/timeline/frame.py:611 +msgid "WARNING: invalid topology" +msgstr "" + +#: ../gui/wxpython/timeline/frame.py:613 msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" "\n" -"Details: %(err)s" +"Press Del to dismiss." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2667 -msgid "Unable to create new location" +#: ../gui/wxpython/gmodeler/toolbars.py:42 +msgid "Create new model (Ctrl+N)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2669 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/gmodeler/toolbars.py:43 +msgid "Load model from file (Ctrl+O)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2686 -#, python-brace-format -msgid "Unable to create new GRASS Database <{path}>: {error}" +#: ../gui/wxpython/gmodeler/toolbars.py:45 +msgid "Save current model to file (Ctrl+S)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2725 -msgid "EPSG code missing." +#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2043 +msgid "Export model to image" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2737 -msgid "IAU code missing." +#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2045 +msgid "Export model to Python script" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2751 -#, python-format -msgid "File <%s> not found." +#: ../gui/wxpython/gmodeler/toolbars.py:52 +msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2761 -msgid "WKT string missing." +#: ../gui/wxpython/gmodeler/toolbars.py:54 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 -msgid "Set default region extent and resolution" +#: ../gui/wxpython/gmodeler/toolbars.py:57 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 -msgid "&Set region" +#: ../gui/wxpython/gmodeler/toolbars.py:59 +msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:121 -msgid "Invalid location selected." +#: ../gui/wxpython/gmodeler/toolbars.py:60 +msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:139 -msgid "Invalid region" +#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:199 +#: ../gui/wxpython/menustrings.py:2070 +msgid "Run model" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:171 -msgid "Click here to show 3D settings" +#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2072 +msgid "Validate model" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 -msgid "Click here to hide 3D settings" +#: ../gui/wxpython/gmodeler/toolbars.py:64 +msgid "Show model properties" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 -#, python-format -msgid "Rows: %d" +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 -#, python-format -msgid "Cols: %d" +#: ../gui/wxpython/gmodeler/toolbars.py:68 +msgid "Redraw model canvas" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 -#, python-format -msgid "Cells: %d" +#: ../gui/wxpython/gmodeler/model.py:75 +msgid "model" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 -#, python-format -msgid "Depth: %d" +#: ../gui/wxpython/gmodeler/model.py:76 +msgid "Script generated by wxGUI Graphical Modeler." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/gmodeler/model.py:513 ../gui/wxpython/gmodeler/model.py:577 #, python-format -msgid "3D Cells: %d" +msgid "undefined variable '%s'" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:585 -msgid "Top" +#: ../gui/wxpython/gmodeler/model.py:610 +msgid "Running model..." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:586 -msgid "Bottom" +#: ../gui/wxpython/gmodeler/model.py:631 +msgid "Model is empty. Nothing to run." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 -msgid "T-B resolution" +#: ../gui/wxpython/gmodeler/model.py:640 ../gui/wxpython/gmodeler/frame.py:681 +msgid "Validating model..." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 -msgid "North" +#: ../gui/wxpython/gmodeler/model.py:648 +#, python-format +msgid "" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:361 -msgid "West" +#: ../gui/wxpython/gmodeler/model.py:651 +msgid "Run model?" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:398 -msgid "East" +#: ../gui/wxpython/gmodeler/model.py:686 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:415 -msgid "South" +#: ../gui/wxpython/gmodeler/model.py:799 +msgid "Raster maps" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:426 -msgid "N-S resolution" +#: ../gui/wxpython/gmodeler/model.py:802 +msgid "3D raster maps" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:443 -msgid "E-W resolution" +#: ../gui/wxpython/gmodeler/model.py:805 ../gui/wxpython/psmap/dialogs.py:1751 +msgid "Vector maps" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:542 -#, python-format -msgid "Invalid value: %s" +#: ../gui/wxpython/gmodeler/model.py:1541 +msgid "" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:646 -msgid "Select datum transformation" +#: ../gui/wxpython/gmodeler/model.py:1669 +msgid "Condition: " msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:675 -msgid "Select from list of datum transformations" +#: ../gui/wxpython/gmodeler/model.py:1671 +msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -msgid "Pan to GCP by number" +#: ../gui/wxpython/gmodeler/model.py:1813 +msgid "if-else" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -msgid "Valid Range:" +#: ../gui/wxpython/gmodeler/model.py:1919 +msgid "empty" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -msgid "RMS error" +#: ../gui/wxpython/gmodeler/model.py:1920 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#, python-format -msgid "Forward: %(forw)s, Backward: %(back)s" +#: ../gui/wxpython/gmodeler/model.py:2932 +msgid "Model parameters" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:99 -msgid "Please provide a group name to process" +#: ../gui/wxpython/gmodeler/model.py:2953 +msgid "Delete intermediate data when finish" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:104 -msgid "Please provide a raster map name to process" +#: ../gui/wxpython/gmodeler/model.py:2961 +#: ../gui/wxpython/gmodeler/frame.py:1999 ../gui/wxpython/modules/vclean.py:174 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +#: ../gui/wxpython/gui_core/forms.py:621 +msgid "&Run" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 -msgid "Please provide a camera name (generated by i.ortho.camera)" +#: ../gui/wxpython/gmodeler/model.py:3009 ../gui/wxpython/gmodeler/frame.py:173 +msgid "Variables" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:115 -msgid "Please provive an order value (1 if 4 Fiducials, 2 if 8 Fiducials)" +#: ../gui/wxpython/gmodeler/preferences.py:31 +#: ../gui/wxpython/menustrings.py:2050 +msgid "Modeler settings" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:121 -msgid "Please provive an output files extension (used by i.rectify)" +#: ../gui/wxpython/gmodeler/preferences.py:55 +msgid "Item properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:40 -#: ../gui/wxpython/gcp/toolbars.py:40 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:40 -msgid "Add new GCP to the list" +#: ../gui/wxpython/gmodeler/preferences.py:62 +msgid "Disabled:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:41 -#: ../gui/wxpython/gcp/toolbars.py:41 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:41 -msgid "Delete selected GCP" +#: ../gui/wxpython/gmodeler/preferences.py:95 +#: ../gui/wxpython/gmodeler/dialogs.py:197 +#: ../gui/wxpython/gmodeler/dialogs.py:537 +#: ../gui/wxpython/gmodeler/dialogs.py:663 +#: ../gui/wxpython/gmodeler/frame.py:1912 +msgid "Command" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:42 -#: ../gui/wxpython/gcp/toolbars.py:42 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:42 -msgid "Clear selected GCP" +#: ../gui/wxpython/gmodeler/preferences.py:99 +#: ../gui/wxpython/gmodeler/preferences.py:418 +#: ../gui/wxpython/gmodeler/preferences.py:525 +#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2912 +#: ../gui/wxpython/wxplot/dialogs.py:1075 +#: ../gui/wxpython/wxplot/dialogs.py:1137 ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/psmap/dialogs.py:6284 ../gui/wxpython/psmap/dialogs.py:6564 +msgid "Color" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:43 -#: ../gui/wxpython/gcp/toolbars.py:43 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:43 -msgid "Recalculate RMS error" +#: ../gui/wxpython/gmodeler/preferences.py:106 +#: ../gui/wxpython/gmodeler/preferences.py:425 +#: ../gui/wxpython/gmodeler/preferences.py:532 +msgid "Valid:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 -#: ../gui/wxpython/menustrings.py:195 ../gui/wxpython/menustrings.py:2009 -#: ../gui/wxpython/gcp/toolbars.py:44 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:44 -msgid "Georectify" +#: ../gui/wxpython/gmodeler/preferences.py:127 +msgid "Invalid:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:45 -#: ../gui/wxpython/gcp/toolbars.py:45 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:45 -msgid "Save GCPs to POINTS file" +#: ../gui/wxpython/gmodeler/preferences.py:148 +msgid "Running:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:47 -#: ../gui/wxpython/gcp/toolbars.py:47 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:47 -msgid "Reload GCPs from POINTS file" +#: ../gui/wxpython/gmodeler/preferences.py:177 +#: ../gui/wxpython/gmodeler/preferences.py:347 +#: ../gui/wxpython/gmodeler/preferences.py:454 +#: ../gui/wxpython/gmodeler/preferences.py:559 +msgid "Shape size" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 -#: ../gui/wxpython/photo2image/ip2i_manager.py:839 -#: ../gui/wxpython/gcp/toolbars.py:106 ../gui/wxpython/gcp/manager.py:1494 -#: ../gui/wxpython/image2target/ii2t_manager.py:1463 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -msgid "source" +#: ../gui/wxpython/gmodeler/preferences.py:184 +#: ../gui/wxpython/gmodeler/preferences.py:354 +#: ../gui/wxpython/gmodeler/preferences.py:461 +#: ../gui/wxpython/gmodeler/preferences.py:566 +#: ../gui/wxpython/nviz/preferences.py:569 +#: ../gui/wxpython/rdigit/toolbars.py:89 +#: ../gui/wxpython/gui_core/dialogs.py:1987 +#: ../gui/wxpython/psmap/dialogs.py:3745 +msgid "Width:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 -#: ../gui/wxpython/photo2image/ip2i_manager.py:841 -#: ../gui/wxpython/gcp/toolbars.py:106 ../gui/wxpython/gcp/manager.py:1496 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -msgid "target" +#: ../gui/wxpython/gmodeler/preferences.py:207 +#: ../gui/wxpython/gmodeler/preferences.py:377 +#: ../gui/wxpython/gmodeler/preferences.py:484 +#: ../gui/wxpython/gmodeler/preferences.py:589 +#: ../gui/wxpython/nviz/tools.py:354 ../gui/wxpython/nviz/tools.py:1333 +#: ../gui/wxpython/nviz/tools.py:2174 ../gui/wxpython/gui_core/dialogs.py:1992 +#: ../gui/wxpython/psmap/dialogs.py:3766 ../gui/wxpython/psmap/dialogs.py:3994 +#: ../gui/wxpython/psmap/dialogs.py:4836 +msgid "Height:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:115 -#: ../gui/wxpython/iclass/toolbars.py:73 ../gui/wxpython/gcp/toolbars.py:115 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:115 -msgid "Set map canvas for " +#: ../gui/wxpython/gmodeler/preferences.py:244 +#: ../gui/wxpython/nviz/tools.py:113 ../gui/wxpython/lmgr/frame.py:595 +msgid "Data" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:117 -#: ../gui/wxpython/gcp/toolbars.py:117 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:117 -msgid " / Zoom to map" +#: ../gui/wxpython/gmodeler/preferences.py:248 +#: ../gui/wxpython/dbmgr/base.py:2403 ../gui/wxpython/dbmgr/dialogs.py:821 +msgid "Type" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:134 -#: ../gui/wxpython/gcp/toolbars.py:134 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:134 -msgid "Update GCP coordinates" +#: ../gui/wxpython/gmodeler/preferences.py:255 +msgid "Raster:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_toolbars.py:135 -#: ../gui/wxpython/gcp/toolbars.py:135 -#: ../gui/wxpython/image2target/ii2t_toolbars.py:135 -msgid "Update GCP coordinates)" +#: ../gui/wxpython/gmodeler/preferences.py:276 +msgid "3D raster:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:310 -msgid "Manage Location of Fiducial Points on a Scanned Photo" +#: ../gui/wxpython/gmodeler/preferences.py:297 +msgid "Vector:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:433 -msgid "A POINTS file exists, renaming it to POINTS_BAK" +#: ../gui/wxpython/gmodeler/preferences.py:318 +msgid "Table:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:461 -msgid "Opening CAMERA file failed" +#: ../gui/wxpython/gmodeler/preferences.py:414 +msgid "Loop" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:507 -#: ../gui/wxpython/photo2image/ip2i_manager.py:932 -#: ../gui/wxpython/gcp/manager.py:1587 -msgid "Writing POINTS file failed" +#: ../gui/wxpython/gmodeler/preferences.py:521 +msgid "Comment" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:693 -#: ../gui/wxpython/gcp/manager.py:1345 -#: ../gui/wxpython/image2target/ii2t_manager.py:1318 -#, python-format -msgid "At least %d GCPs required. Operation canceled." +#: ../gui/wxpython/gmodeler/preferences.py:645 +#: ../gui/wxpython/menustrings.py:2066 +msgid "Model properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:844 -#: ../gui/wxpython/gcp/manager.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:1468 -msgid "Set GCP coordinates" +#: ../gui/wxpython/gmodeler/preferences.py:652 +#: ../gui/wxpython/lmgr/layertree.py:722 ../gui/wxpython/lmgr/layertree.py:817 +#: ../gui/wxpython/lmgr/layertree.py:843 +msgid "Metadata" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:846 -#: ../gui/wxpython/gcp/manager.py:1501 -#: ../gui/wxpython/image2target/ii2t_manager.py:1470 -#, python-format -msgid "" -"Set %(coor)s coordinates for GCP No. %(key)s? \n" -"\n" -"East: %(coor0)s \n" -"North: %(coor1)s" +#: ../gui/wxpython/gmodeler/preferences.py:654 +msgid "Commands" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:946 -#: ../gui/wxpython/gcp/manager.py:1600 -#, python-format -msgid "POINTS file saved for group <%s>" +#: ../gui/wxpython/gmodeler/preferences.py:666 +#: ../gui/wxpython/modules/import_export.py:102 +#: ../gui/wxpython/modules/vclean.py:151 +#: ../gui/wxpython/modules/mcalc_builder.py:284 +#: ../gui/wxpython/gui_core/preferences.py:1135 +msgid "Allow output files to overwrite existing files" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:960 -#: ../gui/wxpython/gcp/manager.py:1614 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -msgid "source mapwin not defined" +#: ../gui/wxpython/gmodeler/preferences.py:677 +msgid "Apply properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:963 -#: ../gui/wxpython/gcp/manager.py:1617 -#: ../gui/wxpython/image2target/ii2t_manager.py:1627 -msgid "target mapwin not defined" +#: ../gui/wxpython/gmodeler/preferences.py:679 +#: ../gui/wxpython/wxplot/dialogs.py:823 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/vdigit/preferences.py:65 +#: ../gui/wxpython/psmap/dialogs.py:537 +msgid "Close dialog and ignore changes" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:993 -#: ../gui/wxpython/gcp/manager.py:1647 -msgid "Reading POINTS file failed" +#: ../gui/wxpython/gmodeler/preferences.py:699 +#: ../gui/wxpython/location_wizard/wizard.py:2249 +msgid "Description:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1087 -#: ../gui/wxpython/gcp/manager.py:1741 -#: ../gui/wxpython/image2target/ii2t_manager.py:1753 -#, python-format -msgid "" -"Insufficient points defined and active (checked) for selected rectification " -"method (order: %d).\n" -"3+ points needed for 1st order,\n" -"6+ points for 2nd order, and\n" -"10+ points for 3rd order." +#: ../gui/wxpython/gmodeler/preferences.py:709 +msgid "Author(s):" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1117 -#: ../gui/wxpython/gcp/manager.py:1843 -#: ../gui/wxpython/image2target/ii2t_manager.py:1783 -msgid "Rectifying images, please wait..." +#: ../gui/wxpython/gmodeler/dialogs.py:56 +msgid "Data properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1141 -msgid "Writing output image to group, please wait..." +#: ../gui/wxpython/gmodeler/dialogs.py:94 ../gui/wxpython/iclass/dialogs.py:268 +msgid "Name of raster map:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1176 -#: ../gui/wxpython/gcp/manager.py:1951 -#: ../gui/wxpython/image2target/ii2t_manager.py:1876 -msgid "GCP Manager settings" +#: ../gui/wxpython/gmodeler/dialogs.py:96 ../gui/wxpython/iclass/dialogs.py:270 +#: ../gui/wxpython/gui_core/dialogs.py:265 +msgid "Name of vector map:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1222 -#: ../gui/wxpython/gcp/manager.py:2003 -#: ../gui/wxpython/image2target/ii2t_manager.py:1928 -msgid "Quit GCP Manager" +#: ../gui/wxpython/gmodeler/dialogs.py:99 +#: ../gui/wxpython/gmodeler/dialogs.py:116 +msgid "Name of element:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1223 -#: ../gui/wxpython/gcp/manager.py:2004 -#: ../gui/wxpython/image2target/ii2t_manager.py:1929 -msgid "Save ground control points?" +#: ../gui/wxpython/gmodeler/dialogs.py:108 +msgid "Type of element:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1302 -#: ../gui/wxpython/gcp/manager.py:2085 -msgid "" -"Could not calculate RMS Error.\n" -"Possible error with m.transform." +#: ../gui/wxpython/gmodeler/dialogs.py:174 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 -#: ../gui/wxpython/gcp/manager.py:2222 -msgid "" -"Could not calculate new extends.\n" -"Possible error with m.transform." +#: ../gui/wxpython/gmodeler/dialogs.py:200 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1577 -#: ../gui/wxpython/gcp/manager.py:2360 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -msgid "Adjust source display to target display" +#: ../gui/wxpython/gmodeler/dialogs.py:243 +#: ../gui/wxpython/gmodeler/frame.py:1633 +msgid "Label:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1583 -#: ../gui/wxpython/gcp/manager.py:2366 -#: ../gui/wxpython/image2target/ii2t_manager.py:2289 -msgid "Adjust target display to source display" +#: ../gui/wxpython/gmodeler/dialogs.py:249 +#: ../gui/wxpython/gmodeler/frame.py:906 ../gui/wxpython/gmodeler/frame.py:1649 +msgid "Comment:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 -#: ../gui/wxpython/vnet/widgets.py:104 ../gui/wxpython/vnet/vnet_data.py:255 -#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -msgid "use" +#: ../gui/wxpython/gmodeler/dialogs.py:309 +msgid "" +"Command not defined.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 -msgid "source X" +#: ../gui/wxpython/gmodeler/dialogs.py:318 +#, python-format +msgid "" +"'%s' is not a GRASS tool.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 -msgid "source Y" +#: ../gui/wxpython/gmodeler/dialogs.py:360 +msgid "Relation properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1700 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1719 -msgid "target X" +#: ../gui/wxpython/gmodeler/dialogs.py:381 +msgid "From" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1701 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1720 -msgid "target Y" +#: ../gui/wxpython/gmodeler/dialogs.py:383 ../gui/wxpython/dbmgr/base.py:2469 +msgid "To" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1702 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1721 -#: ../gui/wxpython/gcp/manager.py:2484 ../gui/wxpython/gcp/manager.py:2503 -#: ../gui/wxpython/image2target/ii2t_manager.py:2409 -#: ../gui/wxpython/image2target/ii2t_manager.py:2430 -msgid "Forward error" +#: ../gui/wxpython/gmodeler/dialogs.py:432 +#, python-format +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1703 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1722 -#: ../gui/wxpython/gcp/manager.py:2485 ../gui/wxpython/gcp/manager.py:2504 -#: ../gui/wxpython/image2target/ii2t_manager.py:2410 -#: ../gui/wxpython/image2target/ii2t_manager.py:2431 -msgid "Backward error" +#: ../gui/wxpython/gmodeler/dialogs.py:441 +msgid "Command:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1857 -#: ../gui/wxpython/gcp/manager.py:2639 -#: ../gui/wxpython/image2target/ii2t_manager.py:2568 -msgid "Invalid coordinate value. Operation canceled." +#: ../gui/wxpython/gmodeler/dialogs.py:449 +msgid "Option:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1903 -#: ../gui/wxpython/gcp/manager.py:2838 -#: ../gui/wxpython/image2target/ii2t_manager.py:2764 -msgid "Edit GCP" +#: ../gui/wxpython/gmodeler/dialogs.py:464 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1917 -#: ../gui/wxpython/gcp/manager.py:2852 -#: ../gui/wxpython/image2target/ii2t_manager.py:2778 -msgid "Ground Control Point No." +#: ../gui/wxpython/gmodeler/dialogs.py:474 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1938 -msgid "source X:" +#: ../gui/wxpython/gmodeler/dialogs.py:489 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1939 -msgid "target X:" +#: ../gui/wxpython/gmodeler/dialogs.py:529 +msgid "Condition" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1940 -msgid "source Y:" +#: ../gui/wxpython/gmodeler/dialogs.py:537 +#: ../gui/wxpython/gmodeler/dialogs.py:663 +#: ../gui/wxpython/gmodeler/frame.py:1912 ../gui/wxpython/psmap/dialogs.py:3586 +msgid "Label" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1941 -msgid "target Y:" +#: ../gui/wxpython/gmodeler/dialogs.py:565 +msgid "Loop properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2076 -#: ../gui/wxpython/gcp/manager.py:3011 ../gui/wxpython/vdigit/preferences.py:85 -#: ../gui/wxpython/image2target/ii2t_manager.py:2944 -#: ../gui/wxpython/psmap/dialogs.py:2670 -msgid "Symbology" +#: ../gui/wxpython/gmodeler/dialogs.py:572 +msgid "List of items in loop" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2084 -#: ../gui/wxpython/gcp/manager.py:3019 -#: ../gui/wxpython/image2target/ii2t_manager.py:2952 -msgid "Highlight highest RMS error only" +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Series" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2096 -#: ../gui/wxpython/gcp/manager.py:3031 -#: ../gui/wxpython/image2target/ii2t_manager.py:2964 -msgid "Highlight RMS error > M + SD * factor:" +#: ../gui/wxpython/gmodeler/dialogs.py:576 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2101 -#: ../gui/wxpython/gcp/manager.py:3035 -#: ../gui/wxpython/image2target/ii2t_manager.py:2968 -msgid "" -"Highlight GCPs with an RMS error larger than \n" -"mean + standard deviation * given factor. \n" -"Recommended values for this factor are between 1 and 2." +#: ../gui/wxpython/gmodeler/dialogs.py:619 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2121 -#: ../gui/wxpython/gcp/manager.py:3054 -#: ../gui/wxpython/image2target/ii2t_manager.py:2987 -msgid "Symbol settings" +#: ../gui/wxpython/gmodeler/dialogs.py:642 +msgid "If-else properties" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2129 -#: ../gui/wxpython/nviz/preferences.py:412 -#: ../gui/wxpython/nviz/preferences.py:585 -#: ../gui/wxpython/nviz/preferences.py:667 ../gui/wxpython/nviz/tools.py:1459 -#: ../gui/wxpython/nviz/tools.py:2212 ../gui/wxpython/nviz/tools.py:2374 -#: ../gui/wxpython/mapswipe/dialogs.py:294 -#: ../gui/wxpython/gui_core/preferences.py:1494 -#: ../gui/wxpython/gcp/manager.py:3062 -#: ../gui/wxpython/image2target/ii2t_manager.py:2995 -#: ../gui/wxpython/psmap/dialogs.py:2408 ../gui/wxpython/psmap/dialogs.py:2559 -msgid "Color:" +#: ../gui/wxpython/gmodeler/dialogs.py:651 +msgid "List of items in 'if' block" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2143 -#: ../gui/wxpython/gcp/manager.py:3076 -#: ../gui/wxpython/image2target/ii2t_manager.py:3009 -msgid "Color for high RMS error:" +#: ../gui/wxpython/gmodeler/dialogs.py:659 +msgid "List of items in 'else' block" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2158 -#: ../gui/wxpython/gcp/manager.py:3091 -#: ../gui/wxpython/image2target/ii2t_manager.py:3024 -msgid "Color for selected GCP:" +#: ../gui/wxpython/gmodeler/dialogs.py:840 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2173 -#: ../gui/wxpython/gcp/manager.py:3106 -#: ../gui/wxpython/image2target/ii2t_manager.py:3039 -msgid "Color for unused GCPs:" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Do you want to delete all variables from the model?" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2186 -#: ../gui/wxpython/gcp/manager.py:3119 -#: ../gui/wxpython/image2target/ii2t_manager.py:3052 -msgid "Show unused GCPs" +#: ../gui/wxpython/gmodeler/dialogs.py:874 +msgid "Delete variables" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2196 -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gcp/manager.py:3129 -#: ../gui/wxpython/image2target/ii2t_manager.py:3062 -msgid "Symbol size:" +#: ../gui/wxpython/gmodeler/dialogs.py:914 +#: ../gui/wxpython/gmodeler/dialogs.py:1080 +#: ../gui/wxpython/vdigit/dialogs.py:305 +msgid "Delete selected" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2208 -#: ../gui/wxpython/vnet/dialogs.py:1314 ../gui/wxpython/mapswipe/dialogs.py:339 -#: ../gui/wxpython/gui_core/preferences.py:1384 -#: ../gui/wxpython/gcp/manager.py:3141 -#: ../gui/wxpython/image2target/ii2t_manager.py:3074 -#: ../gui/wxpython/psmap/dialogs.py:6614 -msgid "Line width:" +#: ../gui/wxpython/gmodeler/dialogs.py:915 +#: ../gui/wxpython/vdigit/dialogs.py:309 +msgid "Delete all" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2250 -#: ../gui/wxpython/gcp/manager.py:794 ../gui/wxpython/gcp/manager.py:3194 -#: ../gui/wxpython/image2target/ii2t_manager.py:785 -#: ../gui/wxpython/image2target/ii2t_manager.py:3126 -msgid "Select source map to display:" +#: ../gui/wxpython/gmodeler/dialogs.py:921 +#: ../gui/wxpython/gmodeler/dialogs.py:1084 ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:2662 ../gui/wxpython/vdigit/dialogs.py:311 +msgid "Reload" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2267 -#: ../gui/wxpython/gcp/manager.py:820 ../gui/wxpython/gcp/manager.py:3208 -#: ../gui/wxpython/image2target/ii2t_manager.py:811 -#: ../gui/wxpython/image2target/ii2t_manager.py:3143 -msgid "Select target raster map to display:" +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/location_wizard/wizard.py:989 +#: ../gui/wxpython/gui_core/gselect.py:2217 +msgid "No" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 -#: ../gui/wxpython/gcp/manager.py:3248 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -msgid "Rectification" +#: ../gui/wxpython/gmodeler/dialogs.py:986 +#: ../gui/wxpython/location_wizard/wizard.py:989 +#: ../gui/wxpython/gui_core/gselect.py:2219 +msgid "Yes" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2303 -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3197 -msgid "Select rectification order" +#: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 +msgid "Graphical Modeler - GRASS GIS" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2304 -#: ../gui/wxpython/gcp/manager.py:3257 -#: ../gui/wxpython/image2target/ii2t_manager.py:3198 -msgid "1st order" +#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/lmgr/toolbars.py:208 +#: ../gui/wxpython/gui_core/forms.py:1526 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2304 -#: ../gui/wxpython/gcp/manager.py:3257 -#: ../gui/wxpython/image2target/ii2t_manager.py:3198 -msgid "2nd order" +#: ../gui/wxpython/gmodeler/frame.py:170 +msgid "Model" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2304 -#: ../gui/wxpython/gcp/manager.py:3257 -#: ../gui/wxpython/image2target/ii2t_manager.py:3198 -msgid "3rd order" +#: ../gui/wxpython/gmodeler/frame.py:171 +msgid "Items" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2314 -#: ../gui/wxpython/gcp/manager.py:3267 -#: ../gui/wxpython/image2target/ii2t_manager.py:3208 -msgid "Select interpolation method:" +#: ../gui/wxpython/gmodeler/frame.py:176 +msgid "Python editor" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2330 -#: ../gui/wxpython/gcp/manager.py:3283 -#: ../gui/wxpython/image2target/ii2t_manager.py:3224 -msgid "clip to computational region in target location" +#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2493 +msgid "Command output" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2338 -#: ../gui/wxpython/gcp/manager.py:619 ../gui/wxpython/gcp/manager.py:3301 -#: ../gui/wxpython/image2target/ii2t_manager.py:624 -#: ../gui/wxpython/image2target/ii2t_manager.py:3232 -msgid "Extension for output maps:" +#: ../gui/wxpython/gmodeler/frame.py:249 ../gui/wxpython/gui_core/pystc.py:263 +msgid "Python script contains local modifications" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2379 -#: ../gui/wxpython/gcp/manager.py:3337 -#: ../gui/wxpython/image2target/ii2t_manager.py:3273 -msgid "RMS threshold factor must be > 0" +#: ../gui/wxpython/gmodeler/frame.py:251 ../gui/wxpython/gmodeler/frame.py:2166 +msgid "Python script is up-to-date" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2384 -#: ../gui/wxpython/gcp/manager.py:3342 -#: ../gui/wxpython/image2target/ii2t_manager.py:3278 -msgid "" -"RMS threshold factor is < 1\n" -"Too many points might be highlighted" +#: ../gui/wxpython/gmodeler/frame.py:267 +msgid "Redrawing model..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:2564 -#: ../gui/wxpython/gcp/manager.py:3585 -#: ../gui/wxpython/image2target/ii2t_manager.py:3490 -#, python-format -msgid "GCP Manager settings saved to file '%s'." +#: ../gui/wxpython/gmodeler/frame.py:323 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:45 -msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" +#: ../gui/wxpython/gmodeler/frame.py:340 +msgid "Do you want to save changes in the model?" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:264 -#: ../gui/wxpython/gcp/mapdisplay.py:268 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:272 -msgid "GCP Display toolbar" +#: ../gui/wxpython/gmodeler/frame.py:343 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:285 -#: ../gui/wxpython/gcp/mapdisplay.py:289 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:293 -msgid "GCP Manager toolbar" +#: ../gui/wxpython/gmodeler/frame.py:350 +msgid "Quit Graphical Modeler" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:305 -#: ../gui/wxpython/gcp/mapdisplay.py:309 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:313 -msgid "GCP List" +#: ../gui/wxpython/gmodeler/frame.py:419 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:320 -#: ../gui/wxpython/gcp/mapdisplay.py:324 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:328 -msgid "Source Display" +#: ../gui/wxpython/gmodeler/frame.py:428 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:331 -#: ../gui/wxpython/gcp/mapdisplay.py:335 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:339 -msgid "Target Display" +#: ../gui/wxpython/gmodeler/frame.py:433 +#, python-format +msgid "Do you want to permanently delete data?%s" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:518 -#: ../gui/wxpython/gcp/mapdisplay.py:522 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:526 -msgid "Zoom to computational region (set with g.region)" +#: ../gui/wxpython/gmodeler/frame.py:434 +msgid "Delete intermediate data?" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:532 -#: ../gui/wxpython/gcp/mapdisplay.py:536 -#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:540 -msgid "Set computational region from display" +#: ../gui/wxpython/gmodeler/frame.py:456 ../gui/wxpython/gmodeler/frame.py:606 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:47 -#, python-brace-format -msgid "" -"The Temporal Plot Tool needs the \"matplotlib\" (python-matplotlib) package " -"to be installed. {0}" +#: ../gui/wxpython/gmodeler/frame.py:460 ../gui/wxpython/gmodeler/frame.py:610 +msgid "Create new model?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:105 -msgid "Temporal Plot Tool" +#: ../gui/wxpython/gmodeler/frame.py:500 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/tplot/frame.py:190 -msgid "" -"Raster temporal dataset (strds)\n" -"Press ENTER after typing the name or select with the combobox" +#: ../gui/wxpython/gmodeler/frame.py:502 ../gui/wxpython/gmodeler/frame.py:558 +#: ../gui/wxpython/lmgr/frame.py:814 ../gui/wxpython/main_window/frame.py:897 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/tplot/frame.py:207 -msgid "X and Y coordinates separated by comma:" +#: ../gui/wxpython/gmodeler/frame.py:520 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/tplot/frame.py:224 -msgid "" -"Coordinates can be obtained for example by right-clicking on Map Display." +#: ../gui/wxpython/gmodeler/frame.py:534 ../gui/wxpython/gmodeler/frame.py:576 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:231 ../gui/wxpython/tplot/frame.py:297 -msgid "Show simple linear regression line" +#: ../gui/wxpython/gmodeler/frame.py:538 ../gui/wxpython/menustrings.py:2037 +msgid "Save model" msgstr "" -#: ../gui/wxpython/tplot/frame.py:247 -msgid "STRDS" +#: ../gui/wxpython/gmodeler/frame.py:546 ../gui/wxpython/gmodeler/frame.py:592 +#, python-format +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/tplot/frame.py:255 -msgid "" -"Vector temporal dataset (stvds)\n" -"Press ENTER after typing the name or select with the combobox" +#: ../gui/wxpython/gmodeler/frame.py:556 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/tplot/frame.py:275 -msgid "Select attribute column" +#: ../gui/wxpython/gmodeler/frame.py:580 ../gui/wxpython/iclass/frame.py:1229 +msgid "File already exists" msgstr "" -#: ../gui/wxpython/tplot/frame.py:292 -msgid "Select category of vector(s)" +#: ../gui/wxpython/gmodeler/frame.py:678 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/tplot/frame.py:316 -msgid "STVDS" +#: ../gui/wxpython/gmodeler/frame.py:687 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/tplot/frame.py:323 -msgid "Set title for the plot" +#: ../gui/wxpython/gmodeler/frame.py:690 +msgid "Model is valid." msgstr "" -#: ../gui/wxpython/tplot/frame.py:333 -msgid "Set label for X axis" +#: ../gui/wxpython/gmodeler/frame.py:751 ../gui/wxpython/gmodeler/frame.py:758 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/tplot/frame.py:343 -msgid "Set label for Y axis" +#: ../gui/wxpython/gmodeler/frame.py:907 ../gui/wxpython/menustrings.py:2062 +msgid "Add comment" msgstr "" -#: ../gui/wxpython/tplot/frame.py:359 -msgid "Labels" +#: ../gui/wxpython/gmodeler/frame.py:915 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/tplot/frame.py:366 -msgid "Path for output CSV file with plotted data" +#: ../gui/wxpython/gmodeler/frame.py:952 +msgid "wxGUI Graphical Modeler" msgstr "" -#: ../gui/wxpython/tplot/frame.py:373 -msgid "CVS path" +#: ../gui/wxpython/gmodeler/frame.py:1088 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/tplot/frame.py:381 -msgid "Do you want the CSV header?" +#: ../gui/wxpython/gmodeler/frame.py:1099 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/tplot/frame.py:420 ../gui/wxpython/tplot/frame.py:1063 -#: ../gui/wxpython/tplot/frame.py:1070 ../gui/wxpython/tplot/frame.py:1099 -#: ../gui/wxpython/tplot/frame.py:1262 -msgid "Invalid input coordinates" +#: ../gui/wxpython/gmodeler/frame.py:1165 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/tplot/frame.py:525 -#, python-brace-format -msgid "Category {ca} is not on vector map {ma} and it will be not used" +#: ../gui/wxpython/gmodeler/frame.py:1177 ../gui/wxpython/lmgr/workspace.py:436 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/tplot/frame.py:547 -msgid "" -"Both coordinates and categories are set, coordinates will be used. The use " -"categories remove text from coordinate form" +#: ../gui/wxpython/gmodeler/frame.py:1548 +msgid "Disable" msgstr "" -#: ../gui/wxpython/tplot/frame.py:557 -msgid "With Vector temporal dataset you have to select an attribute column" +#: ../gui/wxpython/gmodeler/frame.py:1551 +msgid "Enable" msgstr "" -#: ../gui/wxpython/tplot/frame.py:627 -msgid "" -"Difference number of vector layers and maps in the vector temporal dataset" +#: ../gui/wxpython/gmodeler/frame.py:1556 +#: ../gui/wxpython/gmodeler/frame.py:1634 +msgid "Set label" msgstr "" -#: ../gui/wxpython/tplot/frame.py:672 -#, python-brace-format -msgid "No connection between vector map {vmap} and layer {la}" +#: ../gui/wxpython/gmodeler/frame.py:1559 +#: ../gui/wxpython/gmodeler/frame.py:1650 +msgid "Set comment" msgstr "" -#: ../gui/wxpython/tplot/frame.py:745 -#, python-format -msgid "Temporal resolution: %s" +#: ../gui/wxpython/gmodeler/frame.py:1564 +msgid "Add control point" msgstr "" -#: ../gui/wxpython/tplot/frame.py:861 -msgid "" -"Problem getting data from raster temporal dataset. Empty list of values." +#: ../gui/wxpython/gmodeler/frame.py:1566 +msgid "Remove control point" msgstr "" -#: ../gui/wxpython/tplot/frame.py:920 -#, python-brace-format -msgid "" -"Problem getting data from vector temporal dataset. Empty list of values for " -"cat {ca}." +#: ../gui/wxpython/gmodeler/frame.py:1580 +msgid "Intermediate" msgstr "" -#: ../gui/wxpython/tplot/frame.py:977 -msgid "" -"Problem getting data from vector temporal dataset. Empty list of values." +#: ../gui/wxpython/gmodeler/frame.py:1591 ../gui/wxpython/nviz/tools.py:1609 +#: ../gui/wxpython/nviz/tools.py:1842 ../gui/wxpython/vdigit/preferences.py:137 +msgid "Display" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1013 -#, python-brace-format -msgid "{pa} already exists, do you want to overwrite?" +#: ../gui/wxpython/gmodeler/frame.py:1609 ../gui/wxpython/lmgr/layertree.py:510 +msgid "Properties" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1016 -msgid "File exists" +#: ../gui/wxpython/gmodeler/frame.py:1753 +msgid "List of variables - right-click to delete" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1024 -msgid "Please change name of output CSV file or " +#: ../gui/wxpython/gmodeler/frame.py:1758 +#: ../gui/wxpython/gmodeler/frame.py:1808 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gui_core/ghelp.py:428 ../gui/wxpython/gui_core/ghelp.py:431 +#: ../gui/wxpython/gui_core/ghelp.py:504 +msgid "Name" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1052 -msgid "Incorrect coordinates format, should be: x,y" +#: ../gui/wxpython/gmodeler/frame.py:1758 +#: ../gui/wxpython/gmodeler/frame.py:1814 ../gui/wxpython/dbmgr/base.py:2973 +msgid "Data type" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1078 -msgid "Seed point outside the current region" +#: ../gui/wxpython/gmodeler/frame.py:1758 +#: ../gui/wxpython/gmodeler/frame.py:1820 +msgid "Default value" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1092 -msgid "Invalid input raster dataset" +#: ../gui/wxpython/gmodeler/frame.py:1758 +#: ../gui/wxpython/gmodeler/frame.py:1826 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:531 +#: ../gui/wxpython/location_wizard/wizard.py:1078 +#: ../gui/wxpython/location_wizard/wizard.py:1279 +#: ../gui/wxpython/location_wizard/wizard.py:1617 +#: ../gui/wxpython/location_wizard/wizard.py:1815 +msgid "Description" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1115 -msgid "Invalid input vector dataset" +#: ../gui/wxpython/gmodeler/frame.py:1764 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1252 ../gui/wxpython/tplot/frame.py:1316 -msgid "Invalid input temporal dataset" +#: ../gui/wxpython/gmodeler/frame.py:1772 +msgid "integer" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1340 -msgid "Datasets have different number of values" +#: ../gui/wxpython/gmodeler/frame.py:1773 +msgid "float" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1371 -#, python-brace-format -msgid "Value for {date} is {val}" +#: ../gui/wxpython/gmodeler/frame.py:1774 +msgid "string" msgstr "" -#: ../gui/wxpython/tplot/frame.py:1373 -msgid "Press Del to dismiss." +#: ../gui/wxpython/gmodeler/frame.py:1775 +#: ../gui/wxpython/gui_core/dialogs.py:1504 +#: ../gui/wxpython/gui_core/dialogs.py:1746 ../gui/wxpython/gcp/manager.py:422 +#: ../gui/wxpython/image2target/ii2t_manager.py:427 +#: ../gui/wxpython/psmap/dialogs.py:971 +msgid "raster" msgstr "" -#: ../gui/wxpython/tplot/g.gui.tplot.py:145 -msgid "With stvds you have to set 'attr' option" +#: ../gui/wxpython/gmodeler/frame.py:1776 +#: ../gui/wxpython/gui_core/dialogs.py:1504 ../gui/wxpython/gcp/manager.py:422 +#: ../gui/wxpython/image2target/ii2t_manager.py:427 +#: ../gui/wxpython/psmap/dialogs.py:974 +msgid "vector" msgstr "" -#: ../gui/wxpython/tplot/g.gui.tplot.py:151 -msgid "" -"With stvds it is not possible to use 'coordinates' and 'cats' options " -"together" +#: ../gui/wxpython/gmodeler/frame.py:1777 +msgid "region" msgstr "" -#: ../gui/wxpython/tplot/g.gui.tplot.py:157 -msgid "With stvds you have to use 'coordinates' or 'cats' option" +#: ../gui/wxpython/gmodeler/frame.py:1778 +msgid "mapset" msgstr "" -#: ../gui/wxpython/tplot/g.gui.tplot.py:175 -msgid "Temporal Plot Tool - GRASS GIS" +#: ../gui/wxpython/gmodeler/frame.py:1779 +#: ../gui/wxpython/gui_core/forms.py:2004 +msgid "file" msgstr "" -#: ../gui/wxpython/nviz/wxnviz.py:36 -msgid "" -"This module requires the NumPy module, which could not be imported. It " -"probably is not installed (it's not part of the standard Python " -"distribution). See the Numeric Python site (http://numpy.scipy.org) for " -"information on downloading source or binaries." +#: ../gui/wxpython/gmodeler/frame.py:1780 +msgid "dir" msgstr "" -#: ../gui/wxpython/nviz/wxnviz.py:368 ../gui/wxpython/nviz/wxnviz.py:379 -#: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:79 -#: ../gui/wxpython/modules/histogram.py:406 -#: ../gui/wxpython/iclass/g.gui.iclass.py:88 -#, python-format -msgid "Raster map <%s> not found" +#: ../gui/wxpython/gmodeler/frame.py:1789 +msgid "Add new variable to the model" msgstr "" -#: ../gui/wxpython/nviz/wxnviz.py:480 ../gui/wxpython/iclass/g.gui.iclass.py:95 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:74 -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#, python-format -msgid "Vector map <%s> not found" +#: ../gui/wxpython/gmodeler/frame.py:1907 +msgid "List of items - right-click to delete" msgstr "" -#: ../gui/wxpython/nviz/wxnviz.py:550 ../gui/wxpython/nviz/wxnviz.py:561 -#, python-format -msgid "3d raster map <%s> not found" +#: ../gui/wxpython/gmodeler/frame.py:1912 +msgid "In loop" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:35 -msgid "3D view default settings" +#: ../gui/wxpython/gmodeler/frame.py:1912 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:58 -msgid "Revert settings to default, changes are not applied" +#: ../gui/wxpython/gmodeler/frame.py:1960 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/nviz/preferences.py:65 -#: ../gui/wxpython/nviz/preferences.py:69 ../gui/wxpython/nviz/tools.py:110 -msgid "View" +#: ../gui/wxpython/gmodeler/frame.py:1993 +msgid "Python script" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:79 ../gui/wxpython/nviz/tools.py:283 -msgid "Perspective:" +#: ../gui/wxpython/gmodeler/frame.py:2000 +msgid "Run python script" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:84 -#: ../gui/wxpython/nviz/preferences.py:173 -#: ../gui/wxpython/nviz/preferences.py:198 -msgid "value:" +#: ../gui/wxpython/gmodeler/frame.py:2003 +msgid "Save python script to file" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:101 -msgid "step:" +#: ../gui/wxpython/gmodeler/frame.py:2008 +msgid "" +"Refresh python script based on the model.\n" +"It will discards all local changes." msgstr "" -#: ../gui/wxpython/nviz/preferences.py:121 -#: ../gui/wxpython/nviz/preferences.py:327 -msgid "Position:" +#: ../gui/wxpython/gmodeler/frame.py:2042 +#, python-format +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:126 -#: ../gui/wxpython/nviz/preferences.py:332 -msgid "x:" +#: ../gui/wxpython/gmodeler/frame.py:2079 +#: ../gui/wxpython/gui_core/pyedit.py:404 +msgid "Choose file to save" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:168 -msgid "Twist:" +#: ../gui/wxpython/gmodeler/frame.py:2082 +#: ../gui/wxpython/gui_core/pyedit.py:406 +#: ../gui/wxpython/gui_core/pyedit.py:477 +msgid "Python script (*.py)|*.py" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:193 ../gui/wxpython/nviz/tools.py:370 -msgid "Z-exag:" +#: ../gui/wxpython/gmodeler/frame.py:2100 ../gui/wxpython/wxplot/profile.py:400 +#: ../gui/wxpython/gui_core/pyedit.py:424 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:223 ../gui/wxpython/nviz/tools.py:443 -msgid "Image Appearance" +#: ../gui/wxpython/gmodeler/frame.py:2103 +#: ../gui/wxpython/gui_core/pyedit.py:427 +msgid "Save file" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:259 -msgid "Fly-through" +#: ../gui/wxpython/gmodeler/frame.py:2141 +msgid "" +"Python script is locally modificated. Refresh will discard all changes. Do " +"you really want to continue?" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:270 -msgid "Move exag:" +#: ../gui/wxpython/gmodeler/frame.py:2145 +msgid "Update" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:288 -msgid "Turn exag:" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2435 +msgid "Define new GRASS Location" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:316 ../gui/wxpython/nviz/tools.py:762 -msgid "Lighting" +#: ../gui/wxpython/location_wizard/wizard.py:198 +msgid "Change" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:320 -msgid "Light" +#: ../gui/wxpython/location_wizard/wizard.py:215 +#: ../gui/wxpython/gui_core/forms.py:1174 +msgid "This option is required" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:366 -msgid "z:" +#: ../gui/wxpython/location_wizard/wizard.py:218 +msgid "(optional)" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:385 ../gui/wxpython/nviz/tools.py:2227 -msgid "Brightness:" +#: ../gui/wxpython/location_wizard/wizard.py:229 +msgid "Name of location directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:399 ../gui/wxpython/nviz/tools.py:2252 -msgid "Ambient:" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of location directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:438 ../gui/wxpython/nviz/tools.py:690 -#: ../gui/wxpython/nviz/tools.py:2314 -msgid "Surface" +#: ../gui/wxpython/location_wizard/wizard.py:271 +msgid "Location will be created in GRASS database:" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:450 ../gui/wxpython/nviz/tools.py:856 -#: ../gui/wxpython/nviz/tools.py:1952 -msgid "Mode:" +#: ../gui/wxpython/location_wizard/wizard.py:297 +msgid "" +"Name '{}' is not a valid name for location. Please use only ASCII characters " +"excluding characters {} and space." msgstr "" -#: ../gui/wxpython/nviz/preferences.py:458 ../gui/wxpython/nviz/tools.py:864 -msgid "coarse" +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/modules/import_export.py:262 +#: ../gui/wxpython/gui_core/widgets.py:866 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 +msgid "Invalid name" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:458 ../gui/wxpython/nviz/tools.py:864 -msgid "fine" +#: ../gui/wxpython/location_wizard/wizard.py:311 +msgid "" +"Location '{}' already exists. Please consider using another name for your " +"location." msgstr "" -#: ../gui/wxpython/nviz/preferences.py:458 ../gui/wxpython/nviz/tools.py:864 -msgid "both" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing location path" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:469 ../gui/wxpython/nviz/tools.py:942 -msgid "Fine mode:" +#: ../gui/wxpython/location_wizard/wizard.py:347 +msgid "" +"Title of the location is limited only to one line and 256 characters. The " +"rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/nviz/preferences.py:475 -#: ../gui/wxpython/nviz/preferences.py:496 ../gui/wxpython/nviz/tools.py:903 -#: ../gui/wxpython/nviz/tools.py:948 -msgid "resolution:" +#: ../gui/wxpython/location_wizard/wizard.py:358 +msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:488 ../gui/wxpython/nviz/tools.py:898 -msgid "Coarse mode:" +#: ../gui/wxpython/location_wizard/wizard.py:371 +msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:508 ../gui/wxpython/nviz/tools.py:917 -msgid "style:" +#: ../gui/wxpython/location_wizard/wizard.py:380 +#: ../gui/wxpython/location_wizard/wizard.py:1442 +msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:513 ../gui/wxpython/nviz/tools.py:925 -msgid "wire" +#: ../gui/wxpython/location_wizard/wizard.py:385 +msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:513 ../gui/wxpython/nviz/tools.py:925 -msgid "surface" +#: ../gui/wxpython/location_wizard/wizard.py:388 +#: ../gui/wxpython/location_wizard/wizard.py:1525 +msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:525 -msgid "wire color:" +#: ../gui/wxpython/location_wizard/wizard.py:391 +#: ../gui/wxpython/location_wizard/wizard.py:2053 +msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:557 ../gui/wxpython/nviz/tools.py:709 -msgid "Vector" +#: ../gui/wxpython/location_wizard/wizard.py:394 +#: ../gui/wxpython/location_wizard/wizard.py:509 +msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:562 ../gui/wxpython/nviz/tools.py:1522 -msgid "Vector lines" +#: ../gui/wxpython/location_wizard/wizard.py:405 +msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:607 ../gui/wxpython/nviz/tools.py:1701 -msgid "Vector points" +#: ../gui/wxpython/location_wizard/wizard.py:531 +#: ../gui/wxpython/location_wizard/wizard.py:1078 +#: ../gui/wxpython/location_wizard/wizard.py:1279 +#: ../gui/wxpython/location_wizard/wizard.py:1617 +#: ../gui/wxpython/location_wizard/wizard.py:1815 +msgid "Code" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:613 -msgid "Automatic size" +#: ../gui/wxpython/location_wizard/wizard.py:537 +msgid "Projection code:" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:615 -msgid "Icon size is set automatically based on landscape dimensions." +#: ../gui/wxpython/location_wizard/wizard.py:547 +#: ../gui/wxpython/location_wizard/wizard.py:1097 +#: ../gui/wxpython/location_wizard/wizard.py:1305 +msgid "Search in description:" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:625 -#: ../gui/wxpython/mapswipe/dialogs.py:360 -msgid "Size:" +#: ../gui/wxpython/location_wizard/wizard.py:735 +#, python-format +msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:642 -msgid "Marker:" +#: ../gui/wxpython/location_wizard/wizard.py:828 +msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/nviz/preferences.py:755 -#, python-format -msgid "3D view settings saved to file <%s>." +#: ../gui/wxpython/location_wizard/wizard.py:847 +msgid "Select datum or ellipsoid (next page)" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:233 -msgid "" -"Opening 3D view was not successful. Please try to change the value of depth " -"buffer in GUI Settings dialog > tab Map Display > Advanced and restart GUI." +#: ../gui/wxpython/location_wizard/wizard.py:858 +msgid "Datum with associated ellipsoid" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:508 -#, python-format -msgid "" -"Image is too large, your OpenGL implementation supports maximum texture size " -"%d px." +#: ../gui/wxpython/location_wizard/wizard.py:862 +msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1041 -msgid "Easting" +#: ../gui/wxpython/location_wizard/wizard.py:919 +#, python-format +msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1042 -msgid "Northing" +#: ../gui/wxpython/location_wizard/wizard.py:937 +#: ../gui/wxpython/location_wizard/wizard.py:956 +#, python-format +msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1043 -msgid "Elevation" +#: ../gui/wxpython/location_wizard/wizard.py:1053 +msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1054 -msgid "Surface map name" +#: ../gui/wxpython/location_wizard/wizard.py:1078 +msgid "Ellipsoid" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1056 -msgid "Surface map elevation" +#: ../gui/wxpython/location_wizard/wizard.py:1084 +msgid "Datum code:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1058 -msgid "Surface map color" +#: ../gui/wxpython/location_wizard/wizard.py:1245 +msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1068 -msgid "XY distance from previous" +#: ../gui/wxpython/location_wizard/wizard.py:1266 +msgid "Earth based" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1070 -msgid "XYZ distance from previous" +#: ../gui/wxpython/location_wizard/wizard.py:1269 +msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1075 -msgid "Distance along surface" +#: ../gui/wxpython/location_wizard/wizard.py:1286 +msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1087 -msgid "Distance along exag. surface" +#: ../gui/wxpython/location_wizard/wizard.py:1452 +msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1098 -msgid "No point on surface" +#: ../gui/wxpython/location_wizard/wizard.py:1510 +msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1589 -msgid "Loading raster map" +#: ../gui/wxpython/location_wizard/wizard.py:1536 +msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1593 -msgid "Loading 3d raster map" +#: ../gui/wxpython/location_wizard/wizard.py:1588 +msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1599 -msgid "failed" +#: ../gui/wxpython/location_wizard/wizard.py:1604 +msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1601 -#, python-format -msgid "Unsupported layer type '%s'" +#: ../gui/wxpython/location_wizard/wizard.py:1608 +msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1720 -msgid "Unable to unload raster map" +#: ../gui/wxpython/location_wizard/wizard.py:1617 +#: ../gui/wxpython/location_wizard/wizard.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:390 +msgid "Parameters" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1721 ../gui/wxpython/nviz/tools.py:830 -#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/menustrings.py:2099 -#: ../gui/wxpython/psmap/dialogs.py:1594 -msgid "Raster map" +#: ../gui/wxpython/location_wizard/wizard.py:1758 +#: ../gui/wxpython/gui_core/preferences.py:1873 +#, python-brace-format +msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1725 -msgid "Unable to unload 3d raster map" +#: ../gui/wxpython/location_wizard/wizard.py:1777 +msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1726 -msgid "3d raster map" +#: ../gui/wxpython/location_wizard/wizard.py:1793 +msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1737 -msgid "unloaded successfully" +#: ../gui/wxpython/location_wizard/wizard.py:1797 +msgid "IAU code:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1791 -#, python-format -msgid "Loading vector map <%(name)s> (%(type)s) failed" +#: ../gui/wxpython/location_wizard/wizard.py:1999 +msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1855 -#, python-format -msgid "Unable to unload vector map <%(name)s> (%(type)s)" +#: ../gui/wxpython/location_wizard/wizard.py:2034 +#, python-brace-format +msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:1860 -#, python-format -msgid "Vector map <%(name)s> (%(type)s) unloaded successfully" +#: ../gui/wxpython/location_wizard/wizard.py:2069 +msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:2266 -#, python-format -msgid "Vector point layer not found (id = %d)" +#: ../gui/wxpython/location_wizard/wizard.py:2134 +#: ../gui/wxpython/location_wizard/wizard.py:2138 +msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:2268 -#, python-format -msgid "Unable to set data layer properties (id = %d)" +#: ../gui/wxpython/location_wizard/wizard.py:2182 +#: ../gui/wxpython/rlisetup/wizard.py:1962 +msgid "Summary" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:2272 -#, python-format -msgid "" -"Setting data layer properties failed.\n" -"\n" -"%s" +#: ../gui/wxpython/location_wizard/wizard.py:2231 +msgid "GRASS Database:" msgstr "" -#: ../gui/wxpython/nviz/mapwindow.py:2332 -#: ../gui/wxpython/nviz/mapwindow.py:2351 ../gui/wxpython/nviz/tools.py:2773 -#: ../gui/wxpython/nviz/tools.py:2819 ../gui/wxpython/nviz/tools.py:5228 -msgid "constant#" +#: ../gui/wxpython/location_wizard/wizard.py:2240 +msgid "Location Name:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:116 -#: ../gui/wxpython/gui_core/preferences.py:515 -msgid "Appearance" +#: ../gui/wxpython/location_wizard/wizard.py:2261 +msgid "Projection:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:119 -msgid "Analysis" +#: ../gui/wxpython/location_wizard/wizard.py:2273 +msgid "" +"PROJ.4 definition:\n" +" (non-definitive)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:121 ../gui/wxpython/nviz/tools.py:485 -msgid "Animation" +#: ../gui/wxpython/location_wizard/wizard.py:2392 +#: ../gui/wxpython/psmap/dialogs.py:744 ../gui/wxpython/psmap/dialogs.py:767 +msgid "custom" msgstr "" -#: ../gui/wxpython/nviz/tools.py:250 -msgid "Control View" +#: ../gui/wxpython/location_wizard/wizard.py:2534 +#, python-format +msgid "" +"Unable to create new location. Location <%(loc)s> not created.\n" +"\n" +"Details: %(err)s" msgstr "" -#: ../gui/wxpython/nviz/tools.py:271 -msgid "Adjusts the distance and angular perspective of the image viewpoint" +#: ../gui/wxpython/location_wizard/wizard.py:2667 +msgid "Unable to create new location" msgstr "" -#: ../gui/wxpython/nviz/tools.py:299 -msgid "Tilts the plane of the surface from the horizontal" +#: ../gui/wxpython/location_wizard/wizard.py:2669 +msgid "Location already exists in GRASS Database." msgstr "" -#: ../gui/wxpython/nviz/tools.py:309 ../gui/wxpython/nviz/tools.py:1297 -msgid "Tilt:" +#: ../gui/wxpython/location_wizard/wizard.py:2686 +#, python-brace-format +msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:324 -msgid "" -"Adjusts the viewing height above the surface (angle of view automatically " -"adjusts to maintain the same center of view)" +#: ../gui/wxpython/location_wizard/wizard.py:2725 +msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/nviz/tools.py:337 -msgid "Adjusts the relative height of features above the plane of the surface" +#: ../gui/wxpython/location_wizard/wizard.py:2737 +msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/nviz/tools.py:395 -msgid "Look:" +#: ../gui/wxpython/location_wizard/wizard.py:2751 +#, python-format +msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/nviz/tools.py:399 -msgid "here" +#: ../gui/wxpython/location_wizard/wizard.py:2761 +msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/nviz/tools.py:404 -msgid "" -"Allows you to select a point on the surface that becomes the new center of " -"view. Click on the button and then on the surface." +#: ../gui/wxpython/location_wizard/dialogs.py:39 +msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/nviz/tools.py:413 -msgid "center" +#: ../gui/wxpython/location_wizard/dialogs.py:92 +msgid "&Set region" msgstr "" -#: ../gui/wxpython/nviz/tools.py:416 -msgid "Resets the view to the original default center of view" +#: ../gui/wxpython/location_wizard/dialogs.py:121 +msgid "Invalid location selected." msgstr "" -#: ../gui/wxpython/nviz/tools.py:421 -msgid "top" +#: ../gui/wxpython/location_wizard/dialogs.py:139 +msgid "Invalid region" msgstr "" -#: ../gui/wxpython/nviz/tools.py:426 -msgid "" -"Sets the viewer directly over the scene's center position. This top view " -"orients approximately north south." +#: ../gui/wxpython/location_wizard/dialogs.py:171 +msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 -msgid "reset" +#: ../gui/wxpython/location_wizard/dialogs.py:172 +msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:432 -msgid "Reset to default view" +#: ../gui/wxpython/location_wizard/dialogs.py:200 +#: ../gui/wxpython/location_wizard/dialogs.py:580 +#, python-format +msgid "Rows: %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:495 -msgid "" -"Press 'Record' button and start changing the view. It is recommended to use " -"fly-through mode (Map Display toolbar) to achieve smooth motion." +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:581 +#, python-format +msgid "Cols: %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:507 -msgid "Record" +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:582 +#, python-format +msgid "Cells: %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:509 -msgid "Play" +#: ../gui/wxpython/location_wizard/dialogs.py:247 +#: ../gui/wxpython/location_wizard/dialogs.py:584 +#, python-format +msgid "Depth: %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:531 -msgid "Total number of frames :" +#: ../gui/wxpython/location_wizard/dialogs.py:248 +#: ../gui/wxpython/location_wizard/dialogs.py:585 +#, python-format +msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:536 -msgid "Frame rate (FPS):" +#: ../gui/wxpython/location_wizard/dialogs.py:252 +#: ../gui/wxpython/psmap/dialogs.py:585 +msgid "Top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:546 -msgid "Frames are recorded with given frequency (FPS). " +#: ../gui/wxpython/location_wizard/dialogs.py:262 +#: ../gui/wxpython/psmap/dialogs.py:586 +msgid "Bottom" msgstr "" -#: ../gui/wxpython/nviz/tools.py:598 -msgid "Save image sequence" +#: ../gui/wxpython/location_wizard/dialogs.py:272 +msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 ../gui/wxpython/psmap/dialogs.py:5743 -msgid "Choose a directory:" +#: ../gui/wxpython/location_wizard/dialogs.py:344 +msgid "North" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 -msgid "Choose a directory for images" +#: ../gui/wxpython/location_wizard/dialogs.py:361 +msgid "West" msgstr "" -#: ../gui/wxpython/nviz/tools.py:623 -msgid "" -"Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." +#: ../gui/wxpython/location_wizard/dialogs.py:398 +msgid "East" msgstr "" -#: ../gui/wxpython/nviz/tools.py:700 ../gui/wxpython/nviz/tools.py:1394 -msgid "Constant surface" +#: ../gui/wxpython/location_wizard/dialogs.py:415 +msgid "South" msgstr "" -#: ../gui/wxpython/nviz/tools.py:718 ../gui/wxpython/gui_core/dialogs.py:1504 -msgid "3D raster" +#: ../gui/wxpython/location_wizard/dialogs.py:426 +msgid "N-S resolution" msgstr "" -#: ../gui/wxpython/nviz/tools.py:770 -msgid "Fringe" +#: ../gui/wxpython/location_wizard/dialogs.py:443 +msgid "E-W resolution" msgstr "" -#: ../gui/wxpython/nviz/tools.py:806 ../gui/wxpython/nviz/tools.py:1149 -msgid "Cutting planes" +#: ../gui/wxpython/location_wizard/dialogs.py:542 +#, python-format +msgid "Invalid value: %s" msgstr "" -#: ../gui/wxpython/nviz/tools.py:875 ../gui/wxpython/nviz/tools.py:1168 -#: ../gui/wxpython/nviz/tools.py:1970 -msgid "Shading:" +#: ../gui/wxpython/location_wizard/dialogs.py:646 +msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:880 ../gui/wxpython/nviz/tools.py:1978 -msgid "flat" +#: ../gui/wxpython/location_wizard/dialogs.py:675 +msgid "Select from list of datum transformations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:880 ../gui/wxpython/nviz/tools.py:1978 -msgid "gouraud" +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:37 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 +msgid "Pan to GCP by number" msgstr "" -#: ../gui/wxpython/nviz/tools.py:888 -msgid "Set to all" +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:53 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 +msgid "Valid Range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:889 -msgid "Use draw settings for all loaded surfaces" +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:119 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 +msgid "RMS error" msgstr "" -#: ../gui/wxpython/nviz/tools.py:936 -msgid "Change wire color" +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:124 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 +#, python-format +msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" -#: ../gui/wxpython/nviz/tools.py:973 -msgid "Surface attributes" +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:99 +msgid "Please provide a group name to process" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2913 -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1285 -#: ../gui/wxpython/psmap/dialogs.py:2352 -msgid "Mask" +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:104 +msgid "Please provide a raster map name to process" msgstr "" -#: ../gui/wxpython/nviz/tools.py:984 ../gui/wxpython/nviz/tools.py:2914 -msgid "Transparency" +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 +msgid "Please provide a camera name (generated by i.ortho.camera)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:985 ../gui/wxpython/nviz/tools.py:2915 -msgid "Shininess" +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:115 +msgid "Please provive an order value (1 if 4 Fiducials, 2 if 8 Fiducials)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:994 ../gui/wxpython/nviz/tools.py:2930 -msgid "map" +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:121 +msgid "Please provive an output files extension (used by i.rectify)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:998 ../gui/wxpython/nviz/tools.py:2936 -msgid "unset" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:40 +#: ../gui/wxpython/gcp/toolbars.py:40 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:40 +msgid "Add new GCP to the list" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1003 ../gui/wxpython/nviz/tools.py:2941 -msgid "constant" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:41 +#: ../gui/wxpython/gcp/toolbars.py:41 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:41 +msgid "Delete selected GCP" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1055 ../gui/wxpython/nviz/tools.py:2069 -#: ../gui/wxpython/psmap/dialogs.py:3707 ../gui/wxpython/psmap/dialogs.py:4470 -#: ../gui/wxpython/psmap/dialogs.py:4761 ../gui/wxpython/psmap/dialogs.py:5375 -#: ../gui/wxpython/psmap/dialogs.py:5379 ../gui/wxpython/psmap/dialogs.py:5856 -#: ../gui/wxpython/psmap/dialogs.py:5861 ../gui/wxpython/psmap/dialogs.py:6377 -#: ../gui/wxpython/psmap/dialogs.py:6382 -msgid "Position" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:42 +#: ../gui/wxpython/gcp/toolbars.py:42 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:42 +msgid "Clear selected GCP" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1060 -msgid "Changes the x, y, and z position of the current surface" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:43 +#: ../gui/wxpython/gcp/toolbars.py:43 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:43 +msgid "Recalculate RMS error" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1079 ../gui/wxpython/nviz/tools.py:1372 -#: ../gui/wxpython/nviz/tools.py:2091 ../gui/wxpython/nviz/tools.py:3117 -msgid "Reset" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 +#: ../gui/wxpython/menustrings.py:195 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/gcp/toolbars.py:44 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:44 +msgid "Georectify" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1080 ../gui/wxpython/nviz/tools.py:2092 -msgid "Reset to default position" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:45 +#: ../gui/wxpython/gcp/toolbars.py:45 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:45 +msgid "Save GCPs to POINTS file" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1156 -msgid "Active cutting plane:" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:47 +#: ../gui/wxpython/gcp/toolbars.py:47 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:47 +msgid "Reload GCPs from POINTS file" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 -msgid "clear" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 +#: ../gui/wxpython/photo2image/ip2i_manager.py:839 +#: ../gui/wxpython/gcp/toolbars.py:106 ../gui/wxpython/gcp/manager.py:1494 +#: ../gui/wxpython/image2target/ii2t_manager.py:1463 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 +msgid "source" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 -msgid "top color" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 +#: ../gui/wxpython/gcp/toolbars.py:106 ../gui/wxpython/gcp/manager.py:1496 +#: ../gui/wxpython/image2target/ii2t_manager.py:1465 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:106 +msgid "target" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 -msgid "bottom color" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:115 +#: ../gui/wxpython/iclass/toolbars.py:73 ../gui/wxpython/gcp/toolbars.py:115 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:115 +msgid "Set map canvas for " msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 -msgid "blend" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:117 +#: ../gui/wxpython/gcp/toolbars.py:117 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:117 +msgid " / Zoom to map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1177 -msgid "shaded" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:134 +#: ../gui/wxpython/gcp/toolbars.py:134 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:134 +msgid "Update GCP coordinates" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1190 -msgid "Horizontal X:" +#: ../gui/wxpython/photo2image/ip2i_toolbars.py:135 +#: ../gui/wxpython/gcp/toolbars.py:135 +#: ../gui/wxpython/image2target/ii2t_toolbars.py:135 +msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1194 -msgid "Sets the X coordinate of the current cutting plane" +#: ../gui/wxpython/photo2image/ip2i_manager.py:310 +msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1225 -msgid "Horizontal Y:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:433 +msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1229 -msgid "Sets the Y coordinate of the current cutting plane" +#: ../gui/wxpython/photo2image/ip2i_manager.py:461 +msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1261 -msgid "Rotation:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:507 +#: ../gui/wxpython/photo2image/ip2i_manager.py:932 +#: ../gui/wxpython/gcp/manager.py:1587 +msgid "Writing POINTS file failed" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1265 -msgid "Rotates the current cutting plane about vertical axis" +#: ../gui/wxpython/photo2image/ip2i_manager.py:693 +#: ../gui/wxpython/gcp/manager.py:1345 +#: ../gui/wxpython/image2target/ii2t_manager.py:1318 +#, python-format +msgid "At least %d GCPs required. Operation canceled." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1301 -msgid "Rotates the current cutting plane about horizontal axis" +#: ../gui/wxpython/photo2image/ip2i_manager.py:844 +#: ../gui/wxpython/gcp/manager.py:1499 +#: ../gui/wxpython/image2target/ii2t_manager.py:1468 +msgid "Set GCP coordinates" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1338 +#: ../gui/wxpython/photo2image/ip2i_manager.py:846 +#: ../gui/wxpython/gcp/manager.py:1501 +#: ../gui/wxpython/image2target/ii2t_manager.py:1470 +#, python-format msgid "" -"Sets the Z coordinate of the current cutting plane (only meaningful when " -"tilt is not 0)" +"Set %(coor)s coordinates for GCP No. %(key)s? \n" +"\n" +"East: %(coor0)s \n" +"North: %(coor1)s" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2032 -msgid "New" +#: ../gui/wxpython/photo2image/ip2i_manager.py:946 +#: ../gui/wxpython/gcp/manager.py:1600 +#, python-format +msgid "POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2452 -#: ../gui/wxpython/nviz/tools.py:2514 ../gui/wxpython/menustrings.py:178 -#: ../gui/wxpython/menustrings.py:1204 ../gui/wxpython/menustrings.py:2115 -#: ../gui/wxpython/psmap/dialogs.py:1818 -msgid "Delete" +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 +#: ../gui/wxpython/gcp/manager.py:1614 +#: ../gui/wxpython/image2target/ii2t_manager.py:1624 +msgid "source mapwin not defined" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1422 -msgid "Fine resolution:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:963 +#: ../gui/wxpython/gcp/manager.py:1617 +#: ../gui/wxpython/image2target/ii2t_manager.py:1627 +msgid "target mapwin not defined" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 -msgid "Value:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:993 +#: ../gui/wxpython/gcp/manager.py:1647 +msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3099 -msgid "Transparency:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1087 +#: ../gui/wxpython/gcp/manager.py:1741 +#: ../gui/wxpython/image2target/ii2t_manager.py:1753 +#, python-format +msgid "" +"Insufficient points defined and active (checked) for selected rectification " +"method (order: %d).\n" +"3+ points needed for 1st order,\n" +"6+ points for 2nd order, and\n" +"10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1486 ../gui/wxpython/lmgr/layertree.py:1012 -#: ../gui/wxpython/menustrings.py:2101 ../gui/wxpython/psmap/dialogs.py:3585 -msgid "Vector map" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1117 +#: ../gui/wxpython/gcp/manager.py:1843 +#: ../gui/wxpython/image2target/ii2t_manager.py:1783 +msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1508 -msgid "Show vector lines" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1141 +msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1528 -msgid "Line:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1176 +#: ../gui/wxpython/gcp/manager.py:1951 +#: ../gui/wxpython/image2target/ii2t_manager.py:1876 +msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1533 -msgid "width:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1222 +#: ../gui/wxpython/gcp/manager.py:2003 +#: ../gui/wxpython/image2target/ii2t_manager.py:1928 +msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1548 ../gui/wxpython/nviz/tools.py:1743 -msgid "color:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1223 +#: ../gui/wxpython/gcp/manager.py:2004 +#: ../gui/wxpython/image2target/ii2t_manager.py:1929 +msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1564 ../gui/wxpython/nviz/tools.py:1797 -msgid "use color for thematic mapping" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1302 +#: ../gui/wxpython/gcp/manager.py:2085 +msgid "" +"Could not calculate RMS Error.\n" +"Possible error with m.transform." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1567 -msgid "use width for thematic mapping" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 +#: ../gui/wxpython/gcp/manager.py:2222 +msgid "" +"Could not calculate new extends.\n" +"Possible error with m.transform." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1583 ../gui/wxpython/nviz/tools.py:1594 -#: ../gui/wxpython/nviz/tools.py:1819 ../gui/wxpython/nviz/tools.py:1830 -msgid "Set options..." +#: ../gui/wxpython/photo2image/ip2i_manager.py:1577 +#: ../gui/wxpython/gcp/manager.py:2360 +#: ../gui/wxpython/image2target/ii2t_manager.py:2283 +msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1618 ../gui/wxpython/nviz/tools.py:5505 -#: ../gui/wxpython/nviz/tools.py:5558 -msgid "on surface(s):" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1583 +#: ../gui/wxpython/gcp/manager.py:2366 +#: ../gui/wxpython/image2target/ii2t_manager.py:2289 +msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1618 ../gui/wxpython/nviz/tools.py:5505 -#: ../gui/wxpython/nviz/tools.py:5558 -msgid "as 3D" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 +#: ../gui/wxpython/vnet/widgets.py:104 ../gui/wxpython/vnet/vnet_data.py:255 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2402 +#: ../gui/wxpython/image2target/ii2t_manager.py:2423 +msgid "use" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1632 ../gui/wxpython/nviz/tools.py:1851 -msgid "Height above surface:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 +msgid "source X" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1688 -msgid "Show vector points" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 +msgid "source Y" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1708 -msgid "Icon:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1700 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1719 +msgid "target X" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1713 ../gui/wxpython/psmap/dialogs.py:2743 -msgid "size:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1701 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1720 +msgid "target Y" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1775 ../gui/wxpython/psmap/dialogs.py:2675 -msgid "symbol:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1702 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1721 +#: ../gui/wxpython/gcp/manager.py:2484 ../gui/wxpython/gcp/manager.py:2503 +#: ../gui/wxpython/image2target/ii2t_manager.py:2409 +#: ../gui/wxpython/image2target/ii2t_manager.py:2430 +msgid "Forward error" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1800 -msgid "use size for thematic mapping" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1703 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1722 +#: ../gui/wxpython/gcp/manager.py:2485 ../gui/wxpython/gcp/manager.py:2504 +#: ../gui/wxpython/image2target/ii2t_manager.py:2410 +#: ../gui/wxpython/image2target/ii2t_manager.py:2431 +msgid "Backward error" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1925 ../gui/wxpython/lmgr/layertree.py:1016 -msgid "3D raster map" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1857 +#: ../gui/wxpython/gcp/manager.py:2639 +#: ../gui/wxpython/image2target/ii2t_manager.py:2568 +msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1960 -msgid "isosurfaces" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1903 +#: ../gui/wxpython/gcp/manager.py:2838 +#: ../gui/wxpython/image2target/ii2t_manager.py:2764 +msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1960 -msgid "slices" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1917 +#: ../gui/wxpython/gcp/manager.py:2852 +#: ../gui/wxpython/image2target/ii2t_manager.py:2778 +msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1987 -msgid "Resolution:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1938 +msgid "source X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2001 -msgid "Draw wire box" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1939 +msgid "target X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2014 ../gui/wxpython/nviz/tools.py:4353 -msgid "List of isosurfaces" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1940 +msgid "source Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2132 -msgid "Show light model" +#: ../gui/wxpython/photo2image/ip2i_manager.py:1941 +msgid "target Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2144 -msgid "Light source position" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2076 +#: ../gui/wxpython/gcp/manager.py:3011 ../gui/wxpython/vdigit/preferences.py:85 +#: ../gui/wxpython/image2target/ii2t_manager.py:2944 +#: ../gui/wxpython/psmap/dialogs.py:2670 +msgid "Symbology" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2161 -msgid "Adjusts the light height" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2084 +#: ../gui/wxpython/gcp/manager.py:3019 +#: ../gui/wxpython/image2target/ii2t_manager.py:2952 +msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2206 -msgid "Light color and intensity" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2096 +#: ../gui/wxpython/gcp/manager.py:3031 +#: ../gui/wxpython/image2target/ii2t_manager.py:2964 +msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2231 -msgid "Adjusts the brightness of the light" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2101 +#: ../gui/wxpython/gcp/manager.py:3035 +#: ../gui/wxpython/image2target/ii2t_manager.py:2968 +msgid "" +"Highlight GCPs with an RMS error larger than \n" +"mean + standard deviation * given factor. \n" +"Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2256 -msgid "Adjusts the ambient light" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2121 +#: ../gui/wxpython/gcp/manager.py:3054 +#: ../gui/wxpython/image2target/ii2t_manager.py:2987 +msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2328 -msgid "Edges with fringe" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2129 +#: ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/preferences.py:585 +#: ../gui/wxpython/nviz/preferences.py:667 ../gui/wxpython/nviz/tools.py:1459 +#: ../gui/wxpython/nviz/tools.py:2212 ../gui/wxpython/nviz/tools.py:2374 +#: ../gui/wxpython/mapswipe/dialogs.py:294 +#: ../gui/wxpython/gui_core/preferences.py:1494 +#: ../gui/wxpython/gcp/manager.py:3062 +#: ../gui/wxpython/image2target/ii2t_manager.py:2995 +#: ../gui/wxpython/psmap/dialogs.py:2408 ../gui/wxpython/psmap/dialogs.py:2559 +msgid "Color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 -msgid "N && W" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2143 +#: ../gui/wxpython/gcp/manager.py:3076 +#: ../gui/wxpython/image2target/ii2t_manager.py:3009 +msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2333 -msgid "N && E" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2158 +#: ../gui/wxpython/gcp/manager.py:3091 +#: ../gui/wxpython/image2target/ii2t_manager.py:3024 +msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2334 -msgid "S && W" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2173 +#: ../gui/wxpython/gcp/manager.py:3106 +#: ../gui/wxpython/image2target/ii2t_manager.py:3039 +msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2335 -msgid "S && E" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2186 +#: ../gui/wxpython/gcp/manager.py:3119 +#: ../gui/wxpython/image2target/ii2t_manager.py:3052 +msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2361 -msgid "Elevation of fringe from bottom:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2196 +#: ../gui/wxpython/gui_core/preferences.py:1417 +#: ../gui/wxpython/gcp/manager.py:3129 +#: ../gui/wxpython/image2target/ii2t_manager.py:3062 +msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2411 ../gui/wxpython/menustrings.py:2113 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6152 -msgid "North Arrow" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2208 +#: ../gui/wxpython/vnet/dialogs.py:1314 ../gui/wxpython/mapswipe/dialogs.py:339 +#: ../gui/wxpython/gui_core/preferences.py:1384 +#: ../gui/wxpython/gcp/manager.py:3141 +#: ../gui/wxpython/image2target/ii2t_manager.py:3074 +#: ../gui/wxpython/psmap/dialogs.py:6614 +msgid "Line width:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2417 -msgid "Arrow length (in map units):" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2250 +#: ../gui/wxpython/gcp/manager.py:794 ../gui/wxpython/gcp/manager.py:3194 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 +#: ../gui/wxpython/image2target/ii2t_manager.py:3126 +msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2433 -msgid "Arrow color:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2267 +#: ../gui/wxpython/gcp/manager.py:820 ../gui/wxpython/gcp/manager.py:3208 +#: ../gui/wxpython/image2target/ii2t_manager.py:811 +#: ../gui/wxpython/image2target/ii2t_manager.py:3143 +msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2446 -msgid "Place arrow" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3248 +#: ../gui/wxpython/image2target/ii2t_manager.py:3189 +msgid "Rectification" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2468 ../gui/wxpython/menustrings.py:2107 -#: ../gui/wxpython/psmap/toolbars.py:100 -msgid "Scale bar" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2303 +#: ../gui/wxpython/gcp/manager.py:3256 +#: ../gui/wxpython/image2target/ii2t_manager.py:3197 +msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2474 -msgid "Scale bar length (in map units):" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2304 +#: ../gui/wxpython/gcp/manager.py:3257 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +msgid "1st order" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2490 -msgid "Scale bar color:" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2304 +#: ../gui/wxpython/gcp/manager.py:3257 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +msgid "2nd order" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2504 -msgid "Place new scale bar" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2304 +#: ../gui/wxpython/gcp/manager.py:3257 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +msgid "3rd order" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2580 -msgid "Do you want to record new animation without saving the previous one?" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2314 +#: ../gui/wxpython/gcp/manager.py:3267 +#: ../gui/wxpython/image2target/ii2t_manager.py:3208 +msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2585 -msgid "Animation already exists" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2330 +#: ../gui/wxpython/gcp/manager.py:3283 +#: ../gui/wxpython/image2target/ii2t_manager.py:3224 +msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2751 -msgid "No file prefix given." +#: ../gui/wxpython/photo2image/ip2i_manager.py:2338 +#: ../gui/wxpython/gcp/manager.py:619 ../gui/wxpython/gcp/manager.py:3301 +#: ../gui/wxpython/image2target/ii2t_manager.py:624 +#: ../gui/wxpython/image2target/ii2t_manager.py:3232 +msgid "Extension for output maps:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2754 -#, python-format -msgid "Directory %s does not exist." +#: ../gui/wxpython/photo2image/ip2i_manager.py:2379 +#: ../gui/wxpython/gcp/manager.py:3337 +#: ../gui/wxpython/image2target/ii2t_manager.py:3273 +msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2896 -msgid "Isosurface attributes" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2384 +#: ../gui/wxpython/gcp/manager.py:3342 +#: ../gui/wxpython/image2target/ii2t_manager.py:3278 +msgid "" +"RMS threshold factor is < 1\n" +"Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2903 -msgid "toggle normal direction" +#: ../gui/wxpython/photo2image/ip2i_manager.py:2564 +#: ../gui/wxpython/gcp/manager.py:3585 +#: ../gui/wxpython/image2target/ii2t_manager.py:3490 +#, python-format +msgid "GCP Manager settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2911 -msgid "Isosurface value" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:45 +msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3024 -msgid "Slice attributes" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:264 +#: ../gui/wxpython/gcp/mapdisplay.py:268 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:272 +msgid "GCP Display toolbar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3031 -msgid "Slice parallel to axis:" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:285 +#: ../gui/wxpython/gcp/mapdisplay.py:289 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:293 +msgid "GCP Manager toolbar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3187 -msgid "W" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:305 +#: ../gui/wxpython/gcp/mapdisplay.py:309 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:313 +msgid "GCP List" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3188 -msgid "N" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:320 +#: ../gui/wxpython/gcp/mapdisplay.py:324 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:328 +msgid "Source Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3189 -msgid "S" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:331 +#: ../gui/wxpython/gcp/mapdisplay.py:335 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:339 +msgid "Target Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3190 -msgid "E" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:518 +#: ../gui/wxpython/gcp/mapdisplay.py:522 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:526 +msgid "Zoom to computational region (set with g.region)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3191 -msgid "NW" +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:532 +#: ../gui/wxpython/gcp/mapdisplay.py:536 +#: ../gui/wxpython/image2target/ii2t_mapdisplay.py:540 +msgid "Set computational region from display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3192 -msgid "NE" +#: ../gui/wxpython/tplot/frame.py:47 +#, python-brace-format +msgid "" +"The Temporal Plot Tool needs the \"matplotlib\" (python-matplotlib) package " +"to be installed. {0}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 -msgid "SE" +#: ../gui/wxpython/tplot/frame.py:105 +msgid "Temporal Plot Tool" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3194 -msgid "SW" +#: ../gui/wxpython/tplot/frame.py:190 +msgid "" +"Raster temporal dataset (strds)\n" +"Press ENTER after typing the name or select with the combobox" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3708 ../gui/wxpython/nviz/tools.py:5622 -msgid "Level" +#: ../gui/wxpython/tplot/frame.py:207 +msgid "X and Y coordinates separated by comma:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4359 -msgid "List of slices" +#: ../gui/wxpython/tplot/frame.py:224 +msgid "" +"Coordinates can be obtained for example by right-clicking on Map Display." msgstr "" -#: ../gui/wxpython/nviz/tools.py:4552 ../gui/wxpython/nviz/tools.py:4555 -#, python-brace-format -msgid "Level {level}" +#: ../gui/wxpython/tplot/frame.py:231 ../gui/wxpython/tplot/frame.py:297 +msgid "Show simple linear regression line" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4562 ../gui/wxpython/nviz/tools.py:4565 -#, python-brace-format -msgid "Slice parallel to {axis}" +#: ../gui/wxpython/tplot/frame.py:247 +msgid "STRDS" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4855 ../gui/wxpython/nviz/tools.py:5635 -msgid "Slice parallel to" +#: ../gui/wxpython/tplot/frame.py:255 +msgid "" +"Vector temporal dataset (stvds)\n" +"Press ENTER after typing the name or select with the combobox" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5081 -#, python-format -msgid "Scalebar %d" +#: ../gui/wxpython/tplot/frame.py:275 +msgid "Select attribute column" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5236 -msgid "None" +#: ../gui/wxpython/tplot/frame.py:292 +msgid "Select category of vector(s)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5239 ../gui/wxpython/menustrings.py:501 -#: ../gui/wxpython/menustrings.py:1452 -msgid "Plane" +#: ../gui/wxpython/tplot/frame.py:316 +msgid "STVDS" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5442 -msgid "Vector map is 3D" +#: ../gui/wxpython/tplot/frame.py:323 +msgid "Set title for the plot" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5445 -msgid "Vector map is 2D" +#: ../gui/wxpython/tplot/frame.py:333 +msgid "Set label for X axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5447 -#, python-format -msgid "%(features)d features (%(points)d points)" +#: ../gui/wxpython/tplot/frame.py:343 +msgid "Set label for Y axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5507 ../gui/wxpython/nviz/tools.py:5560 -msgid "on surface" +#: ../gui/wxpython/tplot/frame.py:359 +msgid "Labels" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5657 -msgid "range:" +#: ../gui/wxpython/tplot/frame.py:366 +msgid "Path for output CSV file with plotted data" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5733 ../gui/wxpython/nviz/tools.py:5744 -msgid "North edge:" +#: ../gui/wxpython/tplot/frame.py:373 +msgid "CVS path" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5734 ../gui/wxpython/nviz/tools.py:5745 -msgid "South edge:" +#: ../gui/wxpython/tplot/frame.py:381 +msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5735 ../gui/wxpython/nviz/tools.py:5742 -#: ../gui/wxpython/nviz/tools.py:5751 -msgid "West edge:" +#: ../gui/wxpython/tplot/frame.py:420 ../gui/wxpython/tplot/frame.py:1063 +#: ../gui/wxpython/tplot/frame.py:1070 ../gui/wxpython/tplot/frame.py:1099 +#: ../gui/wxpython/tplot/frame.py:1262 +msgid "Invalid input coordinates" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5736 ../gui/wxpython/nviz/tools.py:5743 -#: ../gui/wxpython/nviz/tools.py:5752 -msgid "East edge:" +#: ../gui/wxpython/tplot/frame.py:525 +#, python-brace-format +msgid "Category {ca} is not on vector map {ma} and it will be not used" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 -#: ../gui/wxpython/nviz/tools.py:5757 -msgid "Northing (Y):" +#: ../gui/wxpython/tplot/frame.py:547 +msgid "" +"Both coordinates and categories are set, coordinates will be used. The use " +"categories remove text from coordinate form" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5758 -msgid "Height (Z):" +#: ../gui/wxpython/tplot/frame.py:557 +msgid "With Vector temporal dataset you have to select an attribute column" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 -msgid "Easting (X):" +#: ../gui/wxpython/tplot/frame.py:627 +msgid "" +"Difference number of vector layers and maps in the vector temporal dataset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5753 -msgid "Bottom edge:" +#: ../gui/wxpython/tplot/frame.py:672 +#, python-brace-format +msgid "No connection between vector map {vmap} and layer {la}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5754 -msgid "Top edge:" +#: ../gui/wxpython/tplot/frame.py:745 +#, python-format +msgid "Temporal resolution: %s" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5862 -msgid "Adjusts the distance and direction of the image viewpoint" +#: ../gui/wxpython/tplot/frame.py:861 +msgid "" +"Problem getting data from raster temporal dataset. Empty list of values." msgstr "" -#: ../gui/wxpython/nviz/tools.py:5898 +#: ../gui/wxpython/tplot/frame.py:920 +#, python-brace-format msgid "" -"Adjusts the light direction. Click and drag the puck to change the light " -"direction." +"Problem getting data from vector temporal dataset. Empty list of values for " +"cat {ca}." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:51 -msgid "Insert points from Map Display" +#: ../gui/wxpython/tplot/frame.py:977 +msgid "" +"Problem getting data from vector temporal dataset. Empty list of values." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:53 -msgid "Activate snapping to nodes" +#: ../gui/wxpython/tplot/frame.py:1013 +#, python-brace-format +msgid "{pa} already exists, do you want to overwrite?" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:55 -msgid "Activate mode for turns editing" +#: ../gui/wxpython/tplot/frame.py:1016 +msgid "File exists" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:58 -msgid "Activate mode for global turns editing" +#: ../gui/wxpython/tplot/frame.py:1024 +msgid "Please change name of output CSV file or " msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:60 -msgid "Add new point" +#: ../gui/wxpython/tplot/frame.py:1052 +msgid "Incorrect coordinates format, should be: x,y" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:61 -msgid "Delete selected point" +#: ../gui/wxpython/tplot/frame.py:1078 +msgid "Seed point outside the current region" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:125 -msgid "Execute analysis" +#: ../gui/wxpython/tplot/frame.py:1092 +msgid "Invalid input raster dataset" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:126 -msgid "Go to previous analysis result" +#: ../gui/wxpython/tplot/frame.py:1115 +msgid "Invalid input vector dataset" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:127 -msgid "Go to next analysis result" +#: ../gui/wxpython/tplot/frame.py:1252 ../gui/wxpython/tplot/frame.py:1316 +msgid "Invalid input temporal dataset" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:128 -msgid "Show analysis result" +#: ../gui/wxpython/tplot/frame.py:1340 +msgid "Datasets have different number of values" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:130 -msgid "Save temporary result" +#: ../gui/wxpython/tplot/frame.py:1371 +#, python-brace-format +msgid "Value for {date} is {val}" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:146 -msgid "Previous analysis result" +#: ../gui/wxpython/tplot/frame.py:1373 +msgid "Press Del to dismiss." msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:151 -msgid "Next analysis result" +#: ../gui/wxpython/tplot/g.gui.tplot.py:145 +msgid "With stvds you have to set 'attr' option" msgstr "" -#: ../gui/wxpython/vnet/toolbars.py:226 -msgid "Available analyses" +#: ../gui/wxpython/tplot/g.gui.tplot.py:151 +msgid "" +"With stvds it is not possible to use 'coordinates' and 'cats' options " +"together" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:404 -msgid "Invalid value inserted. Operation canceled." +#: ../gui/wxpython/tplot/g.gui.tplot.py:157 +msgid "With stvds you have to use 'coordinates' or 'cats' option" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:560 -msgid "Edit point" +#: ../gui/wxpython/tplot/g.gui.tplot.py:175 +msgid "Temporal Plot Tool - GRASS GIS" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:93 -msgid "Vector Network Analysis Tool" +#: ../gui/wxpython/nviz/wxnviz.py:36 +msgid "" +"This module requires the NumPy module, which could not be imported. It " +"probably is not installed (it's not part of the standard Python " +"distribution). See the Numeric Python site (http://numpy.scipy.org) for " +"information on downloading source or binaries." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:205 -msgid "Point list toolbar" +#: ../gui/wxpython/nviz/wxnviz.py:368 ../gui/wxpython/nviz/wxnviz.py:379 +#: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:79 +#: ../gui/wxpython/modules/histogram.py:406 +#: ../gui/wxpython/iclass/g.gui.iclass.py:88 +#, python-format +msgid "Raster map <%s> not found" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:218 -msgid "Analysis toolbar" +#: ../gui/wxpython/nviz/wxnviz.py:480 ../gui/wxpython/iclass/g.gui.iclass.py:95 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:74 +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 +#, python-format +msgid "Vector map <%s> not found" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:259 -msgid "Points for analysis:" +#: ../gui/wxpython/nviz/wxnviz.py:550 ../gui/wxpython/nviz/wxnviz.py:561 +#, python-format +msgid "3d raster map <%s> not found" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:263 -msgid "Analysis settings:" +#: ../gui/wxpython/nviz/preferences.py:35 +msgid "3D view default settings" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:267 -msgid "Points" +#: ../gui/wxpython/nviz/preferences.py:58 +msgid "Revert settings to default, changes are not applied" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:281 -msgid "Maximum distance of point to the network:" +#: ../gui/wxpython/nviz/preferences.py:65 +#: ../gui/wxpython/nviz/preferences.py:69 ../gui/wxpython/nviz/tools.py:110 +msgid "View" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:300 -msgid "Iso lines:" +#: ../gui/wxpython/nviz/preferences.py:79 ../gui/wxpython/nviz/tools.py:283 +msgid "Perspective:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:374 -#: ../gui/wxpython/modules/mcalc_builder.py:155 -msgid "Output" +#: ../gui/wxpython/nviz/preferences.py:84 +#: ../gui/wxpython/nviz/preferences.py:173 +#: ../gui/wxpython/nviz/preferences.py:198 +msgid "value:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:428 -msgid "Add vector map into layer tree" +#: ../gui/wxpython/nviz/preferences.py:101 +msgid "step:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:549 -msgid "Input tables" +#: ../gui/wxpython/nviz/preferences.py:121 +#: ../gui/wxpython/nviz/preferences.py:327 +msgid "Position:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:578 -msgid "Result tables" +#: ../gui/wxpython/nviz/preferences.py:126 +#: ../gui/wxpython/nviz/preferences.py:332 +msgid "x:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:594 -msgid "Loading tables..." +#: ../gui/wxpython/nviz/preferences.py:168 +msgid "Twist:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:731 -msgid "Creating turntable..." +#: ../gui/wxpython/nviz/preferences.py:193 ../gui/wxpython/nviz/tools.py:370 +msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:906 -msgid "Input vector map does not exist." +#: ../gui/wxpython/nviz/preferences.py:223 ../gui/wxpython/nviz/tools.py:443 +msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:930 -msgid "Analysing..." +#: ../gui/wxpython/nviz/preferences.py:259 +msgid "Fly-through" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1052 -msgid "Computing nodes..." +#: ../gui/wxpython/nviz/preferences.py:270 +msgid "Move exag:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1258 -msgid "Other settings" +#: ../gui/wxpython/nviz/preferences.py:288 +msgid "Turn exag:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1262 -msgid "Point style:" +#: ../gui/wxpython/nviz/preferences.py:316 ../gui/wxpython/nviz/tools.py:762 +msgid "Lighting" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1266 -msgid "Analysis result style:" +#: ../gui/wxpython/nviz/preferences.py:320 +msgid "Light" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1275 -#, python-format -msgid "Color table style %s:" +#: ../gui/wxpython/nviz/preferences.py:366 +msgid "z:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1291 -#, python-format -msgid "Invert colors %s:" +#: ../gui/wxpython/nviz/preferences.py:385 ../gui/wxpython/nviz/tools.py:2227 +msgid "Brightness:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1299 -msgid "Line color:" +#: ../gui/wxpython/nviz/preferences.py:399 ../gui/wxpython/nviz/tools.py:2252 +msgid "Ambient:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1300 -msgid "Color for unused point:" +#: ../gui/wxpython/nviz/preferences.py:438 ../gui/wxpython/nviz/tools.py:690 +#: ../gui/wxpython/nviz/tools.py:2314 +msgid "Surface" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 -msgid "Color for Start/From/Source/Used point:" +#: ../gui/wxpython/nviz/preferences.py:450 ../gui/wxpython/nviz/tools.py:856 +#: ../gui/wxpython/nviz/tools.py:1952 +msgid "Mode:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 -msgid "Color for End/To/Sink point:" +#: ../gui/wxpython/nviz/preferences.py:458 ../gui/wxpython/nviz/tools.py:864 +msgid "coarse" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 -msgid "Color for selected point:" +#: ../gui/wxpython/nviz/preferences.py:458 ../gui/wxpython/nviz/tools.py:864 +msgid "fine" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1315 -msgid "Point size:" +#: ../gui/wxpython/nviz/preferences.py:458 ../gui/wxpython/nviz/tools.py:864 +msgid "both" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1316 -msgid "Point width:" +#: ../gui/wxpython/nviz/preferences.py:469 ../gui/wxpython/nviz/tools.py:942 +msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1318 -msgid "Maximum number of results in history:" +#: ../gui/wxpython/nviz/preferences.py:475 +#: ../gui/wxpython/nviz/preferences.py:496 ../gui/wxpython/nviz/tools.py:903 +#: ../gui/wxpython/nviz/tools.py:948 +msgid "resolution:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1519 -msgid "New vector map with turntable" +#: ../gui/wxpython/nviz/preferences.py:488 ../gui/wxpython/nviz/tools.py:898 +msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1677 -msgid "Save analysis result" +#: ../gui/wxpython/nviz/preferences.py:508 ../gui/wxpython/nviz/tools.py:917 +msgid "style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1794 -msgid "Edit intersection turns costs" +#: ../gui/wxpython/nviz/preferences.py:513 ../gui/wxpython/nviz/tools.py:925 +msgid "wire" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1835 -msgid "Define Global Turn Costs" +#: ../gui/wxpython/nviz/preferences.py:513 ../gui/wxpython/nviz/tools.py:925 +msgid "surface" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:157 -#, python-format -msgid "Module <%s> does not support turns costs." +#: ../gui/wxpython/nviz/preferences.py:525 +msgid "wire color:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 -#, python-format -msgid "Vector map '%s' does not exist." +#: ../gui/wxpython/nviz/preferences.py:557 ../gui/wxpython/nviz/tools.py:709 +msgid "Vector" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:166 -msgid "Vector map was not chosen." +#: ../gui/wxpython/nviz/preferences.py:562 ../gui/wxpython/nviz/tools.py:1522 +msgid "Vector lines" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 -msgid "arc layer" +#: ../gui/wxpython/nviz/preferences.py:607 ../gui/wxpython/nviz/tools.py:1701 +msgid "Vector points" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 -msgid "node layer" +#: ../gui/wxpython/nviz/preferences.py:613 +msgid "Automatic size" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:176 -msgid "turntable layer" +#: ../gui/wxpython/nviz/preferences.py:615 +msgid "Icon size is set automatically based on landscape dimensions." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:177 -msgid "unique categories layer" +#: ../gui/wxpython/nviz/preferences.py:625 +#: ../gui/wxpython/mapswipe/dialogs.py:360 +msgid "Size:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 -#, python-format -msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" +#: ../gui/wxpython/nviz/preferences.py:642 +msgid "Marker:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:189 +#: ../gui/wxpython/nviz/preferences.py:755 #, python-format -msgid "Choose existing %s.\n" +msgid "3D view settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:198 -#, python-format +#: ../gui/wxpython/nviz/mapwindow.py:233 msgid "" -"Chosen column '%s' does not exist in attribute table of layer '%s' of vector " -"map '%s'.\n" +"Opening 3D view was not successful. Please try to change the value of depth " +"buffer in GUI Settings dialog > tab Map Display > Advanced and restart GUI." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:255 ../gui/wxpython/gui_core/vselect.py:46 -msgid "type" +#: ../gui/wxpython/nviz/mapwindow.py:508 +#, python-format +msgid "" +"Image is too large, your OpenGL implementation supports maximum texture size " +"%d px." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:255 -msgid "topology" +#: ../gui/wxpython/nviz/mapwindow.py:1041 +msgid "Easting" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:257 ../gui/wxpython/vnet/vnet_data.py:750 -msgid "Start point" +#: ../gui/wxpython/nviz/mapwindow.py:1042 +msgid "Northing" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:257 -msgid "End Point" +#: ../gui/wxpython/nviz/mapwindow.py:1043 +msgid "Elevation" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:544 ../gui/wxpython/vnet/vnet_data.py:553 -#: ../gui/wxpython/vnet/vnet_data.py:556 -msgid "new point" +#: ../gui/wxpython/nviz/mapwindow.py:1054 +msgid "Surface map name" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:731 -msgid "Arc forward/both direction(s) cost column:" +#: ../gui/wxpython/nviz/mapwindow.py:1056 +msgid "Surface map elevation" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 -msgid "arc forward/both" +#: ../gui/wxpython/nviz/mapwindow.py:1058 +msgid "Surface map color" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:735 -msgid "Arc backward direction cost column:" +#: ../gui/wxpython/nviz/mapwindow.py:1068 +msgid "XY distance from previous" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:736 -msgid "arc backward" +#: ../gui/wxpython/nviz/mapwindow.py:1070 +msgid "XYZ distance from previous" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:739 -msgid "Arcs' cost column (for both directions):" +#: ../gui/wxpython/nviz/mapwindow.py:1075 +msgid "Distance along surface" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:740 -msgid "arc" +#: ../gui/wxpython/nviz/mapwindow.py:1087 +msgid "Distance along exag. surface" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:743 -msgid "Node cost column:" +#: ../gui/wxpython/nviz/mapwindow.py:1098 +msgid "No point on surface" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:743 -msgid "node" +#: ../gui/wxpython/nviz/mapwindow.py:1589 +msgid "Loading raster map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:748 -#, python-format -msgid "Shortest path %s" +#: ../gui/wxpython/nviz/mapwindow.py:1593 +msgid "Loading 3d raster map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:750 -msgid "End point" +#: ../gui/wxpython/nviz/mapwindow.py:1599 +msgid "failed" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:760 +#: ../gui/wxpython/nviz/mapwindow.py:1601 #, python-format -msgid "Traveling salesman %s" +msgid "Unsupported layer type '%s'" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:769 -#, python-format -msgid "Maximum flow %s" +#: ../gui/wxpython/nviz/mapwindow.py:1720 +msgid "Unable to unload raster map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:772 -msgid "Source point" +#: ../gui/wxpython/nviz/mapwindow.py:1721 ../gui/wxpython/nviz/tools.py:830 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/menustrings.py:2099 +#: ../gui/wxpython/psmap/dialogs.py:1594 +msgid "Raster map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:773 -msgid "Sink point" +#: ../gui/wxpython/nviz/mapwindow.py:1725 +msgid "Unable to unload 3d raster map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:781 -#, python-format -msgid "Subnets for nearest centers %s" +#: ../gui/wxpython/nviz/mapwindow.py:1726 +msgid "3d raster map" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:790 +#: ../gui/wxpython/nviz/mapwindow.py:1737 +msgid "unloaded successfully" +msgstr "" + +#: ../gui/wxpython/nviz/mapwindow.py:1791 #, python-format -msgid "Steiner tree for the network and given terminals %s" +msgid "Loading vector map <%(name)s> (%(type)s) failed" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:802 +#: ../gui/wxpython/nviz/mapwindow.py:1855 #, python-format -msgid "Shortest distance via the network %s" +msgid "Unable to unload vector map <%(name)s> (%(type)s)" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:811 +#: ../gui/wxpython/nviz/mapwindow.py:1860 #, python-format -msgid "Cost isolines %s" +msgid "Vector map <%(name)s> (%(type)s) unloaded successfully" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:893 -msgid "Overwrite map layer" +#: ../gui/wxpython/nviz/mapwindow.py:2266 +#, python-format +msgid "Vector point layer not found (id = %d)" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:111 -msgid "Unable to perform analysis." +#: ../gui/wxpython/nviz/mapwindow.py:2268 +#, python-format +msgid "Unable to set data layer properties (id = %d)" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:230 +#: ../gui/wxpython/nviz/mapwindow.py:2272 #, python-format msgid "" -"Temporary map '%s' with result was changed outside vector network analysis " -"tool.\n" -"Showed result may not correspond original analysis result." +"Setting data layer properties failed.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:236 -msgid "Result changed outside" +#: ../gui/wxpython/nviz/mapwindow.py:2332 +#: ../gui/wxpython/nviz/mapwindow.py:2351 ../gui/wxpython/nviz/tools.py:2773 +#: ../gui/wxpython/nviz/tools.py:2819 ../gui/wxpython/nviz/tools.py:5228 +msgid "constant#" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:275 -msgid "Map can be created only in current mapset" +#: ../gui/wxpython/nviz/tools.py:116 +#: ../gui/wxpython/gui_core/preferences.py:515 +msgid "Appearance" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:285 ../gui/wxpython/vnet/vnet_core.py:363 -#, python-format -msgid "Vector map %s already exists. Do you want to overwrite it?" +#: ../gui/wxpython/nviz/tools.py:119 +msgid "Analysis" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:288 ../gui/wxpython/vnet/vnet_core.py:366 -msgid "Overwrite vector map" +#: ../gui/wxpython/nviz/tools.py:121 ../gui/wxpython/nviz/tools.py:485 +msgid "Animation" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:313 -msgid "Creation of turntable failed." +#: ../gui/wxpython/nviz/tools.py:250 +msgid "Control View" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:333 -msgid "Vector map with analysis result does not exist." +#: ../gui/wxpython/nviz/tools.py:271 +msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:353 -msgid "Map can be saved only to currently set mapset" +#: ../gui/wxpython/nviz/tools.py:299 +msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:437 ../gui/wxpython/vnet/vnet_core.py:660 -#, python-format -msgid "Please choose '%s' and '%s' point." +#: ../gui/wxpython/nviz/tools.py:309 ../gui/wxpython/nviz/tools.py:1297 +msgid "Tilt:" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:668 -msgid "Please choose at least two points." +#: ../gui/wxpython/nviz/tools.py:324 +msgid "" +"Adjusts the viewing height above the surface (angle of view automatically " +"adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:961 -#, python-format -msgid "" -"Input map '%s' for analysis was changed outside vector network analysis " -"tool.\n" -"Topology column may not correspond to changed situation." +#: ../gui/wxpython/nviz/tools.py:337 +msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:967 -msgid "Input changed outside" +#: ../gui/wxpython/nviz/tools.py:395 +msgid "Look:" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1037 -#, python-format +#: ../gui/wxpython/nviz/tools.py:399 +msgid "here" +msgstr "" + +#: ../gui/wxpython/nviz/tools.py:404 msgid "" -"Temporary map %s already exists.\n" -"Do you want to continue in analysis and overwrite it?" +"Allows you to select a point on the surface that becomes the new center of " +"view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1064 -msgid "Unable to use ctypes. \n" +#: ../gui/wxpython/nviz/tools.py:413 +msgid "center" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1065 -#: ../gui/wxpython/vnet/vnet_core.py:1089 -msgid "Snapping mode can not be activated." +#: ../gui/wxpython/nviz/tools.py:416 +msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1099 -msgid "Do you really want to activate snapping and overwrite it?" +#: ../gui/wxpython/nviz/tools.py:421 +msgid "top" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1108 -#, python-format +#: ../gui/wxpython/nviz/tools.py:426 msgid "" -"Temporary map '%s' was changed outside vector analysis tool.\n" -"Do you really want to activate snapping and overwrite it? " +"Sets the viewer directly over the scene's center position. This top view " +"orients approximately north south." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1113 -msgid "Overwrite map" -msgstr "" - -#: ../gui/wxpython/rdigit/g.gui.rdigit.py:195 -msgid "Raster map <{}> not found in current mapset." +#: ../gui/wxpython/nviz/tools.py:431 +msgid "reset" msgstr "" -#: ../gui/wxpython/rdigit/g.gui.rdigit.py:212 -msgid "Base raster map <{}> not found in current mapset." +#: ../gui/wxpython/nviz/tools.py:432 +msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/rdigit/g.gui.rdigit.py:237 -msgid "Raster Digitizer - GRASS GIS" +#: ../gui/wxpython/nviz/tools.py:495 +msgid "" +"Press 'Record' button and start changing the view. It is recommended to use " +"fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:28 -msgid "Digitize area" +#: ../gui/wxpython/nviz/tools.py:507 +msgid "Record" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:29 -msgid "Digitize line" +#: ../gui/wxpython/nviz/tools.py:509 +msgid "Play" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:30 -msgid "Digitize point" +#: ../gui/wxpython/nviz/tools.py:531 +msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:31 -msgid "Save raster map" +#: ../gui/wxpython/nviz/tools.py:536 +msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:32 ../gui/wxpython/vdigit/toolbars.py:238 -msgid "Undo" +#: ../gui/wxpython/nviz/tools.py:546 +msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:47 -msgid "Select raster map" +#: ../gui/wxpython/nviz/tools.py:598 +msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:56 -msgid "Set drawing color (not raster cell color)" +#: ../gui/wxpython/nviz/tools.py:608 ../gui/wxpython/psmap/dialogs.py:5743 +msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:73 -msgid "Cell value:" +#: ../gui/wxpython/nviz/tools.py:609 +msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:86 +#: ../gui/wxpython/nviz/tools.py:623 msgid "" -"Width of currently digitized line or diameter of a digitized point in map " -"units." +"Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 -msgid "New raster map" +#: ../gui/wxpython/nviz/tools.py:700 ../gui/wxpython/nviz/tools.py:1394 +msgid "Constant surface" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:34 -msgid "Create new raster map" +#: ../gui/wxpython/nviz/tools.py:718 ../gui/wxpython/gui_core/dialogs.py:1504 +msgid "3D raster" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:54 -msgid "Name for new raster map:" +#: ../gui/wxpython/nviz/tools.py:770 +msgid "Fringe" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:61 -msgid "Optionally select background raster map:" +#: ../gui/wxpython/nviz/tools.py:806 ../gui/wxpython/nviz/tools.py:1149 +msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:68 -msgid "New raster map type:" +#: ../gui/wxpython/nviz/tools.py:875 ../gui/wxpython/nviz/tools.py:1168 +#: ../gui/wxpython/nviz/tools.py:1970 +msgid "Shading:" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:101 -msgid "Please specify name for a new raster map" +#: ../gui/wxpython/nviz/tools.py:880 ../gui/wxpython/nviz/tools.py:1978 +msgid "flat" msgstr "" -#: ../gui/wxpython/rdigit/dialogs.py:109 -#, python-format -msgid "" -"Raster map <%s> already exists in the current mapset. Do you want to " -"overwrite it?" +#: ../gui/wxpython/nviz/tools.py:880 ../gui/wxpython/nviz/tools.py:1978 +msgid "gouraud" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 -msgid "Please select first the raster map" +#: ../gui/wxpython/nviz/tools.py:888 +msgid "Set to all" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 -msgid "Right click to finish area" +#: ../gui/wxpython/nviz/tools.py:889 +msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 -msgid "Right click to finish line" +#: ../gui/wxpython/nviz/tools.py:936 +msgid "Change wire color" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 -msgid "Do you want to save changes?" +#: ../gui/wxpython/nviz/tools.py:973 +msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 -msgid "Save raster map changes" +#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2913 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/psmap/dialogs.py:2352 +msgid "Mask" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 -msgid "Failed to create backup copy of edited raster map." +#: ../gui/wxpython/nviz/tools.py:984 ../gui/wxpython/nviz/tools.py:2914 +msgid "Transparency" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 -msgid "Failed to create new raster map." +#: ../gui/wxpython/nviz/tools.py:985 ../gui/wxpython/nviz/tools.py:2915 +msgid "Shininess" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 -msgid "Rasterizing..." +#: ../gui/wxpython/nviz/tools.py:994 ../gui/wxpython/nviz/tools.py:2930 +msgid "map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 -msgid "Failed to set default color table for edited raster map" +#: ../gui/wxpython/nviz/tools.py:998 ../gui/wxpython/nviz/tools.py:2936 +msgid "unset" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:46 -msgid "Create new workspace (Ctrl+N)" +#: ../gui/wxpython/nviz/tools.py:1003 ../gui/wxpython/nviz/tools.py:2941 +msgid "constant" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:49 -msgid "Open existing workspace file (Ctrl+O)" +#: ../gui/wxpython/nviz/tools.py:1055 ../gui/wxpython/nviz/tools.py:2069 +#: ../gui/wxpython/psmap/dialogs.py:3707 ../gui/wxpython/psmap/dialogs.py:4470 +#: ../gui/wxpython/psmap/dialogs.py:4761 ../gui/wxpython/psmap/dialogs.py:5375 +#: ../gui/wxpython/psmap/dialogs.py:5379 ../gui/wxpython/psmap/dialogs.py:5856 +#: ../gui/wxpython/psmap/dialogs.py:5861 ../gui/wxpython/psmap/dialogs.py:6377 +#: ../gui/wxpython/psmap/dialogs.py:6382 +msgid "Position" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:52 -msgid "Save current workspace to file (Ctrl+S)" +#: ../gui/wxpython/nviz/tools.py:1060 +msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:58 -msgid "New workspace" +#: ../gui/wxpython/nviz/tools.py:1079 ../gui/wxpython/nviz/tools.py:1372 +#: ../gui/wxpython/nviz/tools.py:2091 ../gui/wxpython/nviz/tools.py:3117 +msgid "Reset" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:63 -msgid "Open workspace" +#: ../gui/wxpython/nviz/tools.py:1080 ../gui/wxpython/nviz/tools.py:2092 +msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:68 ../gui/wxpython/lmgr/workspace.py:376 -#: ../gui/wxpython/lmgr/workspace.py:399 ../gui/wxpython/menustrings.py:10 -msgid "Save workspace" +#: ../gui/wxpython/nviz/tools.py:1156 +msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:93 -msgid "Add multiple raster or vector map layers (Ctrl+Shift+L)" +#: ../gui/wxpython/nviz/tools.py:1173 +msgid "clear" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:96 -msgid "Add raster map layer (Ctrl+Shift+R)" +#: ../gui/wxpython/nviz/tools.py:1174 +msgid "top color" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:100 -msgid "Add various raster map layers (RGB, HIS, shaded relief...)" +#: ../gui/wxpython/nviz/tools.py:1175 +msgid "bottom color" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:103 -msgid "Add vector map layer (Ctrl+Shift+V)" +#: ../gui/wxpython/nviz/tools.py:1176 +msgid "blend" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:107 -msgid "Add various vector map layers (thematic, chart...)" +#: ../gui/wxpython/nviz/tools.py:1177 +msgid "shaded" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:111 -msgid "Add web service layer (WMS, WMTS, NASA OnEarth)" +#: ../gui/wxpython/nviz/tools.py:1190 +msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:113 -msgid "Add group" +#: ../gui/wxpython/nviz/tools.py:1194 +msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:114 ../gui/wxpython/lmgr/toolbars.py:153 -msgid "Add various overlays" +#: ../gui/wxpython/nviz/tools.py:1225 +msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:117 -msgid "Remove selected map layer(s) from layer tree" +#: ../gui/wxpython/nviz/tools.py:1229 +msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:119 -msgid "Edit selected vector map" +#: ../gui/wxpython/nviz/tools.py:1261 +msgid "Rotation:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:121 -msgid "Show attribute data for selected vector map" +#: ../gui/wxpython/nviz/tools.py:1265 +msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:128 -msgid "Add multiple map layers" +#: ../gui/wxpython/nviz/tools.py:1301 +msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:133 ../gui/wxpython/iclass/toolbars.py:402 -msgid "Add raster map" +#: ../gui/wxpython/nviz/tools.py:1338 +msgid "" +"Sets the Z coordinate of the current cutting plane (only meaningful when " +"tilt is not 0)" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:138 -msgid "Add various raster maps" +#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2032 +msgid "New" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:143 -msgid "Add vector map" +#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2452 +#: ../gui/wxpython/nviz/tools.py:2514 ../gui/wxpython/menustrings.py:178 +#: ../gui/wxpython/menustrings.py:1204 ../gui/wxpython/menustrings.py:2115 +#: ../gui/wxpython/psmap/dialogs.py:1818 +msgid "Delete" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:148 -msgid "Add various vector maps" +#: ../gui/wxpython/nviz/tools.py:1422 +msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:158 -msgid "Add web service map" +#: ../gui/wxpython/nviz/tools.py:1435 +msgid "Value:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:169 -msgid "Delete map layer" +#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3099 +msgid "Transparency:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:203 -msgid "Start new map display" +#: ../gui/wxpython/nviz/tools.py:1486 ../gui/wxpython/lmgr/layertree.py:1012 +#: ../gui/wxpython/menustrings.py:2101 ../gui/wxpython/psmap/dialogs.py:3585 +msgid "Vector map" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:206 -#: ../gui/wxpython/modules/mcalc_builder.py:68 -msgid "Raster Map Calculator" +#: ../gui/wxpython/nviz/tools.py:1508 +msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:209 -msgid "Georectifier" +#: ../gui/wxpython/nviz/tools.py:1528 +msgid "Line:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/menustrings.py:207 -#: ../gui/wxpython/menustrings.py:2003 ../gui/wxpython/psmap/frame.py:58 -msgid "Cartographic Composer" +#: ../gui/wxpython/nviz/tools.py:1533 +msgid "width:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:212 -msgid "Launch user-defined script" +#: ../gui/wxpython/nviz/tools.py:1548 ../gui/wxpython/nviz/tools.py:1743 +msgid "color:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:82 -msgid "Open a simple Python code editor" +#: ../gui/wxpython/nviz/tools.py:1564 ../gui/wxpython/nviz/tools.py:1797 +msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:222 -msgid "New display" +#: ../gui/wxpython/nviz/tools.py:1567 +msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:254 -msgid "Python code editor" +#: ../gui/wxpython/nviz/tools.py:1583 ../gui/wxpython/nviz/tools.py:1594 +#: ../gui/wxpython/nviz/tools.py:1819 ../gui/wxpython/nviz/tools.py:1830 +msgid "Set options..." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:276 -msgid "GUI settings" +#: ../gui/wxpython/nviz/tools.py:1618 ../gui/wxpython/nviz/tools.py:5505 +#: ../gui/wxpython/nviz/tools.py:5558 +msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:277 -msgid "GRASS manual" +#: ../gui/wxpython/nviz/tools.py:1618 ../gui/wxpython/nviz/tools.py:5505 +#: ../gui/wxpython/nviz/tools.py:5558 +msgid "as 3D" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:317 -msgid "Generate command for m.nviz.image" +#: ../gui/wxpython/nviz/tools.py:1632 ../gui/wxpython/nviz/tools.py:1851 +msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:318 -msgid "Generate command for m.nviz.image based on current state" +#: ../gui/wxpython/nviz/tools.py:1688 +msgid "Show vector points" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:322 -msgid "3D view mode settings" +#: ../gui/wxpython/nviz/tools.py:1708 +msgid "Icon:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:323 -msgid "Show 3D view mode settings dialog" +#: ../gui/wxpython/nviz/tools.py:1713 ../gui/wxpython/psmap/dialogs.py:2743 +msgid "size:" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:325 -msgid "Show 3D view mode manual" +#: ../gui/wxpython/nviz/tools.py:1775 ../gui/wxpython/psmap/dialogs.py:2675 +msgid "symbol:" msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:84 -msgid "Left mouse click to remove the MASK" +#: ../gui/wxpython/nviz/tools.py:1800 +msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:130 -msgid "Are you sure that you want to remove the MASK?" +#: ../gui/wxpython/nviz/tools.py:1925 ../gui/wxpython/lmgr/layertree.py:1016 +msgid "3D raster map" msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:131 -msgid "Remove MASK" +#: ../gui/wxpython/nviz/tools.py:1960 +msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:71 -msgid "" -"Current workspace is not empty. Do you want to store current settings to " -"workspace file?" +#: ../gui/wxpython/nviz/tools.py:1960 +msgid "slices" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:75 -msgid "Create new workspace?" +#: ../gui/wxpython/nviz/tools.py:1987 +msgid "Resolution:" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:104 -msgid "Choose workspace file" +#: ../gui/wxpython/nviz/tools.py:2001 +msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:106 ../gui/wxpython/lmgr/workspace.py:353 -msgid "GRASS Workspace File (*.gxw)|*.gxw" +#: ../gui/wxpython/nviz/tools.py:2014 ../gui/wxpython/nviz/tools.py:4353 +msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:135 -msgid "Most likely the database, location or mapset does not exist" +#: ../gui/wxpython/nviz/tools.py:2132 +msgid "Show light model" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:138 -#, python-brace-format -msgid "" -"Unable to change to location and mapset specified in the workspace.\n" -"Reason: {reason}\n" -"Details: {details}\n" -"\n" -"Do you want to proceed with opening the workspace anyway?" +#: ../gui/wxpython/nviz/tools.py:2144 +msgid "Light source position" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:147 -msgid "Proceed with opening of the workspace?" +#: ../gui/wxpython/nviz/tools.py:2161 +msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:158 -#: ../gui/wxpython/startup/guiutils.py:704 -#, python-format -msgid "" -"Current location is <%(loc)s>.\n" -"Current mapset is <%(mapset)s>." +#: ../gui/wxpython/nviz/tools.py:2206 +msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:190 -msgid "Please wait, loading workspace..." +#: ../gui/wxpython/nviz/tools.py:2231 +msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:351 -msgid "Choose file to save current workspace" +#: ../gui/wxpython/nviz/tools.py:2256 +msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:372 ../gui/wxpython/lmgr/workspace.py:395 -#, python-format -msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/nviz/tools.py:2328 +msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:424 -msgid "Writing current settings to workspace file failed." +#: ../gui/wxpython/nviz/tools.py:2332 +msgid "N && W" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:452 -msgid "Do you want to save changes in the workspace?" +#: ../gui/wxpython/nviz/tools.py:2333 +msgid "N && E" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:455 -msgid "Do you want to store current settings to workspace file?" +#: ../gui/wxpython/nviz/tools.py:2334 +msgid "S && W" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:105 ../gui/wxpython/main_window/frame.py:108 -msgid "GRASS GIS" +#: ../gui/wxpython/nviz/tools.py:2335 +msgid "S && E" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:137 -msgid "There were some issues when loading menu or Tools tab:" +#: ../gui/wxpython/nviz/tools.py:2361 +msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:173 ../gui/wxpython/main_window/frame.py:549 -msgid "Workspace Toolbar" +#: ../gui/wxpython/nviz/tools.py:2411 ../gui/wxpython/menustrings.py:2113 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6152 +msgid "North Arrow" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:177 ../gui/wxpython/main_window/frame.py:553 -msgid "Tools Toolbar" +#: ../gui/wxpython/nviz/tools.py:2417 +msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:179 ../gui/wxpython/main_window/frame.py:555 -msgid "3D view Toolbar" +#: ../gui/wxpython/nviz/tools.py:2433 +msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:332 ../gui/wxpython/main_window/frame.py:255 -msgid "Rename current Map Display" +#: ../gui/wxpython/nviz/tools.py:2446 +msgid "Place arrow" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:446 ../gui/wxpython/main_window/frame.py:390 -#, python-brace-format -msgid "Map Display {number}" +#: ../gui/wxpython/nviz/tools.py:2468 ../gui/wxpython/menustrings.py:2107 +#: ../gui/wxpython/psmap/toolbars.py:100 +msgid "Scale bar" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:549 ../gui/wxpython/lmgr/frame.py:869 -#: ../gui/wxpython/main_window/frame.py:487 -#: ../gui/wxpython/main_window/frame.py:943 -msgid "Close Map Display {}" +#: ../gui/wxpython/nviz/tools.py:2474 +msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:598 -#: ../gui/wxpython/gui_core/preferences.py:1220 -msgid "Layers" +#: ../gui/wxpython/nviz/tools.py:2490 +msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:602 ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/modules/vclean.py:505 -#: ../gui/wxpython/gui_core/preferences.py:327 -#: ../gui/wxpython/gui_core/preferences.py:1117 -msgid "Tools" +#: ../gui/wxpython/nviz/tools.py:2504 +msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:605 -msgid "Console" +#: ../gui/wxpython/nviz/tools.py:2580 +msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:612 -#: ../gui/wxpython/gui_core/preferences.py:341 -msgid "Python" +#: ../gui/wxpython/nviz/tools.py:2585 +msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:760 ../gui/wxpython/main_window/frame.py:843 -msgid "Map Swipe Tool" +#: ../gui/wxpython/nviz/tools.py:2751 +msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:812 ../gui/wxpython/main_window/frame.py:895 -msgid "Choose model to run" +#: ../gui/wxpython/nviz/tools.py:2754 +#, python-format +msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:958 ../gui/wxpython/main_window/frame.py:1038 -#, python-format -msgid "" -"Command '%s' not yet implemented in the WxGUI. Try adding it as a command " -"layer instead." +#: ../gui/wxpython/nviz/tools.py:2896 +msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1144 ../gui/wxpython/lmgr/frame.py:1832 -#: ../gui/wxpython/main_window/frame.py:1229 -#: ../gui/wxpython/main_window/frame.py:1916 -msgid "Selected map layer is not vector." +#: ../gui/wxpython/nviz/tools.py:2903 +msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1151 ../gui/wxpython/main_window/frame.py:1236 -msgid "Editing is allowed only for vector maps from the current mapset." +#: ../gui/wxpython/nviz/tools.py:2911 +msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1179 ../gui/wxpython/main_window/frame.py:1264 -msgid "Choose script file to run" +#: ../gui/wxpython/nviz/tools.py:3024 +msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1181 ../gui/wxpython/main_window/frame.py:1266 -msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" +#: ../gui/wxpython/nviz/tools.py:3031 +msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1194 ../gui/wxpython/main_window/frame.py:1279 -#, python-format -msgid "Script file '%s' doesn't exist. Operation canceled." +#: ../gui/wxpython/nviz/tools.py:3187 +msgid "W" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1204 ../gui/wxpython/main_window/frame.py:1289 -#, python-format -msgid "" -"Script <%s> is not executable. Do you want to set the permissions that " -"allows you to run this script (note that you must be the owner of the file)?" +#: ../gui/wxpython/nviz/tools.py:3188 +msgid "N" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1210 ../gui/wxpython/main_window/frame.py:1295 -msgid "Set permission?" +#: ../gui/wxpython/nviz/tools.py:3189 +msgid "S" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1220 ../gui/wxpython/main_window/frame.py:1305 -msgid "Unable to set permission. Operation canceled." +#: ../gui/wxpython/nviz/tools.py:3190 +msgid "E" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1233 ../gui/wxpython/main_window/frame.py:1318 -#, python-format -msgid "" -"Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " -"directory to GRASS_ADDON_PATH?" +#: ../gui/wxpython/nviz/tools.py:3191 +msgid "NW" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1237 ../gui/wxpython/main_window/frame.py:1322 -msgid "Update Addons path?" +#: ../gui/wxpython/nviz/tools.py:3192 +msgid "NE" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1244 ../gui/wxpython/main_window/frame.py:1329 -#, python-format -msgid "Launching script '%s'..." +#: ../gui/wxpython/nviz/tools.py:3193 +msgid "SE" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1259 ../gui/wxpython/main_window/frame.py:1344 -msgid "No location/mapset provided. Operation canceled." +#: ../gui/wxpython/nviz/tools.py:3194 +msgid "SW" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1299 ../gui/wxpython/main_window/frame.py:1384 -msgid "No mapset provided. Operation canceled." +#: ../gui/wxpython/nviz/tools.py:3708 ../gui/wxpython/nviz/tools.py:5622 +msgid "Level" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1334 ../gui/wxpython/main_window/frame.py:1419 -#, python-format -msgid "" -"Working directory changed to:\n" -"\"%s\"" +#: ../gui/wxpython/nviz/tools.py:4359 +msgid "List of slices" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1342 ../gui/wxpython/main_window/frame.py:1427 -msgid "Changes current working directory for this GUI." +#: ../gui/wxpython/nviz/tools.py:4552 ../gui/wxpython/nviz/tools.py:4555 +#, python-brace-format +msgid "Level {level}" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1344 ../gui/wxpython/main_window/frame.py:1429 -msgid "Usage: cd [directory]" +#: ../gui/wxpython/nviz/tools.py:4562 ../gui/wxpython/nviz/tools.py:4565 +#, python-brace-format +msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1345 ../gui/wxpython/main_window/frame.py:1430 -msgid "Without parameters it opens a dialog." +#: ../gui/wxpython/nviz/tools.py:4855 ../gui/wxpython/nviz/tools.py:5635 +msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1351 ../gui/wxpython/main_window/frame.py:1436 -msgid "" -"If ~ (tilde) is present as the first directory on the path, it is replaced " -"by user's home directory." +#: ../gui/wxpython/nviz/tools.py:5081 +#, python-format +msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1369 ../gui/wxpython/main_window/frame.py:1454 -msgid "More than one parameter provided." +#: ../gui/wxpython/nviz/tools.py:5236 +msgid "None" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1390 ../gui/wxpython/main_window/frame.py:1475 -msgid "Choose a working directory" +#: ../gui/wxpython/nviz/tools.py:5239 ../gui/wxpython/menustrings.py:501 +#: ../gui/wxpython/menustrings.py:1452 +msgid "Plane" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1429 ../gui/wxpython/gui_core/ghelp.py:116 -#: ../gui/wxpython/gui_core/ghelp.py:944 -#: ../gui/wxpython/main_window/frame.py:1514 -msgid "Unable to get GRASS version\n" +#: ../gui/wxpython/nviz/tools.py:5442 +msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1439 ../gui/wxpython/main_window/frame.py:1524 -msgid "System Info" +#: ../gui/wxpython/nviz/tools.py:5445 +msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1455 ../gui/wxpython/main_window/frame.py:1540 -msgid "GRASS version" +#: ../gui/wxpython/nviz/tools.py:5447 +#, python-format +msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1456 ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1541 -msgid "unknown version" +#: ../gui/wxpython/nviz/tools.py:5507 ../gui/wxpython/nviz/tools.py:5560 +msgid "on surface" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1457 ../gui/wxpython/main_window/frame.py:1542 -msgid "Code revision" +#: ../gui/wxpython/nviz/tools.py:5657 +msgid "range:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1459 ../gui/wxpython/main_window/frame.py:1544 -msgid "Build date" +#: ../gui/wxpython/nviz/tools.py:5733 ../gui/wxpython/nviz/tools.py:5744 +msgid "North edge:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1461 ../gui/wxpython/main_window/frame.py:1546 -msgid "Build platform" +#: ../gui/wxpython/nviz/tools.py:5734 ../gui/wxpython/nviz/tools.py:5745 +msgid "South edge:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1473 ../gui/wxpython/main_window/frame.py:1558 -msgid "Platform" +#: ../gui/wxpython/nviz/tools.py:5735 ../gui/wxpython/nviz/tools.py:5742 +#: ../gui/wxpython/nviz/tools.py:5751 +msgid "West edge:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1533 ../gui/wxpython/main_window/frame.py:1618 -msgid "Close all Map Displays" +#: ../gui/wxpython/nviz/tools.py:5736 ../gui/wxpython/nviz/tools.py:5743 +#: ../gui/wxpython/nviz/tools.py:5752 +msgid "East edge:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1551 ../gui/wxpython/main_window/frame.py:1636 -msgid "Enter new name:" +#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5757 +msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1552 ../gui/wxpython/main_window/frame.py:1637 -msgid "Rename Map Display" +#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5748 +#: ../gui/wxpython/nviz/tools.py:5758 +msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1646 ../gui/wxpython/main_window/frame.py:1730 -#, python-format -msgid "" -"Unable to launch \"Supervised Classification Tool\".\n" -"\n" -"Reason: %s" +#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 +#: ../gui/wxpython/nviz/tools.py:5756 +msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1654 ../gui/wxpython/iclass/frame.py:89 -#: ../gui/wxpython/iclass/frame.py:1622 -#: ../gui/wxpython/main_window/frame.py:1738 -msgid "Supervised Classification Tool" +#: ../gui/wxpython/nviz/tools.py:5753 +msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1692 ../gui/wxpython/main_window/frame.py:1776 -msgid "Unable to start Timeline Tool." +#: ../gui/wxpython/nviz/tools.py:5754 +msgid "Top edge:" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1702 ../gui/wxpython/main_window/frame.py:1786 -msgid "Unable to start Temporal Plot Tool." +#: ../gui/wxpython/nviz/tools.py:5862 +msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1880 ../gui/wxpython/main_window/frame.py:1964 -msgid "Add selected map layers into layer tree" +#: ../gui/wxpython/nviz/tools.py:5898 +msgid "" +"Adjusts the light direction. Click and drag the puck to change the light " +"direction." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:1912 ../gui/wxpython/lmgr/frame.py:1950 -#: ../gui/wxpython/main_window/frame.py:1996 -#: ../gui/wxpython/main_window/frame.py:2034 -#, python-format -msgid "Unsupported map layer type <%s>." +#: ../gui/wxpython/vnet/toolbars.py:51 +msgid "Insert points from Map Display" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2093 ../gui/wxpython/main_window/frame.py:2158 -msgid "" -"Note that cell values can only be displayed for regions of less than 10,000 " -"cells." +#: ../gui/wxpython/vnet/toolbars.py:53 +msgid "Activate snapping to nodes" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2184 ../gui/wxpython/lmgr/layertree.py:2059 -#: ../gui/wxpython/main_window/frame.py:2235 -msgid "opacity:" +#: ../gui/wxpython/vnet/toolbars.py:55 +msgid "Activate mode for turns editing" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2193 ../gui/wxpython/main_window/frame.py:2244 -#, python-format -msgid "" -"Do you want to remove map layer(s)\n" -"%s\n" -"from layer tree?" +#: ../gui/wxpython/vnet/toolbars.py:58 +msgid "Activate mode for global turns editing" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2198 ../gui/wxpython/main_window/frame.py:2249 -msgid "Do you want to remove selected map layer(s) from layer tree?" +#: ../gui/wxpython/vnet/toolbars.py:60 +msgid "Add new point" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2204 ../gui/wxpython/main_window/frame.py:2255 -msgid "Remove map layer" +#: ../gui/wxpython/vnet/toolbars.py:61 +msgid "Delete selected point" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2278 ../gui/wxpython/main_window/frame.py:2319 -msgid "Quit GRASS GUI" +#: ../gui/wxpython/vnet/toolbars.py:125 +msgid "Execute analysis" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2316 ../gui/wxpython/main_window/frame.py:2357 -msgid "" -"Display resolution is currently not constrained to computational settings. " -"It's suggested to constrain map to region geometry. Do you want to constrain " -"the resolution?" +#: ../gui/wxpython/vnet/toolbars.py:126 +msgid "Go to previous analysis result" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:2327 ../gui/wxpython/main_window/frame.py:2368 -msgid "Constrain map to region geometry?" +#: ../gui/wxpython/vnet/toolbars.py:127 +msgid "Go to next analysis result" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:53 -msgid "Import data from WMS server" +#: ../gui/wxpython/vnet/toolbars.py:128 +msgid "Show analysis result" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:54 -msgid "Add command layer" +#: ../gui/wxpython/vnet/toolbars.py:130 +msgid "Save temporary result" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:55 ../gui/wxpython/menustrings.py:2094 -#: ../gui/wxpython/gui_core/toolbars.py:70 -#: ../gui/wxpython/vdigit/toolbars.py:227 -msgid "Quit" +#: ../gui/wxpython/vnet/toolbars.py:146 +msgid "Previous analysis result" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:56 ../gui/wxpython/gui_core/toolbars.py:71 -msgid "Add raster map layer" +#: ../gui/wxpython/vnet/toolbars.py:151 +msgid "Next analysis result" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:57 ../gui/wxpython/iclass/toolbars.py:48 -#: ../gui/wxpython/gui_core/simplelmgr.py:537 -msgid "Add RGB map layer" +#: ../gui/wxpython/vnet/toolbars.py:226 +msgid "Available analyses" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:58 -msgid "Add HIS map layer" +#: ../gui/wxpython/vnet/widgets.py:404 +msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:60 -msgid "Add shaded relief map layer" +#: ../gui/wxpython/vnet/widgets.py:560 +msgid "Edit point" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:62 -msgid "Add raster flow arrows" +#: ../gui/wxpython/vnet/dialogs.py:93 +msgid "Vector Network Analysis Tool" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:63 -msgid "Add raster cell numbers" +#: ../gui/wxpython/vnet/dialogs.py:205 +msgid "Point list toolbar" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:64 ../gui/wxpython/gui_core/toolbars.py:72 -msgid "Add vector map layer" +#: ../gui/wxpython/vnet/dialogs.py:218 +msgid "Analysis toolbar" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:66 -msgid "Add thematic (choropleth) vector map layer" +#: ../gui/wxpython/vnet/dialogs.py:259 +msgid "Points for analysis:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:69 -msgid "Add thematic chart layer" +#: ../gui/wxpython/vnet/dialogs.py:263 +msgid "Analysis settings:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:71 -msgid "Add grid layer" +#: ../gui/wxpython/vnet/dialogs.py:267 +msgid "Points" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:73 -msgid "Add geodesic line layer" +#: ../gui/wxpython/vnet/dialogs.py:281 +msgid "Maximum distance of point to the network:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:75 -msgid "Add rhumbline layer" +#: ../gui/wxpython/vnet/dialogs.py:300 +msgid "Iso lines:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:76 ../gui/wxpython/psmap/toolbars.py:107 -msgid "Add labels" +#: ../gui/wxpython/vnet/dialogs.py:374 +#: ../gui/wxpython/modules/mcalc_builder.py:155 +msgid "Output" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:79 -#: ../gui/wxpython/gui_core/simplelmgr.py:534 -#: ../gui/wxpython/gui_core/simplelmgr.py:535 -msgid "Add 3D raster map layer" +#: ../gui/wxpython/vnet/dialogs.py:428 +msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:80 -msgid "Note that 3D raster data are rendered only in 3D view mode" +#: ../gui/wxpython/vnet/dialogs.py:549 +msgid "Input tables" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:82 -msgid "Add WMS layer." +#: ../gui/wxpython/vnet/dialogs.py:578 +msgid "Result tables" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:84 -msgid "Editing mode" +#: ../gui/wxpython/vnet/dialogs.py:594 +msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:85 -msgid "Background vector map" +#: ../gui/wxpython/vnet/dialogs.py:731 +msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:158 ../gui/wxpython/lmgr/layertree.py:1584 -msgid "Map Layers" +#: ../gui/wxpython/vnet/dialogs.py:906 +msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:454 ../gui/wxpython/rlisetup/frame.py:159 -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:956 -#: ../gui/wxpython/menustrings.py:1202 ../gui/wxpython/menustrings.py:1907 -msgid "Rename" +#: ../gui/wxpython/vnet/dialogs.py:930 +msgid "Analysing..." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:461 -msgid "Check selected layers" +#: ../gui/wxpython/vnet/dialogs.py:1052 +msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:472 -msgid "Uncheck selected layers" +#: ../gui/wxpython/vnet/dialogs.py:1258 +msgid "Other settings" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:523 -msgid "3D view properties" +#: ../gui/wxpython/vnet/dialogs.py:1262 +msgid "Point style:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:533 -msgid "Zoom to selected map(s)" +#: ../gui/wxpython/vnet/dialogs.py:1266 +msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:545 -msgid "Zoom to selected map(s) (ignore NULLs)" +#: ../gui/wxpython/vnet/dialogs.py:1275 +#, python-format +msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:556 -msgid "Set computational region from selected map(s)" +#: ../gui/wxpython/vnet/dialogs.py:1291 +#, python-format +msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:569 -msgid "Align computational region to selected map" +#: ../gui/wxpython/vnet/dialogs.py:1299 +msgid "Line color:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:585 -msgid "Export common formats" +#: ../gui/wxpython/vnet/dialogs.py:1300 +msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:599 -msgid "Export PostGIS" +#: ../gui/wxpython/vnet/dialogs.py:1301 +msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:611 ../gui/wxpython/iclass/dialogs.py:795 -msgid "Export attribute table" +#: ../gui/wxpython/vnet/dialogs.py:1302 +msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:624 ../gui/wxpython/lmgr/layertree.py:747 -msgid "Create pack" +#: ../gui/wxpython/vnet/dialogs.py:1303 +msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:638 ../gui/wxpython/lmgr/layertree.py:763 -msgid "Make a copy in the current mapset" +#: ../gui/wxpython/vnet/dialogs.py:1315 +msgid "Point size:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:644 ../gui/wxpython/lmgr/layertree.py:769 -#: ../gui/wxpython/lmgr/layertree.py:826 -msgid "Set color table" +#: ../gui/wxpython/vnet/dialogs.py:1316 +msgid "Point width:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:648 ../gui/wxpython/lmgr/layertree.py:773 -msgid "Set color table interactively" +#: ../gui/wxpython/vnet/dialogs.py:1318 +msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:653 -msgid "Show attribute data" +#: ../gui/wxpython/vnet/dialogs.py:1519 +msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:669 -msgid "Start editing" +#: ../gui/wxpython/vnet/dialogs.py:1677 +msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:674 -msgid "Stop editing" +#: ../gui/wxpython/vnet/dialogs.py:1794 +msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:691 -msgid "Rebuild topology" +#: ../gui/wxpython/vnet/dialogs.py:1835 +msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:780 ../gui/wxpython/menustrings.py:775 -#: ../gui/wxpython/menustrings.py:1726 -msgid "Histogram" +#: ../gui/wxpython/vnet/vnet_data.py:157 +#, python-format +msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:791 ../gui/wxpython/lmgr/layertree.py:834 -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1492 -msgid "Univariate raster statistics" +#: ../gui/wxpython/vnet/vnet_data.py:164 +#, python-format +msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:800 -msgid "Report raster statistics" +#: ../gui/wxpython/vnet/vnet_data.py:166 +msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:808 -msgid "Profile" +#: ../gui/wxpython/vnet/vnet_data.py:174 +msgid "arc layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:851 -msgid "Save web service layer" +#: ../gui/wxpython/vnet/vnet_data.py:175 +msgid "node layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:966 -msgid "Unable to create profile of raster map." +#: ../gui/wxpython/vnet/vnet_data.py:176 +msgid "turntable layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1018 -#, python-format -msgid "Unsupported map type <%s>" +#: ../gui/wxpython/vnet/vnet_data.py:177 +msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1024 +#: ../gui/wxpython/vnet/vnet_data.py:186 #, python-format -msgid "Enter name for the new %s in the current mapset:" +msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1026 +#: ../gui/wxpython/vnet/vnet_data.py:189 #, python-format -msgid "Make a copy of %s <%s>" +msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1044 +#: ../gui/wxpython/vnet/vnet_data.py:198 #, python-format msgid "" -"%s <%s> already exists in the current mapset. Do you want to overwrite it?" +"Chosen column '%s' does not exist in attribute table of layer '%s' of vector " +"map '%s'.\n" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1057 -#, python-format -msgid "Unable to make copy of <%s>" +#: ../gui/wxpython/vnet/vnet_data.py:255 ../gui/wxpython/gui_core/vselect.py:46 +msgid "type" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1064 -#, python-format -msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." +#: ../gui/wxpython/vnet/vnet_data.py:255 +msgid "topology" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1085 -msgid "Unable to display histogram of raster map. No map name defined." +#: ../gui/wxpython/vnet/vnet_data.py:257 ../gui/wxpython/vnet/vnet_data.py:750 +msgid "Start point" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1200 -#: ../gui/wxpython/gui_core/simplelmgr.py:303 -#, python-format -msgid "Set opacity of <%s>" +#: ../gui/wxpython/vnet/vnet_data.py:257 +msgid "End Point" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1396 -msgid "Layer group:" +#: ../gui/wxpython/vnet/vnet_data.py:544 ../gui/wxpython/vnet/vnet_data.py:553 +#: ../gui/wxpython/vnet/vnet_data.py:556 +msgid "new point" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1401 -#: ../gui/wxpython/lmgr/layertree.py:1973 -msgid "Click to edit layer settings" +#: ../gui/wxpython/vnet/vnet_data.py:731 +msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1467 -msgid "(double click to set properties)" +#: ../gui/wxpython/vnet/vnet_data.py:732 +msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1749 -msgid "Please wait, updating data..." +#: ../gui/wxpython/vnet/vnet_data.py:735 +msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:50 -#, python-format -msgid "Welcome to wxGUI Interactive Python Shell %s" +#: ../gui/wxpython/vnet/vnet_data.py:736 +msgid "arc backward" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:52 -#, python-format -msgid "Type %s for more GRASS scripting related information." +#: ../gui/wxpython/vnet/vnet_data.py:739 +msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:54 -#, python-format -msgid "Type %s to add raster or vector to the layer tree." +#: ../gui/wxpython/vnet/vnet_data.py:740 +msgid "arc" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:76 -msgid "Delete all text from the shell" +#: ../gui/wxpython/vnet/vnet_data.py:743 +msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:80 -msgid "Simple &editor" +#: ../gui/wxpython/vnet/vnet_data.py:743 +msgid "node" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:137 +#: ../gui/wxpython/vnet/vnet_data.py:748 #, python-format -msgid "Raster or vector map <%s> not found" +msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:143 -#, python-format -msgid "Raster map <%s> added" +#: ../gui/wxpython/vnet/vnet_data.py:750 +msgid "End point" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:145 +#: ../gui/wxpython/vnet/vnet_data.py:760 #, python-format -msgid "Vector map <%s> added" +msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:28 -#: ../gui/wxpython/mapswipe/dialogs.py:52 -msgid "Select raster maps" +#: ../gui/wxpython/vnet/vnet_data.py:769 +#, python-format +msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:141 -msgid "Swipe mode" +#: ../gui/wxpython/vnet/vnet_data.py:772 +msgid "Source point" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:141 -#: ../gui/wxpython/mapswipe/dialogs.py:285 -msgid "Mirror mode" +#: ../gui/wxpython/vnet/vnet_data.py:773 +msgid "Sink point" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:154 -msgid "Choose view mode" +#: ../gui/wxpython/vnet/vnet_data.py:781 +#, python-format +msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:188 -msgid "Switch orientation" +#: ../gui/wxpython/vnet/vnet_data.py:790 +#, python-format +msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/mapswipe/toolbars.py:194 -msgid "Switch maps" +#: ../gui/wxpython/vnet/vnet_data.py:802 +#, python-format +msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:148 -msgid "Name of top/left raster map:" +#: ../gui/wxpython/vnet/vnet_data.py:811 +#, python-format +msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:155 -msgid "Name of bottom/right raster map:" +#: ../gui/wxpython/vnet/vnet_data.py:893 +msgid "Overwrite map layer" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:200 -msgid "Switch to advanced mode" +#: ../gui/wxpython/vnet/vnet_core.py:111 +msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:201 ../gui/wxpython/gui_core/wrap.py:265 -msgid "Cancel" +#: ../gui/wxpython/vnet/vnet_core.py:230 +#, python-format +msgid "" +"Temporary map '%s' with result was changed outside vector network analysis " +"tool.\n" +"Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:205 -msgid "Switch to simple mode" +#: ../gui/wxpython/vnet/vnet_core.py:236 +msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:206 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2040 ../gui/wxpython/gui_core/wrap.py:278 -msgid "Close" +#: ../gui/wxpython/vnet/vnet_core.py:275 +msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:229 -msgid "Name of the first map is missing." +#: ../gui/wxpython/vnet/vnet_core.py:285 ../gui/wxpython/vnet/vnet_core.py:363 +#, python-format +msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:231 -msgid "Name of the second map is missing." +#: ../gui/wxpython/vnet/vnet_core.py:288 ../gui/wxpython/vnet/vnet_core.py:366 +msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:264 -msgid "Map Swipe settings" +#: ../gui/wxpython/vnet/vnet_core.py:313 +msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:288 -msgid "Mirrored cursor" +#: ../gui/wxpython/vnet/vnet_core.py:333 +msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:310 -msgid "Shape:" +#: ../gui/wxpython/vnet/vnet_core.py:353 +msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87 -msgid "Map Swipe Tool - GRASS GIS" +#: ../gui/wxpython/vnet/vnet_core.py:437 ../gui/wxpython/vnet/vnet_core.py:660 +#, python-format +msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:209 -#: ../gui/wxpython/menustrings.py:2017 -msgid "Map Swipe" +#: ../gui/wxpython/vnet/vnet_core.py:668 +msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:458 +#: ../gui/wxpython/vnet/vnet_core.py:961 #, python-format -msgid "Map <%s> not found. " -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 +msgid "" +"Input map '%s' for analysis was changed outside vector network analysis " +"tool.\n" +"Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/modules/import_export.py:50 -msgid "Multiple import" +#: ../gui/wxpython/vnet/vnet_core.py:967 +msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/modules/import_export.py:69 -msgid "List of raster layers" +#: ../gui/wxpython/vnet/vnet_core.py:1037 +#, python-format +msgid "" +"Temporary map %s already exists.\n" +"Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/modules/import_export.py:71 -msgid "List of vector layers" +#: ../gui/wxpython/vnet/vnet_core.py:1064 +msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/modules/import_export.py:73 -#, python-format -msgid "List of %s layers" +#: ../gui/wxpython/vnet/vnet_core.py:1065 +#: ../gui/wxpython/vnet/vnet_core.py:1089 +msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/modules/import_export.py:75 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:968 -msgid "right click to (un)select all" +#: ../gui/wxpython/vnet/vnet_core.py:1099 +msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/import_export.py:965 -msgid "right click to (un)select all" +#: ../gui/wxpython/vnet/vnet_core.py:1108 +#, python-format +msgid "" +"Temporary map '%s' was changed outside vector analysis tool.\n" +"Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:937 -#: ../gui/wxpython/gui_core/forms.py:2246 -msgid "Layer id" +#: ../gui/wxpython/vnet/vnet_core.py:1113 +msgid "Overwrite map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:81 -#: ../gui/wxpython/gui_core/forms.py:2247 -msgid "Layer name" +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:195 +msgid "Raster map <{}> not found in current mapset." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/modules/import_export.py:82 -msgid "Name for output GRASS map (editable)" +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:212 +msgid "Base raster map <{}> not found in current mapset." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> 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" +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:237 +msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/modules/import_export.py:86 -#: ../gui/wxpython/modules/import_export.py:88 -#: ../gui/wxpython/gui_core/forms.py:2249 -msgid "Projection match" +#: ../gui/wxpython/rdigit/toolbars.py:28 +msgid "Digitize area" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/modules/import_export.py:96 -msgid "Override projection check (use current location's projection)" +#: ../gui/wxpython/rdigit/toolbars.py:29 +msgid "Digitize line" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:127 -#: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/import_export.py:113 -#: ../gui/wxpython/gui_core/forms.py:705 -msgid "Close dialog on finish" +#: ../gui/wxpython/rdigit/toolbars.py:30 +msgid "Digitize point" msgstr "" -#: ../gui/wxpython/modules/import_export.py:127 -#: ../gui/wxpython/modules/import_export.py:440 -#: ../gui/wxpython/modules/import_export.py:582 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -msgid "&Import" +#: ../gui/wxpython/rdigit/toolbars.py:31 +msgid "Save raster map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:128 -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:441 -#: ../gui/wxpython/modules/import_export.py:583 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 -======= -#: ../gui/wxpython/modules/import_export.py:441 -#: ../gui/wxpython/modules/import_export.py:583 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/modules/import_export.py:441 -#: ../gui/wxpython/modules/import_export.py:583 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -msgid "Import selected layers" +#: ../gui/wxpython/rdigit/toolbars.py:32 ../gui/wxpython/vdigit/toolbars.py:238 +msgid "Undo" msgstr "" -#: ../gui/wxpython/modules/import_export.py:136 -msgid "Source settings" +#: ../gui/wxpython/rdigit/toolbars.py:47 +msgid "Select raster map" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:160 -msgid "Import settings" +#: ../gui/wxpython/rdigit/toolbars.py:56 +msgid "Set drawing color (not raster cell color)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:254 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/import_export.py:161 -msgid "Import settings" +#: ../gui/wxpython/rdigit/toolbars.py:73 +msgid "Cell value:" msgstr "" -#: ../gui/wxpython/modules/import_export.py:255 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#, python-format -msgid "Output map names %(names)s exist. " +#: ../gui/wxpython/rdigit/toolbars.py:86 +msgid "" +"Width of currently digitized line or diameter of a digitized point in map " +"units." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:259 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:258 -======= -#: ../gui/wxpython/modules/import_export.py:259 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/modules/import_export.py:259 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-format -msgid "Output map name <%(name)s> exist. " +#: ../gui/wxpython/rdigit/toolbars.py:167 +msgid "New raster map" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 -msgid "Add linked layers into layer tree" +#: ../gui/wxpython/rdigit/dialogs.py:34 +msgid "Create new raster map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 -msgid "Add imported layers into layer tree" +#: ../gui/wxpython/rdigit/dialogs.py:54 +msgid "Name for new raster map:" msgstr "" -#: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 -msgid "&Link" +#: ../gui/wxpython/rdigit/dialogs.py:61 +msgid "Optionally select background raster map:" msgstr "" -#: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 -msgid "Link selected layers" +#: ../gui/wxpython/rdigit/dialogs.py:68 +msgid "New raster map type:" msgstr "" -#: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 -msgid "No layers selected. Operation canceled." +#: ../gui/wxpython/rdigit/dialogs.py:101 +msgid "Please specify name for a new raster map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 -msgid "Unable to determine number of raster bands" +#: ../gui/wxpython/rdigit/dialogs.py:109 +#, python-format +msgid "" +"Raster map <%s> already exists in the current mapset. Do you want to " +"overwrite it?" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 -msgid "Define output format for vector data" +#: ../gui/wxpython/rdigit/controller.py:121 +msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 -msgid "Define output format for raster data" +#: ../gui/wxpython/rdigit/controller.py:154 +msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 -msgid "Set external format and close dialog" +#: ../gui/wxpython/rdigit/controller.py:159 +msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 -msgid "No data source selected." +#: ../gui/wxpython/rdigit/controller.py:293 +msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 -msgid "Import DXF layers" +#: ../gui/wxpython/rdigit/controller.py:294 +msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/modules/import_export.py:824 -msgid "Choose DXF file to import" +#: ../gui/wxpython/rdigit/controller.py:382 +msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/modules/import_export.py:844 -msgid "No layers selected." +#: ../gui/wxpython/rdigit/controller.py:419 +#: ../gui/wxpython/rdigit/controller.py:436 +msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 -msgid "Name for output GRASS map" +#: ../gui/wxpython/rdigit/controller.py:537 +#: ../gui/wxpython/rdigit/controller.py:570 +msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/import_export.py:419 -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1189 -msgid "Link external raster data" +#: ../gui/wxpython/rdigit/controller.py:618 +msgid "Failed to set default color table for edited raster map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:428 -#: ../gui/wxpython/modules/import_export.py:570 -msgid "Add linked layers into layer tree" +#: ../gui/wxpython/lmgr/toolbars.py:46 +msgid "Create new workspace (Ctrl+N)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:430 -#: ../gui/wxpython/modules/import_export.py:572 -#: ../gui/wxpython/modules/import_export.py:828 -msgid "Add imported layers into layer tree" +#: ../gui/wxpython/lmgr/toolbars.py:49 +msgid "Open existing workspace file (Ctrl+O)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:437 -#: ../gui/wxpython/modules/import_export.py:579 -msgid "&Link" +#: ../gui/wxpython/lmgr/toolbars.py:52 +msgid "Save current workspace to file (Ctrl+S)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:438 -#: ../gui/wxpython/modules/import_export.py:580 -msgid "Link selected layers" +#: ../gui/wxpython/lmgr/toolbars.py:58 +msgid "New workspace" msgstr "" -#: ../gui/wxpython/modules/import_export.py:462 -#: ../gui/wxpython/modules/import_export.py:604 -msgid "No layers selected. Operation canceled." +#: ../gui/wxpython/lmgr/toolbars.py:63 +msgid "Open workspace" msgstr "" -#: ../gui/wxpython/modules/import_export.py:488 -msgid "Unable to determine number of raster bands" +#: ../gui/wxpython/lmgr/toolbars.py:68 ../gui/wxpython/lmgr/workspace.py:376 +#: ../gui/wxpython/lmgr/workspace.py:399 ../gui/wxpython/menustrings.py:10 +msgid "Save workspace" msgstr "" -#: ../gui/wxpython/modules/import_export.py:561 -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1191 -msgid "Link external vector data" +#: ../gui/wxpython/lmgr/toolbars.py:93 +msgid "Add multiple raster or vector map layers (Ctrl+Shift+L)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:713 -msgid "Define output format for vector data" +#: ../gui/wxpython/lmgr/toolbars.py:96 +msgid "Add raster map layer (Ctrl+Shift+R)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:715 -msgid "Define output format for raster data" +#: ../gui/wxpython/lmgr/toolbars.py:100 +msgid "Add various raster map layers (RGB, HIS, shaded relief...)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:723 -msgid "Set external format and close dialog" +#: ../gui/wxpython/lmgr/toolbars.py:103 +msgid "Add vector map layer (Ctrl+Shift+V)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:783 -msgid "No data source selected." +#: ../gui/wxpython/lmgr/toolbars.py:107 +msgid "Add various vector map layers (thematic, chart...)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:807 -msgid "Import DXF layers" +#: ../gui/wxpython/lmgr/toolbars.py:111 +msgid "Add web service layer (WMS, WMTS, NASA OnEarth)" msgstr "" -#: ../gui/wxpython/modules/import_export.py:820 -msgid "Choose DXF file to import" +#: ../gui/wxpython/lmgr/toolbars.py:113 +msgid "Add group" msgstr "" -#: ../gui/wxpython/modules/import_export.py:840 -msgid "No layers selected." +#: ../gui/wxpython/lmgr/toolbars.py:114 ../gui/wxpython/lmgr/toolbars.py:153 +msgid "Add various overlays" msgstr "" -#: ../gui/wxpython/modules/import_export.py:937 -msgid "Name for output GRASS map" +#: ../gui/wxpython/lmgr/toolbars.py:117 +msgid "Remove selected map layer(s) from layer tree" msgstr "" -#: ../gui/wxpython/modules/import_export.py:959 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -msgid "" -"Projection of following layers do not match with projection of current " -"location. " +#: ../gui/wxpython/lmgr/toolbars.py:119 +msgid "Edit selected vector map" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/modules/import_export.py:966 -msgid "Layers to be reprojected" +#: ../gui/wxpython/lmgr/toolbars.py:121 +msgid "Show attribute data for selected vector map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 -msgid "&Import && reproject" +#: ../gui/wxpython/lmgr/toolbars.py:128 +msgid "Add multiple map layers" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 -msgid "Reproject selected layers" +#: ../gui/wxpython/lmgr/toolbars.py:133 ../gui/wxpython/iclass/toolbars.py:402 +msgid "Add raster map" msgstr "" -#: ../gui/wxpython/modules/histogram.py:298 -msgid "Histogram Tool [d.histogram]" +#: ../gui/wxpython/lmgr/toolbars.py:138 +msgid "Add various raster maps" msgstr "" -#: ../gui/wxpython/modules/histogram.py:427 -msgid "Select font for histogram text" +#: ../gui/wxpython/lmgr/toolbars.py:143 +msgid "Add vector map" msgstr "" -#: ../gui/wxpython/modules/extensions.py:45 -msgid "Fetch & install extension from GRASS Addons" -msgstr "" +#: ../gui/wxpython/lmgr/toolbars.py:148 +msgid "Add various vector maps" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:158 +msgid "Add web service map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:169 +msgid "Delete map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:203 +msgid "Start new map display" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:206 +#: ../gui/wxpython/modules/mcalc_builder.py:68 +msgid "Raster Map Calculator" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:209 +msgid "Georectifier" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/menustrings.py:207 +#: ../gui/wxpython/menustrings.py:2003 ../gui/wxpython/psmap/frame.py:58 +msgid "Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:212 +msgid "Launch user-defined script" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:82 +msgid "Open a simple Python code editor" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:222 +msgid "New display" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:254 +msgid "Python code editor" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:276 +msgid "GUI settings" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:277 +msgid "GRASS manual" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:317 +msgid "Generate command for m.nviz.image" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:318 +msgid "Generate command for m.nviz.image based on current state" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:322 +msgid "3D view mode settings" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:323 +msgid "Show 3D view mode settings dialog" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:325 +msgid "Show 3D view mode manual" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:84 +msgid "Left mouse click to remove the MASK" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:130 +msgid "Are you sure that you want to remove the MASK?" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:131 +msgid "Remove MASK" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:71 +msgid "" +"Current workspace is not empty. Do you want to store current settings to " +"workspace file?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:75 +msgid "Create new workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:104 +msgid "Choose workspace file" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:106 ../gui/wxpython/lmgr/workspace.py:353 +msgid "GRASS Workspace File (*.gxw)|*.gxw" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:135 +msgid "Most likely the database, location or mapset does not exist" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:138 +#, python-brace-format +msgid "" +"Unable to change to location and mapset specified in the workspace.\n" +"Reason: {reason}\n" +"Details: {details}\n" +"\n" +"Do you want to proceed with opening the workspace anyway?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:147 +msgid "Proceed with opening of the workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:158 +#: ../gui/wxpython/startup/guiutils.py:704 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:190 +msgid "Please wait, loading workspace..." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:351 +msgid "Choose file to save current workspace" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:372 ../gui/wxpython/lmgr/workspace.py:395 +#, python-format +msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:424 +msgid "Writing current settings to workspace file failed." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:452 +msgid "Do you want to save changes in the workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:455 +msgid "Do you want to store current settings to workspace file?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:105 ../gui/wxpython/main_window/frame.py:108 +msgid "GRASS GIS" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:137 +msgid "There were some issues when loading menu or Tools tab:" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:173 ../gui/wxpython/main_window/frame.py:549 +msgid "Workspace Toolbar" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:177 ../gui/wxpython/main_window/frame.py:553 +msgid "Tools Toolbar" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:179 ../gui/wxpython/main_window/frame.py:555 +msgid "3D view Toolbar" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:332 ../gui/wxpython/main_window/frame.py:255 +msgid "Rename current Map Display" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:446 ../gui/wxpython/main_window/frame.py:390 +#, python-brace-format +msgid "Map Display {number}" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:549 ../gui/wxpython/lmgr/frame.py:869 +#: ../gui/wxpython/main_window/frame.py:487 +#: ../gui/wxpython/main_window/frame.py:943 +msgid "Close Map Display {}" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:598 +#: ../gui/wxpython/gui_core/preferences.py:1220 +msgid "Layers" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:602 ../gui/wxpython/mapswipe/toolbars.py:27 +#: ../gui/wxpython/modules/vclean.py:505 +#: ../gui/wxpython/gui_core/preferences.py:327 +#: ../gui/wxpython/gui_core/preferences.py:1117 +msgid "Tools" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:605 +msgid "Console" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:612 +#: ../gui/wxpython/gui_core/preferences.py:341 +msgid "Python" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:760 ../gui/wxpython/main_window/frame.py:843 +msgid "Map Swipe Tool" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:812 ../gui/wxpython/main_window/frame.py:895 +msgid "Choose model to run" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:958 ../gui/wxpython/main_window/frame.py:1038 +#, python-format +msgid "" +"Command '%s' not yet implemented in the WxGUI. Try adding it as a command " +"layer instead." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1144 ../gui/wxpython/lmgr/frame.py:1832 +#: ../gui/wxpython/main_window/frame.py:1229 +#: ../gui/wxpython/main_window/frame.py:1916 +msgid "Selected map layer is not vector." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1151 ../gui/wxpython/main_window/frame.py:1236 +msgid "Editing is allowed only for vector maps from the current mapset." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1179 ../gui/wxpython/main_window/frame.py:1264 +msgid "Choose script file to run" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1181 ../gui/wxpython/main_window/frame.py:1266 +msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1194 ../gui/wxpython/main_window/frame.py:1279 +#, python-format +msgid "Script file '%s' doesn't exist. Operation canceled." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1204 ../gui/wxpython/main_window/frame.py:1289 +#, python-format +msgid "" +"Script <%s> is not executable. Do you want to set the permissions that " +"allows you to run this script (note that you must be the owner of the file)?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1210 ../gui/wxpython/main_window/frame.py:1295 +msgid "Set permission?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1220 ../gui/wxpython/main_window/frame.py:1305 +msgid "Unable to set permission. Operation canceled." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1233 ../gui/wxpython/main_window/frame.py:1318 +#, python-format +msgid "" +"Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " +"directory to GRASS_ADDON_PATH?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1237 ../gui/wxpython/main_window/frame.py:1322 +msgid "Update Addons path?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1244 ../gui/wxpython/main_window/frame.py:1329 +#, python-format +msgid "Launching script '%s'..." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1259 ../gui/wxpython/main_window/frame.py:1344 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1299 ../gui/wxpython/main_window/frame.py:1384 +msgid "No mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1334 ../gui/wxpython/main_window/frame.py:1419 +#, python-format +msgid "" +"Working directory changed to:\n" +"\"%s\"" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1342 ../gui/wxpython/main_window/frame.py:1427 +msgid "Changes current working directory for this GUI." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1344 ../gui/wxpython/main_window/frame.py:1429 +msgid "Usage: cd [directory]" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1345 ../gui/wxpython/main_window/frame.py:1430 +msgid "Without parameters it opens a dialog." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1351 ../gui/wxpython/main_window/frame.py:1436 +msgid "" +"If ~ (tilde) is present as the first directory on the path, it is replaced " +"by user's home directory." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1369 ../gui/wxpython/main_window/frame.py:1454 +msgid "More than one parameter provided." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1390 ../gui/wxpython/main_window/frame.py:1475 +msgid "Choose a working directory" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1429 ../gui/wxpython/gui_core/ghelp.py:116 +#: ../gui/wxpython/gui_core/ghelp.py:944 +#: ../gui/wxpython/main_window/frame.py:1514 +msgid "Unable to get GRASS version\n" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1439 ../gui/wxpython/main_window/frame.py:1524 +msgid "System Info" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1455 ../gui/wxpython/main_window/frame.py:1540 +msgid "GRASS version" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1456 ../gui/wxpython/gui_core/ghelp.py:130 +#: ../gui/wxpython/main_window/frame.py:1541 +msgid "unknown version" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1457 ../gui/wxpython/main_window/frame.py:1542 +msgid "Code revision" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1459 ../gui/wxpython/main_window/frame.py:1544 +msgid "Build date" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1461 ../gui/wxpython/main_window/frame.py:1546 +msgid "Build platform" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1473 ../gui/wxpython/main_window/frame.py:1558 +msgid "Platform" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1533 ../gui/wxpython/main_window/frame.py:1618 +msgid "Close all Map Displays" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1551 ../gui/wxpython/main_window/frame.py:1636 +msgid "Enter new name:" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1552 ../gui/wxpython/main_window/frame.py:1637 +msgid "Rename Map Display" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1646 ../gui/wxpython/main_window/frame.py:1730 +#, python-format +msgid "" +"Unable to launch \"Supervised Classification Tool\".\n" +"\n" +"Reason: %s" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1654 ../gui/wxpython/iclass/frame.py:89 +#: ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1738 +msgid "Supervised Classification Tool" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1692 ../gui/wxpython/main_window/frame.py:1776 +msgid "Unable to start Timeline Tool." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1702 ../gui/wxpython/main_window/frame.py:1786 +msgid "Unable to start Temporal Plot Tool." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1880 ../gui/wxpython/main_window/frame.py:1964 +msgid "Add selected map layers into layer tree" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1912 ../gui/wxpython/lmgr/frame.py:1950 +#: ../gui/wxpython/main_window/frame.py:1996 +#: ../gui/wxpython/main_window/frame.py:2034 +#, python-format +msgid "Unsupported map layer type <%s>." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2093 ../gui/wxpython/main_window/frame.py:2158 +msgid "" +"Note that cell values can only be displayed for regions of less than 10,000 " +"cells." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2184 ../gui/wxpython/lmgr/layertree.py:2059 +#: ../gui/wxpython/main_window/frame.py:2235 +msgid "opacity:" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2193 ../gui/wxpython/main_window/frame.py:2244 +#, python-format +msgid "" +"Do you want to remove map layer(s)\n" +"%s\n" +"from layer tree?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2198 ../gui/wxpython/main_window/frame.py:2249 +msgid "Do you want to remove selected map layer(s) from layer tree?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2204 ../gui/wxpython/main_window/frame.py:2255 +msgid "Remove map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2278 ../gui/wxpython/main_window/frame.py:2319 +msgid "Quit GRASS GUI" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2316 ../gui/wxpython/main_window/frame.py:2357 +msgid "" +"Display resolution is currently not constrained to computational settings. " +"It's suggested to constrain map to region geometry. Do you want to constrain " +"the resolution?" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:2327 ../gui/wxpython/main_window/frame.py:2368 +msgid "Constrain map to region geometry?" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:53 +msgid "Import data from WMS server" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:54 +msgid "Add command layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:55 ../gui/wxpython/menustrings.py:2094 +#: ../gui/wxpython/gui_core/toolbars.py:70 +#: ../gui/wxpython/vdigit/toolbars.py:227 +msgid "Quit" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:56 ../gui/wxpython/gui_core/toolbars.py:71 +msgid "Add raster map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:57 ../gui/wxpython/iclass/toolbars.py:48 +#: ../gui/wxpython/gui_core/simplelmgr.py:537 +msgid "Add RGB map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:58 +msgid "Add HIS map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:60 +msgid "Add shaded relief map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:62 +msgid "Add raster flow arrows" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:63 +msgid "Add raster cell numbers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:64 ../gui/wxpython/gui_core/toolbars.py:72 +msgid "Add vector map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:66 +msgid "Add thematic (choropleth) vector map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:69 +msgid "Add thematic chart layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:71 +msgid "Add grid layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:73 +msgid "Add geodesic line layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:75 +msgid "Add rhumbline layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:76 ../gui/wxpython/psmap/toolbars.py:107 +msgid "Add labels" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:79 +#: ../gui/wxpython/gui_core/simplelmgr.py:534 +#: ../gui/wxpython/gui_core/simplelmgr.py:535 +msgid "Add 3D raster map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:80 +msgid "Note that 3D raster data are rendered only in 3D view mode" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:82 +msgid "Add WMS layer." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:84 +msgid "Editing mode" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:85 +msgid "Background vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:158 ../gui/wxpython/lmgr/layertree.py:1584 +msgid "Map Layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:454 ../gui/wxpython/rlisetup/frame.py:159 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:956 +#: ../gui/wxpython/menustrings.py:1202 ../gui/wxpython/menustrings.py:1907 +msgid "Rename" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:461 +msgid "Check selected layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:472 +msgid "Uncheck selected layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:523 +msgid "3D view properties" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:533 +msgid "Zoom to selected map(s)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:545 +msgid "Zoom to selected map(s) (ignore NULLs)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:556 +msgid "Set computational region from selected map(s)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:569 +msgid "Align computational region to selected map" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:585 +msgid "Export common formats" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:599 +msgid "Export PostGIS" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:611 ../gui/wxpython/iclass/dialogs.py:795 +msgid "Export attribute table" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:624 ../gui/wxpython/lmgr/layertree.py:747 +msgid "Create pack" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:638 ../gui/wxpython/lmgr/layertree.py:763 +msgid "Make a copy in the current mapset" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:644 ../gui/wxpython/lmgr/layertree.py:769 +#: ../gui/wxpython/lmgr/layertree.py:826 +msgid "Set color table" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:648 ../gui/wxpython/lmgr/layertree.py:773 +msgid "Set color table interactively" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:653 +msgid "Show attribute data" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:669 +msgid "Start editing" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:674 +msgid "Stop editing" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:691 +msgid "Rebuild topology" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:780 ../gui/wxpython/menustrings.py:775 +#: ../gui/wxpython/menustrings.py:1726 +msgid "Histogram" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:791 ../gui/wxpython/lmgr/layertree.py:834 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1492 +msgid "Univariate raster statistics" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:800 +msgid "Report raster statistics" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:808 +msgid "Profile" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:851 +msgid "Save web service layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:966 +msgid "Unable to create profile of raster map." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1018 +#, python-format +msgid "Unsupported map type <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1024 +#, python-format +msgid "Enter name for the new %s in the current mapset:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1026 +#, python-format +msgid "Make a copy of %s <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1044 +#, python-format +msgid "" +"%s <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1057 +#, python-format +msgid "Unable to make copy of <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1064 +#, python-format +msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1085 +msgid "Unable to display histogram of raster map. No map name defined." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1200 +#: ../gui/wxpython/gui_core/simplelmgr.py:303 +#, python-format +msgid "Set opacity of <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1396 +msgid "Layer group:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1401 +#: ../gui/wxpython/lmgr/layertree.py:1973 +msgid "Click to edit layer settings" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1467 +msgid "(double click to set properties)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1749 +msgid "Please wait, updating data..." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:50 +#, python-format +msgid "Welcome to wxGUI Interactive Python Shell %s" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:52 +#, python-format +msgid "Type %s for more GRASS scripting related information." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:54 +#, python-format +msgid "Type %s to add raster or vector to the layer tree." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:76 +msgid "Delete all text from the shell" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:80 +msgid "Simple &editor" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:137 +#, python-format +msgid "Raster or vector map <%s> not found" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:143 +#, python-format +msgid "Raster map <%s> added" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:145 +#, python-format +msgid "Vector map <%s> added" +msgstr "" + +#: ../gui/wxpython/mapswipe/toolbars.py:28 +#: ../gui/wxpython/mapswipe/dialogs.py:52 +msgid "Select raster maps" +msgstr "" + +#: ../gui/wxpython/mapswipe/toolbars.py:141 +msgid "Swipe mode" +msgstr "" + +#: ../gui/wxpython/mapswipe/toolbars.py:141 +#: ../gui/wxpython/mapswipe/dialogs.py:285 +msgid "Mirror mode" +msgstr "" + +#: ../gui/wxpython/mapswipe/toolbars.py:154 +msgid "Choose view mode" +msgstr "" + +#: ../gui/wxpython/mapswipe/toolbars.py:188 +msgid "Switch orientation" +msgstr "" + +#: ../gui/wxpython/mapswipe/toolbars.py:194 +msgid "Switch maps" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:148 +msgid "Name of top/left raster map:" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:155 +msgid "Name of bottom/right raster map:" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:200 +msgid "Switch to advanced mode" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:201 ../gui/wxpython/gui_core/wrap.py:265 +msgid "Cancel" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:205 +msgid "Switch to simple mode" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:206 ../gui/wxpython/menustrings.py:13 +#: ../gui/wxpython/menustrings.py:2040 ../gui/wxpython/gui_core/wrap.py:278 +msgid "Close" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:229 +msgid "Name of the first map is missing." +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:231 +msgid "Name of the second map is missing." +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:264 +msgid "Map Swipe settings" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:288 +msgid "Mirrored cursor" +msgstr "" + +#: ../gui/wxpython/mapswipe/dialogs.py:310 +msgid "Shape:" +msgstr "" + +#: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87 +msgid "Map Swipe Tool - GRASS GIS" +msgstr "" + +#: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:209 +#: ../gui/wxpython/menustrings.py:2017 +msgid "Map Swipe" +msgstr "" + +#: ../gui/wxpython/mapswipe/frame.py:458 +#, python-format +msgid "Map <%s> not found. " +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:50 +msgid "Multiple import" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:69 +msgid "List of raster layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:71 +msgid "List of vector layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:73 +#, python-format +msgid "List of %s layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:75 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +#: ../gui/wxpython/modules/import_export.py:985 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:968 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +msgid "right click to (un)select all" +msgstr "" + +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:965 +msgid "right click to (un)select all" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:80 +#: ../gui/wxpython/modules/import_export.py:937 +#: ../gui/wxpython/gui_core/forms.py:2246 +msgid "Layer id" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:81 +#: ../gui/wxpython/gui_core/forms.py:2247 +msgid "Layer name" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> 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" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:86 +#: ../gui/wxpython/modules/import_export.py:88 +#: ../gui/wxpython/gui_core/forms.py:2249 +msgid "Projection match" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:127 +#: ../gui/wxpython/modules/import_export.py:435 +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:597 +======= +#: ../gui/wxpython/modules/import_export.py:581 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:113 +#: ../gui/wxpython/gui_core/forms.py:705 +msgid "Close dialog on finish" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:127 +#: ../gui/wxpython/modules/import_export.py:440 +#: ../gui/wxpython/modules/import_export.py:582 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "&Import" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:128 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:441 +#: ../gui/wxpython/modules/import_export.py:583 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:436 +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:598 +======= +#: ../gui/wxpython/modules/import_export.py:582 +======= +#: ../gui/wxpython/modules/import_export.py:441 +#: ../gui/wxpython/modules/import_export.py:583 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "Import selected layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:136 +msgid "Source settings" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:160 +msgid "Import settings" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:254 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:161 +msgid "Import settings" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:255 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:259 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:258 +======= +#: ../gui/wxpython/modules/import_export.py:259 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/modules/import_export.py:259 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-format +msgid "Output map name <%(name)s> exist. " +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:423 +#: ../gui/wxpython/modules/import_export.py:585 +msgid "Add linked layers into layer tree" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:425 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 +msgid "Add imported layers into layer tree" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:432 +#: ../gui/wxpython/modules/import_export.py:594 +msgid "&Link" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:433 +#: ../gui/wxpython/modules/import_export.py:595 +msgid "Link selected layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:456 +#: ../gui/wxpython/modules/import_export.py:618 +msgid "No layers selected. Operation canceled." +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:503 +msgid "Unable to determine number of raster bands" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:733 +msgid "Define output format for vector data" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:735 +msgid "Define output format for raster data" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:743 +msgid "Set external format and close dialog" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:803 +msgid "No data source selected." +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:827 +msgid "Import DXF layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:840 +msgid "Choose DXF file to import" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:860 +msgid "No layers selected." +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:956 +msgid "Name for output GRASS map" +msgstr "" + +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:978 +======= +#: ../gui/wxpython/modules/import_export.py:962 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:419 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1189 +msgid "Link external raster data" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:428 +#: ../gui/wxpython/modules/import_export.py:570 +msgid "Add linked layers into layer tree" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:430 +#: ../gui/wxpython/modules/import_export.py:572 +#: ../gui/wxpython/modules/import_export.py:828 +msgid "Add imported layers into layer tree" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:437 +#: ../gui/wxpython/modules/import_export.py:579 +msgid "&Link" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:438 +#: ../gui/wxpython/modules/import_export.py:580 +msgid "Link selected layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:462 +#: ../gui/wxpython/modules/import_export.py:604 +msgid "No layers selected. Operation canceled." +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:488 +msgid "Unable to determine number of raster bands" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:561 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1191 +msgid "Link external vector data" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:713 +msgid "Define output format for vector data" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:715 +msgid "Define output format for raster data" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:723 +msgid "Set external format and close dialog" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:783 +msgid "No data source selected." +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:807 +msgid "Import DXF layers" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:820 +msgid "Choose DXF file to import" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:840 +msgid "No layers selected." +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:937 +msgid "Name for output GRASS map" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:959 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "" +"Projection of following layers do not match with projection of current " +"location. " +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +#: ../gui/wxpython/modules/import_export.py:983 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/modules/import_export.py:966 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +msgid "Layers to be reprojected" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:996 +msgid "&Import && reproject" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:998 +msgid "Reproject selected layers" +msgstr "" + +#: ../gui/wxpython/modules/histogram.py:298 +msgid "Histogram Tool [d.histogram]" +msgstr "" + +#: ../gui/wxpython/modules/histogram.py:427 +msgid "Select font for histogram text" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:45 +msgid "Fetch & install extension from GRASS Addons" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:65 +msgid "List of extensions - double-click to install" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:82 +msgid "Options" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:116 +msgid "&Install" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:117 +msgid "Install selected add-ons GRASS tool" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:120 +msgid "Show g.extension manual page" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:188 +msgid "Extension not defined" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:212 +msgid "Fetching list of tools from GRASS-Addons (be patient)..." +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:227 +#, python-format +msgid "%d extensions loaded" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:250 +msgid "Install" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:253 +msgid "Show manual page" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:369 +#, python-format +msgid "Unable to load extensions. %s" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:416 +msgid "Manage installed GRASS Addons extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:431 +msgid "List of installed extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:438 +msgid "Uninstall" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:440 +msgid "Uninstall selected Addons extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:442 +msgid "Reinstall" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:444 +msgid "Reinstall selected Addons extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:477 +msgid "No extension selected. Operation canceled." +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:503 +#, python-format +msgid "" +"List of files to be removed:\n" +"%(files)s\n" +"\n" +"Do you want really to remove <%(ext)s> extension?" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:507 +msgid "Remove extension" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:546 +msgid "Extension" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:68 +#: ../gui/wxpython/lmgr/toolbars.py:206 +msgid "Raster Map Calculator" +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/import_export.py:963 +msgid "Layers to be reprojected" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:976 +msgid "&Import && reproject" +msgstr "" + +#: ../gui/wxpython/modules/import_export.py:978 +msgid "Reproject selected layers" +msgstr "" + +#: ../gui/wxpython/modules/histogram.py:299 +msgid "Histogram Tool [d.histogram]" +msgstr "" + +#: ../gui/wxpython/modules/histogram.py:428 +msgid "Select font for histogram text" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:35 ../gui/wxpython/modules/vclean.py:114 +msgid "Set up vector cleaning tools" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:75 +msgid "break lines/boundaries" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:76 +msgid "remove duplicates" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:77 +msgid "remove dangles" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:78 +msgid "change boundary dangles to lines" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:79 +msgid "remove bridges" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:80 +msgid "change bridges to lines" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:81 +msgid "snap lines/boundaries" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:82 +msgid "remove duplicate area centroids" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:83 +msgid "break polygons" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:84 +msgid "prune lines/boundaries" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:85 +msgid "remove small areas" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:86 +msgid "remove lines/boundaries of zero length" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:87 +msgid "remove small angles at nodes" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:116 +msgid "Choose cleaning tools and set thresholds" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:120 +msgid "Select input vector map:" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:130 +msgid " Feature type: " +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:135 +msgid "Select output vector map:" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:178 +msgid "Copy the current command string to the clipboard (Ctrl+C)" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:222 ../gui/wxpython/psmap/utils.py:103 +msgid "point" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:223 +msgid "line" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:224 +msgid "boundary" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:225 +msgid "centroid" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:226 +#: ../gui/wxpython/vdigit/preferences.py:613 +msgid "area" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:227 +msgid "face" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:397 +#, python-format +msgid "%s. cleaning tool removed, will be ignored" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:399 +msgid "Please select a cleaning tool to remove" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:420 +#, python-format +msgid "%s. cleaning tool moved up" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:422 +msgid "1. cleaning tool can not be moved up " +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:424 +msgid "Please select a cleaning tool to move up" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:446 +#, python-format +msgid "%s. cleaning tool moved down" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:448 +msgid "Last cleaning tool can not be moved down " +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:450 +msgid "Please select a cleaning tool to move down" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:462 +#, python-format +msgid "cleaning tool: '%s'" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:472 +#, python-format +msgid "Threshold for %(num)s. tool '%(tool)s': %(thresh)s" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:503 +msgid "Name of input vector map" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:504 +msgid "Name for output vector map" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:506 +msgid "Threshold" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:509 +#, python-format +msgid "'%s' not defined" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:512 +#, python-format +msgid "" +"Some parameters not defined. Operation canceled.\n" +"\n" +"%s" +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:518 +msgid "Executing selected cleaning operations..." +msgstr "" + +#: ../gui/wxpython/modules/vclean.py:580 +msgid "Vector cleaning command copied to clipboard" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:89 +msgid "Check all" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:92 +msgid "Clear all" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:152 +msgid "Enter vector attribute values" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:320 +msgid "Bad color format. Use color format '0:0:0'" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:420 +#: ../gui/wxpython/wxplot/dialogs.py:445 +msgid "Select raster map:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:422 +msgid "Select vector map:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:440 +msgid "Import or export color table:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:449 +msgid "Choose file to load color table" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:450 +msgid "Load" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:451 +msgid "Type filename or click to choose file and load color table" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:461 +msgid "Choose file to save color table" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:462 +msgid "Type filename or click to choose file and save color table" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:463 ../gui/wxpython/menustrings.py:9 +#: ../gui/wxpython/menustrings.py:2036 +msgid "Save" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:476 +msgid "&Set" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:485 +msgid "Load color table:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:492 +msgid "Load color table from file:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:498 +msgid "Save color table to file:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:528 +msgid "Reload default table" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:584 +#: ../gui/wxpython/iclass/toolbars.py:64 +msgid "Preview" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:588 +msgid "Show preview of map (current Map Display extent is used)." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:623 +#: ../gui/wxpython/modules/colorrules.py:1939 +msgid "No valid color rules given." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:672 +#, python-format +msgid "File <%s> already already exists. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:687 +#: ../gui/wxpython/gui_core/forms.py:2579 +msgid "Nothing to save." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:719 +msgid "Invalid color table format" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:796 +#, python-format +msgid "Invalid rule value '%s'. Unable to apply color table." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:886 +msgid "Create new color table for raster map" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:980 +msgid "Enter raster category values or percents" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:984 +#: ../gui/wxpython/modules/colorrules.py:1686 +#: ../gui/wxpython/modules/colorrules.py:1692 +#: ../gui/wxpython/psmap/dialogs.py:3504 +msgid "range" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:986 +msgid "fp range" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:988 +#, python-format +msgid "Enter raster category values or percents (%(range)s = %(min)d-%(max)d)" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1095 +msgid "Create new color rules for vector map" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1107 +#: ../gui/wxpython/modules/colorrules.py:1705 +msgid "Enter vector attribute values or percents:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1109 +#: ../gui/wxpython/modules/colorrules.py:1707 +msgid "Enter vector attribute values:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1120 +msgid "Select vector columns" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1122 +msgid "Layer:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1123 +msgid "Attribute column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1126 +msgid "Load color from column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1126 +msgid "Save color to column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1128 +msgid "Load size from column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1128 +msgid "Save size to column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1130 +msgid "Load width from column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1130 +msgid "Save width to column:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1136 +msgid "Use color column instead of color table:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1148 ../gui/wxpython/dbmgr/base.py:512 +#: ../gui/wxpython/dbmgr/base.py:2371 +msgid "Add column" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1149 +msgid "Add GRASSRGB column to current attribute table." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1196 +#: ../gui/wxpython/modules/colorrules.py:1245 +msgid "Import or export color table" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1261 +#, python-format +msgid "" +"Database connection for vector map <%s> is not defined in DB file. Do you " +"want to create and connect new attribute table?" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1266 +msgid "No database connection defined" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1342 +#, python-format +msgid "" +"Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " +"table cannot be edited." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1537 +#, python-format +msgid "%s column already exists." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1576 +msgid "Please wait, loading data from attribute table..." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1641 +#, python-format +msgid "" +"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?" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1647 +msgid "Too many records" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1699 +#, python-format +msgid "Enter vector attribute values or percents %s:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1702 +#, python-format +msgid "Enter vector attribute values %s:" +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1844 +msgid "Please select column to save values to." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1881 +msgid "No color column defined. Operation canceled." +msgstr "" + +#: ../gui/wxpython/modules/colorrules.py:1924 +msgid "Thematic mapping for vector map in 3D view" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:71 +msgid "3D Raster Map Calculator" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:84 +msgid "mapcalc statement" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:152 +msgid "Operators" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:158 +msgid "Operands" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:161 +msgid "Expression" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:173 +msgid "Save expression to file" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> 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" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> 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 +msgid "Copy" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:177 +#: ../gui/wxpython/gui_core/forms.py:636 +msgid "Copy the current command string to the clipboard" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +#: ../gui/wxpython/modules/mcalc_builder.py:183 +msgid "divide" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:185 +msgid "add" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:187 +msgid "subtract" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:189 +msgid "modulus" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:191 +msgid "multiply" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:196 +msgid "left shift" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:198 +msgid "right shift" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:200 +msgid "right shift (unsigned)" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:202 +msgid "greater than" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:204 +msgid "greater than or equal to" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:206 +msgid "less than" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:208 +msgid "less than or equal to" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:210 +msgid "equal to" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:212 +msgid "not equal to" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:215 +msgid "one's complement" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:217 +msgid "NOT" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:219 +msgid "bitwise AND" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:221 +msgid "bitwise OR" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:223 +msgid "logical AND" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:225 +msgid "logical AND (ignores NULLs)" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:227 +msgid "logical OR" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:229 +msgid "logical OR (ignores NULLs)" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:231 +msgid "conditional" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:245 +msgid "Name for new 3D raster map to create" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:247 +msgid "Name for new raster map to create" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:260 +msgid "Insert existing 3D raster map" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:262 +msgid "Insert existing raster map" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:271 +msgid "Insert mapcalc function" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:291 +msgid "Generate random seed for rand()" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:293 +msgid "Seed:" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:297 +msgid "Integer seed for rand() function" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:304 +msgid "Add created raster map into layer tree" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:648 +msgid "You must enter the name of a new raster map to create." +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:662 +msgid "You must enter an expression to create a new raster map." +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:731 +msgid "Choose a file name to save the expression" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:732 +#: ../gui/wxpython/modules/mcalc_builder.py:754 +msgid "Expression file (*)|*" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:753 +msgid "Choose a file name to load the expression" +msgstr "" + +#: ../gui/wxpython/modules/mcalc_builder.py:789 +#, python-brace-format +msgid "'{cmd}' copied to clipboard" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +#: ../gui/wxpython/iscatt/plots.py:45 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/iscatt/plots.py:44 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +#, python-brace-format +msgid "" +"The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " +"be installed. {0}" +msgstr "" + +#: ../gui/wxpython/iscatt/plots.py:616 +msgid "Zoom to scatter plot extend" +msgstr "" + +#: ../gui/wxpython/iscatt/core_c.py:24 +msgid "Loading ctypes libs failed" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 +msgid "Loading data..." +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:214 +msgid "No data set." +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:233 +#, python-format +msgid "" +"Interactive Scatter Plot Tool can not be used.\n" +"Number of cells (rows*cols) <%d> in current regionis higher than maximum " +"limit <%d>.\n" +"\n" +"You can reduce number of cells in current region using command." +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:246 +#, python-format +msgid "" +"Number of cells (rows*cols) <%d> in current region is higher than " +"recommended threshold <%d>.\n" +"It is strongly advised to reduce number of cells in current region below " +"recommend threshold.\n" +" It can be done by command.\n" +"\n" +"Do you want to continue using Interactive Scatter Plot Tool with this region?" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:306 +msgid "" +"Scatter plot with same band combination (regardless x y order) is already " +"displayed." +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:321 +#, python-format +msgid "Band <%s> is not CELL (integer) type.\n" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:325 +msgid "Scatter plot cannot be added.\n" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:334 +#, python-format +msgid "" +"Scatter plot cannot be added.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:352 +#, python-format +msgid "" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " +"limit <%d>.\n" +"It is strongly advised to reduce range extend of bands(e. g. using r." +"rescale) below recommended threshold.\n" +"\n" +"Do you really want to add this scatter plot?" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:451 +msgid "" +"In order to select arrea in scatter plot, you have to select class first.\n" +"\n" +"There is no class yet, do you want to create one?" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:491 +#, python-format +msgid "" +"Error occurred during computation of scatter plot category:\n" +"%s" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:793 +#, python-format +msgid "Export scatter plot raster of class <%s>" +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:813 +#, python-format +msgid "Scatter plot raster of class <%s> exported to raster map <%s>." +msgstr "" + +#: ../gui/wxpython/iscatt/controllers.py:818 +#, python-format +msgid "" +"Export of scatter plot raster of class <%s> to map <%s> failed.\n" +"%s" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:61 +msgid "Add scatter plot" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:63 +msgid "Select area with polygon" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:64 +msgid "Pan mode for scatter plots" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:67 +msgid "Zoom mode for scatter plots (left mouse button, wheel)" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:72 +msgid "" +"Zoom to scatter plot data extend mode (click on scatter plot for zooming to " +"extend)" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:77 +msgid "Show/hide class manager" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 +msgid "Include selected area to class" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 +msgid "Exclude selected area from class" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:223 +msgid "Add new vertex" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:224 +msgid "Add new vertex to polygon boundary scatter plot" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:228 +msgid "Create selection polygon" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:229 +msgid "Add new vertex between last and first points of the boundary" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:233 +msgid "Move vertex" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:234 +msgid "Move boundary vertex" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:238 +msgid "Remove vertex" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:239 +msgid "Remove boundary vertex" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:244 +msgid "Remove polygon (click on scatter plot for removing it's polygon)" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:344 +msgid "Add class" +msgstr "" + +#: ../gui/wxpython/iscatt/toolbars.py:346 +msgid "Remove selected class" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:36 +msgid "Add scatter plots" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:53 +msgid "x axis:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:63 +msgid "y axis:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:110 +msgid "Bands of scatter plots to be added (x y):" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:156 +msgid "No scatter plots selected." +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:196 +msgid "Select both x and y bands." +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:199 +msgid "Selected bands must be different." +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:206 +msgid "" +"Scatter plot with same bands combination (regardless x y order) has been " +"already added into the list." +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:330 +#, python-format +msgid "Raster map <%s> already exists. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:333 +#, python-format +msgid "Raster <%s> exists" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:366 +msgid "Show confidence ellipses" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:374 +msgid "Selection polygon color:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:375 +msgid "Color of selection polygon vertex:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:376 +msgid "Selected area color:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:388 +msgid "Selected area opacity:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:424 +msgid "Selection style:" +msgstr "" + +#: ../gui/wxpython/iscatt/dialogs.py:459 +msgid "Ellipses settings:" +msgstr "" + +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 +msgid "Select category for editing." +msgstr "" + +#: ../gui/wxpython/iscatt/iscatt_core.py:142 +msgid "Computing of scatter plots failed." +msgstr "" + +#: ../gui/wxpython/iscatt/iscatt_core.py:276 +msgid "Patching category raster conditions file failed." +msgstr "" + +#: ../gui/wxpython/iscatt/iscatt_core.py:298 +#, python-format +msgid "" +"v.build failed:\n" +"%s" +msgstr "" + +#: ../gui/wxpython/iscatt/iscatt_core.py:318 +#, python-format +msgid "" +"v.to.rast failed:\n" +"%s" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:160 +msgid "Interactive Scatter Plot Tool" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:390 +msgid "scatter plot" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:470 +msgid "Maximum limit of categories number was reached." +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:566 +msgid "Rename class" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:569 +msgid "Set color" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 +msgid "Change opacity level" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:576 +msgid "Hide" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:578 +msgid "Show" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:589 +msgid "Move to top" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:594 +msgid "Move to bottom" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:601 +msgid "Move category up" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:606 +msgid "Move category down" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:613 +msgid "Export class raster" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:685 +#, python-format +msgid "Change opacity of class <%s>" +msgstr "" + +#: ../gui/wxpython/iscatt/frame.py:709 +msgid "Empty name was inserted." +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:225 +#: ../gui/wxpython/rlisetup/sampling_frame.py:348 +#, python-format +msgid "The raster file %s already exists, please change name" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:254 +msgid "Raster map not created. Please redraw region." +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:373 +msgid "Raster map not created. redraw region again." +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:443 +#: ../gui/wxpython/rlisetup/wizard.py:913 +msgid "Draw sampling frame" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:444 +msgid "Draw sampling frame by clicking and dragging" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:448 +msgid "Draw sampling rectangle" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:449 +msgid "Draw sampling rectangle by clicking and dragging" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:453 +msgid "Draw sampling circle" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:454 +msgid "Draw sampling circle radius by clicking and dragging" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:458 +#: ../gui/wxpython/rlisetup/wizard.py:1244 +#: ../gui/wxpython/rlisetup/wizard.py:1662 +msgid "Draw sampling region" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:459 +msgid "Draw sampling region by polygon. Right Double click to end drawing" +msgstr "" + +#: ../gui/wxpython/rlisetup/g.gui.rlisetup.py:48 +msgid "Setup for r.li modules - GRASS GIS" +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/modules/extensions.py:45 +msgid "Fetch & install extension from GRASS Addons" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:65 +msgid "List of extensions - double-click to install" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:82 +msgid "Options" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:116 +msgid "&Install" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:117 +msgid "Install selected add-ons GRASS tool" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:120 +msgid "Show g.extension manual page" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:188 +msgid "Extension not defined" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:212 +msgid "Fetching list of tools from GRASS-Addons (be patient)..." +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:227 +#, python-format +msgid "%d extensions loaded" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:250 +msgid "Install" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:253 +msgid "Show manual page" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:369 +#, python-format +msgid "Unable to load extensions. %s" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:416 +msgid "Manage installed GRASS Addons extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:431 +msgid "List of installed extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:438 +msgid "Uninstall" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:440 +msgid "Uninstall selected Addons extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:442 +msgid "Reinstall" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:444 +msgid "Reinstall selected Addons extensions" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:477 +msgid "No extension selected. Operation canceled." +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:503 +#, python-format +msgid "" +"List of files to be removed:\n" +"%(files)s\n" +"\n" +"Do you want really to remove <%(ext)s> extension?" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:507 +msgid "Remove extension" +msgstr "" + +#: ../gui/wxpython/modules/extensions.py:546 +msgid "Extension" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:66 +msgid "Create new configuration file for r.li modules" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:131 +#, python-format +msgid "Do you want to create r.li configuration file <%s>?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:133 +msgid "Create new r.li configuration file?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:149 +msgid "r.li.setup wizard canceled. Configuration file not created." +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:496 +msgid "Select maps and define name" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:510 +msgid "Name for new configuration file to create" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:530 +msgid "Raster map to use to select areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:549 +msgid "Vector map to use to select areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:570 +msgid "Vector map layer to use to select areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:589 +msgid "Define sampling region (region for analysis)" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:591 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/wizard.py:981 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:982 +======= +#: ../gui/wxpython/rlisetup/wizard.py:981 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/rlisetup/wizard.py:981 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +msgid "Whole map layer" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:592 +msgid "Keyboard setting" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:593 +msgid "Draw the sampling frame" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:646 +#, python-format +msgid "The configuration file %s already exists, please change name" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/wizard.py:708 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:709 +======= +#: ../gui/wxpython/rlisetup/wizard.py:708 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/rlisetup/wizard.py:708 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-format +msgid "Vector %s was not found, please select another vector" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/wizard.py:713 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:714 +======= +#: ../gui/wxpython/rlisetup/wizard.py:713 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/rlisetup/wizard.py:713 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-format +msgid "Vector %s has no areas, please select another vector" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/wizard.py:719 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:720 +======= +#: ../gui/wxpython/rlisetup/wizard.py:719 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/rlisetup/wizard.py:719 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-format +msgid "Vector %s has no table connected, please select another vector" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:763 +msgid "Insert sampling frame parameter" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:773 +msgid "Column of upper left corner" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:794 +msgid "Row of upper left corner" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:815 +#: ../gui/wxpython/rlisetup/wizard.py:836 +msgid "Row length of sampling frame" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:972 +msgid "Insert sampling areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:983 +msgid "Regions" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:984 +msgid "Sample units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:986 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:762 +msgid "Insert sampling frame parameter" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:772 +msgid "Column of upper left corner" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:793 +msgid "Row of upper left corner" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:814 +#: ../gui/wxpython/rlisetup/wizard.py:835 +msgid "Row length of sampling frame" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:912 +#: ../gui/wxpython/rlisetup/sampling_frame.py:441 +msgid "Draw sampling frame" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:971 +msgid "Insert sampling areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:982 +msgid "Regions" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:983 +msgid "Sample units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:984 ../gui/wxpython/menustrings.py:342 +#: ../gui/wxpython/menustrings.py:1293 +msgid "Moving window" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:985 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:998 +msgid "Choose a method" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1000 +msgid "Use keyboard to enter sampling area" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1001 +msgid "Use mouse to draw sampling area" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1007 +msgid "This option is not supported yet" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1020 +msgid "Number of regions to draw:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1037 +msgid "Do you want to overwrite existing temporal maps if they exist?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1044 +msgid "Do you want to check vector areas?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1047 +msgid "Select if use area by area" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1049 +msgid "All the features will be used" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1062 +msgid "Analysing all vector features..." +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1162 +msgid "Analysing vector" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1180 +msgid "All feature are been analyzed." +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1184 +msgid "An error occurred" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1215 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:997 +msgid "Choose a method" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:999 +msgid "Use keyboard to enter sampling area" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1000 +msgid "Use mouse to draw sampling area" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1006 +msgid "This option is not supported yet" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1019 +msgid "Number of regions to draw:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1036 +msgid "Do you want to overwrite existing temporal maps if they exist?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1043 +msgid "Do you want to check vector areas?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1046 +msgid "Select if use area by area" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1048 +msgid "All the features will be used" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1061 +msgid "Analysing all vector features..." +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1161 +msgid "Analysing vector" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1179 +msgid "All feature are been analyzed." +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1183 +msgid "An error occurred" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1214 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "Draw sampling regions" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1233 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#, python-brace-format +msgid "Draw sample region {count} of {num_regions}" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1242 +#: ../gui/wxpython/rlisetup/wizard.py:1654 +msgid "Draw moving windows region" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1289 +msgid "Select sample units from keyboard" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1306 +#: ../gui/wxpython/rlisetup/wizard.py:1498 +#: ../gui/wxpython/rlisetup/wizard.py:1611 +msgid "Select type of shape" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1307 +#: ../gui/wxpython/rlisetup/wizard.py:1499 +#: ../gui/wxpython/rlisetup/wizard.py:1612 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +msgid "Draw sample region " +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1244 +#: ../gui/wxpython/rlisetup/wizard.py:1656 +msgid "Draw moving windows region" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1246 +#: ../gui/wxpython/rlisetup/wizard.py:1664 +#: ../gui/wxpython/rlisetup/sampling_frame.py:456 +msgid "Draw sampling region" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1291 +msgid "Select sample units from keyboard" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1308 +#: ../gui/wxpython/rlisetup/wizard.py:1500 +#: ../gui/wxpython/rlisetup/wizard.py:1613 +msgid "Select type of shape" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1309 +#: ../gui/wxpython/rlisetup/wizard.py:1501 +#: ../gui/wxpython/rlisetup/wizard.py:1614 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:1307 +#: ../gui/wxpython/rlisetup/wizard.py:1499 +#: ../gui/wxpython/rlisetup/wizard.py:1612 +msgid "Circle" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1339 +#: ../gui/wxpython/rlisetup/wizard.py:1511 +#: ../gui/wxpython/rlisetup/wizard.py:1545 +msgid "Width size (in cells)?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1340 +#: ../gui/wxpython/rlisetup/wizard.py:1546 +msgid "What radius size (in meters)?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1342 +#: ../gui/wxpython/rlisetup/wizard.py:1527 +#: ../gui/wxpython/rlisetup/wizard.py:1548 +msgid "Height size (in cells)?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1342 +#: ../gui/wxpython/rlisetup/wizard.py:1548 +msgid "Name of the circle mask" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1349 +msgid "Select method of sampling unit distribution" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1351 +msgid "Random non overlapping" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1352 +msgid "Systematic contiguous" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1353 +msgid "Stratified random" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1354 +msgid "Systematic non contiguous" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1355 +msgid "Centered over sites" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1368 +#: ../gui/wxpython/rlisetup/wizard.py:1437 +msgid "What number of Sampling Units to use?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1451 +msgid "Insert number of row strates" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1452 +msgid "Insert number of column strates" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1458 +msgid "Insert distance between units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1488 +msgid "Set sample units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1559 +msgid "Set moving windows" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1602 +#: ../gui/wxpython/rlisetup/wizard.py:1713 +msgid "Draw sampling units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1624 +msgid "Number of sampling area to draw:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1731 +#, python-brace-format +msgid "Draw sampling {draw_type} {count} of {num_regions}" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1799 +msgid "Select sampling areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1808 +msgid "Is this area ok?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1830 +#, python-brace-format +msgid "Select sample area {areas_count} of {area_num}" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1865 +<<<<<<< HEAD +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/functions.py:156 +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:1309 +#: ../gui/wxpython/rlisetup/wizard.py:1501 +#: ../gui/wxpython/rlisetup/wizard.py:1614 +msgid "Circle" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1341 +#: ../gui/wxpython/rlisetup/wizard.py:1513 +#: ../gui/wxpython/rlisetup/wizard.py:1547 +msgid "Width size (in cells)?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1342 +#: ../gui/wxpython/rlisetup/wizard.py:1548 +msgid "What radius size (in meters)?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1344 +#: ../gui/wxpython/rlisetup/wizard.py:1529 +#: ../gui/wxpython/rlisetup/wizard.py:1550 +msgid "Height size (in cells)?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1344 +#: ../gui/wxpython/rlisetup/wizard.py:1550 +msgid "Name of the circle mask" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1351 +msgid "Select method of sampling unit distribution" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1353 +msgid "Random non overlapping" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1354 +msgid "Systematic contiguos" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1355 +msgid "Stratified random" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1356 +msgid "Systematic non contiguos" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1357 +msgid "Centered over sites" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1370 +#: ../gui/wxpython/rlisetup/wizard.py:1439 +msgid "What number of Sampling Units to use?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1453 +msgid "Insert number of row strates" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1454 +msgid "Insert number of column strates" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1460 +msgid "Insert distance between units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1490 +msgid "Set sample units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1561 +msgid "Set moving windows" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1604 +#: ../gui/wxpython/rlisetup/wizard.py:1715 +msgid "Draw sampling units" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1626 +msgid "Number of sampling area to draw:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1734 +msgid "Draw Sampling " +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1804 +msgid "Select sampling areas" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1813 +msgid "Is this area ok?" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1836 +msgid "Select sample area " +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1873 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 +msgid "" +"The raster map <%s> already exists. Please remove or rename the maps with " +"the prefix '%s' or select the option to overwrite existing maps" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/wizard.py:1928 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/wizard.py:1920 +======= +#: ../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)) +======= +#: ../gui/wxpython/rlisetup/wizard.py:1928 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:1923 +msgid "Select sample area 1 of " +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1961 +msgid "Configuration file name:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1977 +msgid "Raster name:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1993 +msgid "Vector name:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2010 +msgid "Region type:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2044 +msgid "Sampling area type:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2158 +msgid "Region keyboard values:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2178 +#: ../gui/wxpython/rlisetup/wizard.py:2205 +#: ../gui/wxpython/rlisetup/wizard.py:2209 +msgid "Type of shape:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2181 +#: ../gui/wxpython/rlisetup/wizard.py:2212 +msgid "Radius size:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2182 +#: ../gui/wxpython/rlisetup/wizard.py:2213 +msgid "Name circle mask:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2184 +#: ../gui/wxpython/rlisetup/wizard.py:2215 +msgid "Width size:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2185 +#: ../gui/wxpython/rlisetup/wizard.py:2216 +msgid "Height size:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2188 +msgid "Method of distribution:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2191 +msgid "Number sampling units:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2194 +msgid "Distance between units:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2197 +msgid "Number row strates:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2199 +msgid "Number column strates:" +msgstr "" + +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/wizard.py:1931 +msgid "Select sample area 1 of " +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1969 +msgid "Configuration file name:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:1985 +msgid "Raster name:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2001 +msgid "Vector name:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2018 +msgid "Region type:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2052 +msgid "Sampling area type:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2166 +msgid "Region keyboard values:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2186 +#: ../gui/wxpython/rlisetup/wizard.py:2213 +#: ../gui/wxpython/rlisetup/wizard.py:2217 +msgid "Type of shape:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2189 +#: ../gui/wxpython/rlisetup/wizard.py:2220 +msgid "Radius size:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2190 +#: ../gui/wxpython/rlisetup/wizard.py:2221 +msgid "Name circle mask:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2192 +#: ../gui/wxpython/rlisetup/wizard.py:2223 +msgid "Width size:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2193 +#: ../gui/wxpython/rlisetup/wizard.py:2224 +msgid "Height size:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2196 +msgid "Method of distribution:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2199 +msgid "Number sampling units:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2202 +msgid "Distance between units:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2205 +msgid "Number row strates:" +msgstr "" + +#: ../gui/wxpython/rlisetup/wizard.py:2207 +msgid "Number column strates:" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:225 +#: ../gui/wxpython/rlisetup/sampling_frame.py:346 +#, python-format +msgid "The raster file %s already exists, please change name" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:254 +msgid "Raster map not created. Please redraw region." +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:371 +msgid "Raster map not created. redraw region again." +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:442 +msgid "Draw sampling frame by clicking and dragging" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:446 +msgid "Draw sampling rectangle" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:447 +msgid "Draw sampling rectangle by clicking and dragging" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:451 +msgid "Draw sampling circle" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:452 +msgid "Draw sampling circle radius by clicking and dragging" +msgstr "" + +#: ../gui/wxpython/rlisetup/sampling_frame.py:457 +msgid "Draw sampling region by polygon. Right Double click to end drawing" +msgstr "" + +#: ../gui/wxpython/rlisetup/g.gui.rlisetup.py:48 +msgid "Setup for r.li modules - GRASS GIS" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +#: ../gui/wxpython/rlisetup/frame.py:44 +#, python-brace-format +msgid "View and modify the configuration file '{name}'" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#: ../gui/wxpython/rlisetup/frame.py:97 +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:101 +======= +#: ../gui/wxpython/rlisetup/frame.py:97 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +#: ../gui/wxpython/rlisetup/frame.py:97 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#, python-brace-format +msgid "" +"Are you sure that you want modify r.li configuration file {name}?\n" +"You could broke the configuration file..." +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:106 +msgid "WARNING" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:130 +msgid "Setup for r.li modules" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:150 +msgid "Available sampling area configuration files" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:160 +msgid "Remove a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:162 +msgid "Create a new configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:164 +msgid "Rename a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:165 +msgid "View/Edit" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:166 +msgid "View and edit a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:239 ../gui/wxpython/rlisetup/frame.py:269 +#: ../gui/wxpython/rlisetup/frame.py:295 +msgid "You have to select a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:244 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:102 +msgid "WARNING" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:126 +msgid "Setup for r.li modules" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:146 +msgid "Available sampling area configuration files" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:156 +msgid "Remove a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:157 ../gui/wxpython/menustrings.py:954 +#: ../gui/wxpython/menustrings.py:1905 +msgid "Create" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:158 +msgid "Create a new configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:160 +msgid "Rename a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:161 +msgid "View/Edit" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:162 +msgid "View and edit a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:235 ../gui/wxpython/rlisetup/frame.py:265 +#: ../gui/wxpython/rlisetup/frame.py:291 +msgid "You have to select a configuration file" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:240 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:245 +msgid "Remove new r.li configuration file?" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:275 +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:241 +msgid "Remove new r.li configuration file?" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:271 +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 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 \" " +"\"configuration file" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:279 +msgid "Rename configuration file" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 +msgid "GRASS GIS" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:158 +msgid "There were some issues when loading menu or Tools:" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 +msgid "Rename current Map Display" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 +#, python-brace-format +msgid "Map Display {number}" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:526 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 +msgid "Close Map Display {}" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 +msgid "Workspace Toolbar" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 +msgid "Tools Toolbar" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 +msgid "3D view Toolbar" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 +msgid "Console" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 +msgid "Map Swipe Tool" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 +msgid "Choose model to run" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003 +#, python-format +msgid "" +"Command '%s' not yet implemented in the WxGUI. Try adding it as a command " +"layer instead." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 +msgid "Selected map layer is not vector." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 +msgid "Editing is allowed only for vector maps from the current mapset." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 +msgid "Choose script file to run" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 +msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 +#, python-format +msgid "Script file '%s' doesn't exist. Operation canceled." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 +#, python-format +msgid "" +"Script <%s> is not executable. Do you want to set the permissions that " +"allows you to run this script (note that you must be the owner of the file)?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 +msgid "Set permission?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 +msgid "Unable to set permission. Operation canceled." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 +#, python-format +msgid "" +"Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " +"directory to GRASS_ADDON_PATH?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 +msgid "Update Addons path?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 +#, python-format +msgid "Launching script '%s'..." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1456 +msgid "No project provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 +msgid "No mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 +#, python-format +msgid "" +"Working directory changed to:\n" +"\"%s\"" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 +msgid "Changes current working directory for this GUI." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 +msgid "Usage: cd [directory]" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 +msgid "Without parameters it opens a dialog." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 +msgid "" +"If ~ (tilde) is present as the first directory on the path, it is replaced " +"by user's home directory." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 +msgid "More than one parameter provided." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 +msgid "Choose a working directory" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 +msgid "System Info" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 +msgid "GRASS version" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 +msgid "Code revision" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 +msgid "Build date" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 +msgid "Build platform" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 +msgid "Platform" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 +msgid "Close all Map Displays" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 +msgid "Enter new name:" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 +msgid "Rename Map Display" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 +#, python-format +msgid "" +"Unable to launch \"Supervised Classification Tool\".\n" +"\n" +"Reason: %s" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 +msgid "Unable to start Timeline Tool." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 +msgid "Unable to start Temporal Plot Tool." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 +msgid "Add selected map layers into layer tree" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 +#, python-format +msgid "Unsupported map layer type <%s>." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 +msgid "" +"Note that cell values can only be displayed for regions of less than 10,000 " +"cells." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 +msgid "opacity:" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 +#, python-format +msgid "" +"Do you want to remove map layer(s)\n" +"%s\n" +"from layer tree?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 +msgid "Do you want to remove selected map layer(s) from layer tree?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 +msgid "Remove map layer" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 +msgid "Quit GRASS GUI" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 +msgid "" +"Display resolution is currently not constrained to computational settings. " +"It's suggested to constrain map to region geometry. Do you want to constrain " +"the resolution?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 +msgid "Constrain map to region geometry?" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:99 +msgid "Please provide a group name to process" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:104 +msgid "Please provide a raster map name to process" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 +msgid "Please provide a camera name (generated by i.ortho.camera)" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:115 +msgid "Please provive an order value (1 if 4 Fiducials, 2 if 8 Fiducials)" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:121 +msgid "Please provive an output files extension (used by i.rectify)" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:45 +msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 +msgid "Manage Location of Fiducial Points on a Scanned Photo" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 +msgid "A POINTS file exists, renaming it to POINTS_BAK" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 +msgid "Opening CAMERA file failed" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 +msgid "Writing output image to group, please wait..." +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +msgid "source X" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 +msgid "source Y" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 +msgid "target X" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 +msgid "target Y" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 +msgid "source X:" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 +msgid "target X:" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 +msgid "source Y:" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 +msgid "target Y:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:54 +msgid "Import data from WMS server" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:55 +msgid "Add command layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:59 +msgid "Add HIS map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:61 +msgid "Add shaded relief map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:63 +msgid "Add raster flow arrows" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:64 +msgid "Add raster cell numbers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:67 +msgid "Add thematic (choropleth) vector map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:70 +msgid "Add thematic chart layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:72 +msgid "Add grid layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:74 +msgid "Add geodesic line layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:76 +msgid "Add rhumbline layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:77 ../gui/wxpython/psmap/toolbars.py:107 +msgid "Add labels" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:81 +msgid "Note that 3D raster data are rendered only in 3D view mode" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:83 +msgid "Add WMS layer." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:84 +#: ../gui/wxpython/animation/dialogs.py:462 +msgid "Set options" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:85 +msgid "Editing mode" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:86 +msgid "Background vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 +msgid "Map Layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:464 +msgid "Check selected layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:475 +msgid "Uncheck selected layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:526 +msgid "3D view properties" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:536 +msgid "Zoom to selected map(s)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:548 +msgid "Zoom to selected map(s) (ignore NULLs)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:559 +msgid "Set computational region from selected map(s)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:572 +msgid "Align computational region to selected map" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:615 +msgid "Export common formats" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:629 +msgid "Export PostGIS" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 +msgid "Create pack" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 +msgid "Make a copy in the current mapset" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 +msgid "Set color table" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 +msgid "Set color table interactively" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:683 +msgid "Show attribute data" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:699 +msgid "Start editing" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:704 +msgid "Stop editing" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:727 +msgid "Rebuild topology" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:841 +msgid "Report raster statistics" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:849 +msgid "Profile" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:892 +msgid "Save web service layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1007 +msgid "Unable to create profile of raster map." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1059 +#, python-format +msgid "Unsupported map type <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1065 +#, python-format +msgid "Enter name for the new %s in the current mapset:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1067 +#, python-format +msgid "Make a copy of %s <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1085 +#, python-format +msgid "" +"%s <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1098 +#, python-format +msgid "Unable to make copy of <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1105 +#, python-format +msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1126 +msgid "Unable to display histogram of raster map. No map name defined." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1246 +msgid "Set opacity of <{}>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1485 +msgid "Layer group:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 +msgid "Click to edit layer settings" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1556 +msgid "(double click to set properties)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1838 +msgid "Please wait, updating data..." +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:85 +msgid "Left mouse click to remove the MASK" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:137 +msgid "Are you sure that you want to remove the MASK?" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:138 +msgid "Remove MASK" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:46 +msgid "Create new workspace (Ctrl+N)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:49 +msgid "Open existing workspace file (Ctrl+O)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:52 +msgid "Save current workspace to file (Ctrl+S)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:58 +msgid "New workspace" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:63 +msgid "Open workspace" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:93 +msgid "Add multiple raster or vector map layers (Ctrl+Shift+L)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:96 +msgid "Add raster map layer (Ctrl+Shift+R)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:100 +msgid "Add various raster map layers (RGB, HIS, shaded relief...)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:103 +msgid "Add vector map layer (Ctrl+Shift+V)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:107 +msgid "Add various vector map layers (thematic, chart...)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:111 +msgid "Add web service layer (WMS, WMTS, NASA OnEarth)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:113 +msgid "Add group" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:114 ../gui/wxpython/lmgr/toolbars.py:153 +msgid "Add various overlays" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:117 +msgid "Remove selected map layer(s) from layer tree" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:119 +msgid "Edit selected vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:121 +msgid "Show attribute data for selected vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:128 +msgid "Add multiple map layers" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:138 +msgid "Add various raster maps" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:143 +msgid "Add vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:148 +msgid "Add various vector maps" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:158 +msgid "Add web service map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:169 +msgid "Delete map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:203 +msgid "Start new map display" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:209 +msgid "Georectifier" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:212 +msgid "Launch user-defined script" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:80 +msgid "Open a simple Python code editor" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:222 +msgid "New display" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:254 +msgid "Python code editor" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:276 +msgid "GUI settings" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:277 +msgid "GRASS manual" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:317 +msgid "Generate command for m.nviz.image" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:318 +msgid "Generate command for m.nviz.image based on current state" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:322 +msgid "3D view mode settings" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:323 +msgid "Show 3D view mode settings dialog" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:325 +msgid "Show 3D view mode manual" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:48 +#, python-format +msgid "Welcome to wxGUI Interactive Python Shell %s" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:50 +#, python-format +msgid "Type %s for more GRASS scripting related information." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:52 +#, python-format +msgid "Type %s to add raster or vector to the layer tree." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:74 +msgid "Delete all text from the shell" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:78 +msgid "Simple &editor" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:135 +#, python-format +msgid "Raster or vector map <%s> not found" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:141 +#, python-format +msgid "Raster map <%s> added" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:143 +#, python-format +msgid "Vector map <%s> added" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:72 +msgid "" +"Current workspace is not empty. Do you want to store current settings to " +"workspace file?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:76 +msgid "Create new workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:105 +msgid "Choose workspace file" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:107 ../gui/wxpython/lmgr/workspace.py:366 +msgid "GRASS Workspace File (*.gxw)|*.gxw" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:136 +msgid "Most likely the database, location or mapset does not exist" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:139 +#, python-brace-format +msgid "" +"Unable to change to location and mapset specified in the workspace.\n" +"Reason: {reason}\n" +"Details: {details}\n" +"\n" +"Do you want to proceed with opening the workspace anyway?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:148 +msgid "Proceed with opening of the workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:179 +#: ../gui/wxpython/animation/nviztask.py:40 +#, python-format +msgid "" +"Reading workspace file <%s> failed.\n" +"Invalid file, unable to parse XML document." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:191 +msgid "Please wait, loading workspace..." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:364 +msgid "Choose file to save current workspace" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:385 ../gui/wxpython/lmgr/workspace.py:408 +#, python-format +msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:437 +msgid "Writing current settings to workspace file failed." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:467 +msgid "Do you want to save changes in the workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:470 +msgid "Do you want to store current settings to workspace file?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:554 +msgid "File <{}> doesn't exist. It was probably moved or deleted." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:141 +msgid "There were some issues when loading menu or Tools tab:" +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +#: ../gui/wxpython/rlisetup/frame.py:275 +msgid "Rename configuration file" +msgstr "" + +#: ../gui/wxpython/mapwin/base.py:229 +#, python-format +msgid "" +"Error occurred during calling of handler: %s \n" +"Handler was unregistered." +msgstr "" + +#: ../gui/wxpython/mapwin/base.py:314 +#, python-format +msgid "" +"Error occurred during unregistration of handler: %s \n" +" Handler was unregistered." +msgstr "" + +#: ../gui/wxpython/mapwin/base.py:347 +#, python-format +msgid "Handler: %s was not registered" +msgstr "" + +#: ../gui/wxpython/mapwin/base.py:353 +#, python-format +msgid "" +"Error occurred during unregistration of handler: %s \n" +" Handler was unregistered" +msgstr "" + +#: ../gui/wxpython/mapwin/graphics.py:293 +#: ../gui/wxpython/mapwin/graphics.py:468 +#, python-format +msgid "Property does not exist: %s" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:222 +#: ../gui/wxpython/mapwin/analysis.py:357 +msgid "Measuring finished" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:240 +#: ../gui/wxpython/mapwin/analysis.py:369 +#, python-format +msgid "" +"Click and drag with left mouse button to measure.%sDouble click with left " +"button to clear." +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:248 +msgid "Measuring distance" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:250 +msgid "Measuring distance:" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:261 +#, python-format +msgid "" +"Geodesic distance calculation is not available.\n" +"Reason: %s" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:298 +#: ../gui/wxpython/mapwin/analysis.py:311 +msgid "segment" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:301 +#: ../gui/wxpython/mapwin/analysis.py:314 +msgid "total distance" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:304 +msgid "bearing" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:306 +msgid "degrees (clockwise from grid-north)" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:375 +msgid "Measuring area:" +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:392 +msgid "Units not recognized, measurement failed." +msgstr "" + +#: ../gui/wxpython/mapwin/analysis.py:397 +#: ../gui/wxpython/mapwin/analysis.py:399 +#, python-brace-format +msgid "Area: {area} {unit}\n" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:184 +#: ../gui/wxpython/mapwin/decorations.py:295 +msgid "" +"Please install Python Imaging Library (PIL)\n" +"for better control of legend and other decorations." +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:204 +msgid "Remove text" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:205 +msgid "Text properties" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:227 +msgid "Remove scale bar" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:228 +msgid "Scale bar properties" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:239 +msgid "Remove north arrow" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:240 +msgid "North arrow properties" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:251 +#: ../gui/wxpython/mapwin/decorations.py:263 +msgid "Remove legend" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:252 +msgid "Vector legend properties" +msgstr "" + +#: ../gui/wxpython/mapwin/decorations.py:264 +msgid "Raster legend properties" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:280 +msgid "Copy coordinates to clipboard" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:314 +msgid "Resize and move legend" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:724 +msgid "Please wait, exporting image..." +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:1035 +msgid "Unable to draw registered graphics. The graphics was unregistered." +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:2100 +msgid "Zoom to saved region extents" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:2102 +msgid "Set compulational region from named region" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:2113 +#, python-format +msgid "Region <%s> not found. Operation canceled." +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:2142 +msgid "Save display extents to region file" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:2144 +msgid "Save computational region to region file" +msgstr "" + +#: ../gui/wxpython/mapwin/buffered.py:2156 +#, python-format +msgid "Region file <%s> already exists. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:36 +msgid "Draw/re-draw plot" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:39 +msgid "Draw transect in map display window to profile" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:42 +msgid "Plot statistics" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:43 +msgid "Save profile data to CSV file" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:488 +msgid "Left Mouse Down at Point:" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:587 +#: ../gui/wxpython/wxplot/dialogs.py:654 +msgid "Text settings" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:524 ../gui/wxpython/wxplot/base.py:605 +#: ../gui/wxpython/wxplot/dialogs.py:966 +msgid "Plot settings" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:537 +msgid "This feature is not yet functional" +msgstr "" + +#: ../gui/wxpython/wxplot/base.py:538 +msgid "Under Construction" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:57 +msgid "GRASS Profile Analysis Tool" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:73 ../gui/wxpython/wxplot/profile.py:183 +msgid "Profile of" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:104 +#, python-format +msgid "Distance (%s)" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:106 +msgid "Distance along transect" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:107 +msgid "Cell values" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:175 +msgid "Not all points of profile lie inside computational region." +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:249 +msgid "Raster values" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:313 +msgid "You must draw a transect to profile in the map display window." +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:315 +msgid "Nothing to profile" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:386 +msgid "Choose prefix for file(s) where to save profile values..." +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:388 +msgid "Comma separated value (*.csv)|*.csv" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:404 +msgid "Overwrite file?" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:418 +#, python-format +msgid "" +"Unable to open file <%s> for writing.\n" +"Reason: %s" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:432 +#, python-format +msgid "" +"%d files created:\n" +"%s" +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:434 +msgid "No files generated." +msgstr "" + +#: ../gui/wxpython/wxplot/profile.py:441 +msgid "Statistics for Profile(s)" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:50 +msgid "Histogram Tool" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:58 +msgid "Histogram of" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:59 +#: ../gui/wxpython/wxplot/histogram.py:161 ../gui/wxpython/wxplot/scatter.py:58 +#: ../gui/wxpython/wxplot/scatter.py:59 +msgid "Raster cell values" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:60 +#: ../gui/wxpython/wxplot/histogram.py:167 +msgid "Cell counts" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:147 +#, python-format +msgid "Histogram of image group <%s>" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:150 +#, python-format +msgid "Histogram of raster map <%s>" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:152 +msgid "Histogram of selected raster maps" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:159 +#, python-format +msgid "Raster cell values %s" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:169 +msgid "Percent of total cells" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:171 +msgid "Area" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:259 +msgid "Statistics for Map(s) Histogrammed" +msgstr "" + +#: ../gui/wxpython/wxplot/histogram.py:263 +#, python-format +msgid "Statistics for raster map <%s>" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:50 +msgid "GRASS Bivariate Scatterplot Tool" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:57 +msgid "Bivariate Scatterplot" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +msgid "Nothing to plot." +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:118 +msgid "At least 2 raster maps must be specified" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:140 +msgid "Bivariate Scatterplot of " +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#, python-format +msgid "Raster <%s> cell values" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#, python-format +msgid ": %s" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:269 +msgid "Regression Statistics for Scatterplot(s)" +msgstr "" + +#: ../gui/wxpython/wxplot/scatter.py:286 +#, python-format +msgid "" +"Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" +"\n" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:51 +msgid "Select raster maps to profile" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:93 +msgid "Select raster map(s) to profile:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:141 +msgid "Select pairs of raster maps for scatterplots" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:191 +msgid "Select pairs of raster maps for bivariate scatterplots:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:209 ../gui/wxpython/wxplot/dialogs.py:479 +msgid "Number of bins (for FP maps)" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:297 ../gui/wxpython/dbmgr/base.py:507 +msgid "Statistics" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:358 +msgid "C&opy" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:359 +msgid "Copy regression statistics the clipboard (Ctrl+C)" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:387 +msgid "Regression statistics copied to clipboard" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:399 +msgid "Select raster map or imagery group to histogram" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:429 +msgid "Histogram single raster" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:433 +msgid "Histogram imagery group" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:463 +msgid "Select image group:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:494 +msgid "Histogram type" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:578 +msgid "Selected group must be in current mapset" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:661 +msgid "Profile title:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:672 +msgid "Title font size (pts):" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:690 +msgid "X-axis label:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:700 +msgid "Y-axis label:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:711 +msgid "Label font size (pts):" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:732 +#: ../gui/wxpython/gui_core/preferences.py:519 +#: ../gui/wxpython/gui_core/preferences.py:796 +#: ../gui/wxpython/gui_core/dialogs.py:2453 +#: ../gui/wxpython/psmap/dialogs.py:3872 ../gui/wxpython/psmap/dialogs.py:4519 +#: ../gui/wxpython/psmap/dialogs.py:5185 +msgid "Font settings" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:739 +msgid "Font family:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:758 +msgid "Style:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:777 +msgid "Weight:" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:815 ../gui/wxpython/wxplot/dialogs.py:1326 +msgid "Apply changes for the current session and close dialog" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:878 +#, python-format +msgid "Plot text sizes saved to file '%s'." +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:944 +msgid "No map or image group selected to plot." +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:986 +msgid "Map/image plotted" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:999 +msgid "Settings for selected map" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1015 +msgid "Line color" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1024 +#: ../gui/wxpython/vdigit/preferences.py:142 +msgid "Line width" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1039 ../gui/wxpython/psmap/dialogs.py:2927 +#: ../gui/wxpython/psmap/dialogs.py:6611 +msgid "Line style" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1052 +#: ../gui/wxpython/wxplot/dialogs.py:1109 +#: ../gui/wxpython/wxplot/dialogs.py:1171 ../gui/wxpython/psmap/toolbars.py:99 +msgid "Legend" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1069 +msgid "Transect segment marker settings" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1083 +#: ../gui/wxpython/wxplot/dialogs.py:1145 ../gui/wxpython/psmap/dialogs.py:2738 +#: ../gui/wxpython/psmap/dialogs.py:3709 ../gui/wxpython/psmap/dialogs.py:4831 +msgid "Size" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1097 +#: ../gui/wxpython/wxplot/dialogs.py:1159 ../gui/wxpython/psmap/dialogs.py:2444 +#: ../gui/wxpython/psmap/dialogs.py:2595 +msgid "Fill" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1116 +#: ../gui/wxpython/wxplot/dialogs.py:1178 ../gui/wxpython/psmap/dialogs.py:4913 +msgid "Style" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1131 +msgid "Scatterplot points" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1193 +msgid "Axis settings" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1199 +msgid "X-Axis" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1199 +msgid "Y-Axis" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1207 +msgid "Scale" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1215 +msgid "" +"Automatic axis scaling, custom max and min, or scale matches data range (min)" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1222 +msgid "Custom min" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1230 +msgid "Custom max" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1238 +msgid "Log scale" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1262 +msgid "Grid and Legend settings" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1268 +msgid "Grid color" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1277 +msgid "Show grid" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1283 +msgid "Legend font size" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1294 +msgid "Show legend" +msgstr "" + +#: ../gui/wxpython/wxplot/dialogs.py:1495 +#, python-format +msgid "Plot settings saved to file '%s'." +msgstr "" + +#: ../gui/wxpython/iclass/digit.py:64 +msgid "" +"You are trying to create a training area outside the computational region. " +"Please, use g.region to set the appropriate region first." +msgstr "" + +#: ../gui/wxpython/iclass/digit.py:77 +msgid "" +"In order to create a training area, you have to select class first.\n" +"\n" +"There is no class yet, do you want to create one?" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:34 +msgid "Set opacity level" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:35 ../gui/wxpython/iclass/dialogs.py:295 +msgid "Class manager" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:38 +msgid "Run analysis, update histogram and coincidence plots" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:40 +msgid "Save signature file for i.maxlik" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:41 +msgid "Remove selected map layer" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:43 +msgid "Export training areas to vector map" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:46 +msgid "Import training areas from vector map" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:64 +msgid "Training" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:75 +msgid "/ Zoom to map" +msgstr "" + +#: ../gui/wxpython/iclass/toolbars.py:310 +#: ../gui/wxpython/iclass/toolbars.py:316 +msgid "std dev" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:600 +#: ../gui/wxpython/image2target/ii2t_manager.py:605 +msgid "Create/edit group..." +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:99 +msgid "Name of imagery group is missing." +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:106 +msgid "Name of imagery group:" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:120 +msgid "Name of imagery subgroup:" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:196 +msgid "Please choose a subgroup." +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:200 +#, python-format +msgid "Subgroup <%s> not found in group <%s>" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:209 +#, python-format +msgid "" +"No data found in subgroup <%s> of group <%s>.\n" +"." +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:215 +#, python-format +msgid "" +"No data found in group <%s>.\n" +"." +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/g.gui.iclass.py:77 +#, python-format +msgid "Group <%s> not found" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:261 +msgid "Name of map is missing." +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:539 +msgid "Zoom to training areas of selected class" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:603 +msgid "Save signature file" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:662 +msgid "Enter name of signature file:" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:677 +msgid "Signature file path:" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:728 +msgid "Export training areas" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:799 +msgid "Export attribute table containing computed statistical data" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:836 +#, python-format +msgid "Vector map <%s> already exists. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/iclass/dialogs.py:839 +#, python-format +msgid "Vector <%s> exists" +msgstr "" + +#: ../gui/wxpython/iclass/statistics.py:29 +msgid "Loading imagery lib failed" +msgstr "" + +#: ../gui/wxpython/iclass/plots.py:70 +msgid "Histograms" +msgstr "" + +#: ../gui/wxpython/iclass/plots.py:70 +msgid "Coincident plots" +msgstr "" + +#: ../gui/wxpython/iclass/plots.py:70 +msgid "Scatter plots" +msgstr "" + +#: ../gui/wxpython/iclass/plots.py:93 +#, python-format +msgid "" +"Scatter plot functionality is disabled.\n" +"\n" +"Reason: Unable to import packages needed for scatter plot.\n" +"%s" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:38 +#, python-format +msgid "" +"Loading imagery lib failed.\n" +"%s" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:328 +msgid "IClass Toolbar" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:350 +msgid "IClass Misc Toolbar" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:390 +msgid "Digitization Toolbar" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:420 +msgid "Plots" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:455 +msgid "Preview Display" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:458 +msgid "Training Areas Display" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:538 +msgid "Adjust Training Area Display to Preview Display" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:542 +msgid "Adjust Preview display to Training Area Display" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:545 +msgid "Display synchronization ON" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:547 +msgid "Display synchronization OFF" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:622 +msgid "All changes will be lost. Do you want to continue?" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:630 +msgid "Import vector map" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:649 +#, python-format +msgid "No areas in vector map <%s>.\n" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:652 +#, python-format +msgid "Vector map <%s> contains points or lines, these features are ignored." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:678 +#, python-format +msgid "Unable to open vector map <%s>" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:688 +#, python-format +msgid "Unable to copy vector features from <%s>" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:699 +msgid "Unable to open temporary vector map" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:796 +msgid "No training areas to export." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:809 +#, python-format +msgid "%d training areas (%d classes) exported to vector map <%s>." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1068 +msgid "Failed to create temporary vector map." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1120 +msgid "" +"There was an error initializing signatures. Check GUI console for any error " +"messages." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1171 +#, python-format +msgid "No area in category %s. Category skipped." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1176 +msgid "Analysis failed." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1183 +msgid "results" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1189 +msgid "No imagery group selected." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1196 +msgid "" +"Due to recent changes in classes, signatures can be outdated and should be " +"recalculated. Do you still want to continue?" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1200 +msgid "Outdated signatures" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1213 +msgid "Signatures are not valid. Recalculate them and then try again." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1225 +#, python-format +msgid "" +"A signature file named %s already exists.\n" +"Do you want to replace it?" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1276 +msgid "No imagery group selected. Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1287 +#, python-format +msgid "" +"Group <%(group)s> does not have enough files (it has %(files)d files). " +"Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1296 +msgid "No areas given. Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1314 +msgid "Vector features are outside raster layers. Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:74 +msgid "Name of subgroup required" +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:82 +#, python-format +msgid "Subgroup <%s> not found" +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:111 +msgid "Supervised Classification Tool - GRASS GIS" +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:122 +#, python-format +msgid "Loading raster map <%s>..." +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:125 +#, python-format +msgid "Loading training map <%s>..." +msgstr "" + +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/menustrings.py:2081 +msgid "&File" +msgstr "" + +#: ../gui/wxpython/menustrings.py:4 +msgid "Workspace" +msgstr "" + +#: ../gui/wxpython/menustrings.py:6 +msgid "Create new workspace" +msgstr "" + +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2034 +msgid "Open" +msgstr "" + +#: ../gui/wxpython/menustrings.py:8 +msgid "Load workspace from file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2038 +msgid "Save as" +msgstr "" + +#: ../gui/wxpython/menustrings.py:12 +msgid "Save workspace to file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:14 +msgid "Close workspace file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:15 +#: ../gui/wxpython/web_services/dialogs.py:890 +msgid "Map display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:16 +msgid "Add raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:17 +msgid "Add raster map layer to current display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:18 +msgid "Add vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:19 +msgid "Add vector map layer to current display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:20 +msgid "Add multiple rasters or vectors" +msgstr "" + +#: ../gui/wxpython/menustrings.py:21 +msgid "Add multiple raster or vector map layers to current display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:22 +msgid "Add RGB raster layer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:23 +msgid "Add RGB raster map layer to current display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 +#: ../gui/wxpython/web_services/dialogs.py:533 +msgid "Add web service layer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:26 +msgid "New map display window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:27 +msgid "Open new map display window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:28 +msgid "Render all map displays" +msgstr "" + +#: ../gui/wxpython/menustrings.py:29 +msgid "Re-render maps in all open map display windows" +msgstr "" + +#: ../gui/wxpython/menustrings.py:30 ../gui/wxpython/menustrings.py:31 +msgid "Close current map display window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:32 ../gui/wxpython/menustrings.py:33 +msgid "Close all open map display windows" +msgstr "" + +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1061 +msgid "Simplified raster import with reprojection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +msgid "Imports raster data into a GRASS raster map using GDAL library." +msgstr "" + +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1063 +msgid "Import of common raster formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1065 +msgid "ASCII x,y,z point import and gridding" +msgstr "" + +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1066 +msgid "" +"Creates a raster map from an assemblage of many coordinates using univariate " +"statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1067 +msgid "ASCII grid import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1068 +msgid "Converts a GRASS ASCII raster file to binary raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1069 +msgid "ASCII polygons, lines, and point import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1070 +msgid "Creates raster maps from ASCII polygon/line/point data files." +msgstr "" + +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1071 +msgid "Raw binary array import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1072 +msgid "Import a binary raster file into a GRASS raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1073 +msgid "GRIDATB.FOR import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1074 +msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1075 +msgid "Matlab 2D array import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1076 +msgid "Imports a binary MAT-File(v4) to a GRASS raster." +msgstr "" + +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1077 +msgid "PNG import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1078 +msgid "Imports non-georeferenced PNG format image." +msgstr "" + +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1079 +msgid "SPOT NDVI import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1080 +msgid "Imports SPOT VGT NDVI data into a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1081 +msgid "SRTM HGT import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1082 +msgid "Imports SRTM HGT files into raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1083 +msgid "Terra ASTER HDF import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1084 +msgid "" +"Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " +"using gdalwarp." +msgstr "" + +#: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:86 +#: ../gui/wxpython/menustrings.py:1085 ../gui/wxpython/menustrings.py:1112 +msgid "LAS LiDAR points import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 +#: ../gui/wxpython/menustrings.py:1086 ../gui/wxpython/menustrings.py:1088 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:88 +#: ../gui/wxpython/menustrings.py:1087 ../gui/wxpython/menustrings.py:1114 +msgid "Point cloud (LAS LiDAR) import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1089 +msgid "Unpack raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1090 +msgid "" +"Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " +"raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:292 +#: ../gui/wxpython/menustrings.py:1091 ../gui/wxpython/menustrings.py:1243 +msgid "Reproject raster map from different GRASS location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:293 +#: ../gui/wxpython/menustrings.py:1092 ../gui/wxpython/menustrings.py:1244 +msgid "Re-projects a raster map from given location to the current location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:1094 +msgid "Simplified vector import with reprojection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:71 +#: ../gui/wxpython/menustrings.py:1095 ../gui/wxpython/menustrings.py:1097 +msgid "Imports vector data into a GRASS vector map using OGR library." +msgstr "" + +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1096 +msgid "Import of common vector formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1098 +msgid "ASCII points or GRASS ASCII format" +msgstr "" + +#: ../gui/wxpython/menustrings.py:73 ../gui/wxpython/menustrings.py:1099 +msgid "Creates a vector map from an ASCII points file or ASCII vector file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1100 +msgid "ASCII points as a vector lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1101 +msgid "Imports ASCII x,y[,z] coordinates as a series of lines." +msgstr "" + +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1102 +msgid "DXF import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1103 +msgid "Converts files in DXF format to GRASS vector map format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1104 +msgid "WFS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1105 +msgid "Imports GetFeature from a WFS server." +msgstr "" + +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1106 +msgid "ESRI e00 import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1107 +msgid "Imports E00 file into a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1108 +msgid "Geonames import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1109 +msgid "Imports geonames.org country files into a vector points map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1110 +msgid "Matlab array or Mapgen format import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1111 +msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." +msgstr "" + +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1113 +msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." +msgstr "" + +#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1115 +msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." +msgstr "" + +#: ../gui/wxpython/menustrings.py:90 ../gui/wxpython/menustrings.py:1116 +msgid "Unpack vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1117 +msgid "" +"Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " +"vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:577 +#: ../gui/wxpython/menustrings.py:1118 ../gui/wxpython/menustrings.py:1528 +msgid "Reproject vector map from different GRASS location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:578 +#: ../gui/wxpython/menustrings.py:1119 ../gui/wxpython/menustrings.py:1529 +msgid "Re-projects a vector map from one location to the current location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:1120 +msgid "Import 3D raster data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:1121 +msgid "ASCII 3D import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1122 +msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1123 +msgid "Raw binary array 3D import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1124 +msgid "Imports a binary raster file into a GRASS 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1125 +msgid "Vis5D import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1126 +msgid "Import 3-dimensional Vis5D files." +msgstr "" + +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1127 +msgid "Import database table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1128 +msgid "Common import formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1129 +msgid "Imports attribute tables in various formats." +msgstr "" + +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1130 +msgid "Export raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:134 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:1160 ../gui/wxpython/menustrings.py:1186 +msgid "Common export formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1132 +msgid "Exports GRASS raster maps into GDAL supported formats." +msgstr "" + +#: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:1133 +msgid "ASCII grid export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1134 +msgid "Converts a raster map layer into a GRASS ASCII text file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1135 +msgid "ASCII x,y,z points export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1136 +msgid "" +"Exports a raster map to a text file as x,y,z values based on cell centers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1137 +msgid "GRIDATB.FOR export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1138 +msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1139 +msgid "Matlab 2D array export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1140 +msgid "Exports a GRASS raster to a binary MAT-File." +msgstr "" + +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1141 +msgid "Raw binary array export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1142 +msgid "Exports a GRASS raster to a binary array." +msgstr "" + +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1143 +msgid "MPEG-1 export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1144 +msgid "Converts raster map series to MPEG movie." +msgstr "" + +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1145 +msgid "PNG export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1146 +msgid "Export a GRASS raster map as a non-georeferenced PNG image." +msgstr "" + +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1147 +msgid "PPM export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1148 +msgid "Converts a GRASS raster map to a PPM image file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1149 +msgid "PPM from RGB export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1150 +msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:142 +#: ../gui/wxpython/menustrings.py:1151 ../gui/wxpython/menustrings.py:1168 +msgid "POV-Ray export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1152 +msgid "Converts a raster map layer into a height-field file for POV-Ray." +msgstr "" + +#: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:1153 +msgid "VRML export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1154 +msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:146 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:1172 ../gui/wxpython/menustrings.py:1183 +msgid "VTK export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1156 +msgid "Converts raster maps into the VTK-ASCII format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:1157 +msgid "Pack raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1158 +msgid "Exports a raster map as GRASS GIS specific archive file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1159 +msgid "Export vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1161 +msgid "" +"Exports a vector map layer to any of the supported OGR vector formats. By " +"default a vector map layer is exported to OGC GeoPackage format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:136 ../gui/wxpython/menustrings.py:1162 +msgid "ASCII points or GRASS ASCII vector export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1163 +msgid "" +"Exports a vector map to a GRASS ASCII vector representation. By default only " +"features with category are exported. To export all features use 'layer=-1'." +msgstr "" + +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1164 +msgid "DXF export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1165 +msgid "Exports vector map to DXF file format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1166 +msgid "PostGIS export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1167 +msgid "Exports a vector map layer to PostGIS feature table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1169 +msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:144 ../gui/wxpython/menustrings.py:1170 +msgid "SVG export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1171 +msgid "Exports a vector map to SVG file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1173 +msgid "Converts a vector map to VTK ASCII output." +msgstr "" + +#: ../gui/wxpython/menustrings.py:148 ../gui/wxpython/menustrings.py:1174 +msgid "Pack vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1175 +msgid "Exports a vector map as GRASS GIS specific archive file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1176 +msgid "Export 3D raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1177 +msgid "ASCII 3D export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1178 +msgid "Converts a 3D raster map layer into a ASCII text file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1179 +msgid "Raw binary array 3D export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1180 +msgid "Exports a GRASS 3D raster map to a binary array." +msgstr "" + +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1181 +msgid "Vis5D export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1182 +msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1184 +msgid "Converts 3D raster maps into the VTK-ASCII format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1185 +msgid "Export database table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1187 +msgid "Exports attribute tables into various formats." +msgstr "" + +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1190 +msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1192 +msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1193 +msgid "Output format for raster data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1194 +msgid "" +"Redirects raster output to file utilizing GDAL library rather than storing " +"in GRASS raster format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1195 +msgid "Output format for vector data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1196 +msgid "Defines vector output format utilizing OGR library." +msgstr "" + +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1197 +msgid "Manage maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1199 +msgid "" +"Creates copies of maps and other elements Copies available data files in the " +"current mapset search path to the user's current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:968 +#: ../gui/wxpython/menustrings.py:1200 ../gui/wxpython/menustrings.py:1919 +msgid "List" +msgstr "" + +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1201 +msgid "" +"Lists available GRASS data base files of the user-specified data type " +"optionally using the search pattern." +msgstr "" + +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1203 +msgid "Renames data base element files in the user's current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1205 +msgid "" +"Removes data base element files from the user's current mapset using the " +"search pattern." +msgstr "" + +#: ../gui/wxpython/menustrings.py:180 ../gui/wxpython/menustrings.py:316 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:869 +#: ../gui/wxpython/menustrings.py:1267 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:1820 +msgid "Map type conversions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:317 +#: ../gui/wxpython/menustrings.py:1268 +msgid "Raster to vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:318 +#: ../gui/wxpython/menustrings.py:1269 +msgid "Converts a raster map into a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:319 +#: ../gui/wxpython/menustrings.py:1270 +msgid "Raster series to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:320 +#: ../gui/wxpython/menustrings.py:1271 +msgid "Converts 2D raster map slices to one 3D raster volume map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:321 +#: ../gui/wxpython/menustrings.py:1272 +msgid "Raster 2.5D to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:322 +#: ../gui/wxpython/menustrings.py:1273 +msgid "Creates a 3D volume map based on 2D elevation and value raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:616 +#: ../gui/wxpython/menustrings.py:1567 +msgid "Vector to raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:617 +#: ../gui/wxpython/menustrings.py:1568 +msgid "Converts (rasterize) a vector map into a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:618 +#: ../gui/wxpython/menustrings.py:1569 +msgid "Vector to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:619 +#: ../gui/wxpython/menustrings.py:1570 +msgid "Converts a vector map (only points) into a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:620 +#: ../gui/wxpython/menustrings.py:1571 +msgid "2D vector to 3D vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:621 +#: ../gui/wxpython/menustrings.py:1572 +msgid "Performs transformation of 2D vector features to 3D." +msgstr "" + +#: ../gui/wxpython/menustrings.py:193 +msgid "3D raster to raster series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:871 +#: ../gui/wxpython/menustrings.py:1822 +msgid "Converts 3D raster maps to 2D raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:2010 +msgid "Manage Ground Control Points for Georectification" +msgstr "" + +#: ../gui/wxpython/menustrings.py:197 ../gui/wxpython/menustrings.py:2011 +msgid "Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2012 +msgid "Launch Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:200 +msgid "Run model prepared by Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:201 +msgid "3D image rendering" +msgstr "" + +#: ../gui/wxpython/menustrings.py:202 +msgid "" +"Creates a 3D rendering of GIS data. Renders surfaces (raster data), 2D/3D " +"vector data, and volumes (3D raster data) in 3D." +msgstr "" + +#: ../gui/wxpython/menustrings.py:203 ../gui/wxpython/menustrings.py:1042 +#: ../gui/wxpython/menustrings.py:1993 ../gui/wxpython/menustrings.py:2000 +msgid "Animation tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:204 ../gui/wxpython/menustrings.py:1043 +#: ../gui/wxpython/menustrings.py:1994 ../gui/wxpython/menustrings.py:2001 +msgid "Launch animation tool." +msgstr "" + +#: ../gui/wxpython/menustrings.py:205 +msgid "Bearing/distance to coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:206 +msgid "" +"A simple utility for converting bearing and distance measurements to " +"coordinates and vice versa. It assumes a cartesian coordinate system" +msgstr "" + +#: ../gui/wxpython/menustrings.py:208 ../gui/wxpython/menustrings.py:2004 +msgid "Launch Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2018 +msgid "Launch Map Swipe" +msgstr "" + +#: ../gui/wxpython/menustrings.py:211 +msgid "Launch script" +msgstr "" + +#: ../gui/wxpython/menustrings.py:212 +msgid "Launches script file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:213 ../gui/wxpython/gui_core/pyedit.py:746 +msgid "Simple Python Editor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:214 +msgid "Launches Simple Python Editor." +msgstr "" + +#: ../gui/wxpython/menustrings.py:215 ../gui/wxpython/gui_core/dialogs.py:2388 +msgid "Close GUI" +msgstr "" + +#: ../gui/wxpython/menustrings.py:216 +msgid "Close graphical user interface." +msgstr "" + +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2358 +#: ../gui/wxpython/gui_core/dialogs.py:2391 +msgid "Quit GRASS GIS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:218 +msgid "Close GUI and exit GRASS GIS shell." +msgstr "" + +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/menustrings.py:2048 +msgid "&Settings" +msgstr "" + +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:1207 +msgid "Show current region" +msgstr "" + +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:224 +#: ../gui/wxpython/menustrings.py:1208 ../gui/wxpython/menustrings.py:1210 +msgid "Shows the extent and resolution of the computational region." +msgstr "" + +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1209 +msgid "Show region using latitude and longitude" +msgstr "" + +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1211 +msgid "Show current region extent in Map Display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:226 ../gui/wxpython/menustrings.py:1212 +msgid "Shows the extent of the computational region in Map Display." +msgstr "" + +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1213 +msgid "Set region" +msgstr "" + +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1214 +msgid "Manages the boundary definitions for the geographic region." +msgstr "" + +#: ../gui/wxpython/menustrings.py:229 +msgid "GRASS working environment" +msgstr "" + +#: ../gui/wxpython/menustrings.py:230 +msgid "Mapset access" +msgstr "" + +#: ../gui/wxpython/menustrings.py:231 +msgid "Set/unset access to other mapsets in current location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:232 +msgid "User access" +msgstr "" + +#: ../gui/wxpython/menustrings.py:233 +msgid "" +"Controls access to the current mapset for other users on the system. If no " +"option given, prints current status." +msgstr "" + +#: ../gui/wxpython/menustrings.py:234 +msgid "Change working environment" +msgstr "" + +#: ../gui/wxpython/menustrings.py:235 +msgid "" +"Changes/reports current mapset. Optionally create new mapset or list " +"available mapsets in given location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:236 +msgid "Change location and mapset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:237 +msgid "Change current location and mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:238 +msgid "Change mapset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:239 +msgid "Change current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:240 ../gui/wxpython/menustrings.py:241 +msgid "Change working directory" +msgstr "" + +#: ../gui/wxpython/menustrings.py:242 +msgid "Show settings" +msgstr "" + +#: ../gui/wxpython/menustrings.py:243 +msgid "Outputs and modifies the user's current GRASS variable settings." +msgstr "" + +#: ../gui/wxpython/menustrings.py:244 +msgid "Change settings" +msgstr "" + +#: ../gui/wxpython/menustrings.py:245 +msgid "" +"Outputs and modifies the user's current GRASS variable settings. Prints all " +"defined GRASS variables if no option is given." +msgstr "" + +#: ../gui/wxpython/menustrings.py:246 +msgid "Create new location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:247 +msgid "Launches location wizard to create new GRASS location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:248 ../gui/wxpython/startup/guiutils.py:128 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:638 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1042 +msgid "Create new mapset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:249 +msgid "Creates new mapset in the current location, changes current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:250 +msgid "Map projections" +msgstr "" + +#: ../gui/wxpython/menustrings.py:251 +msgid "Display map projection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:252 +msgid "" +"Converts co-ordinate system descriptions (i.e. projection information) " +"between various formats (including GRASS format)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:253 +msgid "Manage projections" +msgstr "" + +#: ../gui/wxpython/menustrings.py:254 +msgid "" +"Prints or modifies GRASS projection information files (in various co-" +"ordinate system descriptions). Can also be used to create new GRASS " +"locations." +msgstr "" + +#: ../gui/wxpython/menustrings.py:255 +msgid "Convert coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:256 +msgid "Converts coordinates from one projection to another (cs2cs frontend)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:257 +msgid "Addons extensions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:258 +msgid "Install extension from addons" +msgstr "" + +#: ../gui/wxpython/menustrings.py:259 +msgid "Installs new extension from GRASS AddOns repository." +msgstr "" + +#: ../gui/wxpython/menustrings.py:260 +msgid "Manage installed extension" +msgstr "" + +#: ../gui/wxpython/menustrings.py:261 +msgid "Updates or removes installed GRASS AddOns extension(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:262 ../gui/wxpython/menustrings.py:2049 +msgid "Preferences" +msgstr "" + +#: ../gui/wxpython/menustrings.py:263 +msgid "User GUI preferences (display font, commands, digitizer, etc.)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:1215 +msgid "&Raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:265 ../gui/wxpython/menustrings.py:1216 +msgid "Develop raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1217 +msgid "Compress/decompress" +msgstr "" + +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1218 +msgid "Compresses and decompresses raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1219 +msgid "Region boundaries" +msgstr "" + +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1220 +msgid "Sets the boundary definitions for a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1221 +msgid "Manage NULL values" +msgstr "" + +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1222 +msgid "Manages NULL-values of given raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1223 +msgid "Quantization" +msgstr "" + +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1224 +msgid "Produces the quantization file for a floating-point map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1225 +msgid "Timestamp" +msgstr "" + +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1226 +msgid "" +"Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " +"raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1227 +msgid "Resample using aggregate statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1228 +msgid "Resamples raster map layers to a coarser grid using aggregation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1229 +msgid "Resample using multiple methods" +msgstr "" + +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1230 +msgid "Resamples raster map to a finer grid using interpolation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1231 +msgid "Resample using nearest neighbor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1232 +msgid "GRASS raster map layer data resampling capability." +msgstr "" + +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1233 +msgid "Resample using spline tension" +msgstr "" + +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1234 +msgid "" +"Reinterpolates and optionally computes topographic analysis from input " +"raster map to a new raster map (possibly with different resolution) using " +"regularized spline with tension and smoothing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1235 +msgid "Resample using bspline" +msgstr "" + +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1236 +msgid "" +"Performs bilinear or bicubic spline interpolation with Tykhonov " +"regularization." +msgstr "" + +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1237 +msgid "Resample using analytic kernel" +msgstr "" + +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1238 +msgid "Resamples raster map layers using an analytic kernel." +msgstr "" + +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:579 +#: ../gui/wxpython/menustrings.py:1239 ../gui/wxpython/menustrings.py:1530 +msgid "Support file maintenance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1240 +msgid "Allows creation and/or modification of raster map layer support files." +msgstr "" + +#: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:1241 +msgid "Update map statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1242 +msgid "Update raster map statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:294 ../gui/wxpython/menustrings.py:1245 +msgid "Tiling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:295 ../gui/wxpython/menustrings.py:1246 +msgid "" +"Produces tilings of the source projection for use in the destination region " +"and projection." +msgstr "" + +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:598 +#: ../gui/wxpython/menustrings.py:1247 ../gui/wxpython/menustrings.py:1549 +msgid "Manage colors" +msgstr "" + +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:599 +#: ../gui/wxpython/menustrings.py:1248 ../gui/wxpython/menustrings.py:1550 +msgid "Color tables" +msgstr "" + +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1249 +msgid "Creates/modifies the color table associated with a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1250 +msgid "Color tables (stddev)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:1251 +msgid "Sets color rules based on stddev from a raster map's mean value." +msgstr "" + +#: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:601 +#: ../gui/wxpython/menustrings.py:1252 ../gui/wxpython/menustrings.py:1552 +msgid "Manage color rules interactively" +msgstr "" + +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1253 +msgid "Interactive management of raster color tables." +msgstr "" + +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:603 +#: ../gui/wxpython/menustrings.py:1254 ../gui/wxpython/menustrings.py:1554 +msgid "Export color table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1255 +msgid "Exports the color table associated with a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:1256 +msgid "Blend 2 color rasters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1257 +msgid "Blends color components of two raster maps by a given ratio." +msgstr "" + +#: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:1258 +msgid "Create RGB" +msgstr "" + +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1259 +msgid "" +"Combines red, green and blue raster maps into a single composite raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:771 +#: ../gui/wxpython/menustrings.py:1260 ../gui/wxpython/menustrings.py:1722 +msgid "RGB to HIS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1261 +msgid "" +"Generates red, green and blue (RGB) raster map layers combining hue, " +"intensity and saturation (HIS) values from user-specified input raster map " +"layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1262 +msgid "Query raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1263 +msgid "Query values by coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:1264 +msgid "Queries raster maps on their category values and category labels." +msgstr "" + +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1265 +msgid "Query colors by value" +msgstr "" + +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1266 +msgid "Queries colors for a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:323 ../gui/wxpython/menustrings.py:1274 +msgid "Raster buffers and distance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:324 ../gui/wxpython/menustrings.py:1275 +msgid "Buffer rasters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:325 ../gui/wxpython/menustrings.py:1276 +msgid "" +"Creates a raster map showing buffer zones surrounding cells that contain non-" +"NULL category values." +msgstr "" + +#: ../gui/wxpython/menustrings.py:326 ../gui/wxpython/menustrings.py:1277 +msgid "Concentric circles" +msgstr "" + +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1278 +msgid "Creates a raster map containing concentric rings around a given point." +msgstr "" + +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1279 +msgid "Closest points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1280 +msgid "Locates the closest points between objects in two raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1281 +msgid "Grow by one cell" +msgstr "" + +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:399 +#: ../gui/wxpython/menustrings.py:1282 ../gui/wxpython/menustrings.py:1350 +msgid "Generates a raster map layer with contiguous areas grown by one cell." +msgstr "" + +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:391 +#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1342 +msgid "Distance to features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:392 +#: ../gui/wxpython/menustrings.py:1284 ../gui/wxpython/menustrings.py:1343 +msgid "" +"Generates a raster map containing distances to nearest raster features and/" +"or the value of the nearest non-null cell." +msgstr "" + +#: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:1286 +msgid "Creates a MASK for limiting raster operation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:339 +#: ../gui/wxpython/menustrings.py:1287 ../gui/wxpython/menustrings.py:1290 +msgid "Raster map calculator" +msgstr "" + +#: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:1288 +msgid "Simplified raster map calculator" +msgstr "" + +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1289 +msgid "Calculates a new raster map from a simple r.mapcalc expression." +msgstr "" + +#: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:1291 +msgid "Raster map calculator." +msgstr "" + +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1292 +msgid "Neighborhood analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:343 ../gui/wxpython/menustrings.py:1294 +msgid "" +"Makes each cell category value a function of the category values assigned to " +"the cells around it, and stores new cell values in an output raster map " +"layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1295 +msgid "Neighborhood points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1296 +msgid "" +"Neighborhood analysis tool for vector point maps. 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 in an output raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1297 +msgid "Overlay rasters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1298 +msgid "Cross product" +msgstr "" + +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1299 +msgid "" +"Creates a cross product of the category values from multiple raster map " +"layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1300 +msgid "Patch raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1301 +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." +msgstr "" + +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1302 +msgid "Raster series aggregation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1303 +msgid "" +"Makes each output cell value a function of the values assigned to the " +"corresponding cells in the input raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1304 +msgid "Raster series accumulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1305 +msgid "" +"Makes each output cell value a accumulationfunction of the values assigned " +"to the corresponding cells in the input raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1306 +msgid "Statistical overlay" +msgstr "" + +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1307 +msgid "" +"Calculates category or object oriented statistics (accumulator-based " +"statistics)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1308 +msgid "Quantiles overlay" +msgstr "" + +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1309 +msgid "Compute category quantiles using two passes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1310 +msgid "Solar radiance and shadows" +msgstr "" + +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1311 +msgid "LatLong map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1312 +msgid "Creates a latitude/longitude raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1313 +msgid "Solar irradiance and irradiation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1314 +msgid "" +"Solar irradiance and irradiation model. Computes direct (beam), diffuse and " +"reflected solar irradiation raster maps for given day, latitude, surface and " +"atmospheric conditions. Solar parameters (e.g. sunrise, sunset times, " +"declination, extraterrestrial irradiance, daylight length) are saved in the " +"map history file. Alternatively, a local time can be specified to compute " +"solar incidence angle and/or irradiance raster maps. The shadowing effect of " +"the topography is optionally incorporated." +msgstr "" + +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1315 +msgid "Shadows map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1316 +msgid "" +"Calculates cast shadow areas from sun position and elevation raster map. " +"Either exact sun position (A) is specified, or date/time to calculate the " +"sun position (B) by r.sunmask itself." +msgstr "" + +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1317 +msgid "Sunshine hours and solar angles" +msgstr "" + +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1318 +msgid "" +"Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " +"the angle between the direction of the geometric center of the sun's " +"apparent disk and the (idealized) horizon. Solar azimuth: the angle from due " +"north in clockwise direction." +msgstr "" + +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1319 +msgid "Terrain analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1320 +msgid "Generate contour lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1321 +msgid "Produces a vector map of specified contours from a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1322 +msgid "Cost surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1323 +msgid "" +"Creates a raster map showing the cumulative cost of moving between different " +"geographic locations on an input raster map whose cell category values " +"represent cost." +msgstr "" + +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1324 +msgid "Cumulative movement costs" +msgstr "" + +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1325 +msgid "" +"Creates a raster map showing the anisotropic cumulative cost of moving " +"between different geographic locations on an input raster map whose cell " +"category values represent cost." +msgstr "" + +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1326 +msgid "Least cost route or flow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1327 +msgid "" +"Traces a flow through an elevation model or cost surface on a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1328 +msgid "Compute shaded relief" +msgstr "" + +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1329 +msgid "Creates shaded relief map from an elevation map (DEM). " +msgstr "" + +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1330 +msgid "Apply shade to raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1331 +msgid "Drapes a color raster over an shaded relief or aspect map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1332 +msgid "Slope and aspect" +msgstr "" + +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1333 +msgid "" +"Generates raster maps of slope, aspect, curvatures and partial derivatives " +"from an elevation raster map. Aspect is calculated counterclockwise from " +"east." +msgstr "" + +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1334 +msgid "Landforms" +msgstr "" + +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1335 +msgid "" +"Calculates geomorphons (terrain forms) and associated geometry using machine " +"vision approach." +msgstr "" + +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1336 +msgid "Terrain parameters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1337 +msgid "" +"Extracts terrain parameters from a DEM. Uses a multi-scale approach by " +"taking fitting quadratic parameters to any size window (via least squares)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1338 +msgid "Textural features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1339 +msgid "Generate images with textural features from a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1340 +msgid "Visibility" +msgstr "" + +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1341 +msgid "" +"Computes the viewshed of a point on an elevation raster map. Default format: " +"NULL (invisible), vertical angle wrt viewpoint (visible)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1344 +msgid "Horizon angle" +msgstr "" + +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1345 +msgid "" +"Computes horizon angle height from a digital elevation model. The module has " +"two different modes of operation: 1. Computes the entire horizon around a " +"single point whose coordinates are given with the 'coord' option. The " +"horizon height (in radians). 2. Computes one or more raster maps of the " +"horizon height in a single direction. The input for this is the angle (in " +"degrees), which is measured counterclockwise with east=0, north=90 etc. The " +"output is the horizon height in radians." +msgstr "" + +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1346 +msgid "Transform features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1347 +msgid "Clump" +msgstr "" + +#: ../gui/wxpython/menustrings.py:397 ../gui/wxpython/menustrings.py:1348 +msgid "" +"Recategorizes data in a raster map by grouping cells that form physically " +"discrete areas into unique categories." +msgstr "" + +#: ../gui/wxpython/menustrings.py:398 ../gui/wxpython/menustrings.py:1349 +msgid "Grow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1351 +msgid "Thin" +msgstr "" + +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1352 +msgid "Thins non-null cells that denote linear features in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1353 +msgid "Hydrologic modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1354 +msgid "Carve stream channels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1355 +msgid "" +"Generates stream channels. Takes vector stream data, transforms it to raster " +"and subtracts depth from the output DEM." +msgstr "" + +#: ../gui/wxpython/menustrings.py:405 ../gui/wxpython/menustrings.py:1356 +msgid "Fill lake" +msgstr "" + +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1357 +msgid "Fills lake at given point to given level." +msgstr "" + +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1358 +msgid "Depressionless map and flowlines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1359 +msgid "" +"Filters and generates a depressionless elevation map and a flow direction " +"map from a given elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1360 +msgid "Flow accumulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1361 +msgid "Performs flow computation for massive grids." +msgstr "" + +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1362 +msgid "Flow lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1363 +msgid "" +"Constructs flowlines. Computes flowlines, flowpath lengths, and " +"flowaccumulation (contributing areas) from a elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1364 +msgid "Watershed analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1365 +msgid "Calculates hydrological parameters and RUSLE factors." +msgstr "" + +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1366 +msgid "Watershed subbasins" +msgstr "" + +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1367 +msgid "Generates watershed subbasins raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1368 +msgid "Watershed basin creation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1369 +msgid "Creates watershed basins from a drainage direction map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1370 +msgid "Extraction of stream networks" +msgstr "" + +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1371 +msgid "Performs stream network extraction." +msgstr "" + +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1372 +msgid "SIMWE Overland flow modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1373 +msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1374 +msgid "SIMWE Sediment flux modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1375 +msgid "" +"Sediment transport and erosion/deposition simulation using path sampling " +"method (SIMWE)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1376 +msgid "Topographic index map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1377 +msgid "" +"Creates a topographic index (wetness index) raster map from an elevation " +"raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1378 +msgid "TOPMODEL simulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1379 +msgid "Simulates TOPMODEL which is a physically based hydrologic model." +msgstr "" + +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1380 +msgid "USLE K-factor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1381 +msgid "Computes USLE Soil Erodibility Factor (K)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1382 +msgid "USLE R-factor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1383 +msgid "Computes USLE R factor, Rainfall erosivity index." +msgstr "" + +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:882 +#: ../gui/wxpython/menustrings.py:1384 ../gui/wxpython/menustrings.py:1833 +msgid "Groundwater modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1385 +msgid "Groundwater flow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1386 +msgid "" +"Numerical calculation program for transient, confined and unconfined " +"groundwater flow in two dimensions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1387 +msgid "Groundwater solute transport" +msgstr "" + +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1388 +msgid "" +"Numerical calculation program for transient, confined and unconfined solute " +"transport in two dimensions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1389 +msgid "Landscape patch analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:2019 +msgid "Set up sampling and analysis framework" +msgstr "" + +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:2020 +msgid "Configuration editor for r.li.'index'" +msgstr "" + +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1392 +msgid "Edge density" +msgstr "" + +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1393 +msgid "" +"Calculates edge density index on a raster map, using a 4 neighbour algorithm" +msgstr "" + +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1394 +msgid "Contrast weighted edge density" +msgstr "" + +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1395 +msgid "Calculates contrast weighted edge density index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1396 +msgid "Patch area mean" +msgstr "" + +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1397 +msgid "" +"Calculates mean patch size index on a raster map, using a 4 neighbour " +"algorithm" +msgstr "" + +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1398 +msgid "Patch area range" +msgstr "" + +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1399 +msgid "Calculates range of patch area size on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1400 +msgid "Patch area Std Dev" +msgstr "" + +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1401 +msgid "Calculates standard deviation of patch area a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1402 +msgid "Patch area Coeff Var" +msgstr "" + +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1403 +msgid "Calculates coefficient of variation of patch area on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1404 +msgid "Patch density" +msgstr "" + +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1405 +msgid "" +"Calculates patch density index on a raster map, using a 4 neighbour algorithm" +msgstr "" + +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1406 +msgid "Patch number" +msgstr "" + +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1407 +msgid "" +"Calculates patch number index on a raster map, using a 4 neighbour algorithm." +msgstr "" + +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1408 +msgid "Dominance's diversity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1409 +msgid "Calculates dominance's diversity index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1410 +msgid "Shannon's diversity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1411 +msgid "Calculates Shannon's diversity index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1412 +msgid "Simpson's diversity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1413 +msgid "Calculates Simpson's diversity index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1414 +msgid "Richness" +msgstr "" + +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1415 +msgid "Calculates richness index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1416 +msgid "Shape index" +msgstr "" + +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1417 +msgid "Calculates shape index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1418 +msgid "Wildfire modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1419 +msgid "Rate of spread" +msgstr "" + +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1420 +msgid "" +"Generates rate of spread raster maps. Generates three, or four raster map " +"layers showing the base (perpendicular) rate of spread (ROS), the maximum " +"(forward) ROS, the direction of the maximum ROS, and optionally the maximum " +"potential spotting distance for fire spread simulation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1421 +msgid "Least-cost spread paths" +msgstr "" + +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1422 +msgid "" +"Recursively traces the least cost path backwards to cells from which the " +"cumulative cost was determined." +msgstr "" + +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1423 +msgid "Anisotropic spread simulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1424 +msgid "" +"Simulates elliptically anisotropic spread. Generates a raster map of the " +"cumulative time of spread, given raster maps containing the rates of spread " +"(ROS), the ROS directions and the spread origins. It optionally produces " +"raster maps to contain backlink UTM coordinates for tracing spread paths. " +"Usable for fire spread simulations." +msgstr "" + +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1425 +msgid "Change category values and labels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:527 +#: ../gui/wxpython/menustrings.py:1426 ../gui/wxpython/menustrings.py:1478 +msgid "Manage category information" +msgstr "" + +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:528 +#: ../gui/wxpython/menustrings.py:1427 ../gui/wxpython/menustrings.py:1479 +msgid "" +"Manages category values and labels associated with user-specified raster map " +"layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1428 +msgid "Interactively edit category values" +msgstr "" -#: ../gui/wxpython/modules/extensions.py:65 -msgid "List of extensions - double-click to install" +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1429 +msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/modules/extensions.py:82 -msgid "Options" +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1430 +msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/modules/extensions.py:116 -msgid "&Install" +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1431 +msgid "" +"Reclasses a raster map greater or less than user specified area size (in " +"hectares)." msgstr "" -#: ../gui/wxpython/modules/extensions.py:117 -msgid "Install selected add-ons GRASS tool" +#: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:702 +#: ../gui/wxpython/menustrings.py:1432 ../gui/wxpython/menustrings.py:1653 +msgid "Reclassify" +msgstr "" + +#: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:1433 +msgid "" +"Reclassify raster map based on category values. Creates a new raster map " +"whose category values are based upon a reclassification of the categories in " +"an existing raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1434 +msgid "Recode" +msgstr "" + +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1435 +msgid "Recodes categorical raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1436 +msgid "Rescale" +msgstr "" + +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1437 +msgid "Rescales the range of category values in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:1438 +msgid "Rescale with histogram" +msgstr "" + +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1439 +msgid "" +"Rescales histogram equalized the range of category values in a raster map " +"layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1440 +msgid "Generate random cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1441 +msgid "Random cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1442 +msgid "Generates random cell values with spatial dependence." +msgstr "" + +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1443 +msgid "Random cells and vector points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1444 +msgid "" +"Creates randomly placed raster cells or vector points Creates a raster map " +"and vector point map containing randomly located cells and points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1445 +msgid "Generate surfaces" +msgstr "" + +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1446 +msgid "Fractal surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1447 +msgid "Creates a fractal surface of a given fractal dimension." +msgstr "" + +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1448 +msgid "Gaussian kernel density surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1449 +msgid "" +"Generates a raster density map from vector points map. Density is computed " +"using a moving kernel. Optionally generates a vector density map on a vector " +"network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1450 +msgid "Gaussian deviates surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1451 +msgid "" +"Generates a raster map using gaussian random number generator. Mean and " +"standard deviation of gaussian deviates can be expressed by the user." +msgstr "" + +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1453 +msgid "" +"Creates raster plane map given dip (inclination), aspect (azimuth) and one " +"point." +msgstr "" + +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1454 +msgid "Random deviates surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1455 +msgid "" +"Produces a raster surface map of uniform random deviates with defined range." +msgstr "" + +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1456 +msgid "Random surface with spatial dependence" +msgstr "" + +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1457 +msgid "Generates random surface(s) with spatial dependence." +msgstr "" + +#: ../gui/wxpython/menustrings.py:507 ../gui/wxpython/menustrings.py:1458 +msgid "Interpolate surfaces" +msgstr "" + +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1459 +msgid "Bilinear and bicubic from vector points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1460 +msgid "" +"Performs bicubic or bilinear spline interpolation with Tykhonov " +"regularization." +msgstr "" + +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1461 +msgid "IDW from raster points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1462 +msgid "" +"Provides surface interpolation from raster point data by Inverse Distance " +"Squared Weighting." +msgstr "" + +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1463 +msgid "IDW from vector points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1464 +msgid "" +"Provides surface interpolation from vector point data by Inverse Distance " +"Squared Weighting." +msgstr "" + +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1465 +msgid "Raster contours" +msgstr "" + +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1466 +msgid "Generates surface raster map from rasterized contours." +msgstr "" + +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1467 +msgid "Regularized spline tension" +msgstr "" + +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1468 +msgid "" +"Performs surface interpolation from vector points map by splines. Spatial " +"approximation and topographic analysis from given point or isoline data in " +"vector format to floating point raster format using regularized spline with " +"tension." +msgstr "" + +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1469 +msgid "Raster series interpolation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1470 +msgid "" +"Interpolates raster maps located (temporal or spatial) in between input " +"raster maps at specific sampling positions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1471 +msgid "Fill NULL cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1472 +msgid "Fills no-data areas in raster maps using spline interpolation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1473 +msgid "Fill NULL cells using IDW" +msgstr "" + +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1474 +msgid "" +"Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " +"values (IDW)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:741 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:886 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:1692 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:1837 ../gui/wxpython/menustrings.py:1981 +msgid "Reports and statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1476 +msgid "Basic raster metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1477 +msgid "Outputs basic information about a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1480 +msgid "General statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:1481 +msgid "Generates area statistics for raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1482 +msgid "Quantiles for large data sets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1483 +msgid "Compute quantiles using two passes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:533 ../gui/wxpython/menustrings.py:1484 +msgid "Range of category values" +msgstr "" + +#: ../gui/wxpython/menustrings.py:534 ../gui/wxpython/menustrings.py:1485 +msgid "Prints terse list of category values found in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1486 +msgid "Sum area by raster map and category" +msgstr "" + +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1487 +msgid "Reports statistics for raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1488 +msgid "Statistics for clumped cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1489 +msgid "" +"Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " +"points map containing the calculated centroids of these clumps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1490 +msgid "Total corrected area" +msgstr "" + +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1491 +msgid "Prints estimation of surface area for raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1493 +msgid "" +"Calculates univariate statistics from the non-null cells of a raster map. " +"Statistics include number of cells counted, minimum and maximum cell values, " +"range, arithmetic mean, population variance, standard deviation, coefficient " +"of variation, and sum." +msgstr "" + +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:752 +#: ../gui/wxpython/menustrings.py:1494 ../gui/wxpython/menustrings.py:1703 +msgid "Sample transects" +msgstr "" + +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1495 +msgid "Outputs the raster map layer values lying on user-defined line(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1496 +msgid "Sample transects (bearing/distance)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1497 +msgid "" +"Outputs raster map layer values lying along user defined transect line(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1498 +msgid "Covariance/correlation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1499 +msgid "" +"Outputs a covariance/correlation matrix for user-specified raster map " +"layer(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:1500 +msgid "Linear regression" +msgstr "" + +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1501 +msgid "Calculates linear regression from two raster maps: y = a + b*x." +msgstr "" + +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1502 +msgid "Multiple regression" +msgstr "" + +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1503 +msgid "Calculates multiple linear regression from raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1504 +msgid "Mutual category occurrences" +msgstr "" + +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1505 +msgid "" +"Tabulates the mutual occurrence (coincidence) of categories for two raster " +"map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1506 +msgid "&Vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1507 +msgid "Develop vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/gui_core/dialogs.py:296 +#: ../gui/wxpython/gui_core/dialogs.py:449 +msgid "Create new vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1509 +msgid "Create new empty vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1510 +msgid "Edit vector map (non-interactively)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1511 +msgid "" +"Edits a vector map, allows adding, deleting and modifying selected vector " +"features." +msgstr "" + +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1512 +msgid "Convert object types" +msgstr "" + +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1513 +msgid "Changes type of vector features." +msgstr "" + +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1514 +msgid "Parallel lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1515 +msgid "Creates parallel line to input vector lines." +msgstr "" + +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1516 +msgid "Dissolve boundaries" +msgstr "" + +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1517 +msgid "" +"Dissolves boundaries between adjacent areas sharing a common category number " +"or attribute." +msgstr "" + +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1518 +msgid "Create 3D vector over raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1519 +msgid "Converts 2D vector features to 3D by sampling of elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1520 +msgid "Extrude 3D vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1521 +msgid "" +"Extrudes flat vector features to 3D vector features with defined height. " +"Optionally the height can be derived from sampling of elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1522 +msgid "Create labels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1523 +msgid "Creates paint labels for a vector map from attached attributes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1524 +msgid "Reposition vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1525 +msgid "" +"Performs an affine transformation (shift, scale and rotate) on vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1526 +msgid "Rectify vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1527 +msgid "" +"Rectifies a vector by computing a coordinate transformation for each object " +"in the vector based on the control points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1531 +msgid "Updates vector map metadata." +msgstr "" + +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1532 +msgid "Topology maintenance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1533 +msgid "Create or rebuild topology" +msgstr "" + +#: ../gui/wxpython/menustrings.py:583 ../gui/wxpython/menustrings.py:1534 +msgid "" +"Creates topology for vector map. Optionally also checks for topological " +"errors." +msgstr "" + +#: ../gui/wxpython/menustrings.py:584 ../gui/wxpython/menustrings.py:1535 +msgid "Rebuild topology on all vector maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:585 ../gui/wxpython/menustrings.py:1536 +msgid "Rebuilds topology on all vector maps in the current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1537 +msgid "Build polylines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1538 +msgid "Builds polylines from lines or boundaries." +msgstr "" + +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1539 +msgid "Split lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1540 +msgid "Splits vector lines to shorter segments." +msgstr "" + +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1541 +msgid "Split polylines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1542 +msgid "Creates points/segments from input vector lines and positions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1543 +msgid "Clean vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1544 +msgid "Toolset for cleaning topology of vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1545 +msgid "Smooth or simplify" +msgstr "" + +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1546 +msgid "Performs vector based generalization." +msgstr "" + +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1547 +msgid "Add centroids" msgstr "" -#: ../gui/wxpython/modules/extensions.py:120 -msgid "Show g.extension manual page" +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1548 +msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/modules/extensions.py:188 -msgid "Extension not defined" +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1551 +msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/modules/extensions.py:212 -msgid "Fetching list of tools from GRASS-Addons (be patient)..." +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1553 +msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/modules/extensions.py:227 -#, python-format -msgid "%d extensions loaded" +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1555 +msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/modules/extensions.py:250 -msgid "Install" +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1556 +msgid "Query vector map" msgstr "" -#: ../gui/wxpython/modules/extensions.py:253 -msgid "Show manual page" +#: ../gui/wxpython/menustrings.py:606 ../gui/wxpython/menustrings.py:1557 +msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/modules/extensions.py:369 -#, python-format -msgid "Unable to load extensions. %s" +#: ../gui/wxpython/menustrings.py:607 ../gui/wxpython/menustrings.py:1558 +msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/modules/extensions.py:416 -msgid "Manage installed GRASS Addons extensions" +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:925 +#: ../gui/wxpython/menustrings.py:1559 ../gui/wxpython/menustrings.py:1876 +msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/modules/extensions.py:431 -msgid "List of installed extensions" +#: ../gui/wxpython/menustrings.py:609 ../gui/wxpython/menustrings.py:926 +#: ../gui/wxpython/menustrings.py:1560 ../gui/wxpython/menustrings.py:1877 +msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/modules/extensions.py:438 -msgid "Uninstall" +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1561 +msgid "Feature selection" msgstr "" -#: ../gui/wxpython/modules/extensions.py:440 -msgid "Uninstall selected Addons extensions" +#: ../gui/wxpython/menustrings.py:611 ../gui/wxpython/menustrings.py:1562 +msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/modules/extensions.py:442 -msgid "Reinstall" +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1563 +msgid "" +"Selects vector features from an existing vector map and creates a new vector " +"map containing only the selected features." msgstr "" -#: ../gui/wxpython/modules/extensions.py:444 -msgid "Reinstall selected Addons extensions" +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1564 +msgid "Select by another map" msgstr "" -#: ../gui/wxpython/modules/extensions.py:477 -msgid "No extension selected. Operation canceled." +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1565 +msgid "" +"Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/modules/extensions.py:503 -#, python-format -msgid "" -"List of files to be removed:\n" -"%(files)s\n" -"\n" -"Do you want really to remove <%(ext)s> extension?" +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1573 +msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/modules/extensions.py:507 -msgid "Remove extension" +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:1574 +msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/modules/extensions.py:546 -msgid "Extension" +#: ../gui/wxpython/menustrings.py:624 ../gui/wxpython/menustrings.py:1575 +msgid "Point analysis" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:68 -#: ../gui/wxpython/lmgr/toolbars.py:206 -msgid "Raster Map Calculator" -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/import_export.py:963 -msgid "Layers to be reprojected" +#: ../gui/wxpython/menustrings.py:625 ../gui/wxpython/menustrings.py:638 +#: ../gui/wxpython/menustrings.py:1576 ../gui/wxpython/menustrings.py:1589 +msgid "Identify and remove outliers" msgstr "" -#: ../gui/wxpython/modules/import_export.py:976 -msgid "&Import && reproject" +#: ../gui/wxpython/menustrings.py:626 ../gui/wxpython/menustrings.py:639 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:1590 ../gui/wxpython/menustrings.py:1689 +msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/modules/import_export.py:978 -msgid "Reproject selected layers" +#: ../gui/wxpython/menustrings.py:627 ../gui/wxpython/menustrings.py:1578 +msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/modules/histogram.py:299 -msgid "Histogram Tool [d.histogram]" +#: ../gui/wxpython/menustrings.py:628 ../gui/wxpython/menustrings.py:1579 +msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/modules/histogram.py:428 -msgid "Select font for histogram text" +#: ../gui/wxpython/menustrings.py:629 ../gui/wxpython/menustrings.py:1580 +msgid "Indices for quadrat counts of vector point lists" msgstr "" -#: ../gui/wxpython/modules/vclean.py:35 ../gui/wxpython/modules/vclean.py:114 -msgid "Set up vector cleaning tools" +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:755 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1706 +msgid "Indices for quadrat counts of vector point lists." msgstr "" -#: ../gui/wxpython/modules/vclean.py:75 -msgid "break lines/boundaries" +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:735 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1686 +msgid "Perturb points" msgstr "" -#: ../gui/wxpython/modules/vclean.py:76 -msgid "remove duplicates" +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:736 +#: ../gui/wxpython/menustrings.py:1583 ../gui/wxpython/menustrings.py:1687 +msgid "Random location perturbations of vector points." msgstr "" -#: ../gui/wxpython/modules/vclean.py:77 -msgid "remove dangles" +#: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:739 +#: ../gui/wxpython/menustrings.py:1584 ../gui/wxpython/menustrings.py:1690 +msgid "Test/training point sets" msgstr "" -#: ../gui/wxpython/modules/vclean.py:78 -msgid "change boundary dangles to lines" +#: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:740 +#: ../gui/wxpython/menustrings.py:1585 ../gui/wxpython/menustrings.py:1691 +msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/modules/vclean.py:79 -msgid "remove bridges" +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1586 +msgid "Tests for normality for vector points" msgstr "" -#: ../gui/wxpython/modules/vclean.py:80 -msgid "change bridges to lines" +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:757 +#: ../gui/wxpython/menustrings.py:1587 ../gui/wxpython/menustrings.py:1708 +msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/modules/vclean.py:81 -msgid "snap lines/boundaries" +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1588 +msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/modules/vclean.py:82 -msgid "remove duplicate area centroids" +#: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:1591 +msgid "Detect edges" msgstr "" -#: ../gui/wxpython/modules/vclean.py:83 -msgid "break polygons" +#: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:1592 +msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/modules/vclean.py:84 -msgid "prune lines/boundaries" +#: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:1593 +msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/modules/vclean.py:85 -msgid "remove small areas" +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1594 +msgid "" +"Building contour determination and Region Growing algorithm for determining " +"the building inside" msgstr "" -#: ../gui/wxpython/modules/vclean.py:86 -msgid "remove lines/boundaries of zero length" +#: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:1595 +msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/modules/vclean.py:87 -msgid "remove small angles at nodes" +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1596 +msgid "" +"Corrects the v.lidar.growing output. It is the last of the three algorithms " +"for LIDAR filtering." msgstr "" -#: ../gui/wxpython/modules/vclean.py:116 -msgid "Choose cleaning tools and set thresholds" +#: ../gui/wxpython/menustrings.py:646 ../gui/wxpython/menustrings.py:1597 +msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/modules/vclean.py:120 -msgid "Select input vector map:" +#: ../gui/wxpython/menustrings.py:647 ../gui/wxpython/menustrings.py:1598 +msgid "Create LRS" msgstr "" -#: ../gui/wxpython/modules/vclean.py:130 -msgid " Feature type: " +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1599 +msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/modules/vclean.py:135 -msgid "Select output vector map:" +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1600 +msgid "Create stationing" msgstr "" -#: ../gui/wxpython/modules/vclean.py:178 -msgid "Copy the current command string to the clipboard (Ctrl+C)" +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1601 +msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/modules/vclean.py:222 ../gui/wxpython/psmap/utils.py:103 -msgid "point" +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1602 +msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/modules/vclean.py:223 -msgid "line" +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1603 +msgid "" +"Creates points/segments from input lines, linear reference system and " +"positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/modules/vclean.py:224 -msgid "boundary" +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1604 +msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/modules/vclean.py:225 -msgid "centroid" +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1605 +msgid "" +"Finds line id and real km+offset for given points in vector map using linear " +"reference system." msgstr "" -#: ../gui/wxpython/modules/vclean.py:226 -#: ../gui/wxpython/vdigit/preferences.py:613 -msgid "area" +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1606 +msgid "Nearest features" msgstr "" -#: ../gui/wxpython/modules/vclean.py:227 -msgid "face" +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1607 +msgid "" +"Finds the nearest element in vector map 'to' for elements in vector map " +"'from'." msgstr "" -#: ../gui/wxpython/modules/vclean.py:397 -#, python-format -msgid "%s. cleaning tool removed, will be ignored" +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1608 +msgid "Network analysis" msgstr "" -#: ../gui/wxpython/modules/vclean.py:399 -msgid "Please select a cleaning tool to remove" +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1610 +msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/modules/vclean.py:420 -#, python-format -msgid "%s. cleaning tool moved up" +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1611 +msgid "Network preparation" msgstr "" -#: ../gui/wxpython/modules/vclean.py:422 -msgid "1. cleaning tool can not be moved up " +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1612 +msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/modules/vclean.py:424 -msgid "Please select a cleaning tool to move up" +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1613 +msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/modules/vclean.py:446 -#, python-format -msgid "%s. cleaning tool moved down" +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1614 +msgid "" +"Allocates subnets for nearest centers. Center node must be opened (costs >= " +"0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/modules/vclean.py:448 -msgid "Last cleaning tool can not be moved down " +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1615 +msgid "Split net" msgstr "" -#: ../gui/wxpython/modules/vclean.py:450 -msgid "Please select a cleaning tool to move down" +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1616 +msgid "" +"Splits subnets for nearest centers by cost isolines. Splits net to bands " +"between cost isolines (direction from center). Center node must be opened " +"(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/modules/vclean.py:462 -#, python-format -msgid "cleaning tool: '%s'" +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1617 +msgid "Shortest path" msgstr "" -#: ../gui/wxpython/modules/vclean.py:472 -#, python-format -msgid "Threshold for %(num)s. tool '%(tool)s': %(thresh)s" +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1618 +msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/modules/vclean.py:503 -msgid "Name of input vector map" +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1619 +msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/modules/vclean.py:504 -msgid "Name for output vector map" +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1620 +msgid "" +"Computes shortest distance via the network between the given sets of " +"features. Finds the shortest paths from each 'from' point to the nearest " +"'to' feature and various information about this relation are uploaded to the " +"attribute table." msgstr "" -#: ../gui/wxpython/modules/vclean.py:506 -msgid "Threshold" +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1621 +msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/modules/vclean.py:509 -#, python-format -msgid "'%s' not defined" +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1622 +msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/modules/vclean.py:512 -#, python-format -msgid "" -"Some parameters not defined. Operation canceled.\n" -"\n" -"%s" +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1623 +msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/modules/vclean.py:518 -msgid "Executing selected cleaning operations..." +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1624 +msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/modules/vclean.py:580 -msgid "Vector cleaning command copied to clipboard" +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1625 +msgid "Visibility network" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:89 -msgid "Check all" +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1626 +msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:92 -msgid "Clear all" +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1627 +msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:152 -msgid "Enter vector attribute values" +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1628 +msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:320 -msgid "Bad color format. Use color format '0:0:0'" +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1629 +msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:420 -#: ../gui/wxpython/wxplot/dialogs.py:445 -msgid "Select raster map:" +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1630 +msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:422 -msgid "Select vector map:" +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1631 +msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:440 -msgid "Import or export color table:" +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1632 +msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:449 -msgid "Choose file to load color table" +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1633 +msgid "Components" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:450 -msgid "Load" +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1634 +msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:451 -msgid "Type filename or click to choose file and load color table" +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1635 +msgid "Centrality" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:461 -msgid "Choose file to save color table" +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1636 +msgid "" +"Computes degree, centrality, betweeness, closeness and eigenvector " +"centrality measures in the network." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:462 -msgid "Type filename or click to choose file and save color table" +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1637 +msgid "Steiner tree" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:463 ../gui/wxpython/menustrings.py:9 -#: ../gui/wxpython/menustrings.py:2036 -msgid "Save" +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1638 +msgid "" +"Creates Steiner tree for the network and given terminals. Note that 'Minimum " +"Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " +"module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:476 -msgid "&Set" +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1639 +msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:485 -msgid "Load color table:" +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1640 +msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:492 -msgid "Load color table from file:" +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1641 +msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:498 -msgid "Save color table to file:" +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1642 +msgid "" +"Creates a cycle connecting given nodes (Traveling salesman problem). Note " +"that TSP is NP-hard, heuristic algorithm is used by this module and created " +"cycle may be sub optimal" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:528 -msgid "Reload default table" +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:695 +#: ../gui/wxpython/menustrings.py:1643 ../gui/wxpython/menustrings.py:1646 +msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:584 -#: ../gui/wxpython/iclass/toolbars.py:64 -msgid "Preview" +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1644 +msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:588 -msgid "Show preview of map (current Map Display extent is used)." +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1645 +msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:623 -#: ../gui/wxpython/modules/colorrules.py:1939 -msgid "No valid color rules given." +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1647 +msgid "" +"Overlays two vector maps offering clip, intersection, difference, " +"symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:672 -#, python-format -msgid "File <%s> already already exists. Do you want to overwrite it?" +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1648 +msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:687 -#: ../gui/wxpython/gui_core/forms.py:2579 -msgid "Nothing to save." +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1649 +msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:719 -msgid "Invalid color table format" +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1650 +msgid "Manage categories" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:796 -#, python-format -msgid "Invalid rule value '%s'. Unable to apply color table." +#: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:1651 +msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:886 -msgid "Create new color table for raster map" +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1652 +msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:980 -msgid "Enter raster category values or percents" +#: ../gui/wxpython/menustrings.py:703 ../gui/wxpython/menustrings.py:1654 +msgid "" +"Changes vector category values for an existing vector map according to " +"results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:984 -#: ../gui/wxpython/modules/colorrules.py:1686 -#: ../gui/wxpython/modules/colorrules.py:1692 -#: ../gui/wxpython/psmap/dialogs.py:3504 -msgid "range" +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/dbmgr/dialogs.py:127 +msgid "Update attributes" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:986 -msgid "fp range" +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1656 +msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:988 -#, python-format -msgid "Enter raster category values or percents (%(range)s = %(min)d-%(max)d)" +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1657 +msgid "" +"Calculates univariate statistics from a raster map based on a vector map and " +"uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1095 -msgid "Create new color rules for vector map" +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1658 +msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1107 -#: ../gui/wxpython/modules/colorrules.py:1705 -msgid "Enter vector attribute values or percents:" +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1659 +msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1109 -#: ../gui/wxpython/modules/colorrules.py:1707 -msgid "Enter vector attribute values:" +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1660 +msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1120 -msgid "Select vector columns" +#: ../gui/wxpython/menustrings.py:710 ../gui/wxpython/menustrings.py:1661 +msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1122 -msgid "Layer:" +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1662 +msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1123 -msgid "Attribute column:" +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1663 +msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1126 -msgid "Load color from column:" +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1664 +msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1126 -msgid "Save color to column:" +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1665 +msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1128 -msgid "Load size from column:" +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1666 +msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1128 -msgid "Save size to column:" +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1667 +msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1130 -msgid "Load width from column:" +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1668 +msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1130 -msgid "Save width to column:" +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1669 +msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1136 -msgid "Use color column instead of color table:" +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1670 +msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1148 ../gui/wxpython/dbmgr/base.py:512 -#: ../gui/wxpython/dbmgr/base.py:2371 -msgid "Add column" +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1671 +msgid "Convex hull" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1149 -msgid "Add GRASSRGB column to current attribute table." +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1672 +msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1196 -#: ../gui/wxpython/modules/colorrules.py:1245 -msgid "Import or export color table" +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1673 +msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1261 -#, python-format +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1674 msgid "" -"Database connection for vector map <%s> is not defined in DB file. Do you " -"want to create and connect new attribute table?" +"Creates a Delaunay triangulation from an input vector map containing points " +"or centroids." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1266 -msgid "No database connection defined" +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1675 +msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1342 -#, python-format +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1676 msgid "" -"Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " -"table cannot be edited." +"Creates a Voronoi diagram constrained to the extents of the current region " +"from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1537 -#, python-format -msgid "%s column already exists." +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1677 +msgid "Generate grid" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1576 -msgid "Please wait, loading data from attribute table..." +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1678 +msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1641 -#, python-format -msgid "" -"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?" +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1679 +msgid "Generate points" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1647 -msgid "Too many records" +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1680 +msgid "Generate from database" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1699 -#, python-format -msgid "Enter vector attribute values or percents %s:" +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1681 +msgid "" +"Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1702 -#, python-format -msgid "Enter vector attribute values %s:" +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1682 +msgid "Generate points along lines" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1844 -msgid "Please select column to save values to." +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1683 +msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1881 -msgid "No color column defined. Operation canceled." +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1684 +msgid "Generate random points" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1924 -msgid "Thematic mapping for vector map in 3D view" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1685 +msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:71 -msgid "3D Raster Map Calculator" +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1688 +msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:84 -msgid "mapcalc statement" +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1693 +msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:152 -msgid "Operators" +#: ../gui/wxpython/menustrings.py:743 ../gui/wxpython/menustrings.py:1694 +msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:158 -msgid "Operands" +#: ../gui/wxpython/menustrings.py:744 ../gui/wxpython/menustrings.py:1695 +msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:161 -msgid "Expression" +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1696 +msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:173 -msgid "Save expression to file" +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1697 +msgid "Report topology by category" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/mcalc_builder.py:174 -#: ../gui/wxpython/gui_core/forms.py:2054 -msgid "&Load" +#: ../gui/wxpython/menustrings.py:747 ../gui/wxpython/menustrings.py:1698 +msgid "Reports geometry statistics for vector maps." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/modules/mcalc_builder.py:175 -msgid "Load expression from file" +#: ../gui/wxpython/menustrings.py:748 ../gui/wxpython/menustrings.py:1699 +msgid "Univariate attribute statistics for points" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> 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 -msgid "Copy" +#: ../gui/wxpython/menustrings.py:749 ../gui/wxpython/menustrings.py:1700 +msgid "" +"Calculates univariate statistics of vector map features. Variance and " +"standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:177 -#: ../gui/wxpython/gui_core/forms.py:636 -msgid "Copy the current command string to the clipboard" +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1701 +msgid "Univariate statistics for attribute columns" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/modules/mcalc_builder.py:181 -msgid "exponent" +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1702 +msgid "" +"Calculates univariate statistics on selected table column for a GRASS vector " +"map." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:183 -msgid "divide" +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1704 +msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:185 -msgid "add" +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1705 +msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:187 -msgid "subtract" +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1707 +msgid "Test normality" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:189 -msgid "modulus" +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1709 +msgid "&Imagery" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:191 -msgid "multiply" +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1710 +msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:196 -msgid "left shift" +#: ../gui/wxpython/menustrings.py:760 ../gui/wxpython/menustrings.py:1711 +msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:198 -msgid "right shift" +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1712 +msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:200 -msgid "right shift (unsigned)" +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1713 +msgid "Target group" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:202 -msgid "greater than" +#: ../gui/wxpython/menustrings.py:763 ../gui/wxpython/menustrings.py:1714 +msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:204 -msgid "greater than or equal to" +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1715 +msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:206 -msgid "less than" +#: ../gui/wxpython/menustrings.py:765 ../gui/wxpython/menustrings.py:1716 +msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:208 -msgid "less than or equal to" +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1717 +msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:210 -msgid "equal to" +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1718 +msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:212 -msgid "not equal to" +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1719 +msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:215 -msgid "one's complement" +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1720 +msgid "HIS to RGB" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:217 -msgid "NOT" +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1721 +msgid "" +"Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " +"RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:219 -msgid "bitwise AND" +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1723 +msgid "" +"Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" +"Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:221 -msgid "bitwise OR" +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1724 +msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:223 -msgid "logical AND" +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1725 +msgid "" +"Rectifies an image by computing a coordinate transformation for each pixel " +"in the image based on the control points." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:225 -msgid "logical AND (ignores NULLs)" +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1727 +msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:227 -msgid "logical OR" +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1728 +msgid "Spectral response" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:229 -msgid "logical OR (ignores NULLs)" +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1729 +msgid "" +"Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:231 -msgid "conditional" +#: ../gui/wxpython/menustrings.py:779 ../gui/wxpython/menustrings.py:1730 +msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:245 -msgid "Name for new 3D raster map to create" +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1731 +msgid "" +"Image fusion algorithms to sharpen multispectral with high-res panchromatic " +"channels" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:247 -msgid "Name for new raster map to create" +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1732 +msgid "Classify image" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:260 -msgid "Insert existing 3D raster map" +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1733 +msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:262 -msgid "Insert existing raster map" +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1734 +msgid "" +"Generates spectral signatures for land cover types in an image using a " +"clustering algorithm. The resulting signature file is used as input for i." +"maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:271 -msgid "Insert mapcalc function" +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1735 +msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:291 -msgid "Generate random seed for rand()" +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1736 +msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:293 -msgid "Seed:" +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1737 +msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:297 -msgid "Integer seed for rand() function" +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1738 +msgid "" +"Classifies the cell spectral reflectances in imagery data. Classification is " +"based on the spectral signature information generated by either i.cluster, g." +"gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:304 -msgid "Add created raster map into layer tree" +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:2013 +msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:648 -msgid "You must enter the name of a new raster map to create." +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:2014 +msgid "" +"Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:662 -msgid "You must enter an expression to create a new raster map." +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1741 +msgid "Input for supervised SMAP" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:731 -msgid "Choose a file name to save the expression" +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1742 +msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:732 -#: ../gui/wxpython/modules/mcalc_builder.py:754 -msgid "Expression file (*)|*" +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1743 +msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:753 -msgid "Choose a file name to load the expression" +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1744 +msgid "" +"Performs contextual image classification using sequential maximum a " +"posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/modules/mcalc_builder.py:789 -#, python-brace-format -msgid "'{cmd}' copied to clipboard" +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1745 +msgid "Object segmentation" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/iscatt/plots.py:44 -#, python-brace-format -msgid "" -"The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " -"be installed. {0}" +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1746 +msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 -msgid "Zoom to scatter plot extend" +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1747 +msgid "Filter image" msgstr "" -#: ../gui/wxpython/iscatt/core_c.py:24 -msgid "Loading ctypes libs failed" +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1748 +msgid "Edge detection" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 -msgid "Loading data..." +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1749 +msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:213 -msgid "No data set." +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1750 +msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 -#, python-format -msgid "" -"Interactive Scatter Plot Tool can not be used.\n" -"Number of cells (rows*cols) <%d> in current regionis higher than maximum " -"limit <%d>.\n" -"\n" -"You can reduce number of cells in current region using command." +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1751 +msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 -#, python-format -msgid "" -"Number of cells (rows*cols) <%d> in current region is higher than " -"recommended threshold <%d>.\n" -"It is strongly advised to reduce number of cells in current region below " -"recommend threshold.\n" -" It can be done by command.\n" -"\n" -"Do you want to continue using Interactive Scatter Plot Tool with this region?" +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1752 +msgid "Transform image" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 -msgid "" -"Scatter plot with same band combination (regardless x y order) is already " -"displayed." +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1753 +msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 -#, python-format -msgid "Band <%s> is not CELL (integer) type.\n" +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1754 +msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 -msgid "Scatter plot cannot be added.\n" +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1755 +msgid "Principal components" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 -#, python-format -msgid "" -"Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1756 +msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 -#, python-format -msgid "" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " -"limit <%d>.\n" -"It is strongly advised to reduce range extend of bands(e. g. using r." -"rescale) below recommended threshold.\n" -"\n" -"Do you really want to add this scatter plot?" +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1757 +msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 -msgid "" -"In order to select arrea in scatter plot, you have to select class first.\n" -"\n" -"There is no class yet, do you want to create one?" +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1758 +msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 -#, python-format -msgid "" -"Error occurred during computation of scatter plot category:\n" -"%s" +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1759 +msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 -#, python-format -msgid "Export scatter plot raster of class <%s>" +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1760 +msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 -#, python-format -msgid "Scatter plot raster of class <%s> exported to raster map <%s>." +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1761 +msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 -#, python-format +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1762 +msgid "Aster DN to radiance/reflectance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1763 msgid "" -"Export of scatter plot raster of class <%s> to map <%s> failed.\n" -"%s" +"Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " +"from ASTER DN." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 -msgid "Add scatter plot" +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1764 +msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 -msgid "Select area with polygon" +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1765 +msgid "" +"Calculates top-of-atmosphere radiance or reflectance and temperature for " +"Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 -msgid "Pan mode for scatter plots" +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1766 +msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 -msgid "Zoom mode for scatter plots (left mouse button, wheel)" +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1767 +msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 -msgid "" -"Zoom to scatter plot data extend mode (click on scatter plot for zooming to " -"extend)" +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1768 +msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 -msgid "Show/hide class manager" +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1769 +msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 -msgid "Include selected area to class" +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1770 +msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 -msgid "Exclude selected area from class" +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1771 +msgid "" +"Performs atmospheric correction using the 6S algorithm. 6S - Second " +"Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 -msgid "Add new vertex" +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1772 +msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:222 -msgid "Add new vertex to polygon boundary scatter plot" +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1773 +msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 -msgid "Create selection polygon" +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1774 +msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 -msgid "Add new vertex between last and first points of the boundary" +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1775 +msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 -msgid "Move vertex" +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:2016 +msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:232 -msgid "Move boundary vertex" +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:2005 +msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 -msgid "Remove vertex" +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:2006 +msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:237 -msgid "Remove boundary vertex" +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1779 +msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 -msgid "Remove polygon (click on scatter plot for removing it's polygon)" +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1780 +msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 -msgid "Add class" +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1781 +msgid "" +"Calculates different types of vegetation indices. Uses red and nir bands " +"mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 -msgid "Remove selected class" +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1782 +msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:36 -msgid "Add scatter plots" +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1783 +msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:53 -msgid "x axis:" +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1784 +msgid "Albedo" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:63 -msgid "y axis:" +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1785 +msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:110 -msgid "Bands of scatter plots to be added (x y):" +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1786 +msgid "Emissivity" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:156 -msgid "No scatter plots selected." +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1787 +msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:196 -msgid "Select both x and y bands." +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1788 +msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:199 -msgid "Selected bands must be different." +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1789 +msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:206 -msgid "" -"Scatter plot with same bands combination (regardless x y order) has been " -"already added into the list." +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1790 +msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:330 -#, python-format -msgid "Raster map <%s> already exists. Do you want to overwrite it?" +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1791 +msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:333 -#, python-format -msgid "Raster <%s> exists" +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1792 +msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:366 -msgid "Show confidence ellipses" +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1793 +msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:374 -msgid "Selection polygon color:" +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1794 +msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:375 -msgid "Color of selection polygon vertex:" +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1795 +msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:376 -msgid "Selected area color:" +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1796 +msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:388 -msgid "Selected area opacity:" +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1797 +msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 -msgid "Selection style:" +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1798 +msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 -msgid "Ellipses settings:" +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1799 +msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 -msgid "Select category for editing." +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1800 +msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 -msgid "Computing of scatter plots failed." +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1801 +msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 -msgid "Patching category raster conditions file failed." +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1802 +msgid "" +"Computes temporal integration of satellite ET actual (ETa) following the " +"daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 -#, python-format -msgid "" -"v.build failed:\n" -"%s" +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1803 +msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 -#, python-format +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1804 msgid "" -"v.to.rast failed:\n" -"%s" +"Computes evapotranspiration calculation modified or original Hargreaves " +"formulation, 2001." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 -msgid "Interactive Scatter Plot Tool" +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1805 +msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 -msgid "scatter plot" +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1806 +msgid "" +"Computes potential evapotranspiration calculation with hourly Penman-" +"Monteith." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 -msgid "Maximum limit of categories number was reached." +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1807 +msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 -msgid "Rename class" +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1808 +msgid "" +"Computes evapotranspiration calculation Priestley and Taylor formulation, " +"1972." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 -msgid "Set color" +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1810 +msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 -msgid "Change opacity level" +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1811 +msgid "" +"Calculates error matrix and kappa parameter for accuracy assessment of " +"classification result." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:577 -msgid "Hide" +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1812 +msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:579 -msgid "Show" +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1813 +msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:590 -msgid "Move to top" +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1814 +msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 -msgid "Move to bottom" +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1815 +msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:602 -msgid "Move category up" +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1816 +msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 -msgid "Move category down" +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1817 +msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 -msgid "Export class raster" +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1818 +msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 -#, python-format -msgid "Change opacity of class <%s>" +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1819 +msgid "" +"Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " +"3D raster map." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 -msgid "Empty name was inserted." +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1821 +msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:225 -#: ../gui/wxpython/rlisetup/sampling_frame.py:348 -#, python-format -msgid "The raster file %s already exists, please change name" +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1823 +msgid "3D color tables" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:254 -msgid "Raster map not created. Please redraw region." +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1824 +msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:373 -msgid "Raster map not created. redraw region again." +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1825 +msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:443 -#: ../gui/wxpython/rlisetup/wizard.py:913 -msgid "Draw sampling frame" +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1826 +msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:444 -msgid "Draw sampling frame by clicking and dragging" +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1827 +msgid "3D mask" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:448 -msgid "Draw sampling rectangle" +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1828 +msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:449 -msgid "Draw sampling rectangle by clicking and dragging" +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:879 +#: ../gui/wxpython/menustrings.py:1829 ../gui/wxpython/menustrings.py:1830 +msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:453 -msgid "Draw sampling circle" +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1831 +msgid "Cross section" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:454 -msgid "Draw sampling circle radius by clicking and dragging" +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1832 +msgid "" +"Creates cross section 2D raster map from 3D raster map based on 2D elevation " +"map" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:458 -#: ../gui/wxpython/rlisetup/wizard.py:1244 -#: ../gui/wxpython/rlisetup/wizard.py:1662 -msgid "Draw sampling region" +#: ../gui/wxpython/menustrings.py:883 ../gui/wxpython/menustrings.py:1834 +msgid "" +"Numerical calculation program for transient, confined groundwater flow in " +"three dimensions." msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:459 -msgid "Draw sampling region by polygon. Right Double click to end drawing" +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1835 +msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/rlisetup/g.gui.rlisetup.py:48 -msgid "Setup for r.li modules - GRASS GIS" -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/modules/extensions.py:45 -msgid "Fetch & install extension from GRASS Addons" +#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1836 +msgid "" +"Interpolates point data to a 3D raster map using regularized spline with " +"tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/modules/extensions.py:65 -msgid "List of extensions - double-click to install" +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1838 +msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/modules/extensions.py:82 -msgid "Options" +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1839 +msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/modules/extensions.py:116 -msgid "&Install" +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1840 +msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/modules/extensions.py:117 -msgid "Install selected add-ons GRASS tool" +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1841 +msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/modules/extensions.py:120 -msgid "Show g.extension manual page" +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1842 +msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/modules/extensions.py:188 -msgid "Extension not defined" +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1843 +msgid "" +"Calculates univariate statistics from the non-null cells of a 3D raster map. " +"Statistics include number of cells counted, minimum and maximum cell values, " +"range, arithmetic mean, population variance, standard deviation, coefficient " +"of variation, and sum." msgstr "" -#: ../gui/wxpython/modules/extensions.py:212 -msgid "Fetching list of tools from GRASS-Addons (be patient)..." +#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1844 +msgid "&Database" msgstr "" -#: ../gui/wxpython/modules/extensions.py:227 -#, python-format -msgid "%d extensions loaded" +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1845 +msgid "Database information" msgstr "" -#: ../gui/wxpython/modules/extensions.py:250 -msgid "Install" +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1846 +msgid "List databases" msgstr "" -#: ../gui/wxpython/modules/extensions.py:253 -msgid "Show manual page" +#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1847 +msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/modules/extensions.py:369 -#, python-format -msgid "Unable to load extensions. %s" +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1848 +msgid "List drivers" msgstr "" -#: ../gui/wxpython/modules/extensions.py:416 -msgid "Manage installed GRASS Addons extensions" +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1849 +msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/modules/extensions.py:431 -msgid "List of installed extensions" +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1850 +msgid "List tables" msgstr "" -#: ../gui/wxpython/modules/extensions.py:438 -msgid "Uninstall" +#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1851 +msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/modules/extensions.py:440 -msgid "Uninstall selected Addons extensions" +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1852 +msgid "Describe table" msgstr "" -#: ../gui/wxpython/modules/extensions.py:442 -msgid "Reinstall" +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1853 +msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/modules/extensions.py:444 -msgid "Reinstall selected Addons extensions" +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1854 +msgid "List columns" msgstr "" -#: ../gui/wxpython/modules/extensions.py:477 -msgid "No extension selected. Operation canceled." +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1855 +msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/modules/extensions.py:503 -#, python-format -msgid "" -"List of files to be removed:\n" -"%(files)s\n" -"\n" -"Do you want really to remove <%(ext)s> extension?" +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1856 +msgid "Manage databases" msgstr "" -#: ../gui/wxpython/modules/extensions.py:507 -msgid "Remove extension" +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1857 +msgid "Connect" msgstr "" -#: ../gui/wxpython/modules/extensions.py:546 -msgid "Extension" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1858 +msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:66 -msgid "Create new configuration file for r.li modules" +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1859 +msgid "Login" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:131 -#, python-format -msgid "Do you want to create r.li configuration file <%s>?" +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1860 +msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:133 -msgid "Create new r.li configuration file?" +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1861 +msgid "Create database" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:149 -msgid "r.li.setup wizard canceled. Configuration file not created." +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1862 +msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:496 -msgid "Select maps and define name" +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1863 +msgid "Drop database" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:510 -msgid "Name for new configuration file to create" +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1864 +msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:530 -msgid "Raster map to use to select areas" +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1865 +msgid "Drop table" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:549 -msgid "Vector map to use to select areas" +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1866 +msgid "Drops an attribute table." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:570 -msgid "Vector map layer to use to select areas" +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1867 +msgid "Copy table" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:589 -msgid "Define sampling region (region for analysis)" +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1868 +msgid "" +"Copy a table. Either 'from_table' (optionally with 'where') can be used or " +"'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:591 -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:981 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:982 -======= -#: ../gui/wxpython/rlisetup/wizard.py:981 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/rlisetup/wizard.py:981 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -msgid "Whole map layer" +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:938 +#: ../gui/wxpython/menustrings.py:1869 ../gui/wxpython/menustrings.py:1889 +msgid "Drop column" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:592 -msgid "Keyboard setting" +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1870 +msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:593 -msgid "Draw the sampling frame" +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1871 +msgid "Test" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:646 -#, python-format -msgid "The configuration file %s already exists, please change name" +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1872 +msgid "Test database driver, database must exist and set by db.connect." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:708 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:709 -======= -#: ../gui/wxpython/rlisetup/wizard.py:708 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/rlisetup/wizard.py:708 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-format -msgid "Vector %s was not found, please select another vector" +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:123 +msgid "Query" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:713 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:714 -======= -#: ../gui/wxpython/rlisetup/wizard.py:713 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/rlisetup/wizard.py:713 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-format -msgid "Vector %s has no areas, please select another vector" +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1874 +msgid "Query any table" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:719 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:720 -======= -#: ../gui/wxpython/rlisetup/wizard.py:719 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/rlisetup/wizard.py:719 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-format -msgid "Vector %s has no table connected, please select another vector" +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1875 +msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:763 -msgid "Insert sampling frame parameter" +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1878 +msgid "SQL statement" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:773 -msgid "Column of upper left corner" +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1879 +msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:794 -msgid "Row of upper left corner" +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1880 +msgid "Vector database connections" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:815 -#: ../gui/wxpython/rlisetup/wizard.py:836 -msgid "Row length of sampling frame" +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1881 +msgid "New table" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:972 -msgid "Insert sampling areas" +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1882 +msgid "" +"Creates and connects a new attribute table to a given layer of an existing " +"vector map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:983 -msgid "Regions" +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1883 +msgid "Remove table" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:984 -msgid "Sample units" +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1884 +msgid "Removes existing attribute table of a vector map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:986 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/wizard.py:762 -msgid "Insert sampling frame parameter" +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1885 +msgid "Join table" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:772 -msgid "Column of upper left corner" +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1886 +msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:793 -msgid "Row of upper left corner" +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1887 +msgid "Add columns" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:814 -#: ../gui/wxpython/rlisetup/wizard.py:835 -msgid "Row length of sampling frame" +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1888 +msgid "" +"Adds one or more columns to the attribute table connected to a given vector " +"map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:912 -#: ../gui/wxpython/rlisetup/sampling_frame.py:441 -msgid "Draw sampling frame" +#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1890 +msgid "" +"Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:971 -msgid "Insert sampling areas" +#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/dbmgr/base.py:2433 +msgid "Rename column" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:982 -msgid "Regions" +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1892 +msgid "" +"Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:983 -msgid "Sample units" +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1893 +msgid "Change values" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:984 ../gui/wxpython/menustrings.py:342 -#: ../gui/wxpython/menustrings.py:1293 -msgid "Moving window" +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1894 +msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:985 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1895 +msgid "Drop row" +msgstr "" + +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1896 +msgid "Removes a vector feature from a vector map through attribute selection." +msgstr "" + +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1897 +msgid "Reconnect vectors to database" +msgstr "" + +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1898 msgid "" -"Select areas from the\n" -"overlaid vector map" +"Reconnects attribute tables for all vector maps from the current mapset to a " +"new database." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:998 -msgid "Choose a method" +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1899 +msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1000 -msgid "Use keyboard to enter sampling area" +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1900 +msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1001 -msgid "Use mouse to draw sampling area" +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1901 +msgid "&Temporal" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1007 -msgid "This option is not supported yet" +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1902 +msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1020 -msgid "Number of regions to draw:" +#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1903 +msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1037 -msgid "Do you want to overwrite existing temporal maps if they exist?" +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1904 +msgid "" +"Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1044 -msgid "Do you want to check vector areas?" +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1906 +msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1047 -msgid "Select if use area by area" +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1908 +msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1049 -msgid "All the features will be used" +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1910 +msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1062 -msgid "Analysing all vector features..." +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1911 +msgid "Update metadata" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1162 -msgid "Analysing vector" +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1912 +msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1180 -msgid "All feature are been analyzed." +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1913 +msgid "Merge" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1184 -msgid "An error occurred" +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1914 +msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1215 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/wizard.py:997 -msgid "Choose a method" +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1915 +msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:999 -msgid "Use keyboard to enter sampling area" +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1916 +msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1000 -msgid "Use mouse to draw sampling area" +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1917 +msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1006 -msgid "This option is not supported yet" +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1918 +msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1019 -msgid "Number of regions to draw:" +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1920 +msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1036 -msgid "Do you want to overwrite existing temporal maps if they exist?" +#: ../gui/wxpython/menustrings.py:970 ../gui/wxpython/menustrings.py:1921 +msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1043 -msgid "Do you want to check vector areas?" +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1922 +msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1046 -msgid "Select if use area by area" +#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1923 +msgid "" +"Assigns timestamps and registers raster, vector and raster3d maps in a space " +"time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1048 -msgid "All the features will be used" +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1924 +msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1061 -msgid "Analysing all vector features..." +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1925 +msgid "" +"Unregisters raster, vector and raster3d maps from the temporal database or a " +"specific space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1161 -msgid "Analysing vector" +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1926 +msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1179 -msgid "All feature are been analyzed." +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1927 +msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1183 -msgid "An error occurred" +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1928 +msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1214 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -msgid "Draw sampling regions" +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1929 +msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1233 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#, python-brace-format -msgid "Draw sample region {count} of {num_regions}" +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1930 +msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1242 -#: ../gui/wxpython/rlisetup/wizard.py:1654 -msgid "Draw moving windows region" +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1931 +msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1289 -msgid "Select sample units from keyboard" +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1932 +msgid "Import" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1306 -#: ../gui/wxpython/rlisetup/wizard.py:1498 -#: ../gui/wxpython/rlisetup/wizard.py:1611 -msgid "Select type of shape" +#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1933 +msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1307 -#: ../gui/wxpython/rlisetup/wizard.py:1499 -#: ../gui/wxpython/rlisetup/wizard.py:1612 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -msgid "Draw sample region " +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1934 +msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1244 -#: ../gui/wxpython/rlisetup/wizard.py:1656 -msgid "Draw moving windows region" +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1935 +msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1246 -#: ../gui/wxpython/rlisetup/wizard.py:1664 -#: ../gui/wxpython/rlisetup/sampling_frame.py:456 -msgid "Draw sampling region" +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1936 +msgid "" +"Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1291 -msgid "Select sample units from keyboard" +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1938 +msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1308 -#: ../gui/wxpython/rlisetup/wizard.py:1500 -#: ../gui/wxpython/rlisetup/wizard.py:1613 -msgid "Select type of shape" +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1939 +msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1309 -#: ../gui/wxpython/rlisetup/wizard.py:1501 -#: ../gui/wxpython/rlisetup/wizard.py:1614 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/psmap/toolbars.py:105 -msgid "Rectangle" +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1940 +msgid "Export raster dataset as VTK time series" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:1307 -#: ../gui/wxpython/rlisetup/wizard.py:1499 -#: ../gui/wxpython/rlisetup/wizard.py:1612 -msgid "Circle" +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1941 +msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1339 -#: ../gui/wxpython/rlisetup/wizard.py:1511 -#: ../gui/wxpython/rlisetup/wizard.py:1545 -msgid "Width size (in cells)?" +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1942 +msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1340 -#: ../gui/wxpython/rlisetup/wizard.py:1546 -msgid "What radius size (in meters)?" +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1943 +msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1342 -#: ../gui/wxpython/rlisetup/wizard.py:1527 -#: ../gui/wxpython/rlisetup/wizard.py:1548 -msgid "Height size (in cells)?" +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1944 +msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1342 -#: ../gui/wxpython/rlisetup/wizard.py:1548 -msgid "Name of the circle mask" +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1945 +msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1349 -msgid "Select method of sampling unit distribution" +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1946 +msgid "Extraction" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1351 -msgid "Random non overlapping" +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1947 +msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1352 -msgid "Systematic contiguous" +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1948 +msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1353 -msgid "Stratified random" +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1949 +msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1354 -msgid "Systematic non contiguous" +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1950 +msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1355 -msgid "Centered over sites" +#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1951 +msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1368 -#: ../gui/wxpython/rlisetup/wizard.py:1437 -msgid "What number of Sampling Units to use?" +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1952 +msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1451 -msgid "Insert number of row strates" +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1953 +msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1452 -msgid "Insert number of column strates" +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1954 +msgid "" +"Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1458 -msgid "Insert distance between units" +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1955 +msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1488 -msgid "Set sample units" +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1956 +msgid "" +"Creates/modifies the color table associated with each raster map of the " +"space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1559 -msgid "Set moving windows" +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1957 +msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1602 -#: ../gui/wxpython/rlisetup/wizard.py:1713 -msgid "Draw sampling units" +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1958 +msgid "" +"Performs spatio-temporal mapcalc expressions on temporally sampled maps of " +"space time raster datasets." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1624 -msgid "Number of sampling area to draw:" +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1959 +msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1731 -#, python-brace-format -msgid "Draw sampling {draw_type} {count} of {num_regions}" +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1960 +msgid "" +"Performs r3.mapcalc expressions on maps of sampled space time 3D raster " +"datasets." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1799 -msgid "Select sampling areas" +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1961 +msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1808 -msgid "Is this area ok?" +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1962 +msgid "" +"Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1830 -#, python-brace-format -msgid "Select sample area {areas_count} of {area_num}" +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1963 +msgid "Aggregation" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1865 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/wizard.py:1309 -#: ../gui/wxpython/rlisetup/wizard.py:1501 -#: ../gui/wxpython/rlisetup/wizard.py:1614 -msgid "Circle" +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1964 +msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1341 -#: ../gui/wxpython/rlisetup/wizard.py:1513 -#: ../gui/wxpython/rlisetup/wizard.py:1547 -msgid "Width size (in cells)?" +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1965 +msgid "" +"Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1342 -#: ../gui/wxpython/rlisetup/wizard.py:1548 -msgid "What radius size (in meters)?" +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1966 +msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1344 -#: ../gui/wxpython/rlisetup/wizard.py:1529 -#: ../gui/wxpython/rlisetup/wizard.py:1550 -msgid "Height size (in cells)?" +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1967 +msgid "" +"Performs different aggregation algorithms from r.series on all or a subset " +"of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1344 -#: ../gui/wxpython/rlisetup/wizard.py:1550 -msgid "Name of the circle mask" +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1968 +msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1351 -msgid "Select method of sampling unit distribution" +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1969 +msgid "" +"Aggregates temporally the maps of a space time raster dataset by a user " +"defined granularity." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1970 +msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1353 -msgid "Random non overlapping" +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1971 +msgid "" +"Aggregates data of an existing space time raster dataset using the time " +"intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1354 -msgid "Systematic contiguos" +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1972 +msgid "Sampling" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1355 -msgid "Stratified random" +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1973 +msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1356 -msgid "Systematic non contiguos" +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1974 +msgid "" +"Sample a space time raster dataset at specific vector point coordinates and " +"write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1357 -msgid "Centered over sites" +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1975 +msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1370 -#: ../gui/wxpython/rlisetup/wizard.py:1439 -msgid "What number of Sampling Units to use?" +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1976 +msgid "" +"Stores raster map values at spatial and temporal positions of vector points " +"as vector attributes." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1453 -msgid "Insert number of row strates" +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1977 +msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1454 -msgid "Insert number of column strates" +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1978 +msgid "" +"Observes specific locations in a space time raster dataset over a period of " +"time using vector points." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1460 -msgid "Insert distance between units" +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1979 +msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1490 -msgid "Set sample units" +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1980 +msgid "" +"Samples the input space time dataset(s) with a sample space time dataset and " +"print the result to stdout." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1561 -msgid "Set moving windows" +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1982 +msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1604 -#: ../gui/wxpython/rlisetup/wizard.py:1715 -msgid "Draw sampling units" +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1983 +msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1626 -msgid "Number of sampling area to draw:" +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1984 +msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1734 -msgid "Draw Sampling " +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1985 +msgid "" +"Calculates univariate statistics from the non-null cells for each registered " +"raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1804 -msgid "Select sampling areas" +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1986 +msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1813 -msgid "Is this area ok?" +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1987 +msgid "" +"Calculates univariate statistics of attributes for each registered vector " +"map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1836 -msgid "Select sample area " +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:1988 +msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1873 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/rlisetup/functions.py:155 -#, python-format +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:1989 msgid "" -"The raster map <%s> already exists. Please remove or rename the maps with " -"the prefix '%s' or select the option to overwrite existing maps" +"Calculates univariate statistics from the non-null cells for each registered " +"3D raster map of a space time 3D raster dataset." msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:1928 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:1920 -======= -#: ../gui/wxpython/rlisetup/wizard.py:1928 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/rlisetup/wizard.py:1928 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/functions.py:139 -msgid "The polygon seems to have 0 areas" +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:1990 +msgid "Report temporal topology" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/wizard.py:1923 -msgid "Select sample area 1 of " +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:1991 +msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1961 -msgid "Configuration file name:" +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1999 +msgid "GUI tools" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1977 -msgid "Raster name:" +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:2023 +msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1993 -msgid "Vector name:" +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:2024 +msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2010 -msgid "Region type:" +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:2021 +msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2044 -msgid "Sampling area type:" +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:2022 +msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2158 -msgid "Region keyboard values:" +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/menustrings.py:2117 +msgid "&Help" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2178 -#: ../gui/wxpython/rlisetup/wizard.py:2205 -#: ../gui/wxpython/rlisetup/wizard.py:2209 -msgid "Type of shape:" +#: ../gui/wxpython/menustrings.py:1049 +msgid "GRASS help" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2181 -#: ../gui/wxpython/rlisetup/wizard.py:2212 -msgid "Radius size:" +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:1052 +msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2182 -#: ../gui/wxpython/rlisetup/wizard.py:2213 -msgid "Name circle mask:" +#: ../gui/wxpython/menustrings.py:1051 +msgid "GUI help" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2184 -#: ../gui/wxpython/rlisetup/wizard.py:2215 -msgid "Width size:" +#: ../gui/wxpython/menustrings.py:1053 +msgid "About system" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2185 -#: ../gui/wxpython/rlisetup/wizard.py:2216 -msgid "Height size:" +#: ../gui/wxpython/menustrings.py:1054 +msgid "Prints system information" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2188 -msgid "Method of distribution:" +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/gui_core/ghelp.py:60 +msgid "About GRASS GIS" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2191 -msgid "Number sampling units:" +#: ../gui/wxpython/menustrings.py:1059 +msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2194 -msgid "Distance between units:" +#: ../gui/wxpython/menustrings.py:2002 +msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2197 -msgid "Number row strates:" +#: ../gui/wxpython/menustrings.py:2008 +msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2199 -msgid "Number column strates:" +#: ../gui/wxpython/menustrings.py:2015 +msgid "Managing GCPs for 3D correction" msgstr "" -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/wizard.py:1931 -msgid "Select sample area 1 of " +#: ../gui/wxpython/menustrings.py:2026 +msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1969 -msgid "Configuration file name:" +#: ../gui/wxpython/menustrings.py:2028 +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:1985 -msgid "Raster name:" +#: ../gui/wxpython/menustrings.py:2033 +msgid "Create new model" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2001 -msgid "Vector name:" +#: ../gui/wxpython/menustrings.py:2035 +msgid "Load model from file" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2018 -msgid "Region type:" +#: ../gui/wxpython/menustrings.py:2039 +msgid "Save model to file" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2052 -msgid "Sampling area type:" +#: ../gui/wxpython/menustrings.py:2041 +msgid "Close model file" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2166 -msgid "Region keyboard values:" +#: ../gui/wxpython/menustrings.py:2042 +msgid "Export to image" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2186 -#: ../gui/wxpython/rlisetup/wizard.py:2213 -#: ../gui/wxpython/rlisetup/wizard.py:2217 -msgid "Type of shape:" +#: ../gui/wxpython/menustrings.py:2044 +msgid "Export to Python" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2189 -#: ../gui/wxpython/rlisetup/wizard.py:2220 -msgid "Radius size:" +#: ../gui/wxpython/menustrings.py:2046 +msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2190 -#: ../gui/wxpython/rlisetup/wizard.py:2221 -msgid "Name circle mask:" +#: ../gui/wxpython/menustrings.py:2047 +msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2192 -#: ../gui/wxpython/rlisetup/wizard.py:2223 -msgid "Width size:" +#: ../gui/wxpython/menustrings.py:2051 +msgid "&Model" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2193 -#: ../gui/wxpython/rlisetup/wizard.py:2224 -msgid "Height size:" +#: ../gui/wxpython/menustrings.py:2052 +msgid "Add command" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2196 -msgid "Method of distribution:" +#: ../gui/wxpython/menustrings.py:2053 +msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2199 -msgid "Number sampling units:" +#: ../gui/wxpython/menustrings.py:2054 +msgid "Add data" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2202 -msgid "Distance between units:" +#: ../gui/wxpython/menustrings.py:2055 +msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2205 -msgid "Number row strates:" +#: ../gui/wxpython/menustrings.py:2056 +msgid "Define relation" msgstr "" -#: ../gui/wxpython/rlisetup/wizard.py:2207 -msgid "Number column strates:" +#: ../gui/wxpython/menustrings.py:2057 +msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:225 -#: ../gui/wxpython/rlisetup/sampling_frame.py:346 -#, python-format -msgid "The raster file %s already exists, please change name" +#: ../gui/wxpython/menustrings.py:2058 +msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:254 -msgid "Raster map not created. Please redraw region." +#: ../gui/wxpython/menustrings.py:2059 +msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:371 -msgid "Raster map not created. redraw region again." +#: ../gui/wxpython/menustrings.py:2060 +msgid "Add condition" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:442 -msgid "Draw sampling frame by clicking and dragging" +#: ../gui/wxpython/menustrings.py:2061 +msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:446 -msgid "Draw sampling rectangle" +#: ../gui/wxpython/menustrings.py:2063 +msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:447 -msgid "Draw sampling rectangle by clicking and dragging" +#: ../gui/wxpython/menustrings.py:2064 +msgid "Remove item" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:451 -msgid "Draw sampling circle" +#: ../gui/wxpython/menustrings.py:2065 +msgid "Remove action/data from model" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:452 -msgid "Draw sampling circle radius by clicking and dragging" +#: ../gui/wxpython/menustrings.py:2067 +msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/rlisetup/sampling_frame.py:457 -msgid "Draw sampling region by polygon. Right Double click to end drawing" +#: ../gui/wxpython/menustrings.py:2068 +msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/rlisetup/g.gui.rlisetup.py:48 -msgid "Setup for r.li modules - GRASS GIS" +#: ../gui/wxpython/menustrings.py:2069 +msgid "Delete intermediate data defined in the model" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#: ../gui/wxpython/rlisetup/frame.py:26 -msgid "Modify the configuration file" +#: ../gui/wxpython/menustrings.py:2071 +msgid "Run entire model" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:44 -#, python-brace-format -msgid "View and modify the configuration file '{name}'" +#: ../gui/wxpython/menustrings.py:2073 +msgid "Validate entire model" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/frame.py:97 -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/frame.py:101 -======= -#: ../gui/wxpython/rlisetup/frame.py:97 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= -#: ../gui/wxpython/rlisetup/frame.py:97 ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#, python-brace-format -msgid "" -"Are you sure that you want modify r.li configuration file {name}?\n" -"You could broke the configuration file..." +#: ../gui/wxpython/menustrings.py:2076 +msgid "Display the HTML man pages of Graphical modeler" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/frame.py:106 -msgid "WARNING" +#: ../gui/wxpython/menustrings.py:2077 +msgid "About Graphical Modeler" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:130 -msgid "Setup for r.li modules" +#: ../gui/wxpython/menustrings.py:2078 +msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:150 -msgid "Available sampling area configuration files" +#: ../gui/wxpython/menustrings.py:2083 ../gui/wxpython/psmap/toolbars.py:83 +msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:160 -msgid "Remove a configuration file" +#: ../gui/wxpython/menustrings.py:2084 +msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:162 -msgid "Create a new configuration file" +#: ../gui/wxpython/menustrings.py:2085 ../gui/wxpython/psmap/toolbars.py:74 +msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:164 -msgid "Rename a configuration file" +#: ../gui/wxpython/menustrings.py:2086 +msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:165 -msgid "View/Edit" +#: ../gui/wxpython/menustrings.py:2087 ../gui/wxpython/psmap/toolbars.py:71 +msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:166 -msgid "View and edit a configuration file" +#: ../gui/wxpython/menustrings.py:2088 +msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:239 ../gui/wxpython/rlisetup/frame.py:269 -#: ../gui/wxpython/rlisetup/frame.py:295 -msgid "You have to select a configuration file" +#: ../gui/wxpython/menustrings.py:2089 ../gui/wxpython/psmap/toolbars.py:77 +msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:244 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/frame.py:102 -msgid "WARNING" +#: ../gui/wxpython/menustrings.py:2090 +msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:126 -msgid "Setup for r.li modules" +#: ../gui/wxpython/menustrings.py:2091 ../gui/wxpython/psmap/toolbars.py:79 +msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:146 -msgid "Available sampling area configuration files" +#: ../gui/wxpython/menustrings.py:2092 ../gui/wxpython/menustrings.py:2093 +msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:156 -msgid "Remove a configuration file" +#: ../gui/wxpython/menustrings.py:2095 +msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:157 ../gui/wxpython/menustrings.py:954 -#: ../gui/wxpython/menustrings.py:1905 -msgid "Create" +#: ../gui/wxpython/menustrings.py:2096 +msgid "&Insert" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:158 -msgid "Create a new configuration file" +#: ../gui/wxpython/menustrings.py:2097 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:892 ../gui/wxpython/psmap/dialogs.py:941 +msgid "Map frame" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:160 -msgid "Rename a configuration file" +#: ../gui/wxpython/menustrings.py:2098 +msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:161 -msgid "View/Edit" +#: ../gui/wxpython/menustrings.py:2100 +msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:162 -msgid "View and edit a configuration file" +#: ../gui/wxpython/menustrings.py:2102 +msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:235 ../gui/wxpython/rlisetup/frame.py:265 -#: ../gui/wxpython/rlisetup/frame.py:291 -msgid "You have to select a configuration file" +#: ../gui/wxpython/menustrings.py:2103 +msgid "Map legend" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:240 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#, python-format -msgid "Do you want remove r.li configuration file <%s>?" +#: ../gui/wxpython/menustrings.py:2104 +msgid "Add or edit raster and vector legend" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/frame.py:245 -msgid "Remove new r.li configuration file?" +#: ../gui/wxpython/menustrings.py:2105 ../gui/wxpython/psmap/toolbars.py:98 +msgid "Map info" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:275 -======= -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -#: ../gui/wxpython/rlisetup/frame.py:241 -msgid "Remove new r.li configuration file?" +#: ../gui/wxpython/menustrings.py:2106 +msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/rlisetup/frame.py:271 -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 -#, python-format -msgid "" -"Set the new name for %s \" " -"\"configuration file" +#: ../gui/wxpython/menustrings.py:2108 +msgid "Add or edit scale bar" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -#: ../gui/wxpython/rlisetup/frame.py:279 -msgid "Rename configuration file" +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:94 +msgid "Delete selected object" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 -msgid "GRASS GIS" +#: ../gui/wxpython/menustrings.py:2119 +msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/main_window/frame.py:158 -msgid "There were some issues when loading menu or Tools:" +#: ../gui/wxpython/menustrings.py:2120 +msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 -msgid "Rename current Map Display" +#: ../gui/wxpython/menustrings.py:2121 +msgid "Display information about Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:148 +msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format -msgid "Map Display {number}" +msgid "" +"Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " +"{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 -msgid "Close Map Display {}" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded location is not valid" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 -msgid "Workspace Toolbar" +#: ../gui/wxpython/startup/locdownload.py:225 +msgid "Abort" msgstr "" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 -msgid "Tools Toolbar" +#: ../gui/wxpython/startup/locdownload.py:226 +msgid "Abort download location" msgstr "" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 -msgid "3D view Toolbar" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample location to download:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 -msgid "Console" +#: ../gui/wxpython/startup/locdownload.py:294 +#: ../gui/wxpython/startup/locdownload.py:304 +#: ../gui/wxpython/startup/locdownload.py:441 +msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 -msgid "Map Swipe Tool" +#: ../gui/wxpython/startup/locdownload.py:294 +#: ../gui/wxpython/startup/locdownload.py:442 +msgid "Download selected location" msgstr "" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 -msgid "Choose model to run" +#: ../gui/wxpython/startup/locdownload.py:304 +#: ../gui/wxpython/startup/locdownload.py:383 +msgid "Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:311 +#: ../gui/wxpython/startup/locdownload.py:358 +msgid "Download in progress, wait until it is finished" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:326 +#, python-format +msgid "Location named <%s> already exists, download canceled" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995 +#: ../gui/wxpython/startup/locdownload.py:335 #, python-format +msgid "Download failed: %s" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:340 msgid "" -"Command '%s' not yet implemented in the WxGUI. Try adding it as a command " -"layer instead." +"Download completed. The downloaded sample data is listed in the location/" +"mapset tabs upon closing of this window" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 -msgid "Selected map layer is not vector." +#: ../gui/wxpython/startup/locdownload.py:381 +#, python-format +msgid "Location named <%s> already exists, rename it first" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 -msgid "Editing is allowed only for vector maps from the current mapset." +#: ../gui/wxpython/startup/locdownload.py:417 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 +#, python-brace-format +msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 -msgid "Choose script file to run" +#: ../gui/wxpython/startup/locdownload.py:434 +msgid "Location Download" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 -msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" +#: ../gui/wxpython/startup/locdownload.py:485 +msgid "Do you want to cancel location download?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 -#, python-format -msgid "Script file '%s' doesn't exist. Operation canceled." +#: ../gui/wxpython/startup/locdownload.py:486 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 -#, python-format -msgid "" -"Script <%s> is not executable. Do you want to set the permissions that " -"allows you to run this script (note that you must be the owner of the file)?" +#: ../gui/wxpython/startup/guiutils.py:85 +msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 -msgid "Set permission?" +#: ../gui/wxpython/startup/guiutils.py:113 +msgid "Invalid location name" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 -msgid "Unable to set permission. Operation canceled." +#: ../gui/wxpython/startup/guiutils.py:127 +msgid "Name for the new mapset:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:142 +msgid "Unable to create new mapset: {}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:167 +msgid "Do you want to import {} to the newly created location?" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:172 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 +msgid "Import data?" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:223 +#, python-brace-format msgid "" -"Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " -"directory to GRASS_ADDON_PATH?" +"Cannot rename mapset <{mapset}> for the following reason:\n" +"\n" +"{reason}\n" +"\n" +"No mapset will be renamed." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 -msgid "Update Addons path?" +#: ../gui/wxpython/startup/guiutils.py:227 +msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 -#, python-format -msgid "Launching script '%s'..." +#: ../gui/wxpython/startup/guiutils.py:238 +#: ../gui/wxpython/startup/guiutils.py:292 +msgid "" +"Current name: {}\n" +"\n" +"Enter new name:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." +#: ../gui/wxpython/startup/guiutils.py:239 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 +msgid "Rename selected mapset" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 -msgid "No mapset provided. Operation canceled." +#: ../gui/wxpython/startup/guiutils.py:252 +msgid "" +"Unable to rename mapset.\n" +"\n" +"{}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:277 +#, python-brace-format msgid "" -"Working directory changed to:\n" -"\"%s\"" +"Cannot rename location <{location}> for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No location will be renamed." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 -msgid "Changes current working directory for this GUI." +#: ../gui/wxpython/startup/guiutils.py:281 +msgid "Unable to rename selected location" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 -msgid "Usage: cd [directory]" +#: ../gui/wxpython/startup/guiutils.py:293 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 -msgid "Without parameters it opens a dialog." +#: ../gui/wxpython/startup/guiutils.py:305 +msgid "" +"Unable to rename location.\n" +"\n" +"{}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/startup/guiutils.py:367 +#, python-brace-format msgid "" -"If ~ (tilde) is present as the first directory on the path, it is replaced " -"by user's home directory." +"Cannot delete one or more mapsets for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 -msgid "More than one parameter provided." +#: ../gui/wxpython/startup/guiutils.py:371 +msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 -msgid "Choose a working directory" +#: ../gui/wxpython/startup/guiutils.py:387 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following mapsets?\n" +"\n" +"{deletes}\n" +"\n" +"All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 -msgid "System Info" +#: ../gui/wxpython/startup/guiutils.py:392 +msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 -msgid "GRASS version" +#: ../gui/wxpython/startup/guiutils.py:405 +msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 -msgid "Code revision" +#: ../gui/wxpython/startup/guiutils.py:407 +#, python-brace-format +msgid "" +"The following error occured when deleting mapset <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 -msgid "Build date" +#: ../gui/wxpython/startup/guiutils.py:452 +#, python-brace-format +msgid "" +"Cannot delete one or more locations for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No locations will be deleted." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 -msgid "Build platform" +#: ../gui/wxpython/startup/guiutils.py:456 +msgid "Unable to delete selected locations" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 -msgid "Platform" +#: ../gui/wxpython/startup/guiutils.py:472 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following " +"locations?\n" +"\n" +"{deletes}\n" +"\n" +"All mapsets included in these locations will be permanently deleted!" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 -msgid "Close all Map Displays" +#: ../gui/wxpython/startup/guiutils.py:477 +msgid "Delete selected locations" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 -msgid "Enter new name:" +#: ../gui/wxpython/startup/guiutils.py:490 +msgid "Error when deleting locations" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 -msgid "Rename Map Display" +#: ../gui/wxpython/startup/guiutils.py:492 +#, python-brace-format +msgid "" +"The following error occured when deleting location <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of locations was interrupted." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:525 +#, python-brace-format msgid "" -"Unable to launch \"Supervised Classification Tool\".\n" +"Cannot delete GRASS database from disk for the following reason:\n" "\n" -"Reason: %s" +"{reasons}\n" +"\n" +"GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 -msgid "Unable to start Timeline Tool." +#: ../gui/wxpython/startup/guiutils.py:529 +msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 -msgid "Unable to start Temporal Plot Tool." +#: ../gui/wxpython/startup/guiutils.py:537 +#, python-brace-format +msgid "" +"Do you want to delete the following GRASS database from disk?\n" +"\n" +"{grassdb}\n" +"\n" +"The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 -msgid "Add selected map layers into layer tree" +#: ../gui/wxpython/startup/guiutils.py:542 +msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 -#, python-format -msgid "Unsupported map layer type <%s>." +#: ../gui/wxpython/startup/guiutils.py:554 +msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/startup/guiutils.py:556 +#, python-brace-format msgid "" -"Note that cell values can only be displayed for regions of less than 10,000 " -"cells." +"The following error occured when deleting database <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 -msgid "opacity:" +#: ../gui/wxpython/startup/guiutils.py:589 +#, python-brace-format +msgid "" +"User {user} is already running GRASS in selected mapset <{mapset}>\n" +" (file {lockpath} created {timestamp} found).\n" +"\n" +"Concurrent use not allowed.\n" +"\n" +"Do you want to stay in the current mapset or remove .gislock and switch to " +"selected mapset?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 -#, python-format -msgid "" -"Do you want to remove map layer(s)\n" -"%s\n" -"from layer tree?" +#: ../gui/wxpython/startup/guiutils.py:596 +msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 -msgid "Do you want to remove selected map layer(s) from layer tree?" +#: ../gui/wxpython/startup/guiutils.py:607 +msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 -msgid "Remove map layer" +#: ../gui/wxpython/startup/guiutils.py:609 +#, python-brace-format +msgid "" +"Unable to remove {lockpath}.\n" +"\n" +" Details: {error}." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 -msgid "Quit GRASS GUI" +#: ../gui/wxpython/startup/guiutils.py:649 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 +#, python-format +msgid "" +"Import of <%(name)s> failed.\n" +"Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/startup/guiutils.py:655 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format msgid "" -"Display resolution is currently not constrained to computational settings. " -"It's suggested to constrain map to region geometry. Do you want to constrain " -"the resolution?" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 -msgid "Constrain map to region geometry?" +#: ../gui/wxpython/startup/guiutils.py:686 +#, python-format +msgid "" +"Current GRASS database is <%(dbase)s>.\n" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:99 -msgid "Please provide a group name to process" +#: ../gui/wxpython/startup/guiutils.py:716 +#, python-format +msgid "Current mapset is <%s>." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:104 -msgid "Please provide a raster map name to process" +#: ../gui/wxpython/dbmgr/base.py:188 +#, python-format +msgid "" +"Attribute table <%s> not found. For creating the table switch to 'Manage " +"layers' tab." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 -msgid "Please provide a camera name (generated by i.ortho.camera)" +#: ../gui/wxpython/dbmgr/base.py:204 +#, python-format +msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:115 -msgid "Please provive an order value (1 if 4 Fiducials, 2 if 8 Fiducials)" +#: ../gui/wxpython/dbmgr/base.py:279 +msgid "Can display only 256 columns." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:121 -msgid "Please provive an output files extension (used by i.rectify)" +#: ../gui/wxpython/dbmgr/base.py:308 +#, python-brace-format +msgid "" +"Incorrect encoding {enc} used. Set encoding in GUI Settings or set " +"GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:45 -msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" +#: ../gui/wxpython/dbmgr/base.py:327 +#, python-brace-format +msgid "" +"Unable to read the table <{table}> from the database due to seemingly " +"inconsistent number of columns in the data transfer. Check row: {row}... " +"Likely, a newline character is present in the attribute value starting with: " +"'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 -msgid "Manage Location of Fiducial Points on a Scanned Photo" +#: ../gui/wxpython/dbmgr/base.py:341 +msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 -msgid "A POINTS file exists, renaming it to POINTS_BAK" +#: ../gui/wxpython/dbmgr/base.py:366 ../gui/wxpython/dbmgr/base.py:947 +#: ../gui/wxpython/dbmgr/base.py:1118 ../gui/wxpython/dbmgr/base.py:1469 +#: ../gui/wxpython/dbmgr/base.py:2162 ../gui/wxpython/dbmgr/manager.py:236 +#, python-format +msgid "Number of loaded records: %d" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 -msgid "Opening CAMERA file failed" +#: ../gui/wxpython/dbmgr/base.py:389 +msgid "Unknown value" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 -msgid "Writing output image to group, please wait..." +#: ../gui/wxpython/dbmgr/base.py:397 +msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 -msgid "source X" +#: ../gui/wxpython/dbmgr/base.py:410 +#, python-format +msgid "" +"Error loading attribute data. Record number: %(rec)d. Unable to convert " +"value '%(val)s' in key column (%(key)s) to integer.\n" +"\n" +"Details: %(detail)s" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 -msgid "source Y" +#: ../gui/wxpython/dbmgr/base.py:498 +msgid "Sort ascending" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 -msgid "target X" +#: ../gui/wxpython/dbmgr/base.py:499 +msgid "Sort descending" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 -msgid "target Y" +#: ../gui/wxpython/dbmgr/base.py:503 +msgid "Calculate (only numeric columns)" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 -msgid "source X:" +#: ../gui/wxpython/dbmgr/base.py:505 +msgid "Field calculator" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 -msgid "target X:" +#: ../gui/wxpython/dbmgr/base.py:524 +msgid "Area size" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 -msgid "source Y:" +#: ../gui/wxpython/dbmgr/base.py:525 +msgid "Line length" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 -msgid "target Y:" +#: ../gui/wxpython/dbmgr/base.py:526 +msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:54 -msgid "Import data from WMS server" +#: ../gui/wxpython/dbmgr/base.py:529 +msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:55 -msgid "Add command layer" +#: ../gui/wxpython/dbmgr/base.py:531 +msgid "Perimeter length of an area" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:59 -msgid "Add HIS map layer" +#: ../gui/wxpython/dbmgr/base.py:532 +msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:61 -msgid "Add shaded relief map layer" +#: ../gui/wxpython/dbmgr/base.py:533 +msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:63 -msgid "Add raster flow arrows" +#: ../gui/wxpython/dbmgr/base.py:534 +msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:64 -msgid "Add raster cell numbers" +#: ../gui/wxpython/dbmgr/base.py:535 +msgid "Line azimuth" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:67 -msgid "Add thematic (choropleth) vector map layer" +#: ../gui/wxpython/dbmgr/base.py:661 +#, python-format +msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:70 -msgid "Add thematic chart layer" +#: ../gui/wxpython/dbmgr/base.py:1048 +msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:72 -msgid "Add grid layer" +#: ../gui/wxpython/dbmgr/base.py:1063 +#, python-format +msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:74 -msgid "Add geodesic line layer" +#: ../gui/wxpython/dbmgr/base.py:1152 +msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:76 -msgid "Add rhumbline layer" +#: ../gui/wxpython/dbmgr/base.py:1167 ../gui/wxpython/dbmgr/base.py:2324 +#: ../gui/wxpython/dbmgr/base.py:3032 ../gui/wxpython/dbmgr/base.py:3176 +#: ../gui/wxpython/dbmgr/base.py:3448 +msgid "Table" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:77 ../gui/wxpython/psmap/toolbars.py:107 -msgid "Add labels" +#: ../gui/wxpython/dbmgr/base.py:1169 ../gui/wxpython/dbmgr/base.py:2326 +msgid " (read-only)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:81 -msgid "Note that 3D raster data are rendered only in 3D view mode" +#: ../gui/wxpython/dbmgr/base.py:1186 +msgid "SQL Query" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1210 +msgid "Simple" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1213 +msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:83 -msgid "Add WMS layer." +#: ../gui/wxpython/dbmgr/base.py:1243 ../gui/wxpython/dbmgr/base.py:1269 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#, python-format +msgid "Example: %s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:84 -#: ../gui/wxpython/animation/dialogs.py:462 -msgid "Set options" +#: ../gui/wxpython/dbmgr/base.py:1254 +msgid "Builder" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:85 -msgid "Editing mode" +#: ../gui/wxpython/dbmgr/base.py:1257 +msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:86 -msgid "Background vector map" +#: ../gui/wxpython/dbmgr/base.py:1438 ../gui/wxpython/dbmgr/base.py:1623 +msgid "Insert new record" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 -msgid "Map Layers" +#: ../gui/wxpython/dbmgr/base.py:1439 +msgid "Delete selected record(s)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:464 -msgid "Check selected layers" +#: ../gui/wxpython/dbmgr/base.py:1440 +msgid "Delete all records" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:475 -msgid "Uncheck selected layers" +#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/gui_core/widgets.py:1106 +#: ../gui/wxpython/gui_core/dialogs.py:846 +#: ../gui/wxpython/gui_core/dialogs.py:904 +#: ../gui/wxpython/gui_core/dialogs.py:1625 +msgid "Select all" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:526 -msgid "3D view properties" +#: ../gui/wxpython/dbmgr/base.py:1447 ../gui/wxpython/gui_core/widgets.py:1107 +#: ../gui/wxpython/gui_core/dialogs.py:1627 +msgid "Deselect all" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:536 -msgid "Zoom to selected map(s)" +#: ../gui/wxpython/dbmgr/base.py:1449 +#: ../gui/wxpython/gui_core/preferences.py:1486 +msgid "Highlight selected features" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:548 -msgid "Zoom to selected map(s) (ignore NULLs)" +#: ../gui/wxpython/dbmgr/base.py:1450 +msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:559 -msgid "Set computational region from selected map(s)" +#: ../gui/wxpython/dbmgr/base.py:1454 ../gui/wxpython/dbmgr/base.py:1993 +msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:572 -msgid "Align computational region to selected map" +#: ../gui/wxpython/dbmgr/base.py:1455 +msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 -msgid "Export common formats" +#: ../gui/wxpython/dbmgr/base.py:1516 +msgid "Update existing record" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 -msgid "Export PostGIS" +#: ../gui/wxpython/dbmgr/base.py:1547 ../gui/wxpython/dbmgr/base.py:1666 +#, python-format +msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 -msgid "Create pack" +#: ../gui/wxpython/dbmgr/base.py:1562 +#, python-format +msgid "" +"Unable to update existing record.\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 -msgid "Make a copy in the current mapset" +#: ../gui/wxpython/dbmgr/base.py:1638 +#, python-format +msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 -msgid "Set color table" +#: ../gui/wxpython/dbmgr/base.py:1652 +#, python-format +msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 -msgid "Set color table interactively" +#: ../gui/wxpython/dbmgr/base.py:1682 +#, python-format +msgid "" +"Unable to insert new record.\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:656 -msgid "Show attribute data" +#: ../gui/wxpython/dbmgr/base.py:1736 +#, python-format +msgid "" +"Selected data records (%d) will be permanently deleted from table. Do you " +"want to delete them?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:672 -msgid "Start editing" +#: ../gui/wxpython/dbmgr/base.py:1740 ../gui/wxpython/dbmgr/base.py:1790 +msgid "Delete records" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:677 -msgid "Stop editing" +#: ../gui/wxpython/dbmgr/base.py:1786 +#, python-format +msgid "" +"All data records (%d) will be permanently deleted from table. Do you want to " +"delete them?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:694 -msgid "Rebuild topology" +#: ../gui/wxpython/dbmgr/base.py:1987 +msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:803 -msgid "Report raster statistics" +#: ../gui/wxpython/dbmgr/base.py:2028 +msgid "Nothing to delete." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:811 -msgid "Profile" +#: ../gui/wxpython/dbmgr/base.py:2106 ../gui/wxpython/dbmgr/base.py:2142 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:854 -msgid "Save web service layer" +#: ../gui/wxpython/dbmgr/base.py:2122 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"Invalid SQL select statement.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 -msgid "Unable to create profile of raster map." +#: ../gui/wxpython/dbmgr/base.py:2343 ../gui/wxpython/dbmgr/sqlbuilder.py:109 +msgid "Database connection" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/dbmgr/base.py:2360 #, python-format -msgid "Unsupported map type <%s>" +msgid "Table <%s> - right-click to delete column(s)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 -#, python-format -msgid "Enter name for the new %s in the current mapset:" +#: ../gui/wxpython/dbmgr/base.py:2385 ../gui/wxpython/dbmgr/base.py:2447 +#: ../gui/wxpython/dbmgr/dialogs.py:809 +msgid "Column" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 -#, python-format -msgid "Make a copy of %s <%s>" +#: ../gui/wxpython/dbmgr/base.py:2417 ../gui/wxpython/dbmgr/dialogs.py:832 +msgid "Length" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 -#, python-format -msgid "" -"%s <%s> already exists in the current mapset. Do you want to overwrite it?" +#: ../gui/wxpython/dbmgr/base.py:2587 +msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/dbmgr/base.py:2597 #, python-format -msgid "Unable to make copy of <%s>" +msgid "" +"Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " +"exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/dbmgr/base.py:2621 #, python-format -msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." +msgid "" +"Unable to rename column. Column <%(column)s> doesn't exist in the table <" +"%(table)s>." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 -msgid "Unable to display histogram of raster map. No map name defined." +#: ../gui/wxpython/dbmgr/base.py:2652 +msgid "Drop selected column" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 -msgid "Layer group:" +#: ../gui/wxpython/dbmgr/base.py:2660 +msgid "Drop all columns" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 -msgid "Click to edit layer settings" +#: ../gui/wxpython/dbmgr/base.py:2691 +#, python-format +msgid "" +"Selected %s will PERMANENTLY removed from table. Do you want to drop the " +"column?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 -msgid "(double click to set properties)" +#: ../gui/wxpython/dbmgr/base.py:2695 ../gui/wxpython/dbmgr/base.py:2743 +msgid "Drop column(s)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1757 -msgid "Please wait, updating data..." +#: ../gui/wxpython/dbmgr/base.py:2739 +#, python-format +msgid "" +"Selected columns\n" +"%s\n" +"will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:85 -msgid "Left mouse click to remove the MASK" +#: ../gui/wxpython/dbmgr/base.py:2848 +msgid "List of layers" msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:137 -msgid "Are you sure that you want to remove the MASK?" +#: ../gui/wxpython/dbmgr/base.py:2927 ../gui/wxpython/dbmgr/base.py:3368 +#: ../gui/wxpython/dbmgr/base.py:3828 +#, python-format +msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:138 -msgid "Remove MASK" +#: ../gui/wxpython/dbmgr/base.py:2973 +msgid "Column name" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:46 -msgid "Create new workspace (Ctrl+N)" +#: ../gui/wxpython/dbmgr/base.py:2973 +msgid "Data length" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:49 -msgid "Open existing workspace file (Ctrl+O)" +#: ../gui/wxpython/dbmgr/base.py:3032 ../gui/wxpython/dbmgr/base.py:3141 +#: ../gui/wxpython/dbmgr/base.py:3413 ../gui/wxpython/dbmgr/dialogs.py:519 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 +#: ../gui/wxpython/vdigit/dialogs.py:132 ../gui/wxpython/vdigit/dialogs.py:581 +msgid "Layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:52 -msgid "Save current workspace to file (Ctrl+S)" +#: ../gui/wxpython/dbmgr/base.py:3032 ../gui/wxpython/dbmgr/base.py:3154 +#: ../gui/wxpython/dbmgr/base.py:3425 +msgid "Driver" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:58 -msgid "New workspace" +#: ../gui/wxpython/dbmgr/base.py:3032 ../gui/wxpython/dbmgr/base.py:3165 +#: ../gui/wxpython/dbmgr/base.py:3436 ../gui/wxpython/gui_core/gselect.py:1487 +msgid "Database" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:63 -msgid "Open workspace" +#: ../gui/wxpython/dbmgr/base.py:3032 +msgid "Key" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:93 -msgid "Add multiple raster or vector map layers (Ctrl+Shift+L)" +#: ../gui/wxpython/dbmgr/base.py:3121 +msgid "Add layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:96 -msgid "Add raster map layer (Ctrl+Shift+R)" +#: ../gui/wxpython/dbmgr/base.py:3131 +msgid "Layer description" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:100 -msgid "Add various raster map layers (RGB, HIS, shaded relief...)" +#: ../gui/wxpython/dbmgr/base.py:3187 ../gui/wxpython/dbmgr/base.py:3250 +#: ../gui/wxpython/dbmgr/base.py:3459 +msgid "Key column" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:103 -msgid "Add vector map layer (Ctrl+Shift+V)" +#: ../gui/wxpython/dbmgr/base.py:3200 +msgid "Insert record for each category into table" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:107 -msgid "Add various vector map layers (thematic, chart...)" +#: ../gui/wxpython/dbmgr/base.py:3223 +msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:111 -msgid "Add web service layer (WMS, WMTS, NASA OnEarth)" +#: ../gui/wxpython/dbmgr/base.py:3228 +msgid "Table description" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:113 -msgid "Add group" +#: ../gui/wxpython/dbmgr/base.py:3239 +msgid "Table name" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:114 ../gui/wxpython/lmgr/toolbars.py:153 -msgid "Add various overlays" +#: ../gui/wxpython/dbmgr/base.py:3264 +msgid "&Create table" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:117 -msgid "Remove selected map layer(s) from layer tree" +#: ../gui/wxpython/dbmgr/base.py:3267 +#: ../gui/wxpython/web_services/dialogs.py:543 +msgid "&Add layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:119 -msgid "Edit selected vector map" +#: ../gui/wxpython/dbmgr/base.py:3270 +msgid "&Set default" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:121 -msgid "Show attribute data for selected vector map" +#: ../gui/wxpython/dbmgr/base.py:3342 +msgid "Remove layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:128 -msgid "Add multiple map layers" +#: ../gui/wxpython/dbmgr/base.py:3345 +msgid "Layer to remove" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:138 -msgid "Add various raster maps" +#: ../gui/wxpython/dbmgr/base.py:3376 +msgid "&Remove layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:143 -msgid "Add vector map" +#: ../gui/wxpython/dbmgr/base.py:3405 +msgid "Modify layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:148 -msgid "Add various vector maps" +#: ../gui/wxpython/dbmgr/base.py:3506 +msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:158 -msgid "Add web service map" +#: ../gui/wxpython/dbmgr/base.py:3549 +msgid "" +"Unable to get list of tables.\n" +"Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:169 -msgid "Delete map layer" +#: ../gui/wxpython/dbmgr/base.py:3655 +msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:203 -msgid "Start new map display" +#: ../gui/wxpython/dbmgr/base.py:3665 +#, python-format +msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:209 -msgid "Georectifier" +#: ../gui/wxpython/dbmgr/base.py:3710 +#, python-format +msgid "" +"Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " +"exists." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:212 -msgid "Launch user-defined script" +#: ../gui/wxpython/dbmgr/base.py:3893 +msgid "Field statistics" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:80 -msgid "Open a simple Python code editor" +#: ../gui/wxpython/dbmgr/base.py:3916 +msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:222 -msgid "New display" +#: ../gui/wxpython/dbmgr/base.py:3977 +msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:254 -msgid "Python code editor" +#: ../gui/wxpython/dbmgr/base.py:4004 +msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:276 -msgid "GUI settings" +#: ../gui/wxpython/dbmgr/base.py:4013 +#, python-format +msgid "" +"Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:277 -msgid "GRASS manual" +#: ../gui/wxpython/dbmgr/base.py:4040 +msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:317 -msgid "Generate command for m.nviz.image" +#: ../gui/wxpython/dbmgr/base.py:4048 +#, python-format +msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:318 -msgid "Generate command for m.nviz.image based on current state" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 +msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:322 -msgid "3D view mode settings" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 +msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:323 -msgid "Show 3D view mode settings dialog" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:147 +msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:325 -msgid "Show 3D view mode manual" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:223 +msgid "Columns" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:48 -#, python-format -msgid "Welcome to wxGUI Interactive Python Shell %s" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:240 +msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:50 -#, python-format -msgid "Type %s for more GRASS scripting related information." +#: ../gui/wxpython/dbmgr/sqlbuilder.py:254 +msgid "Values" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:52 -#, python-format -msgid "Type %s to add raster or vector to the layer tree." +#: ../gui/wxpython/dbmgr/sqlbuilder.py:267 +msgid "Get all values" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:74 -msgid "Delete all text from the shell" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 +msgid "Get sample" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:78 -msgid "Simple &editor" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:273 +msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:135 -#, python-format -msgid "Raster or vector map <%s> not found" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:288 +msgid "Go to:" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:141 -#, python-format -msgid "Raster map <%s> added" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:300 +msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:143 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:482 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:640 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:892 #, python-format -msgid "Vector map <%s> added" -msgstr "" - -#: ../gui/wxpython/lmgr/workspace.py:72 -msgid "" -"Current workspace is not empty. Do you want to store current settings to " -"workspace file?" +msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:76 -msgid "Create new workspace?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:488 +msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:105 -msgid "Choose workspace file" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:489 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:647 +msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:107 ../gui/wxpython/lmgr/workspace.py:366 -msgid "GRASS Workspace File (*.gxw)|*.gxw" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:513 +msgid "Verify" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:136 -msgid "Most likely the database, location or mapset does not exist" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:514 +msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:139 -#, python-brace-format -msgid "" -"Unable to change to location and mapset specified in the workspace.\n" -"Reason: {reason}\n" -"Details: {details}\n" -"\n" -"Do you want to proceed with opening the workspace anyway?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:522 +msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:148 -msgid "Proceed with opening of the workspace?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:568 +msgid "SQL statement is not valid" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:179 -#: ../gui/wxpython/animation/nviztask.py:40 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 #, python-format msgid "" -"Reading workspace file <%s> failed.\n" -"Invalid file, unable to parse XML document." -msgstr "" - -#: ../gui/wxpython/lmgr/workspace.py:191 -msgid "Please wait, loading workspace..." +"SQL statement is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:364 -msgid "Choose file to save current workspace" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:571 +msgid "SQL statement is valid" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:385 ../gui/wxpython/lmgr/workspace.py:408 -#, python-format -msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:646 +msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:437 -msgid "Writing current settings to workspace file failed." +#: ../gui/wxpython/dbmgr/sqlbuilder.py:648 +msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:467 -msgid "Do you want to save changes in the workspace?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:736 +msgid "Functions" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:470 -msgid "Do you want to store current settings to workspace file?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:773 +msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:554 -msgid "File <{}> doesn't exist. It was probably moved or deleted." +#: ../gui/wxpython/dbmgr/sqlbuilder.py:775 +msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 -msgid "There were some issues when loading menu or Tools tab:" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:808 +msgid "Dbf driver does not support usage of SQL functions." +<<<<<<< HEAD +<<<<<<< HEAD ======= +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= #: ../gui/wxpython/rlisetup/frame.py:275 msgid "Rename configuration file" +>>>>>>> osgeo-main msgstr "" #: ../gui/wxpython/mapwin/base.py:229 @@ -32637,80 +40498,88 @@ msgstr "" #: ../gui/wxpython/dbmgr/sqlbuilder.py:808 msgid "Dbf driver does not support usage of SQL functions." <<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 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 msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " "define new connection in 'Manage layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 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 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../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 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, python-format msgid "Number of loaded records: %d" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32770,6 +40639,7 @@ msgstr "" msgid "Category" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32781,6 +40651,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 @@ -32792,100 +40667,108 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Database connection" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -32893,58 +40776,58 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -32953,19 +40836,19 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -32974,190 +40857,190 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " "want to delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " "delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -33165,7 +41048,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -33174,63 +41057,63 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " "column?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -33238,144 +41121,144 @@ msgid "" "will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " "exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format msgid "" "No attribute table found.\n" @@ -33384,40 +41267,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "" @@ -33439,7 +41322,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "" @@ -33457,138 +41340,138 @@ msgstr "" msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " "each animation." msgstr "" -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "" -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:209 +#: ../gui/wxpython/animation/utils.py:210 msgid "" "The temporal extents of maps in space-time datasets have to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" @@ -33701,7 +41584,7 @@ msgid "" msgstr "" #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "" @@ -33779,7 +41662,7 @@ msgid "Edit" msgstr "" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "" @@ -34021,37 +41904,37 @@ msgstr "" msgid "Invalid" msgstr "" -#: ../gui/wxpython/animation/provider.py:443 +#: ../gui/wxpython/animation/provider.py:444 msgid "Rendering map layers" msgstr "" -#: ../gui/wxpython/animation/provider.py:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "" -#: ../gui/wxpython/animation/provider.py:789 +#: ../gui/wxpython/animation/provider.py:792 #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -34061,6 +41944,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37165,6 +45051,7 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:154 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37176,12 +45063,18 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" "%s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:535 @@ -37190,6 +45083,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/instructions.py:530 ======= #: ../gui/wxpython/psmap/instructions.py:535 @@ -37198,6 +45093,9 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:535 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37205,6 +45103,7 @@ msgstr "" msgid "Instruction file will be loaded with following region: %s\n" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:541 @@ -37213,6 +45112,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/instructions.py:536 ======= #: ../gui/wxpython/psmap/instructions.py:541 @@ -37221,6 +45122,9 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:541 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37230,6 +45134,7 @@ msgid "" "%s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37237,7 +45142,22 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/instructions.py:706 +<<<<<<< HEAD +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 +======= #: ../gui/wxpython/psmap/instructions.py:920 #: ../gui/wxpython/psmap/instructions.py:1048 #: ../gui/wxpython/psmap/instructions.py:1123 @@ -37253,6 +45173,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37270,6 +45193,7 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:2280 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37281,10 +45205,20 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Failed to read instruction %s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:727 @@ -37293,6 +45227,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/instructions.py:722 ======= #: ../gui/wxpython/psmap/instructions.py:727 @@ -37301,6 +45237,9 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:727 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37310,6 +45249,7 @@ msgid "" "new value: %(new)s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:732 @@ -37318,6 +45258,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/instructions.py:727 ======= #: ../gui/wxpython/psmap/instructions.py:732 @@ -37326,6 +45268,9 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:732 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37335,6 +45280,7 @@ msgid "" "Use 1:25000 notation." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:746 @@ -37343,6 +45289,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/instructions.py:741 ======= #: ../gui/wxpython/psmap/instructions.py:746 @@ -37351,6 +45299,9 @@ msgstr "" #: ../gui/wxpython/psmap/instructions.py:746 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37360,6 +45311,7 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:764 @@ -37367,11 +45319,18 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/instructions.py:765 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:759 ======= #: ../gui/wxpython/psmap/instructions.py:764 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/instructions.py:764 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37379,12 +45338,22 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/instructions.py:764 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:837 @@ -37392,11 +45361,18 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/instructions.py:840 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:832 ======= #: ../gui/wxpython/psmap/instructions.py:837 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/instructions.py:837 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37404,12 +45380,22 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/instructions.py:837 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Failed to read instruction %(file)s.\n" "Unknown format %(for)s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:852 @@ -37417,11 +45403,18 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/instructions.py:856 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:847 ======= #: ../gui/wxpython/psmap/instructions.py:852 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/instructions.py:852 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37429,10 +45422,20 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/instructions.py:852 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Failed to read instruction %s." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:1132 @@ -37440,11 +45443,18 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/instructions.py:1136 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/instructions.py:1127 ======= #: ../gui/wxpython/psmap/instructions.py:1132 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/instructions.py:1132 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37452,10 +45462,20 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/instructions.py:1132 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37463,43 +45483,45 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/g.gui.psmap.py:52 msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -37512,6 +45534,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37547,6 +45572,7 @@ msgstr "" msgid "Add simple graphics: rectangles" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37554,6 +45580,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/dialogs.py:267 msgid "Units:" msgstr "" @@ -37563,6 +45591,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37605,6 +45636,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:283 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37616,11 +45648,17 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37628,6 +45666,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/dialogs.py:311 msgid "Position is given:" msgstr "" @@ -37645,6 +45685,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37663,6 +45706,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:350 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37674,143 +45718,162 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:462 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:453 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Font:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:1127 +======= #: ../gui/wxpython/psmap/dialogs.py:1101 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37937,6 +46000,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:1104 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37948,6 +46012,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Map max resolution (dpi):" msgstr "" @@ -37955,32 +46028,46 @@ msgstr "" #. GTC Line around legend or map frame <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:1286 +======= #: ../gui/wxpython/psmap/dialogs.py:1260 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38003,6 +46090,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:1263 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38014,95 +46102,118 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:1296 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:1269 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:2174 +======= #: ../gui/wxpython/psmap/dialogs.py:2143 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38181,6 +46292,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:2153 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38192,184 +46304,207 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "%s properties" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:2249 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:2218 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 +======= #: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38538,6 +46673,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:3414 ../gui/wxpython/psmap/dialogs.py:4396 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38549,78 +46685,101 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "%(rast)s: type %(type)s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:3498 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:3459 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Type of legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:3857 +======= #: ../gui/wxpython/psmap/dialogs.py:3810 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38683,6 +46842,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:3806 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38694,31 +46854,54 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Columns:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:3878 +======= #: ../gui/wxpython/psmap/dialogs.py:3831 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38733,6 +46916,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:3827 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38744,159 +46928,182 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:4133 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:4085 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:5990 +======= #: ../gui/wxpython/psmap/dialogs.py:5937 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39039,6 +47246,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:5935 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39050,11 +47258,21 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "PIL\n" "missing" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:5956 @@ -39062,11 +47280,18 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:6007 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:5954 ======= #: ../gui/wxpython/psmap/dialogs.py:5956 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/dialogs.py:5956 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -39074,10 +47299,20 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/dialogs.py:5956 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Unable to read file %s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:6019 @@ -39085,11 +47320,18 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:6070 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:6017 ======= #: ../gui/wxpython/psmap/dialogs.py:6019 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/dialogs.py:6019 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -39097,42 +47339,65 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/dialogs.py:6019 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:6092 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:6039 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/dialogs.py:6317 +======= #: ../gui/wxpython/psmap/dialogs.py:6264 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39159,6 +47424,7 @@ msgstr "" #: ../gui/wxpython/psmap/dialogs.py:6266 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39170,59 +47436,76 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -39231,6 +47514,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39281,6 +47567,7 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:215 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39292,11 +47579,17 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:275 @@ -39305,6 +47598,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/frame.py:281 ======= #: ../gui/wxpython/psmap/frame.py:275 @@ -39313,6 +47608,9 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:275 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39322,6 +47620,7 @@ msgid "" "which is required by module ps.map." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:283 @@ -39330,6 +47629,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/frame.py:289 ======= #: ../gui/wxpython/psmap/frame.py:283 @@ -39338,6 +47639,9 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:283 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39346,6 +47650,7 @@ msgid "" "required by module ps.map." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -39353,27 +47658,35 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/frame.py:320 msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/frame.py:398 +======= #: ../gui/wxpython/psmap/frame.py:397 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39396,6 +47709,7 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:391 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39407,10 +47721,20 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Ps.map exited with return code %s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:438 @@ -39418,29 +47742,40 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/frame.py:437 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:436 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Program {} is not available." msgstr "" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/frame.py:460 +======= #: ../gui/wxpython/psmap/frame.py:459 ======= #: ../gui/wxpython/psmap/frame.py:438 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD ======= #: ../gui/wxpython/psmap/frame.py:438 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -39448,42 +47783,65 @@ msgstr "" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +#: ../gui/wxpython/psmap/frame.py:438 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/frame.py:464 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:463 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/frame.py:509 +======= #: ../gui/wxpython/psmap/frame.py:508 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39514,6 +47872,7 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:485 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39525,36 +47884,59 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/frame.py:514 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:512 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/psmap/frame.py:620 +======= #: ../gui/wxpython/psmap/frame.py:618 ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39573,6 +47955,7 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:587 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39584,68 +47967,88 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Failed to read file %s." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/psmap/frame.py:794 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/psmap/frame.py:792 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39702,6 +48105,7 @@ msgid "Cartographic Composer - GRASS GIS" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39713,3 +48117,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 6a96ba4ea90..7f5480d623a 100644 --- a/locale/po/grasswxpy_bn.po +++ b/locale/po/grasswxpy_bn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_bn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2018-09-28 23:33+0200\n" "Last-Translator: \n" "Language-Team: Bengali (https://www.transifex.com/grass-gis/teams/45198/" @@ -25,12 +25,12 @@ msgstr "" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "" @@ -38,837 +38,837 @@ msgstr "" msgid "Analysis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1063,8 +1063,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "" @@ -1108,7 +1108,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1216,14 +1216,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "" @@ -1333,8 +1333,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1405,12 +1405,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1472,115 +1472,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1621,7 +1621,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1632,169 +1632,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1903,13 +1903,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "" @@ -1980,56 +1980,56 @@ msgid "Data catalog" msgstr "তথ্যসূচী" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" +#: ../gui/wxpython/datacatalog/catalog.py:212 +msgid "Do you want to create a new project (also known as location)?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" +#: ../gui/wxpython/datacatalog/catalog.py:217 +msgid "Create project?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2037,316 +2037,317 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "নাম অজ্ঞাত" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr " সমস্ত লেখ্য লুপ্তকরুন" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" +#: ../gui/wxpython/datacatalog/tree.py:2174 +msgid "&Rename project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" +#: ../gui/wxpython/datacatalog/tree.py:2193 +msgid "&Create new project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" +#: ../gui/wxpython/datacatalog/tree.py:2239 +msgid "&Delete projects (locations)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2366,78 +2367,78 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" +msgid "Create new mapset in current project" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2450,9 +2451,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "" @@ -2513,7 +2514,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "" @@ -2537,27 +2538,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "" @@ -2566,29 +2567,29 @@ msgstr "" msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -2602,193 +2603,289 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 msgid "&Remove" msgstr "" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 msgid "Remove command" msgstr "" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +msgid "Timestamp:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:41 +msgid "Runtime duration:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:42 +msgid "Status:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:43 +msgid "Mask 2D:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:44 +msgid "Mask 3D:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:45 +msgid "North:" +msgstr "" + #: ../gui/wxpython/history/browser.py:46 +msgid "South:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:47 +msgid "West:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:48 +msgid "East:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:49 +msgid "North-south resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:50 +msgid "East-west resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:51 +msgid "Number of rows:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:52 +msgid "Number of columns:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:53 +msgid "Number of cells:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:63 +msgid "{} sec" +msgstr "" + +#: ../gui/wxpython/history/browser.py:117 +msgid "General info" +msgstr "" + +#: ../gui/wxpython/history/browser.py:138 +msgid "Computational region during command execution" +msgstr "" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +msgid "Update current region" +msgstr "" + +#: ../gui/wxpython/history/browser.py:271 +msgid "Region match" +msgstr "" + +#: ../gui/wxpython/history/browser.py:294 +msgid "Set current computational region to the region of executed command" +msgstr "" + +#: ../gui/wxpython/history/browser.py:359 msgid "History browser" msgstr "" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 msgid "&Export history" msgstr "" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." +#: ../gui/wxpython/history/browser.py:466 +msgid "JSON files" msgstr "" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "" + +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." msgstr "" -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample project to download:" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" +msgstr "নির্বাচিত বিন্দুটি মুছুন" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" +#: ../gui/wxpython/startup/locdownload.py:439 +msgid "Dataset Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" +#: ../gui/wxpython/startup/locdownload.py:447 +msgid "Download selected dataset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" +#: ../gui/wxpython/startup/locdownload.py:490 +msgid "Do you want to cancel dataset download?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +msgid "Invalid project name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" +#: ../gui/wxpython/startup/guiutils.py:173 +msgid "Do you want to import {} to the newly created project?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2798,82 +2895,82 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" +msgstr "নির্বাচিত বিন্দুটি মুছুন" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "নির্বাচিত বিন্দুটি মুছুন" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2883,11 +2980,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2897,15 +2994,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2915,50 +3012,52 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "নির্বাচিত বিন্দুটি মুছুন" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "নির্বাচিত বিন্দুটি মুছুন" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" +#: ../gui/wxpython/startup/guiutils.py:497 +msgid "Error when deleting projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -2968,11 +3067,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -2982,15 +3081,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3000,14 +3099,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3019,15 +3119,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3035,101 +3135,99 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 +#: ../gui/wxpython/startup/guiutils.py:693 #, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 +#: ../gui/wxpython/startup/guiutils.py:711 #, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "" #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -3138,19 +3236,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "" @@ -3159,17 +3257,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -3177,34 +3275,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3212,42 +3310,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3257,37 +3355,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3297,334 +3395,334 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "" -#: ../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 +#: ../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 msgid "source E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -3659,10 +3757,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3671,7 +3769,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3680,7 +3778,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3694,14 +3792,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "" @@ -3714,32 +3812,32 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 msgid "Pan to GCP by number" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -3769,7 +3867,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3805,462 +3903,517 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +msgid "Define new GRASS project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +msgid "Name of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/location_wizard/wizard.py:271 +msgid "Project will be created in GRASS database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +msgid "Project Name:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2530 +#: ../gui/wxpython/location_wizard/wizard.py:2531 #, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +msgid "Unable to create new project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +msgid "Project already exists in GRASS Database." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4277,7 +4430,6 @@ msgid "Disabled:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "" @@ -4286,10 +4438,10 @@ msgid "GRASS API:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "" @@ -4315,7 +4467,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "" @@ -4344,13 +4496,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "" @@ -4359,7 +4511,7 @@ msgid "Commands" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4370,19 +4522,19 @@ msgid "Apply properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "" @@ -4391,686 +4543,668 @@ msgstr "" msgid "Author(s):" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" +#: ../gui/wxpython/gmodeler/panels.py:189 +msgid "Script editor" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:317 +#: ../gui/wxpython/gmodeler/panels.py:861 #, python-format -msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:431 +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 #, python-format -msgid "Data: %s" +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:463 -msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +msgid "Run script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" +#: ../gui/wxpython/gmodeler/panels.py:1617 +msgid "Save the script to a file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" +#: ../gui/wxpython/gmodeler/panels.py:1654 +msgid "Python script type" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/gmodeler/toolbars.py:54 +msgid "Save current model to file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +msgid "Set model properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format +#: ../gui/wxpython/gmodeler/dialogs.py:308 msgid "" -"Model is not valid.\n" +"Command not defined.\n" "\n" -"%s" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 +#: ../gui/wxpython/gmodeler/dialogs.py:317 #, python-format -msgid "Model exported to <%s>" +msgid "" +"'%s' is not a GRASS tool.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1116 +#: ../gui/wxpython/gmodeler/dialogs.py:431 #, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" +#: ../gui/wxpython/gmodeler/dialogs.py:473 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format +msgid "" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -msgid "Run script" +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2042 -msgid "Save the script to a file" +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -msgid "Python script type" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2110 -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "" @@ -5082,7 +5216,7 @@ msgstr "" msgid "Create new workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "" @@ -5090,7 +5224,7 @@ msgstr "" msgid "Load workspace from file" msgstr "" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "" @@ -5100,7 +5234,7 @@ msgstr "" msgid "Save workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "" @@ -5113,7 +5247,7 @@ msgid "Close workspace file" msgstr "" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "" @@ -5150,7 +5284,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -5178,649 +5312,652 @@ msgstr "" msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +msgid "Module not installed" msgstr "" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +msgid "Re-projects a raster map from given project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +msgid "Reproject vector map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +msgid "Re-projects a vector map from one project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "" @@ -5828,20 +5965,20 @@ msgstr "" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "" @@ -5859,13 +5996,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "" @@ -5879,16 +6016,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -5908,7 +6045,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "" @@ -5916,8 +6053,8 @@ msgstr "" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "" @@ -5925,42 +6062,42 @@ msgstr "" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" @@ -5973,7 +6110,7 @@ msgid "Mapset access" msgstr "" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +msgid "Set/unset access to other mapsets in current project" msgstr "" #: ../gui/wxpython/menustrings.py:234 @@ -5997,11 +6134,11 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" +msgid "Change project (location) and mapset" msgstr "" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +msgid "Change current project and mapset." msgstr "" #: ../gui/wxpython/menustrings.py:240 @@ -6035,15 +6172,17 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +msgid "Create new project (location)" msgstr "" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" #: ../gui/wxpython/menustrings.py:252 @@ -6067,8 +6206,7 @@ msgstr "" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6099,7 +6237,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "" @@ -6107,411 +6245,411 @@ msgstr "" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " "regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6522,22 +6660,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6545,127 +6683,127 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " "represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6676,323 +6814,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7000,21 +7138,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7023,203 +7161,203 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7227,106 +7365,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7335,503 +7473,503 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -7839,96 +7977,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -7936,818 +8074,818 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 msgid "Input for supervised SVM" msgstr "" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 msgid "Manage signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -8755,999 +8893,991 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 -msgid "Interactive editing and digitization of raster maps." -msgstr "" - #: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "দ্বীচল বিন্দুচিত্র" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -9780,7 +9910,7 @@ msgid "Text settings" msgstr "" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -9841,74 +9971,74 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "দূরত্ব (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" "Reason: %s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -9932,7 +10062,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "পরিসংখ্যান" @@ -9978,11 +10108,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "" @@ -10007,11 +10137,11 @@ msgid "Label font size (pts):" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "" @@ -10027,402 +10157,401 @@ msgstr "শৈলি:" msgid "Weight:" msgstr "ভর:" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 -msgid "No map or image group selected to plot." -msgstr "" - #: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" +msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "রেখা বর্ণ" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -10462,13 +10591,13 @@ msgstr "" msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "" @@ -10484,105 +10613,105 @@ msgstr "" msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 msgid "Save output to a file" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -10590,7 +10719,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "" @@ -10673,7 +10802,7 @@ msgstr "" msgid "category" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "" @@ -10694,8 +10823,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -10721,424 +10850,437 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:291 -msgid "Ask when removing map layer from layer tree" +#: ../gui/wxpython/gui_core/preferences.py:293 +msgid "Ask when removing map layer from layer tree" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:307 +msgid "Ask when quitting wxGUI or closing display" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:348 +msgid "Layout settings" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 -msgid "Ask when quitting wxGUI or closing display" +#: ../gui/wxpython/gui_core/preferences.py:392 +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 msgid "History" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 msgid "Window layout settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 msgid "Font for manual pages:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11147,7 +11289,7 @@ msgid "" " - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "" @@ -11164,7 +11306,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "" @@ -11286,7 +11428,7 @@ msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "" @@ -11320,7 +11462,7 @@ msgid "Map Display Settings" msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +msgid "(Un)dock" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 @@ -11344,7 +11486,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -11400,7 +11542,7 @@ msgid "Optional" msgstr "" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "" @@ -11412,79 +11554,79 @@ msgstr "" msgid "valid range" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11492,94 +11634,94 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "" @@ -11587,381 +11729,381 @@ msgstr "" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +msgid "Select GRASS project and mapset" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +msgid "Project or mapset is not defined." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +msgid "Name of GRASS project:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +msgid "Select mapset in GRASS project" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " "overwrite it?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12041,9 +12183,9 @@ msgid "Snap also to vertex" msgstr "" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "" @@ -12065,226 +12207,226 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12302,199 +12444,199 @@ msgstr "" msgid "Topology missing" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 msgid "Digitize new point (Ctrl+P)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 msgid "Digitize new line (Ctrl+L)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 msgid "Digitize new boundary (Ctrl+B)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 msgid "Digitize new centroid (Ctrl+C)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "নির্বাচিত লেখ্য (গুলি) লুপ্তকরুন" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 msgid "Display/update attributes (Ctrl+K)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 msgid "Display/update categories (Ctrl+J)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "নির্বাচিত লেখ্য সম্পাদন করুন" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 msgid "Remove selected vertex (Ctrl+X)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 msgid "Settings (Ctrl+T)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 msgid "Show manual (Ctrl+H)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 msgid "Undo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 msgid "Redo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12503,42 +12645,42 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "" @@ -12551,8 +12693,8 @@ msgid "Add new category" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "" @@ -12561,11 +12703,11 @@ msgid "Ignore changes and close dialog" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "" @@ -12610,24 +12752,24 @@ msgstr "" msgid "Layer (Categories)" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -12635,97 +12777,97 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -12737,19 +12879,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -12768,32 +12910,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "" @@ -12903,100 +13045,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13025,12 +13167,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "" @@ -13104,11 +13246,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13119,50 +13261,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -13178,116 +13320,128 @@ msgstr "" msgid "3. Select GRASS Mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." msgstr "" #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be renamed." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13295,14 +13449,14 @@ msgid "" "Enter new name:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13310,7 +13464,7 @@ msgid "" "Mapset <%s> already exists in location." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13318,7 +13472,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13326,7 +13480,7 @@ msgid "" "Location <%s> already exists in GRASS database." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13334,27 +13488,27 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be deleted." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13362,37 +13516,37 @@ msgid "" "ALL MAPS included in this location will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13401,16 +13555,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13422,12 +13576,12 @@ msgid "" "this operation) and continue?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13435,7 +13589,7 @@ msgid "" "your data. Have another look in the processor manager just to be sure..." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13443,164 +13597,164 @@ msgid "" "Details: %(reason)s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " "ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " "located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "টপোলজি" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -13608,7 +13762,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -13616,45 +13770,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -13662,38 +13816,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -13790,117 +13944,117 @@ msgstr "" msgid "Output" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "রেখা বর্ণ" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "" @@ -13916,41 +14070,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -13992,7 +14146,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "" @@ -14023,19 +14177,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "" @@ -14059,25 +14213,25 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -14089,8 +14243,8 @@ msgstr "" msgid "Execution failed:" msgstr "" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "" @@ -14140,7 +14294,7 @@ msgstr "" msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14149,21 +14303,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14184,147 +14338,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "নির্বাচিত লেখ্য সম্পাদন করুন" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14332,11 +14486,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14344,11 +14498,11 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "" @@ -14415,22 +14569,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14460,22 +14614,22 @@ msgstr "" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14484,33 +14638,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "" @@ -14556,46 +14710,46 @@ msgstr "" msgid "Status bar" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 msgid "Go to XY coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 msgid "Display extent" msgstr "" @@ -14669,14 +14823,14 @@ msgid "Click mouse to unzoom" msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "" @@ -14696,47 +14850,47 @@ msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -14746,59 +14900,59 @@ msgid "" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -14900,7 +15054,7 @@ msgstr "" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "" @@ -14967,8 +15121,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "স্তম্ভ যোগ " @@ -15059,7 +15213,7 @@ msgid "List of %s layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -15073,13 +15227,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "" @@ -15102,82 +15256,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -15475,14 +15629,14 @@ msgstr "" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -15490,15 +15644,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -15508,7 +15662,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -15520,30 +15674,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -15554,114 +15708,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -15729,99 +15883,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "আড়াল করুন" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "দেখান" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -16175,7 +16330,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -16183,7 +16338,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -16334,7 +16489,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -16342,184 +16497,184 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 msgid "Map Swipe Tool" msgstr "" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995 +#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003 #, python-format msgid "" "Command '%s' not yet implemented in the WxGUI. Try adding it as a command " "layer instead." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." +#: ../gui/wxpython/main_window/frame.py:1456 +msgid "No project provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -16527,37 +16682,37 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -16565,26 +16720,26 @@ msgid "" "from layer tree?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "" @@ -16612,55 +16767,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "" @@ -16733,7 +16888,7 @@ msgstr "" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "" @@ -16765,112 +16920,116 @@ msgstr "" msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +msgid "Set opacity of <{}>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "" @@ -17101,6 +17260,13 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 #, python-format @@ -17138,57 +17304,61 @@ msgstr "" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " "define new connection in 'Manage layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "" @@ -17202,93 +17372,93 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "উদাহরণ: %s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -17296,58 +17466,58 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -17356,19 +17526,19 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -17377,190 +17547,190 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "উর্ধক্রম সজ্জা" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "অধঃক্রম সজ্জা" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "গননা (কেবল সংখ্যাযুক্ত স্তম্ভ)" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "ক্ষেত্র গনক" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "রেখা দৈর্ঘ্য" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "(কেবল পাঠযোগ্য)" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "সরল" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "রচনাকারি" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "সিকিউল রচনাকারি" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "নতুন লেখ্য সংযুক্তকরুন" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "নির্বাচিত লেখ্য (গুলি) লুপ্তকরুন" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr " সমস্ত লেখ্য লুপ্তকরুন" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " "want to delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " "delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -17568,7 +17738,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -17577,63 +17747,63 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " "column?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -17641,144 +17811,144 @@ msgid "" "will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " "exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format msgid "" "No attribute table found.\n" @@ -17787,40 +17957,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "" @@ -17842,7 +18012,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "" @@ -17860,138 +18030,138 @@ msgstr "" msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " "each animation." msgstr "" -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "" -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:209 +#: ../gui/wxpython/animation/utils.py:210 msgid "" "The temporal extents of maps in space-time datasets have to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" @@ -18104,7 +18274,7 @@ msgid "" msgstr "" #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "" @@ -18182,7 +18352,7 @@ msgid "Edit" msgstr "" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "" @@ -18425,13 +18595,21 @@ msgid "Invalid" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" ======= #: ../gui/wxpython/gui_core/preferences.py:1739 msgid "PROJ string (required):" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18443,13 +18621,24 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -19100,28 +19289,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -19146,17 +19339,17 @@ msgid "" msgstr "" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "" @@ -19182,26 +19375,26 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" "Unknown format %(for)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -19210,39 +19403,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -19310,693 +19503,693 @@ msgid "" "edge of the paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -20023,134 +20216,134 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 msgid "Program {} is not available." msgstr "" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" diff --git a/locale/po/grasswxpy_cs.po b/locale/po/grasswxpy_cs.po index 1b88f3a962c..3d529cf13e0 100644 --- a/locale/po/grasswxpy_cs.po +++ b/locale/po/grasswxpy_cs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_cs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2016-04-09 18:58+0200\n" "Last-Translator: Jan Trochta \n" "Language-Team: cs@li.org\n" @@ -28,12 +28,12 @@ msgstr "Zobrazení" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "Data" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "Vzhled" @@ -41,31 +41,31 @@ msgstr "Vzhled" msgid "Analysis" msgstr "Analýza" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "Animace" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "Nastavení zobrazení" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "Perspektiva:" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "Nakloní rovinu povrchu vzhledem k vodorovné poloze" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "Naklonění:" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" @@ -73,35 +73,35 @@ msgstr "" "Nastaví výšku pohledu nad povrchem (úhel pohledu se automaticky přizpůsobí, " "aby se zachoval střed pohledu)" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "Nastaví relativní výšku prvků nad rovinou povrchu" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "Výška:" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "Převýšení:" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "Pohled:" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "zde" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." @@ -109,19 +109,19 @@ msgstr "" "Umožní vybrat bod povrchu, který se stane novým středem pohledu. Klepněte na " "toto tlačítko a poté na povrch." -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "střed" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "Obnoví původní, výchozí střed pohledu" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "shora" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." @@ -129,26 +129,26 @@ msgstr "" "Nastaví pohled přímo nad místo středu scény. Tento pohled shora je " "orientován přibližně severojižně." -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "obnovit" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "Obnoví výchozí pohled" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "Vzhled obrázku" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "Barva pozadí:" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." @@ -157,310 +157,310 @@ msgstr "" "plynulého pohybu, je vhodné použít režim průletu (nástrojová lišta mapového " "okna)." -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "Zaznamenat" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "Přehrát" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "Pozastavit" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "Zastavit" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "Celkový počet snímků:" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "Snímková frekvence (FPS):" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "Snímky jsou zaznamenávány s danou frekvencí (FPS)." -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "Uložit posloupnost obrázků" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "Vyberte adresář:" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "Zvolte adresář pro obrázky" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "Procházet" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "Předpona souboru:" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "Budou vytvořeny názvy souborů jako predpona_1.ppm, predpona_2.ppm, ..." -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "Formát souboru:" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "Povrch" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "Konstantní povrch" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "Vektor" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "3D rastr" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "Osvětlení" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "Okraj" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "Dekorace" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "Roviny řezu" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "Rastrová vrstva" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "Vykreslit" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "Režim:" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "hrubý" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "jemný" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "oba" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "Stínování:" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "ploché" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "Gouraudovo" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "Nastavit všechny" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "Použít vykreslovací nastavení pro všechny načtené povrchy" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "Hrubý režim:" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "rozlišení:" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "styl:" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "síť" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "povrch" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "Změnit barvu sítě" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "Jemný režim:" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "Vlastnosti povrchu" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Barva" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "Maska" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "Průhlednost" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "Jasnost" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "mapa" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "zrušit" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "konstantní" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "Pozice" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "Změní souřadnice x, y a z pro pozici aktuálního povrchu" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "Obnovit" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "Obnoví výchozí pozici" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "Aktivní rovina řezu:" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "průhledné" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "horní barva" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "dolní barva" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "smíšené" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "stínované" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "Vodorovně X:" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "Nastaví pro aktuální rovinu řezu souřadnici X" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "Vodorovně Y:" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "Nastaví pro aktuální rovinu řezu souřadnici Y" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "Otočení:" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "Otočí aktuální rovinu řezu kolem svislé osy" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "Otočí aktuální rovinu řezu kolem vodorovné osy" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" @@ -468,421 +468,421 @@ msgstr "" "Nataví pro aktuální rovinu řezu souřadnici Z (má význam pouze tehdy, není-li " "naklonění 0)" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Nový" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "Smazat" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "Jemné rozlišení:" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Hodnota:" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "Průhlednost:" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "Barva:" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "Vektorová vrstva" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "Zobrazit vektorové linie" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "Vektorové linie" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Linie:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "šířka:" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "barva:" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "použít barvu pro tematické mapování" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "použít šířku pro tematické mapování" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "Nastavit volby..." -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "Zobrazit" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "na povrchu:" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "jako 3D" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "Výška nad povrchem:" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "Zobrazit vektorové body" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "Vektorové body" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Ikona:" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "použít velikost pro tematické mapování" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "3D rastrová mapa" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "Isopovrch" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "Rozlišení:" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "Seznam Isopovrchů" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "Zobrazit světelný model" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "Umístění zdroje světla" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "Nastaví výšku světla" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "Barva světla a intenzita" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "Jas:" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "Nastaví jas světla" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "Ambientní:" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "Nastaví ambientní světlo" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "Hrany s okrajem" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "S && Z" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "S && V" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "J && Z" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "J && V" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "Nastavení" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "Výška okraje ze spodní strany" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "Směrová růžice" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "Délka růžice (v mapových jednotkách):" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "Barva růžice:" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "Umístit růžici" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "Měřítko" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "Délka měřítka (v mapových jednotkách):" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "Barva měřítka:" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "Umístit nové měřítko" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "Přejete si zaznamenat novou animaci, aniž byste uložili předchozí?" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "Nebyla zadána předpona souboru." -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "Adresář %s neexistuje." -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "konstantní#" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "Atributy isopovrchu" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "Hodnota isopovrchu" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "Z" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "S" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "J" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "V" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "SZ" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "SV" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "JV" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "JZ" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "Úroveň" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "Měřítko %d" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "Žádná" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "Rovinná plocha" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "Vektorové mapa je 3D" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "Vektorová mapa je 2D" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "%(features)d prvků (%(points)d bodů)" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "na povrchu" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "Upraví vzdálenost a směr k bodu pohledu." -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1080,8 +1080,8 @@ msgstr "barva sítě:" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "Šířka:" @@ -1129,7 +1129,7 @@ msgstr "Rastrová mapa <%s> nebyla nalezena." #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "Vektorová mapa <%s> nebyla nalezena." @@ -1237,14 +1237,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "Nápověda" @@ -1354,8 +1354,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1426,12 +1426,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1493,115 +1493,115 @@ msgstr "Přidat rastrovou vrstvu" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Vytvořit/upravit skupinu..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Jméno rastrové mapy:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Jméno vektorové mapy:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "Zadat název nové vektorové mapy:" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "Exportovat atributovou tabulku" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "Vektorová vrstva <%s> již existuje. Přejete si ji přepsat?" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "Vektor <%s> existuje" @@ -1642,7 +1642,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1653,169 +1653,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Nástrojová lišta pro správu mapy" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "Náhled kompozice okna" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "Import vektorové mapy" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "Nelze otevřít vektorovou vrstvu <%s>." -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "Analýza selhala." -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "Zastaralé podpisy" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "Soubor již existuje" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1924,13 +1924,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "Import vektorových dat" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Import rastrových dat" @@ -2001,56 +2001,58 @@ msgid "Data catalog" msgstr "" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "Vybrat adresář s daty GRASSu:" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "Přejete si založit lokaci GRASSu <%s>?" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Vytvořit tabulku?" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "Připojit externí data" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2058,317 +2060,322 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "Přepsat?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "Smazat mapu" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "Od&stranit" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "Pře&jmenovat" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "Smazat záznamy" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "Správa kartografických zobrazení" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" +msgstr "Vytvořit novou lokaci" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2197 +#, fuzzy +msgid "&Download sample project (location)" +msgstr "Vybrat lokaci a mapset projektu" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "Odstranit vybranou lokaci" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 #, fuzzy msgid "&Copy paths to mapsets" msgstr "Správa přístupu do mapsetů" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2388,78 +2395,79 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "Vytvořit nový mapset ve vybrané lokaci" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2472,9 +2480,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "" @@ -2535,7 +2543,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Zavřít" @@ -2559,27 +2567,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "Šířka linie:" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "" @@ -2588,30 +2596,30 @@ msgstr "" msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "Mapa <%s> nebyla nalezena." #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "Není co zobrazit (prázdná mapa). Operace ukončena." #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" "Vyberte název souboru pro uložení obrázku (není potřeba zadávat příponu)" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "Nebyla vybrána žádná vektorová mapa pro dotazování." @@ -2625,200 +2633,321 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 #, fuzzy msgid "Double-click to open the tool" msgstr "(dvojklik pro nastavení vlastností)" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" msgstr "Odstranit" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 #, fuzzy msgid "Do you really want to remove <{}> command?" msgstr "Přejete si vytvořit nový mapset?" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Přejmenovat sloupec" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "Časové razítko" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Kvantizace" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Výchozí zobrazení na stavové liště:" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Maska" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Maska" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Sever" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "Jih" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Západ" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Východ" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "Rozlišení S-J" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Rozlišení V-Z" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Počet částí:" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Číselný sloupec:" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Počet částí:" + +#: ../gui/wxpython/history/browser.py:63 +msgid "{} sec" +msgstr "" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "Obecné" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "Nastavit výpočetní region podle pojmenovaného regionu" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "Vytvořit plochu pokrývající aktuální region" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "Kartografické zobrazení odpovídá" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "Uložit výpočetní region do souboru regionu" + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "Datový prohlížeč" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "Export do Pythonu" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Uložit soubor jako..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "Uložit soubor jako" + +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "Soubory" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "Textové soubory" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "Soubory" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Uložit soubor jako..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 #, fuzzy msgid "Command history saved to '{}'" msgstr "Výstup příkazů uložen do '%s'" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" +msgstr "Vyberte zdrojovou mapu k zobrazení:" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" +msgstr "Smazat vybraný objekt" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Chyba: {text}" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" +#: ../gui/wxpython/startup/locdownload.py:439 +msgid "Dataset Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Přejmenovat vybraný mapset" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Chcete trvale odstranit data? %s" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" msgstr "Neplatný název lokace" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Vytvořit nový mapset" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "Přejete si založit lokaci GRASSu <%s>?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "Importovat data?" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2828,82 +2957,89 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Přejmenovat vybraný mapset" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Chyba" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" msgstr "" +"Nelze přejmenovat mapset. \n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Přejmenovat vybranou lokaci" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Přejmenovat vybraný mapset" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" +"Nelze přejmenovat mapset. \n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2913,11 +3049,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2927,15 +3063,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2945,50 +3081,52 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Smazat vybraný objekt" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Smazat vybraný objekt" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" +#: ../gui/wxpython/startup/guiutils.py:497 +msgid "Error when deleting projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -2998,11 +3136,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3012,15 +3150,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3030,14 +3168,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "neznámý" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3049,15 +3188,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3065,8 +3204,8 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" @@ -3075,95 +3214,95 @@ msgstr "" "Import <%(name)s> selhal.\n" "Důvod: %(msg)s" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"Současná location je <%(loc)s>.\n" +"Současný mapset je <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "Současná location je <%(loc)s>.\n" "Současný mapset je <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "Současný mapset je <%s>." #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "Nastavení georektifikace" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "Nastavení georektifikace zrušeno" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "Vybrat typ mapy a lokaci/mapset" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "Typ mapy pro georektifikaci" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "rastr" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vektor" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "Vybrat zdrojovou lokaci:" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "Vybrat zdrojový mapset:" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "Před vybráním mapsetu musíte vybrat platnou lokaci" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "Abyste mohli pokračovat, musíte vybrat platnou lokaci a mapset" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "Vybrat obrazovou/mapovou skupinu pro georektifikaci" @@ -3172,19 +3311,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "vytvořit skupinu pokud žádná neexistuje" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "Přidat vektorovou vrstvu do skupiny...." -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "Přípona pro výstupní mapy:" @@ -3193,17 +3332,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "Musíte vybrat platnou skupinu obrazů/map pokud chcete dále pokračovat" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "Musíte vložit příponu k mapě pokud chcete dále pokračovat" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "Vyberte mapy zobrazené pro vytvoření vlicovacích bodů" @@ -3211,34 +3350,34 @@ msgstr "Vyberte mapy zobrazené pro vytvoření vlicovacích bodů" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "Vyberte zdrojovou mapu k zobrazení:" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "Abyste mohli pokračovat, musíte vybrat zdrojovou mapu" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3246,42 +3385,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "Spravovat Vlicovací body (GCP)" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "zdroj" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "cíl" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "Nastavit souřadnice vlicovacím bodům" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3295,37 +3434,37 @@ msgstr "" "Sever: %(coor1)s" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "Zapisování souboru POINTS selhalo" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "soubor POINTS byl uložen pro skupinu <%s>" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "Čtení souboru POINTS selhalo" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3335,230 +3474,230 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "Rektifikuji obrazy. prosím počkejte..." -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "transformuji <%s>..." -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "Georektifikace vektorové mapy <%s< selhala" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "Nastavení správce vlicovacích bodů" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "Ukončit Správce GCP" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "Uložit vlicovací body (GCP)?" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "Přizpůsobit zdrojový displej cílovému" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "Přizpůsobit cílový displej zdrojovému" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "použít" -#: ../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 +#: ../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 msgid "source E" msgstr "V souřadnice zdroje " -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "S souřadnice zdroje" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "Cílová V souřadnice" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "Cílová S souřadnice" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "Dopředná chyba" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "Zpětná chyba" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "Vytvořit skupinu vektorových map" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "Vybrat vektorovou mapu pro přidání do skupiny:" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "Upravit vlicovací body" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "Vlicovací bod (GCP) číslo" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "Zdroj V:" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "Cílová V souřadnice:" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "Zdroj S:" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "Cílová S souřadnice:" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "Použít změny jen pro toto sezení" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" "Použít změny a uložit je do souboru s uživatelským nastavením (jako výchozí " "pro další sezení)" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Zavřít dialog " -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "Symbolika" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "Zvýraznit pouze bod s největší RMS" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "Zvýraznit RMS chybu > M + SO * faktor:" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" @@ -3568,98 +3707,98 @@ msgstr "" "průměr + směrodatná odchylka * daný faktor. \n" "Doporučené hodnoty faktoru jsou mezi 1 a 2." -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "Nastavení symbolu" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "Barva pro vysokou RMS chybu:" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "Barva pro vybraný vlicovací bod:" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "Barva pro nevybraný vlicovací bod:" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "Zobrazit nepoužívané vlicovací body" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "Velikost symbolu:" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "Rektifikace" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "georektifikace 1. řádu" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "georektifikace 2. řádu" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "georektifikace 3.řádu" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "Spojit s výpočetním regionem v cílové lokaci" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "Prahová hodnota RMS musí být > 0" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" @@ -3667,9 +3806,9 @@ msgstr "" "Prahová hodnota RMS je < 1 \n" "Příliš mnoho bodů může být zvýrazněno" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "Nastavení Správce vlicovacích bodů uloženo do souboru '%s'." @@ -3704,10 +3843,10 @@ msgstr "Zdrojový displej" msgid "Target Display" msgstr "Cílový displej" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3716,7 +3855,7 @@ msgstr "Nastavení stránky" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3725,7 +3864,7 @@ msgstr "Náhled tisku" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3739,14 +3878,14 @@ msgstr "Přiblížit na výpočetní region (nastaven pomocí g.region)" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "Přiblížit na výchozí region" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "Přiblížit na uložený region" @@ -3759,33 +3898,33 @@ msgstr "Nastavit výpočetní region podle aktuálního okna" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "Uložit aktuální okno jako pojmenovaný region" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Číslo kategorie" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Povolený rozsah:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "RMS (střední kvadratická) chyba" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "Dopředná: %(forw)s, Zpětná: %(back)s" @@ -3815,7 +3954,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3851,312 +3990,321 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "Definujte novou lokaci GRASSu" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Jméno" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" msgstr "Název adresáře lokace v adresáři s daty GRASSu" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Popis" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:251 +#, fuzzy +msgid "Description of project directory in GIS Data Directory" +msgstr "Název adresáře lokace v adresáři s daty GRASSu" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "Lokace již v adresáři databáze GRASSu existuje." -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 +#, fuzzy msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" +"Název <%(name)s> není platným názvem lokace nebo mapsetu. Používejte pouze " +"znaky ASCII kromě %(chars)s a mezery." -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "Neplatný název" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Kód" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Kód kartografického zobrazení:" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Vyhledat v popisu:" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "Nelze načíst seznam: %s" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "Vyberte parametry kartografického zobrazení" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "Vybrat geodetické datum nebo elipsoid (další strana)" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "Datum související s daným vybraným elipsoidem" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "Pouze elipsoid" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "Musíte vložit hodnoty pro %s" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "Definujte parametry kartografického zobrazení %s" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "Ne" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Budiž" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "Specifikovat geodetické datum" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "Elipsoid" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Kód datumu:" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "Vyberte elipsoid" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "Kód elipsoidu:" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "Georeferencovaný soubor:" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "Zvolte georeferencovaný soubor" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Parametry" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "Zvolte kód IAU" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "Cesta k souboru s kódy IAU:" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "Kód IAU:" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "Zvolte soubor s kódy IAU" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "Vložte PROJ.4 parametry:" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "Je vyžadováno datum transformace" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Shrnutí" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "Adresář databáze GRASSu:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Název lokace:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Kód kartografického zobrazení:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Popis:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Projekce:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "volitelné" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" @@ -4164,152 +4312,208 @@ msgstr "" "\n" "Detaily: %(err)s" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" msgstr "Nelze vytvořit novou lokaci" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "Lokace již v adresáři databáze GRASSu existuje." -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "Kód EPSG chybí." -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "Kód IAU chybí." -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "Soubor <%s> nebyl nalezen." -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "Nastavit výchozí region a jeho rozlišení" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "Nastavit ®ion" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "Zvolena neplatná lokace." -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "Neplatný region" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "Klikněte zde pro zobrazení 3D nastavení" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "Klikněte zde pro skrytí 3D nastavení" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Řádky: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Sloupce: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Buňky: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Hloubka: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "3D buňky: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "Horní" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "Spodní" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "Rozlišení H-S" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Sever" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Západ" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Východ" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Jih" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "Rozlišení S-J" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "Rozlišení V-Z" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "Neplatná hodnota: %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "Vyberte transformaci datumu" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "Vyberte ze seznamu transformací datumu" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Odstranit" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Zakázat" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Povolit" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "Nastavit popisek" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "Nastavit komentář" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "Přidat vlicovací bod" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "Odstranit vlicovací bod" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "přechodné" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Vlastnosti" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "Popisek:" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "Komentář:" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "Nastavení modelování" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4326,7 +4530,6 @@ msgid "Disabled:" msgstr "Zakázané:" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "Editor Pythonu" @@ -4336,10 +4539,10 @@ msgid "GRASS API:" msgstr "Nápověda GRASS GIS" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Příkazy" @@ -4365,7 +4568,7 @@ msgid "Shape size" msgstr "Velikost tvaru" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Typ" @@ -4394,13 +4597,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "Vlastnosti modelu" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Metadata" @@ -4409,7 +4612,7 @@ msgid "Commands" msgstr "Příkazy" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4420,19 +4623,19 @@ msgid "Apply properties" msgstr "Přijmout vlastnosti" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "Zavřít dialog a ignorovat změny" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Název:" @@ -4441,700 +4644,685 @@ msgstr "Název:" msgid "Author(s):" msgstr "Autoři:" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "Grafické modelování" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Modelování" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Prvky" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" -msgstr "Export modelu do obrázku" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Proměnné" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" -msgstr "Export modelu do skriptu Pythonu" +#: ../gui/wxpython/gmodeler/panels.py:189 +#, fuzzy +msgid "Script editor" +msgstr "Editor Pythonu" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "Výstup příkazů" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" -msgstr "Spustit model" - -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" -msgstr "Vyhodnotit model" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "Příkaz ukončen" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" -msgstr "Vlastnosti dat" - -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" -msgstr "Jméno prvku:" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "Prosím čekejte, načítám model..." -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." +msgstr "Zápis aktuálního nastavení do souboru modelu selhalo." -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" -msgstr "Přidat do modelu příkaz GRASSu" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." +msgstr "Nelze otevřít soubor <%s> pro zápis." -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" +"Současný model není prázdný. Přejete si uložit aktuální nastavení do souboru " +"modelu?" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "Popisek:" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "Vytvořit nový model?" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "Komentář:" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "Vyberte model ze souboru" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." -msgstr "" -"Příkaz není definován. \n" -"\n" -"Nelze přidat novou akci do modelu." +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "GRASS soubor modulu (*.gxm)|*.gxm" -#: ../gui/wxpython/gmodeler/dialogs.py:317 +#: ../gui/wxpython/gmodeler/panels.py:861 #, python-format -msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." -msgstr "" +msgid "%(items)d items (%(actions)d actions) loaded into model" +msgstr "%(items)d prvků (%(actions)d akcí) načteno do modelu" -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "Soubor s modelem <%s> již existuje. Přejete si tento soubor přepsat?" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "Uložit model" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" -msgstr "Na" - -#: ../gui/wxpython/gmodeler/dialogs.py:431 +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 #, python-format -msgid "Data: %s" -msgstr "" +msgid "File <%s> saved" +msgstr "Soubor <%s> byl uložen" -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" -msgstr "Příkaz:" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "Vybrat soubor pro uložení aktuálního modelu" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "Model exportován do <%s>" -#: ../gui/wxpython/gmodeler/dialogs.py:463 -msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "Přidat komentář" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" -msgstr "Podmínka" - -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "Popisek" - -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" -msgstr "Vlastnosti smyčky" +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "Chcete trvale odstranit data? %s" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" -msgstr "Seznam prvků ve smyčce" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "Smazat dočasná data" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "Model je prázdný. Není co vyhodnotit." -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Vyhodnocuji model..." -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" +"Model není platný.\n" +"\n" +"%s" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" -msgstr "Vlastnosti If-else" - -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" -msgstr "Seznam prvků v bloku 'if' " +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "Model je platný" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" -msgstr "Seznam prvků v bloku 'else' " +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "wxGUI Grafické modelování" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." -msgstr "Proměnná <%s> již v modelu existuje. přidání proměnné selhalo." +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Překresluji model..." -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" -msgstr "Přejete si odstranit všechny proměnné z modelu?" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Chcete uložit změny v modelu?" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" -msgstr "Smazat proměnné" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "Chcete uložit současné nastavení do souboru modelu?" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" -msgstr "Odstranit vybrané" +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Ukončit Grafické modelování" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" -msgstr "Odstranit vše" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "Seznam proměnných - klikněte pravým tlačítkem pro vymazání" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" -msgstr "Znovu načíst" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Datový typ" -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" -msgstr "model" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "výchozí hodnota" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." -msgstr "Skript vytvořen pomocí wxGUi grafického modelování." +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "Přidat novou proměnnou" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." -msgstr "Spouštím modul" +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "desetinné číslo" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." -msgstr "Model je prázdný. Není co spustit." +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "řetězec" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Vyhodnocuji model..." +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "region" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" -msgstr "" -"Modul je neplatný. Chcete jej přesto spustit? \n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "mapset" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" -msgstr "Spustit modul?" +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "soubor" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" -msgstr "Rastrové mapy" - -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" -msgstr "3D rastrové mapy" - -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" -msgstr "Vektorové mapy" - -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "Přidat novou proměnnou do modelu" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " -msgstr "Podmínka:" +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "Seznam prvků - pravým klikem smažete" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" -msgstr "Podmínka: nedefinována" +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "Popisek" -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" -msgstr "if-else" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "Ve smyčce" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" -msgstr "Parametry modelu" - -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Skript Pythonu" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 #: ../gui/wxpython/modules/mcalc_builder.py:169 msgid "&Run" msgstr "&Spustit" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" -msgstr "Proměnné" - -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" -msgstr "Grafické modelování" +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "Spustit skript" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" -msgstr "Modelování" +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Uložit skript Pythonu do souboru" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" -msgstr "Prvky" +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" -msgstr "Výstup příkazů" +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." -msgstr "Překresluji model..." +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Skript Pythonu" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" -msgstr "Příkaz ukončen" +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Skript Pythonu (*.py)|*.py" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "Chcete uložit změny v modelu?" - -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" -msgstr "Chcete uložit současné nastavení do souboru modelu?" - -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" -msgstr "Ukončit Grafické modelování" +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "Vyberte soubor k uložení" -#: ../gui/wxpython/gmodeler/frame.py:433 +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 #, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "" +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "Soubor <%s> již existuje. Přejete si tento soubor přepsat?" -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "Uložit soubor" -#: ../gui/wxpython/gmodeler/frame.py:447 +#: ../gui/wxpython/gmodeler/panels.py:1806 #, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "Chcete trvale odstranit data? %s" - -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "Smazat dočasná data" - -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +msgid "Unable to launch Python script. %s" msgstr "" -"Současný model není prázdný. Přejete si uložit aktuální nastavení do souboru " -"modelu?" - -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" -msgstr "Vytvořit nový model?" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" -msgstr "Vyberte model ze souboru" - -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" -msgstr "GRASS soubor modulu (*.gxm)|*.gxm" - -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" -msgstr "%(items)d prvků (%(actions)d akcí) načteno do modelu" +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" -msgstr "Soubor s modelem <%s> již existuje. Přejete si tento soubor přepsat?" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "Vytvořit nový model" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" -msgstr "Uložit model" +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "Načíst model ze souboru" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" -msgstr "Soubor <%s> byl uložen" +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Uložit model do souboru" -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" -msgstr "Vybrat soubor pro uložení aktuálního modelu" +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" +msgstr "Export modelu do obrázku" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." -msgstr "Model je prázdný. Není co vyhodnotit." +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" +msgstr "Export modelu do skriptu Pythonu" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" msgstr "" -"Model není platný.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." -msgstr "Model je platný" - -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" -msgstr "Model exportován do <%s>" - -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" -msgstr "Přidat komentář" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" -msgstr "wxGUI Grafické modelování" - -#: ../gui/wxpython/gmodeler/frame.py:1116 -#, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "Prosím čekejte, načítám model..." - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." -msgstr "Zápis aktuálního nastavení do souboru modelu selhalo." - -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "Nelze otevřít soubor <%s> pro zápis." - -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "Odstranit" - -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" -msgstr "Zakázat" - -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" -msgstr "Povolit" +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" -msgstr "Nastavit popisek" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" -msgstr "Nastavit komentář" +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" +msgstr "Spustit model" -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" -msgstr "Přidat vlicovací bod" +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" +msgstr "Vyhodnotit model" -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "Odstranit vlicovací bod" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "Vlastnosti modelu" -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" -msgstr "přechodné" +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" -msgstr "Vlastnosti" +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "Seznam proměnných - klikněte pravým tlačítkem pro vymazání" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" +msgstr "Vlastnosti dat" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" -msgstr "Datový typ" +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" +msgstr "Jméno prvku:" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "výchozí hodnota" +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" -msgstr "Přidat novou proměnnou" +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" +msgstr "Přidat do modelu příkaz GRASSu" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "desetinné číslo" +#: ../gui/wxpython/gmodeler/dialogs.py:308 +msgid "" +"Command not defined.\n" +"\n" +"Unable to add new action to the model." +msgstr "" +"Příkaz není definován. \n" +"\n" +"Nelze přidat novou akci do modelu." -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "řetězec" +#: ../gui/wxpython/gmodeler/dialogs.py:317 +#, python-format +msgid "" +"'%s' is not a GRASS tool.\n" +"\n" +"Unable to add new action to the model." +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "region" +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" -msgstr "mapset" +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "soubor" +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" +msgstr "Na" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" +#: ../gui/wxpython/gmodeler/dialogs.py:431 +#, python-format +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" -msgstr "Přidat novou proměnnou do modelu" +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" +msgstr "Příkaz:" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "Seznam prvků - pravým klikem smažete" +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" -msgstr "Ve smyčce" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" +#: ../gui/wxpython/gmodeler/dialogs.py:473 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" -msgstr "Skript Pythonu" +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" +msgstr "Podmínka" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -#, fuzzy -msgid "Run script" -msgstr "Spustit skript" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" +msgstr "Vlastnosti smyčky" -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Uložit skript Pythonu do souboru" +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" +msgstr "Seznam prvků ve smyčce" -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -#, fuzzy -msgid "Python script type" -msgstr "Skript Pythonu" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" +msgstr "Vlastnosti If-else" + +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" +msgstr "Seznam prvků v bloku 'if' " + +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" +msgstr "Seznam prvků v bloku 'else' " + +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." +msgstr "Proměnná <%s> již v modelu existuje. přidání proměnné selhalo." + +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" +msgstr "Přejete si odstranit všechny proměnné z modelu?" + +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" +msgstr "Smazat proměnné" + +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" +msgstr "Odstranit vybrané" + +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" +msgstr "Odstranit vše" + +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" +msgstr "Znovu načíst" + +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" +msgstr "model" + +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." +msgstr "Skript vytvořen pomocí wxGUi grafického modelování." + +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." +msgstr "Spouštím modul" -#: ../gui/wxpython/gmodeler/frame.py:2110 +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." +msgstr "Model je prázdný. Není co spustit." + +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" +"Modul je neplatný. Chcete jej přesto spustit? \n" +"\n" +"%s" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" +msgstr "Spustit modul?" + +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" -msgstr "Vyberte soubor k uložení" +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" +msgstr "Rastrové mapy" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" -msgstr "Skript Pythonu (*.py)|*.py" +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" +msgstr "3D rastrové mapy" -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" -msgstr "Soubor <%s> již existuje. Přejete si tento soubor přepsat?" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" +msgstr "Vektorové mapy" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" -msgstr "Uložit soubor" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " +msgstr "Podmínka:" + +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" +msgstr "Podmínka: nedefinována" + +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" +msgstr "if-else" + +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Upozornění" + +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" +msgstr "Parametry modelu" + +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" +msgstr "" + +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "&Soubor" @@ -5146,7 +5334,7 @@ msgstr "Pracovní plocha" msgid "Create new workspace" msgstr "Vytvořit novou pracovní plochu" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Otevřít" @@ -5154,7 +5342,7 @@ msgstr "Otevřít" msgid "Load workspace from file" msgstr "Načíst soubor pracovní plochy" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Uložit" @@ -5164,7 +5352,7 @@ msgstr "Uložit" msgid "Save workspace" msgstr "Uložit pracovní plochu" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Uložit jako" @@ -5177,7 +5365,7 @@ msgid "Close workspace file" msgstr "Zavřít soubor pracovní plochy" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "Mapové okno" @@ -5214,7 +5402,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "Přidat vrstvu webové služby" @@ -5242,584 +5430,591 @@ msgstr "Zavřít aktuální mapové okno" msgid "Close all open map display windows" msgstr "Zavřít všechna otevřená mapová okna" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "Import ASCII mřížky (grid)" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" "Vytvoří rastrové mapy z ASCII polygonových/liniových/bodových datových " "souborů." -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "Importuje binární rastrový soubor jako GRASS rastrovou mapu." -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "GRIDATB.FOR import" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "Import Matlab 2D pole" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importuje soubor MAT (v4) jako rastrový soubor GRASSu." -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "SPOT NDVI import" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "SRTM HGT import" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Terra ASTER HDF import" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." -msgstr "" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +#, fuzzy +msgid "Module not installed" +msgstr "Styl dialogu pro moduly:" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "Změní projekci vektorové vrstvy ze zvolené lokace do aktuální lokace." -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "Import ASCII body jako vektorové linie" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "Import DXF" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "Převede soubory ve formátu DXF do vektorového formátu GRASSu." -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "ESRI e00 import" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "GEonames import" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" -msgstr "" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" +msgstr "Změní projekci vektorové vrstvy ze zvolené lokace do aktuální lokace." #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "Změní projekci vektorové vrstvy ze zvolené lokace do aktuální lokace." -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "Import 3D rastrových map" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "ASCII 3D import" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Vis5D import" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "Import databázové tabulky" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "Importuje atributové tabulky v různých formátech." -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "Export rastrové mapy" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "Export do běžných formátů" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" "Exportuje GRASS rastrové vrstvy do jednoho z formátů podporovaných knihovnou " "GDAL." -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "ASCII grid export" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "GRIDATB.FOR export" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "Export do Matlab 2D pole" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "Exportuje rastrový soubor GRASSu do binárního souboru MAT." -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "Exportuje rastrový soubor GRASSu do binárního pole." -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "MPEG-1 export" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "PNG export" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "PPM export" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "Export PPM z RGB vrstev" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "POV-Ray export" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "VRML export" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "VTK export" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "Export vektorové mapy" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "DXF export" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "SVG export" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "Export 3D rastrových map" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "ASCII 3D export" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Vis5D export" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "Export databázové tabulky" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "Exportuje atributové tabulky v různých formátech." -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "Připojit externí rastrová data" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "Připojí rastrový soubor podporovaný GDAL jako GRASS rastrovou vrstvu" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "Připojit externí vektorová data" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "Vytvoří nový pseudo- vektor jako připojenou vrstvu pomocí OGR." -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "Určuje výstupní formát vektorů vytvořený pomocí knihovny OGR." -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "Správa map" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "Kopírovat" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "Seznam" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "Přejmenovat" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "Přejmenuje data v aktuálním mapsetu" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." @@ -5828,71 +6023,71 @@ msgstr "" "pomocí parametrů vyhledávání." #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "Konverze typu mapové vrstvy" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "Automatická vektorizace rastrové vrstvy" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "Převede 2D pláty rastrových map na jednu 3D rastrovou mapu." #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" "Vytvoří 3D volume vrstvu založenou na 2D výškového modelu a hodnotových " "rastrových mapách." #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "Rasterizace vektorové vrstvy" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "Převod (rastrizace) vektorové mapy do rastrové." #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "2D vektorové mapa na 3D" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "Převede 2D vektorovou mapu na mapu 3D" @@ -5900,20 +6095,20 @@ msgstr "Převede 2D vektorovou mapu na mapu 3D" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "Převede 3D rastrové mapy na 2D rastrové mapy" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "Správa vlicovacích bodů pro georektifikaci" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "Grafické modelování" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "Spustit grafické modelování" @@ -5931,13 +6126,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "Nástroj pro animace" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "Spustí nástroj pro animace" @@ -5951,16 +6146,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -5980,7 +6175,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "Zavřít grafické prostředí" @@ -5988,8 +6183,8 @@ msgstr "Zavřít grafické prostředí" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "Ukončit GRASS GIS" @@ -5997,42 +6192,42 @@ msgstr "Ukončit GRASS GIS" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "&Nastavení" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "Výpočetní region" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "Nastavit region" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "Spravuje definice hranic geografického regionu." @@ -6045,7 +6240,8 @@ msgid "Mapset access" msgstr "Přístup k mapsetu" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#, fuzzy +msgid "Set/unset access to other mapsets in current project" msgstr "Nastavit/zrušit přístup k mapsetům v aktuální lokaci" #: ../gui/wxpython/menustrings.py:234 @@ -6069,11 +6265,13 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "Změnit lokaci a mapset" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "Vybrat lokaci a mapset projektu" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#, fuzzy +msgid "Change current project and mapset." msgstr "Změnit aktuální lokaci a mapset" #: ../gui/wxpython/menustrings.py:240 @@ -6107,15 +6305,18 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +#, fuzzy +msgid "Create new project (location)" msgstr "Vytvořit novou lokaci" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" #: ../gui/wxpython/menustrings.py:252 @@ -6141,8 +6342,7 @@ msgstr "Správa kartografických zobrazení" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6173,7 +6373,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "Vlastnosti" @@ -6183,86 +6383,86 @@ msgstr "" "Uživatelské nastavení grafického prostředí (font displeje, příkazy, " "digitizér, atd)" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "&Rastr" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "Vytvořit rastrovou mapu" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "Komprimovat/dekomprimovat " -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "Komprimuje a dekomprimuje rastrové soubory." -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "Hranice regionu" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "Definuje hranice rastrové mapy." -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "Spravovat NULL hodnoty" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "Správa NULL hodnot dané rastrové mapy." -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "Kvantizace" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "Vytváří kvantizační soubor pro mapu s plovoucí desetinnou čárkou." -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "Časové razítko" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "Převzorkování za použití agregačních statik" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "Převzorkovat rastrovou vrstvu na hrubší s využitím agregace." -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "Převzorkování (změna rozlišení) za použití různých metod" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "Převzorkování (změna rozlišení) metodou nejbližšího souseda" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "Modul pro převzorkování rastrových map." -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "" "Převzorkování (změna rozlišení) pomocí RST (regularized spline tension)" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " @@ -6272,113 +6472,113 @@ msgstr "" "rastrového souboru do nové rastrové mapy (volitelně s novým rozlišením) za " "použití RST -regularized spline s tension a vyhlazení - smothing." -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "Vytvoření a správa podpůrného souboru" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "Umožňuje vytvořit a/nebo modifikovat podpůrné soubory rastrové mapy." -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "Aktualizovat mapovou statistiku" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "Aktualizuj statistiku rastru" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "Dlaždice" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" "Vytvoří dlaždice zdrojové projekce pro použití v cílovém regionu a projekci." -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "Správa barev" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "Tabulka barev" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "Tabulka barev (stddev)" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "Interaktivní správa rastrové tabulky barev." #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "Exportovat barevnou tabulku" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "Smíchat 2 barevné rastrové mapy" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "Spojí barevné části dvou rastrových map zadaným poměrem." -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "Vytvořit RGB" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" @@ -6386,120 +6586,120 @@ msgstr "" "rastrové vrstvy." #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "Transformace RGB -> HIS" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "Dotazování rastrové vrstvy" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "Dotaz na hodnoty podle souřadnic" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "Dotaz na barvu podle hodnoty" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "Dotazuje se na barvu rastrové vrstvy" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "Obalová zóna rastrové mapy" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "Soustředné kruhy" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" "Vytvoří rastrovou mapu obsahující soustředné kruhy okolo zadaného bodu." -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "Nejbližší body" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "Nalezne nejbližší body mezi objekty ze dvou rastrových map." -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "Vytvoří rastrovou spojitých oblastí zvětšených o jednu buňku." #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "Vzdálenost k prvkům" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "3D rastrový kalkulátor" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "Analýza okolí" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "Pohybující se okno" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " @@ -6508,36 +6708,36 @@ msgstr "" "Hodnota každé buňky v novém rastru bude funkcí hodnot kategorii sousedních " "buněk a bude uložena jako hodnota ve výstupní rastrové mapě." -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "Analýza okolí" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "Překrývat rastrové mapy" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "Výsledek přeložení" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "Vytvoří násobné překrytí hodnot kategorií z několika rastrových map." -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "Překrývat rastrové mapy" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." @@ -6546,11 +6746,11 @@ msgstr "" "jedné nebo několika map tak, že vyplní oblasti \"bez žádných dat\" v " "jinémapové vrstvě." -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." @@ -6558,51 +6758,51 @@ msgstr "" "Hodnota každé buňky ve výstupním rastrovém souboru je funkcí hodnot několika " "dalších buněk ve vstupním rastrovém souboru." -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "Statistický překryv" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "Solární záření a stíny" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "Sluneční záření a ozáření" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6613,22 +6813,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "Stínovaná mapa" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6636,23 +6836,23 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "Terénní analýza" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "Vytvořit vrstevnice" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "Vytvoří vektorovou vrstvu obsahující vrstevnice z modelu terénu." -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "Povrch nákladů" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " @@ -6662,104 +6862,104 @@ msgstr "" "polohami na vstupní rastrové vrstvě kde každá hodnota buňky prezentuje " "náklad." -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "Výpočet kumulativního pohyby nákladů mezi lokacemi" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "Nejméně nákladná cesta nebo dráha odtoku" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "Míra svahu a expozice" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "Parametry terénu" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "Texturální prvky" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "Vytvoří obrázky s texturálními vlastnostmi rastrové mapy." -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "Viditelnost" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "Úhel horizontu" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6770,15 +6970,15 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "Prvky transformace" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "Shromáždit" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." @@ -6786,162 +6986,162 @@ msgstr "" "Změní kategorie dat rastrového souboru tak, že seskupí sousedící buňky " "formující fyzicky spojité oblasti do jedinečných kategorií." -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "Růst " -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "Ztenčit" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "Hydrologické modelování" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "Rozdělit stream na kanály" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "Vyplnit jezera" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "Model terénu bez depresí a mapa odtoku " -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "Akumulace toku gridu" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "Linie toku" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "Analýza povodí" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "Rozvodnice subpovodí" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "Vytvoří mapy povodí v rastrové mapě." -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "Vytvoření rozvodnice povodí" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "Modelování povrchového odtoku SIMWE" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "Modelování toku sedimentů SIMWE" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "Mapa s topografickým indexem" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "Simulace TOPMODEL" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "Simuluje TOPMODEL, což je dynamický hydrologický model." -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "Modelování podzemní vody" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "Proudění podzemní vody" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -6949,52 +7149,52 @@ msgstr "" "Numerický výpočetní program pro dvourozměrné transientní proudění podzemní " "vody s napjatou nebo volnou hladinou." -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "Analýza krajiných \"patch\" charakteristik" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "Nastavit vzorkování a analýzu rámce" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "Konfigurační editor pro r.li.'index'" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "Hustota hran" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "Počítá index hustoty hran rastrové mapy za použití algoritmu 4 sousedů" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "Vážený rozdíl hustoty hran" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "Počítej podle kontrastu vážený index hustoty hran" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "Průměrná velikost plošky" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" @@ -7002,99 +7202,99 @@ msgstr "" "Počítá průměrný index velikosti plošek rastrové mapy za použití algoritmu 4 " "sousedů." -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "Rozmezí velikostí plošek" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "Vypočítá rozsah velikosti plošek v rastrové vrstvě" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "Směrodatná odchylka velikostí plošek" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "Vypočítá směrodatnou odchylku velikostí plošek rastrové vrstvy" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "Koeficient variace velikostí plošek" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "Vypočítá koeficient variace velikostí plošek v rastrové vrstvě" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "Hustota plošek" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Počítá index hustoty plošek na rastrové mapě za použití algoritmu 4 sousedů" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "Číslo plošky" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" "Počítá index počtu plošek na rastrové mapě za použití algoritmu 4 sousedů." -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "Dominanceova diverzita" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "Počítám index diversity dominance rastrové mapy" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "Shannonova diverzita" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "Počítá Shannonův index diversity v rastrové mapě" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "Simpsonova diverzita" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "Spočítá Simpsonův index diversity rastrové vrstvy" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "Bohatost" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "Index ostrosti" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "Počítám index tvaru rastrové mapy" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "Modelování požáru" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "Rychlost šíření" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7102,22 +7302,22 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "Vytvořit trasy s nejmenším odporem šíření" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" "Sleduje cestu zpět až do místa, odkud započal výpočet kumulativních nákladů." -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "Simulace anisotropicého jevu šíření" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7126,17 +7326,17 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "Modifikovat hodnoty kategorií a štítky" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "Upravit informace o kategoriích" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." @@ -7144,19 +7344,19 @@ msgstr "" "Spravuje hodnoty kategorií a štítky spojené s uživatelem zadanou rastrovou " "vrstvou." -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "Interaktivně editovat hodnoty kategorií" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "Reklasifikovat podle velikosti" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." @@ -7165,169 +7365,169 @@ msgstr "" "hraniční velikosti ploch (v hektarech)." #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "Reklasifikovat" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "Překódovat" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "Překóduje kategorie rastrové mapy." -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "Změnit měřítko" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "Změní rozsahy hodnot v kategoriích rastrové mapy." -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "Změnit měřítko s histogramem" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" "Změní kategorie histogramu rastrové mapy podle rozsahu hodnot kategorií." -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "Vytvořit rastrovou vrstvu s náhodnými hodnotami" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "Náhodné buňky" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "Vytvoří prostorově závislé pole náhodných hodnot." -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "Vytvořit rastrovou vrstvu a vektorové body s náhodnými hodnotami" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "Vytvořit povrch" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "Vytvořit povrch na základě fraktálu" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "Vytváří fraktální povrch o zadané fraktální dimenzi" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "Vytvoř povrch Gaussových odchylek" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "Vytvoř povrch Gaussových odchylek" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "Vytvoř náhodný povrch" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "Vytvořit náhodný povrch s prostorovým vztahem" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "Vytvoří prostorově závislé povrchy náhodných hodnot." -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "Interpolovat povrch" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "Bilineární a bikubická interpolace z vektorových bodů" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "Interpolace IDW z rastrových bodů" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "Interpolace IDW z vektorových bodů" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "Rastrové vrstevnice" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "Interpolace pomocí RST (regularized spline tension)" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7335,107 +7535,107 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "Vyplnit NULLové buňky" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "Zprávy, výpisy a statistiky" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "Základní výpis metadat rastrové mapy" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "Vypíše základní informace o rastrové vrstvě." -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "Obecné statistiky" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "Vytvoří statistiku ploch pro rastrovou vrstvu." -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "Kvantily velkých datových sad" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "Vypočítá kvantily použitím dvou průchodů." -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "Rozsah hodnot kategorii" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" "Vytiskne pouze stručný seznam hodnot kategorií, nalezených v rastrové mapě." -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "Výpis ploch v rastrové mapě podle kategorií" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "Vypíše statistiky pro rastrové vrstvy." -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "Souhrnná statistika spojených buněk (po použití r.clump)" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "Celkem opravených ploch" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "Univariantní statistika rastrové vrstvy" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7444,31 +7644,31 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "Vzorové body profilu" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" "Vytvoří rastrovou mapu hodnot, ležících na uživatelem definovaných liniích." -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "Kontrolní hodnoty profilu (použít azimut/vzdálenost)" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" "Vytvoří rastrovou mapu, jejíž hodnoty leží na uživatelem definovaném " "transektu." -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "Kovariance/korelace" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." @@ -7476,27 +7676,27 @@ msgstr "" "Vytvoří kovarianční/korelační matici pro uživatelem zadanou rastrovou " "mapu(y)." -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "Lineární regrese" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "Vypočítá lineární regresi pro dvě rastrové vrstvy: y = a + b*x" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "Vícenásobná regrese" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "Vypočítá vícenásobnou lineární regresi pro rastrové vrstvy." -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "Společný výskyt kategorie (koincidence)" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." @@ -7504,29 +7704,29 @@ msgstr "" "Vytvoří tabulku mutualoccurrence (koincidence) kategorií pro dvě rastrové " "mapy." -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "&Vektor" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "Vytvořit vektorovou mapu" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "Vytvořit novou vektorovou mapu" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "Vytvořit novou prázdnou vektorovou mapu" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "Editovat vektorovou vrstvu (NEinteraktivně) " -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." @@ -7534,92 +7734,93 @@ msgstr "" "Edituje vektorovou mapu, umožňuje přidání, mazání a modifikaci vektorových " "prvků." -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "Změnit typy vektorových prvků" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "Změní typ vektorových prvků." -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "Rovnoběžné linie" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "Vytvoří rovnoběžné linie ke vstupní linii" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "Rozloží společné hranice " -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Rozloží hranice mezi sousedícími plochami, sdílejícími společné číslo " "kategorie nebo atribut." -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "Vytvořit 3D vektor nad rastrem" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "Vytvořit 3D vektorovou mapu" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "Vytvořit popisky" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "Vytvoří barevné popisky pro vektorovou mapu z přiložených atributů." -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "Transformace vektorové vrstvy" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "Aktualizuje metadata vektorové vrstvy." -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "Správa topologie" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "Vytvořit nebo přebudovat topologii" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." @@ -7627,113 +7828,113 @@ msgstr "" "Vytvoří topologii vektorové vrstvy. Volitelně také zkontroluje topologické " "chyby." -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "Přebudovat topologii všech vektorových vrstev" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "Přebuduje topologii všech vektorových vrstev v aktuálním mapsetu." -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "Vytvořit mnohonásobné linie" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "Vytvořit mnohonásobné linie z linií a hranic." -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "Rozdělit linie" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "Rozdělit linie" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "Vytvoří body/segmenty ze vstupních vektorových linií a pozic." -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "Vyčistit vektorovou mapu" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "Sada nástrojů k čištění topologie vektorové mapy." -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "Vyhladit, nebo zjednodušit" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "Přidat centroidy" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "K uzavřeným hranicím přidá chybějící centroidy." -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "Interaktivní správa vektorové tabulky barev" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "Dotaz na vektorovou mapu" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "Souřadnicový dotaz" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "Atributový dotaz" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "Vypsat vektorové atributy" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "Výběr prvků" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "Vybrat podle atributů" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." @@ -7741,102 +7942,102 @@ msgstr "" "Vybrere vektorové prvky z existující vektorové vrstvy a vytvoří novou vrstvu " "obsahující jenom vybrané prvky." -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "Vybrat podle jiné vrstvy" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" "Vybere prvky z vektorové vrstvy (A) podle prvků z druhé vektorové vrstvy (B)" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "Buffer vektorů" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "Vytvoří buffer okolo prvků vektoru zadaného typu." -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "Vyjme outsidery z bodových vektorových dat" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "Rozházet body" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "Testovací/trénovací sada bodů" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "Náhodně rozdělit body do testovacích množin." -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "Analýza LIDAR dat" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "Detekce hran" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "Detekovat hrany objektů z LIDAR dat." -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "Detekovat vnitřní plochy" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" @@ -7844,41 +8045,41 @@ msgstr "" "Hledání linií a algoritmus růstu regionu (Region Growing) pro nalezení " "vnitřků budov" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "Spravit a reklasifikovat prvky" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "Lineární referencování pro vektorové vrstvy" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "Vytvořit LRS" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "vytvořit staničení" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "Vytvořit body/segmenty" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." @@ -7886,11 +8087,11 @@ msgstr "" "Vytvoří body/segmenty ze vstupních linií, lineární referenční systém a " "umístění jsou čteny ze standardního vstupu nebo souboru." -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "Nalézt ID linie a odchylku" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." @@ -7898,11 +8099,11 @@ msgstr "" "Nalezne id linie a skutečnou délku + odchylku pro dané body ve vektorové " "mapě používající lineární referenční systém." -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "Nejbližší prvky" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." @@ -7910,61 +8111,61 @@ msgstr "" "Hledá nejbližší prvek ve vektorové vrstvě 'do_mapy' pro prvky ve vektorové " "vrstvě 'z_mapy'" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "Síťová analýza" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "Analýza vektorové sítě" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "Nástroj pro interaktivní analýzu vektorové sítě." -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "Příprava sítě" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "Provádí údržbu sítě." -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "Přidělit podsítě" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "Rozdělit síť" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "Nejkratší cesta" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "Nalézá nejkratší cestu ve vektorové síti." -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "Nejkratší cesta pro skupinu prvků" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -7972,96 +8173,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "Nejkratší cesta pomocí časového rozvrhu" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "Hledá nejkratší cestu pomocí časového rozvrhu." -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "Nejkratší cesta pro všechny dvojice" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "Vypočítá nejkratší cestu mezi páry bodů v síti." -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "Viditelnost/linie viditelnosti" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "Maximální tok" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "Spojení vrcholů" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "Součásti" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "Vypočítá silně a slabě připojené součásti v síti" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "Steinerův strom" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "Strom nejkratší vzdálenosti" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "Vypočítá nejkratší vzdálenosti pro síť" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "Problém obchodního cestujícího" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8069,45 +8270,45 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "Překrýt vektorové mapy" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "Spojit vektorové mapy" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "Upravit kategorie" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "Změnit nebo vypsat kategorie" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." @@ -8115,89 +8316,89 @@ msgstr "" "Změnit hodnoty kategorií pro existující vektorovou vrstvu podle výsledků SQL " "dotazu nebo podle hodnot sloupce v tabulce." -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "Modifikovat atributy" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "Aktualizovat atributy plochy z rastru" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "Aktualizovat bodové atributy z ploch" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" "Uloží hodnoty rastrové mapy na pozicích bodů překryvné vektorové mapy do " "atributové tabulky." -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "Vzorkovat rastrové vrstvy v bodech" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" "Uloží hodnoty rastru pod vektorovými body do jejich atributové tabulky." -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "Vzorkovat okolí v rastrové vrstvě v okolí daného bodu" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "Získává vzorky z rastrové mapy místech vektorových bodů" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "Vytvořit plochu pokrývající aktuální region" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "Vytvořit plochy z bodových dat" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "Konvexní obal" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "Vytvořit Delaunayovu triangulační síť bodové vrstvy" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." @@ -8205,165 +8406,165 @@ msgstr "" "Vytváří Delaunayovu triangulaci ze vstupní vektorové mapy obsahující body " "nebo centroidy." -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "Voroného diagram/Thiessenovy polygony" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "Vytvořit mřížku" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "Vytvořit bodovou vrstvu" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "Vytvořit z databáze" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" "Vytvoří novou vektorovou (bodovou) mapu na základě databázové takulky " "obsahující souřadnice." -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "Vytvořit body podél linií" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "Vytvořit náhodnou bodovou vrstvu" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "Odstranit body mimo sadu bodů" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "Základní metadata vektorové mapy" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "Klasifikovat atributová data" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "Klasifikuje atributová data, například pro tématické mapy" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "Zpráva o topologii podle kategorií" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "Univariantní statistika vektorových bodů a jejich atributů" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "Univariantní statistika atributových sloupců" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" "Spočítá univariantní statistiku pro vybraný sloupec tabulky vektorové vrstvy." -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "Ukazatel zkusné plochy" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "Test normality" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "&Obraz" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "Vytvořit obrazový soubor a skupiny" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "Vytvořit/upravit skupinu" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "Cílová obrazová skupina" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "Určí cíl obrazové skupiny jako lokaci a mapset GRASSu." -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "Vytvořit mozaiku více jak 4 sousední obrazové soubory" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "Správa barevné škály obrazových dat" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "Vyvážení barev pro RGB" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "Transformace HIS -> RGB" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." @@ -8371,7 +8572,7 @@ msgstr "" "Převede rastrové mapy z HIS (odstín-intenzita-sytost) do RGB (červená-zelená-" "modrá)" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." @@ -8379,11 +8580,11 @@ msgstr "" "Převede rastrové mapy z RGB (červená-zelená-modrá) do HIS (odstín-intenzita-" "sytost)" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "Rektifikovat obraz nebo rastrovou mapu" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." @@ -8391,94 +8592,94 @@ msgstr "" "Rektifikuje obrazová data výpočtem transformace každého pixelu obrazu pomocí " "vlicovacích bodů (GCP)" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "Histogram" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "Vytvořit histogram obrazu" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "Spektrální odezva" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" "Zobrazí spektrální odrazivost na uživatelem zadaných místech ve skupině " "obrazů." -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "Klasifikace obrazových dat" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "Metoda shlukování pro neřízenou klasifikaci" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "Vstup pro řízenou klasifikaci MLC" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "Vytvoří statistiku pro výstupní rastrovou mapu z i.maxlik" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "Klasifikátor MLC (Maximum likelihood classification)" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "Interaktivní vstup pro řízenou klasifikaci" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "Vstup pro řízenou klasifikaci SMAP" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "Vytvoří statistiku pro výstupní rastrovou mapu z i.smap" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "Klasifikátor SMAP (Sequential maximum a posterior)" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." @@ -8486,398 +8687,398 @@ msgstr "" "Provede kontextuální klasifikaci obrazu s využitím metody SMAP (sequential " "maximum a posterior)." -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "Vstup pro řízenou klasifikaci SMAP" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "Upravit kategorie" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "Filtrace obrazu" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "Detekce hran" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "Žádné-křížení \"detekce hran\" rastrová funkce zpracování obrazu." -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "Uživatelská definice maticového filtru" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "Maticový filtr na rastrové mapě." -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "Transformace obrazu" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "Kanonické komponenty" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "Hlavní komponenty" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "Fourierova transformace" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "Rychlá Fourierova transformace (FFT) pro zpracování obrazových dat." -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "Inverzní Fourierova transformace" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" "Rychlá inverzní Fourierova transformace (IFFT) pro zpracování obrazových dat." -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "Atmosférické korekce" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "Vegetační index (tassled cap)" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "Emisivita" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "Výpočet evapotranspirace" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "Kappa analýza " -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "Faktor optimálního indexu pro LandSat TM" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "3D r&astr" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "Upravit 3D NULL hodnoty" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "Vytvořit výlučně soubor s bitmapou 3D NULL-hodnota" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "Správa časového razítka" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "3D maska" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "Vytvoří aktuální pracovní 3D rastrovou masku." -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "3D rastrový mapový kalkulátor" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "Průřez" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." @@ -8885,27 +9086,27 @@ msgstr "" "Interpoluje bodová data do G3D 3D rastrové grid vrstvy za použití " "regularized spline with tension (RST)" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "Vypíše základní informace o uživatelem vybrané 3D rastrové vrstvě." -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -8913,103 +9114,103 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "&Databáze" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "Informace o databázi" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "Seznam databází" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "Vypíše všechny databáze pro dané ovladače a lokaci." -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "Seznam ovladačů" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "Vypíše všechny ovladače databáze." -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "Seznam tabulek" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "Vypíše všechny tabulky pro danou databázi." -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "Popsat tabulku" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "Popíše tabulku (detailně)." -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "Seznam sloupců" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "Vypíše všechny sloupce pro zadanou tabulku." -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "Správa tabulek" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "Spojení " -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "Přihlášení" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "Vytvořit databázi" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "Vytvořit prázdnou databázi" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "Smazat databázi" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "Odstraní existující databázi." -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "Smazat tabulku" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "Odstraní atributovou tabulku." -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "Kopírovat tabulku" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." @@ -9017,82 +9218,82 @@ msgstr "" "Kopíruj tabulku. Použita může být buď volba 'from_table' (volitelně s " "'where') nebo volba 'select', ale nikoliv 'from_table' a 'select' současně." -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "Odstranit sloupec" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "Odstraní sloupec z vybrané atributové tabulky." -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "Test" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" "Otestuj ovladač databáze, databáze musí existovat a nastavena pomocí db." "connect" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "Dotaz" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "Dotazovat jakoukoliv tabulku" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "SQL příkaz" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "Databázové spojení" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "Vytvořit tabulku" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" "Vytvoří a připojí novou atributovou tabulku k dané vrstvě vektorové mapy." -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "Odstranit tabulku" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "Odstraní existující atributovou tabulku z vektorové mapy." -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "Spojit tabulky" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "Přidat sloupce" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." @@ -9100,822 +9301,814 @@ msgstr "" "Přidá jeden nebo více sloupců k atributové tabulce připojené k zadané " "vektorové vrstvě." -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" "Odstraní sloupec z atributové tabulky připojené k zadané vektorové vrstvě." -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "Přejmenovat sloupec" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" "Přejmenuje sloupec v atributové tabulce připojené k zadané vektorové mapě." -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "Změnit atributy" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "Aktualizuje sloupec atributové tabulky připojené k vektorové vrstvě." -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "Odstranit řádek" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "Znovu navázat spojení vektoru s databází" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "Databázové spojení" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" "Vytiskne/nastaví připojení databáze pro vektorovou mapu k atributové tabulce" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "&Časový" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "Import" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "Převést rastrový dataset do 3D rastru" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "Ná&pověda" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "Nápověda GRASS GIS" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "Nápověda wxGUI" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "O systému" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "O GIS GRASS" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "Import, export a připojení dat" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "Správce atributových tabulek" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "Vektorová digitalizace" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "Rastrová digitalizace" -#: ../gui/wxpython/menustrings.py:2052 +#: ../gui/wxpython/menustrings.py:2057 msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "Vytvořit nový model" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" -msgstr "Načíst model ze souboru" - -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "Uložit model do souboru" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "Zavřít soubor modelu" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "Export do obrazu" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "Export do Pythonu" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "Ukončit modelování" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "Zavřít okno modelování" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "&Modelování" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "Přidat příkaz" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "Přidat do modelu akci (příkaz GRASSu)" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "Přidat data" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "Přidat data do modelu" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "Definovat vztah" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "Definovat vztah mezi daty a akcemi" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "Přidat podmínku" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "Přidá podmínky (if/else) do modelu" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "Přidá do modelu komentář" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "Odstranit prvek" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "Odstranit data/akce z modelu" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "Vlastnosti modelu (jméno, účel, atd.)" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "Smazat dočasná data" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "Smazat průběžná data definovaná v modelu" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "Spustit celý model" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "Vyhodnotit celý model" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "Zobrazit manuálové HTML stránky Grafického modelování" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "O grafickém modelování" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "Zobrazit informace o Grafickém modelování" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "Exportovat do PostScriptu" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "Vytvořit výstupní PostScript" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "Exportovat do PDF" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "Vytvořit výstupní PDF" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "Ukončit" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "&Vložit" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "Přidat nebo upravit rastrovou vrstvu" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "Přidat nebo upravit vektorovou vrstvu" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "Legenda mapy" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "Přidat nebo upravit legendu rastrů a vektorů" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "Přidat nebo upravit měřítko" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "Text" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "Přidat text" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "Obrázek" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "Přidat obrázek" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "Přidat směrovou růžici" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "Smazat vybraný objekt" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -9948,7 +10141,7 @@ msgid "Text settings" msgstr "Nastavení písma" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -10009,74 +10202,74 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "Profil" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "Vzdálenost (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "Vzdálenost podél transektu" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "Hodnoty buňky" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "Hodnoty rastrové mapy" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "Musíte zakreslit transekt profilu do mapového okna." -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "Nebylo zvoleno nic pro profilování" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "tečkou oddělené hodnoty (*.csv)|*.csv" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "Přepsat soubor?" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" "Reason: %s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -10100,7 +10293,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "" @@ -10146,11 +10339,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "" @@ -10175,11 +10368,11 @@ msgid "Label font size (pts):" msgstr "Velikost písma popisků (pts):" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "Nastavení písma" @@ -10195,402 +10388,401 @@ msgstr "Styl:" msgid "Weight:" msgstr "Váha:" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "Použít změny pro současné sezení a zavřít dialogové okno" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Upozornění" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "Barva linie" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "Šířka linie" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "styl linie" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "Legenda" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "Nastavení značek segmentů transektu" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr " Velikost" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "Styl" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "Nastavení osy" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "X osa" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Y osa" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "Volitelné minimum" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "Volitelné maximum" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "Logaritmické měřítko" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "Nastavení legendy a mřížky" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "Barva mřížky" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "Zobrazit mřížku" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "Velikost písma legendy" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "Zobrazit legendu" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "Prvek nelze vybrat" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "Mapset" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "Zvolit adresář GRASS dat" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "Nastavení výstupu" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "Zdroj vstupu" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "Soubor" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "Adresář" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "Databáze" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "Protokol" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "Typ výstupu" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "Typ zdroje" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "Všechny soubory" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "Soubory ZIP" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "Soubory GZIP" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "Soubory TAR" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "Soubory TARGZ" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "Soubor:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "Vyberte soubor pro import" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "Adresář:" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "Vyberte vstupní adresář" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "Vyberte soubor" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "Možnosti vytvoření:" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "Formát:" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "Protokol:" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "Nejsou k dispozici žádná nastavení" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "Bod" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -10630,13 +10822,13 @@ msgstr "Překladatelé" msgid "Translation status" msgstr "Stav překladu" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "neznámá verze" @@ -10652,107 +10844,107 @@ msgstr "Revize kódu" msgid "Build Date" msgstr "Datum sestavení" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "Jazyk" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "%s soubor chybí" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "E-mail" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "Země" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "OSGeo_ID" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "Soubor <%s> nebyl nalezen." -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "&Další" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "&Předchozí" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 #, fuzzy msgid "Clear prompt and output window" msgstr "Vyčistit obsah okna s výstupem" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Uložit model do souboru" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "Zrušit běžící příkaz" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -10760,7 +10952,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "Výstup příkazů uložen do '%s'" @@ -10843,7 +11035,7 @@ msgstr "" msgid "category" msgstr "kategorie" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "typ" @@ -10864,8 +11056,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -10891,432 +11083,451 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "Uživatelské nastavení" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "Nastavit na výchozí nastavení" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "Vrátit nastavení na výchozí" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "Použít změny pouze pro současné sezení a zavřít" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "Uložit pouze pro toto sezení" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "Nastavení jsou použita, ale nejsou uložena" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "Klíčový sloupec nemůže obsahovat prázdný řetězec." -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "Nastavení grafického prostředí (GUI)" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "Nastavení Správce vrstev" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "Zeptat se při odstraňování mapy ze stromu vrstev" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "Zeptat se při ukončení wxGUI nebo při zavírání mapového okna" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "Automaticky kopírovat vybraný text do schránky (na kartě Konzole)" + +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "Nastavení písma" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "Uložit aktuální nastavení oken jako výchozí" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" +"Uložit aktuální pozici a velikost okna Správa vrstev a mapový displej a " +"použít jako výchozí při příštích sezeních." + +#: ../gui/wxpython/gui_core/preferences.py:379 +#, fuzzy +msgid "Save current single window panes layout as default" +msgstr "Uložit aktuální nastavení oken jako výchozí" + +#: ../gui/wxpython/gui_core/preferences.py:392 +#, fuzzy +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" +"Uložit aktuální pozici a velikost okna Správa vrstev a mapový displej a " +"použít jako výchozí při příštích sezeních." + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +#, fuzzy +msgid "Hide '{}' tab (requires GUI restart)" msgstr "Skrýt kartu '%s' (vyžaduje restart GUI)" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "Histogram" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "Automaticky kopírovat vybraný text do schránky (na kartě Konzole)" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "Nastavení pracovní plochy" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "Zachovat pozici mapových oken" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "Zachovat pozici okna Správce vrstev" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "Uložit aktuální nastavení oken jako výchozí" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" -"Uložit aktuální pozici a velikost okna Správa vrstev a mapový displej a " -"použít jako výchozí při příštích sezeních." - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 #, fuzzy msgid "Window layout settings" msgstr "Nastavení barev" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 #, fuzzy msgid "Use single-window mode (requires GUI restart)" msgstr "Téma ikonek (vyžaduje restart GUI):" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "Písmo pro výstup příkazů:" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "Nastavit písmo" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "Zobrazit manuálovou stránku" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "Nastavení jazyka" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "Zvolte jazyk (vyžaduje nastavení uložit a restartovat GRASS):" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "Nastavení vzhledu" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "Seznam prvků" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "Styl menu (vyžaduje uložit nastavení a restartovat GUI):" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "Výška okna pro výběr mapy (v pixelech):" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "Téma ikonek (vyžaduje restart GUI):" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "Mapové okno" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "Výchozí písmo pro GRASS monitory:" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "Výchozí nastavení displeje" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "Ovladač displeje:" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "Výchozí zobrazení na stavové liště:" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "Nastavit zobrazené rozlišení jako výpočetní " -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "Zapnout/vypnout automatické vykreslování" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "Povolit automatické přiblížení na vybranou mapovou vrstvu" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "Akce pro kolečko myši:" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "Rozšířené nastavení okna" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "Přidat vytvořenou mapu do stromu vrstev" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "Povolit interaktivní vstup" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "Úroveň upovídanosti příkazů:" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "Vrstvy" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "Výchozí nastavení rastrů" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "Neprůhledné buňky s prázdnou hodnotou" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "Výchozí tabulka barev" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "Výchozí nastavení vektorů" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "Zobrazit:" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "Barva prvku:" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "Průhledný" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "Barva výplně plochy:" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "Symbol:" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "Atributy" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "Zvýraznit vybrané prvky" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "Šířka linie (v pixelech):" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "Automaticky zvýraznit vybrané prvky v mapovém okně" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "Datový prohlížeč" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "Dvojklik levým tlačítkem myši:" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "Kódování atributů (např. utf-8, ascii, iso8859-1, Windows-1250):" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "Zeptat se při odstraňování dat z tabulky" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "Vytvořit tabulku" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "Sloupec s klíčem:" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "Kartografické zobrazení" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "Nastavení kartografického zobrazení ve stavového řádku" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "Kód EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "Řetězec PROJ (vyžadováno):" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "Soubor s kódy EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "Načíst kódy EPSG (buďte trpěliví), vložit kód EPSG nebo vložit přímo řetězec " "PROJ." -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "&Načíst kódy EPSG" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "Formát souřadnic" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "Přesnost:" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "Nelze přečíst kódy EPSG: %s" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "Kód EPSG %s nebyl nalezen" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "Vybrat výchozí písmo" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "Správa přístupu do mapsetů" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11330,7 +11541,7 @@ msgstr "" " - Můžete zapisovat pouze do současného mapsetu.\n" " - Můžete zapisovat pouze do mapsetu, který vlastníte." -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "Vlastník" @@ -11347,7 +11558,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "Nastavit průhlednost <%s>" @@ -11470,7 +11681,7 @@ msgstr "Uložit okno do souboru" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "Vybrat písmo" @@ -11505,9 +11716,8 @@ msgid "Map Display Settings" msgstr "Výchozí nastavení displeje" #: ../gui/wxpython/gui_core/toolbars.py:86 -#, fuzzy -msgid "(Un)dock Map Display" -msgstr "Mapové okno" +msgid "(Un)dock" +msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 msgid "Clear" @@ -11530,7 +11740,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -11586,7 +11796,7 @@ msgid "Optional" msgstr "Volitelné" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "Parametrizace v modelu" @@ -11598,79 +11808,79 @@ msgstr "[mnohonásobné]" msgid "valid range" msgstr "platný rozsah" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "Zvolit barvu" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "Vybrat %s" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "&Nahrát" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "Uložit obsah do souboru pro pozdější použití" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "nebo zadejte hodnoty přímo:" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "ID vrstvy" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "Název vrstvy" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "Typ prvku" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "Kartografické zobrazení odpovídá" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "Manuálová stránka" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11678,95 +11888,95 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "Není co uložit" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "Chyba v %s" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "%(cmd)s: parametr '%(key)s' není dostupný" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "Výsledky dotazu" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" "Po kliknutí pravým tlačítkem lze vybrané hodnoty zkopírovat do schránky." -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "Prvek" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "Hodnota" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "Kopírovat vše do schránky" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "Přesměrovat do konzole" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "Kopírovat ze sloupce '%s'" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "Kopírovat vybrané řádky" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "Kopírovat '%s'" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "Kopírovat řádek" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "Výsledky dotazu:" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "východní, severní" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "Nic nenalezeno" @@ -11774,67 +11984,71 @@ msgstr "Nic nenalezeno" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "Vybrat GRASS location a mapset" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." +msgstr "Není určena délka měřítka" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +#, fuzzy +msgid "Name of GRASS project:" msgstr "Název lokace GRASSu:" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "Název mapsetu:" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "Vybrat mapset v lokaci GRASSu" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "Chybí název mapsetu." -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "Vybrat vektorovou mapu" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "Chybí název vektorové vrstvy." -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "Vyvořit atributovou tabulku" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "Chybí název nové vektorové vrstvy." -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "Název nové vektorové mapy:" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "Nelze vytvořit vektorovou mapu <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " @@ -11843,315 +12057,315 @@ msgstr "" "Vektorová mapa <%s> již existuje v současném mapsetu. Přejete si tuto mapu " "přepsat?" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "Načíst region:" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "Uložit region:" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "Vybrat vše" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "Seznam map:" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "Vybrat přepínač" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "Mapset:" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "Obrátit výběr" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "Zrušit výběr" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "Nastavit průhlednost mapové vrstvy" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "Průhledný" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "Neprůhledný" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "Nastavit velikost obrázku" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "Velikost obrázku" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "Šablona:" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "SQL příkaz" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "Symboly" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "Vybrat písmo:" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "Kódování znaků:" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "Velikost písma:" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 #, fuzzy msgid "{} tools matched" msgstr "%d modulů odpovídá" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "Nastavení <%s> nebylo nalezeno." -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "Uložit nastavení" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "Nastavení <%s> již existuje. Přejete si toto nastavení přepsat?" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "Nastavení není definováno. Operace byla zrušena." -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "Nastavení nelze uložit" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12231,9 +12445,9 @@ msgid "Snap also to vertex" msgstr "Přichytávat také k opěrným bodům" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "Práh přichycení je %(value).1f %(units)s" @@ -12256,141 +12470,141 @@ msgid "" msgstr "" "Jako výchozí jsou vybrány všchny prvky, které zasahují do vyznačené oblasti" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "Zkontrolovat zdvojené prvky" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "Rozdělit linie na průsečících" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "Uložit změny" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "Uložit změny při ukončení" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "Nástroj pro dotazování" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "Vybrat nástroj pro dotazování" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "Vybrat myší" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "délka" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "Vybrat linie" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "kratší než" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "delší než" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "přívěsek" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "Vybrat dangles" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "Digitalizovat nový prvek" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "Přidat nový záznam do atributové tabulky" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Vrstva" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Kategorie" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "Mód" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "Použít další" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "Číslo kategorie" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "Mód kategorie" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "Manuálně" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "Žádná kategorie" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "Odstranit existující prvek(y)" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "Odstranit záznam s tabulky" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "Atributy geometrie prvku" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "plocha" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "Obvod" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." @@ -12398,86 +12612,86 @@ msgstr "" "Poznámka: Tato nastavení jsou uložena v souboru pracovní plochy, ne v " "nastavení vektorové digitalizace." -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "Digitalizovat nový segment linie" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "Digitalizovat novou linii/hranici" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "Zvýraznění" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "Zvýraznění (zdvojené prvky)" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "Linie" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "Hranice (nikoliv plocha)" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "Hranice (jedna plocha)" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "Hranice (dvě plochy)" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "Centroid (uvnitř plochy)" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "Centroid (mimo plochu)" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "Centroid (duplicitní uvnitř plochy)" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "Uzel (jedna linie)" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "Uzel (dvě linie)" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "Opěrný bod" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "Plocha (uzavřené hranice + centroid)" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Směr" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "Zakázat přichycení" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "Práh přichycení je %(value).1f %(units)s (podle výpočetního regionu)" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "Nastavení digitizéru uloženo do souboru <%s>." -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12495,216 +12709,216 @@ msgstr "" msgid "Topology missing" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "Přidat nový bod" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "Levé: nový bod" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "Přidat novou linii" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "Levé: nový bod; Ctrl+levé: zpět poslední bod; Pravé: uzavřít linii" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 #, fuzzy msgid "Digitize new boundary (Ctrl+B)" msgstr "Přidat novou hranici" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 #, fuzzy msgid "Digitize new centroid (Ctrl+C)" msgstr "Přidat nový centroid" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 #, fuzzy msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "Digitalizovat novou plochu (hranice bez kategorie)" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 #, fuzzy msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "Odstranit vybrané body, linie, hranice nebo centroidy" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Odstranit vybrané plochy" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 #, fuzzy msgid "Display/update attributes (Ctrl+K)" msgstr "Zobrazit/aktualizovat atributy" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "Levé: Vybrat" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 #, fuzzy msgid "Display/update categories (Ctrl+J)" msgstr "Zobrazit/aktualizovat kategorie" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "Otočit vybrané linie/hranice" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 #, fuzzy msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "Odstranit vybrané body, linie, hranice nebo centroidy" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "Přejmenovat vybraný mapset" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "Otevřít (Ctrl+O)" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 #, fuzzy msgid "Quit (Ctrl+Q)" msgstr "Spustit (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "Ukončit digitalizaci a uložit změny" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Zobrazit manuál" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "Zobrazit manuál vektorové digitalizace" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "Další nástroje (kopírovat, otočit, spojit, atd.)" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 #, fuzzy msgid "Undo (Ctrl+Z)" msgstr "Spustit (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "Zpět předchozí změny" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 #, fuzzy msgid "Redo (Ctrl+Y)" msgstr "Spustit (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "Obnovit předchozí změny" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "Rozdělit vybrané linie/hranice na průsečíku" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "Spojit vybrané linie/hranice" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "Kopírovat kategorie" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "Kopírovat prvky z podkladové vektorové mapy" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "Konverze typů vektorových prvků" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "Otočit vybrané linie/hranice" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "Připojit vybrané linie/hranice" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "Spojit vybrané linie/hranice (pouze na uzlech)" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "rozdělit linii/hranici" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "Dotazovat prvky" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "Přiřazení Z souřadnice pro popisky u 3D linií" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "Vektorová mapa není 3D. Operace ukončena." -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12713,43 +12927,43 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "Chyba digitalizace" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "Prosím počkejte, otevírá se vektorová mapa <%s> pro editaci..." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "Chcete uložit změny do vektorové mapy <%s>?" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "Uložit změny?" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" "Prosím počkejte, zavírám a buduji topologii pro vektorovou mapu <%s>..." -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "Nová vektorová mapa" @@ -12762,8 +12976,8 @@ msgid "Add new category" msgstr "Přidat novou kategorii" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "Uložit změny" @@ -12772,11 +12986,11 @@ msgid "Ignore changes and close dialog" msgstr "Ignoruj změny a zavři dialog" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "Uložit změny a zavřít" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "ID prvku:" @@ -12824,24 +13038,24 @@ msgstr "ID prvku" msgid "Layer (Categories)" msgstr "Vrstva (Kategorie)" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -12849,97 +13063,97 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -12951,19 +13165,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -12982,32 +13196,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "Prosím čekejte, exportuji obrázek..." -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "Přiblížit na uložený region" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "Nastavit výpočetní region podle pojmenovaného regionu" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "Region <%s> nebyl nalezen. Operace ukončena." -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "Uložit rozsah okna do souboru regionu" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "Uložit výpočetní region do souboru regionu" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "Soubor regionu <%s> již existuje. Přejete si tento soubor přepsat?" @@ -13119,100 +13333,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "Přid&at vrstvu" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13241,12 +13455,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "Nahoru" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "" @@ -13320,11 +13534,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13335,50 +13549,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "Vybrat skupinu:" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -13394,11 +13608,11 @@ msgstr "2. Vyberte lokaci GRASSu" msgid "3. Select GRASS Mapset" msgstr "3. Vyberte mapset GRASSu" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "Adresář databáze GRASS GISu obsahuje lokaci." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." @@ -13407,7 +13621,7 @@ msgstr "" "(kartografické zobrazení). Jedna lokace může představovat jeden projekt. " "Lokace obsahuje mapsety." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." @@ -13415,29 +13629,29 @@ msgstr "" "Mapset obsahuje gisová data, která se mohou vztahovat k určitému projektu, " "úkolu v rámci projektu, subregionu nebo uživateli." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "Spustit sezení &GRASSu" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "&Procházet" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "No&vý" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "Vytvořit nový mapset ve vybrané lokaci" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "N&ová" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." @@ -13446,63 +13660,75 @@ msgstr "" "vytvořena, se spustí sezení GRASSu." #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "Př&ejmenovat" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Přejmenovat vybranou lokaci" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "O&dstranit" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Odstranit vybranou lokaci" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Odstranit vybraný mapset" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "Spuštění GRASS GISu %s %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "Spustit sezení GRASSu" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "Nelze nastavit GRASS databázi. Zkontrolujte nastavení." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "CHYBA: Lokace <%s> nebyla nalezena\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "CHYBA: Mapset <%s> nebyl nalezen\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13512,8 +13738,8 @@ msgstr "" "\n" " Tento mapset nemůže být přejmenován." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13524,14 +13750,14 @@ msgstr "" "\n" "Vložte nové jméno:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Zpráva" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13542,7 +13768,7 @@ msgstr "" "\n" "Mapset <%s> již existuje v location." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13553,7 +13779,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13564,7 +13790,7 @@ msgstr "" "\n" "Lokace <%s> již v adresáři databáze GRASSu existuje." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13575,7 +13801,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13585,11 +13811,11 @@ msgstr "" "\n" "Tento mapset nemůže být smazán." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" @@ -13597,11 +13823,11 @@ msgstr "" "\n" "VŠECHNY MAPY tohoto mapsetu budou NENÁVRATNĚ SMAZÁNY!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "Nelze odstranit mapset" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13612,37 +13838,37 @@ msgstr "" "\n" "VŠECHNY MAPY této lokace budou NENÁVRATNĚ SMAZÁNY!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "Nelze odstranit lokaci" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "Cesta '%s' neexistuje." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "Vložte jméno nové mapsetu:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "Mapset <%s> již existuje." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13651,16 +13877,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "Nelze vytvořit nový mapset: %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13679,12 +13905,12 @@ msgstr "" "Přejete si odstranit .gislock (k této operaci potřebujete příslušné " "oprávnění) a pokračovat?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13696,7 +13922,7 @@ msgstr "" "Pokud je opravdu spuštěno jiné sezení GRASSu, můžete tímto poškodit data. " "Podívejte se radši ještě do správce procesů..." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13707,7 +13933,7 @@ msgstr "" "\n" "Detaily: %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " @@ -13716,7 +13942,7 @@ msgstr "" "Název <%(name)s> není platným názvem lokace nebo mapsetu. Používejte pouze " "znaky ASCII kromě %(chars)s a mezery." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " @@ -13727,150 +13953,150 @@ msgstr "" "volbou je adresář \"grassdata\" umístěný v domovském adresáři. Adresář " "vyberete po stisknutí tlačítka Procházet." -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "topologie" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "Počáteční bod" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "Koncový bod" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "nový bod" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "Nejkratší cesta %s" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "Koncový bod" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "Problém obchodního cestujícího %s" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "Maximální tok %s" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -13878,7 +14104,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -13886,45 +14112,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "Vektorová vrstva s výsledkem analýzy neexistuje." -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -13932,38 +14158,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -14062,117 +14288,117 @@ msgstr "" msgid "Output" msgstr "Výstup" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "Přidat vektorovou vrstvu do stromu vrstev" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "Vstupní tabulky" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "Výsledné tabulky" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "Načítání tabulek..." -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "Vstupní vektorová mapa neexistuje." -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "Analyzování..." -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "Výpočet uzlů..." -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "Ostatní nastavení" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "Styl bodu:" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "Styl výsledku analýzy:" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "Invertovat barvy %s:" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "Barva linie:" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "Barva nepoužitého bodu:" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "Barva vybraného bodu:" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "Velikost bodu:" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "Šířka bodu:" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "Maximální počet výsledků v historii:" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "Uložit výsledek analýzy" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "Vložena neplatná hodnota. Operace zrušena." -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "Upravit bod" @@ -14188,41 +14414,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -14264,7 +14490,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "" @@ -14295,19 +14521,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "metry" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "kilometry" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "míle" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "stopy" @@ -14331,25 +14557,25 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -14361,8 +14587,8 @@ msgstr "Důvod" msgid "Execution failed:" msgstr "Vykonání příkazu selhalo:" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "Detaily:" @@ -14412,7 +14638,7 @@ msgstr "" msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14421,21 +14647,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "Data jsou ponechána v nevhodném stavu a mohou být porušena" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "Příkaz přerušen" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14456,147 +14682,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "Zlom segmentu" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "Zabalit všechny kromě PERMANENT a aktuální mapset" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "Zabalit všechny kromě PERMANENT mapset" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "Zabalit všechny kromě aktuální mapset" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "Zabalit všechny" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "Rozbalit všechny" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "Editovat vybraný záznam" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "Zobrazit vybrané" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "Přiblížit a změnit střed" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "Nic" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "rám" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "koule" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "krychle" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "diamant" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "astra" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "gyro" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "Histogram" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "kruh" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14604,11 +14830,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14619,11 +14845,11 @@ msgstr "" "\n" "Detaily: %(detail)s" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "Nelze nastavit " -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "Nelze provést nastavení '%s'" @@ -14690,22 +14916,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "Nelze přiblížit na rastrovou vrstvu <%s>." -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "Nelze přiblížit na vektorovou vrstvu <%s>." -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "Nelze přiblížit na 3D rastrovou vrstvu <%s>." -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14739,22 +14965,22 @@ msgstr "řádek: %d" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "Nelze vytvořit soubor <%s>" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14763,33 +14989,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "Zapnout/vypnout automatické překreslování" @@ -14845,15 +15071,15 @@ msgstr "" msgid "Status bar" msgstr "Výchozí zobrazení na stavové liště:" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "Vykreslit" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "Měřítko mapy" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." @@ -14861,33 +15087,33 @@ msgstr "" "Kvůli tomu, že má každý jinak nastaven monitor a rozlišení, nejsou tyto " "hodnoty skutečnými měřítky mapy, ale měly by se jim rozumně blížit." -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "Nastavit souřadnice vlicovacím bodům" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "Kartografické zobrazení není definováno (zkontrolujte nastavení)" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "Chyba kartografického zobrazení (zkontrolujte nastavení)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "Geometrie okna" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "Souřadnice" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 #, fuzzy msgid "Display extent" msgstr "Geometrie okna" @@ -14964,14 +15190,14 @@ msgid "Click mouse to unzoom" msgstr "Oddálení kliknutím myší" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "2D zobrazení" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "3D zobrazení" @@ -14991,47 +15217,47 @@ msgstr "Vektorová digitalizace není dostupná" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "Skrýt panely nástrojů" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -15046,59 +15272,59 @@ msgstr "" "\n" "Detaily: %s" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "Spouštím 3D zobrazení..." -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "Prosím čekejte, načítám data..." -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "Přepnutí zpět do 2D režimu zobrazení ..." -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "Nastavit výpočetní region podle aktuálního okna" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "Nastavit výpočetní region interaktivně" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "Nastavit výpočetní region podle pojmenovaného regionu" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "Uložit výpočetní region jako pojmenovaný region" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -18096,7 +18322,7 @@ msgstr "Vložte hodnoty rastrových kategorií nebo procenta" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "rozmezí" ======= @@ -18407,6 +18633,10 @@ msgid "Change" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -18617,8 +18847,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "" @@ -21282,7 +21512,7 @@ msgid "List of %s layers" msgstr "Seznam %s vrstev" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "vybrat vše (zrušit výběr) po kliknutí pravým tlačítkem" @@ -21296,13 +21526,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "&Import" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "Importovat vybrané vrstvy" @@ -21325,82 +21555,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "Přidat importované vrstvy do stromu vrstev" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "&Připojit" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "Připojit vybrané vrstvy" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "Určete výstupní formát vektorových dat" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "Určete výstupní formát rastrových dat" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "Import DXF vrstev" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "Vyberte soubor DXF pro import" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "Nevybrány žádné vrstvy." -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -21410,6 +21640,7 @@ msgstr "" #: ../gui/wxpython/modules/histogram.py:296 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21421,6 +21652,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -21779,6 +22015,7 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21790,6 +22027,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -21977,14 +22219,14 @@ msgstr "Vyberte soubor pro načtení výrazu" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -21992,15 +22234,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "Načítám data..." -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -22010,7 +22252,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -22022,30 +22264,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -22056,114 +22298,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "Vybrat plochu polygonem" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "Přidat nový opěrný bod" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "Přemístit opěrný bod" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "Odstranit opěrný bod" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -22231,99 +22473,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "Změnit úroveň průhlednosti" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "Přesunout dolů" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "Byl vložen prázdný název." @@ -22677,7 +22920,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -22685,7 +22928,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -22789,6 +23032,7 @@ msgstr "" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22800,6 +23044,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -22852,7 +23101,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -22860,21 +23109,22 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/mapwin/decorations.py:203 @@ -22883,23 +23133,29 @@ 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" msgstr "" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "Panel nástrojů" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 #, fuzzy msgid "Map Swipe Tool" msgstr "Nástrojová lišta pro správu mapy" @@ -22909,22 +23165,38 @@ msgid "Text properties" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" +#: ../gui/wxpython/mapwin/decorations.py:226 +msgid "Remove scale bar" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +msgstr "" +>>>>>>> osgeo-main + #: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "Vybrat model ke spuštění" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -23107,6 +23379,10 @@ msgstr "Přepsat soubor?" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " @@ -23115,138 +23391,139 @@ msgstr "" "Příkaz '%s' ještě nebyl implementován do WxGUI. Zkuste jej přidat jako " "vrstvu příkazů." -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "Vybraná mapová vrstva není vektor." -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "Vybrat soubor se skriptem" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Skript Pythonu (*.py)|*.py|Skript Bashe (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "Spouštím script '%s'..." -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "" +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "Nastavení není definováno. Operace byla zrušena." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "Informace o systému" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "Verze GRASSu" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "Datum výstavby" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "Platforma" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "Zadejte nový název:" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "Přejmenovat mapové okno" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -23254,37 +23531,37 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "průhlednost:" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -23295,16 +23572,23 @@ msgstr "" "%s\n" "ze seznamu vrstev?" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "Přejete si odstranit vybranou mapovou vrstvu ze stromu vrstev?" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "Odstranit mapovou vrstvu" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Ukončit GRASS GUI" ======= @@ -23314,26 +23598,36 @@ msgid "Histogram Tool" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" +#: ../gui/wxpython/wxplot/histogram.py:51 +msgid "Histogram of" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +msgstr "" +>>>>>>> osgeo-main + #: ../gui/wxpython/wxplot/histogram.py:51 msgid "Histogram of" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "" @@ -23361,55 +23655,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "" @@ -23482,7 +23776,7 @@ msgstr "" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "Mapové vrstvy" @@ -23514,112 +23808,117 @@ msgstr "Nastavit výpočetní region podle vybrané vrstvy" msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "Export do běžných formátů" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "Export do PostGISu" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "Vytvořit kopii v aktuálním mapsetu" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "Nastavit tabulku barev" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "Nastavit tabulku barev interaktivně" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "Zobrazit atributová data" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "Spustit editaci" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "Ukončit editaci" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "Vytvořit/znovu sestavit topologii" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "Vypsat statistiku rastru" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "Profil" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "Nelze vytvořit profil rastrové mapy." -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "Nepodporovaný typ mapové vrstvy <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "Vytvořit kopii %s <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "%s <%s> již v aktuálním mapsetu existuje. Přejete si ji přepsat?" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "Nelze vytvořit kopii <%s>." -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "Nelze vytvořit kopii <%s>. Mapset <%s> není aktuálním mapsetem." -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "Nelze zobrazit histogram rastrové vrstvy. Nebyl určen název vrstvy." -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +#, fuzzy +msgid "Set opacity of <{}>" +msgstr "Nastavit průhlednost <%s>" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "Skupina vrstev:" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "Klikněte pro nastavení vrstev " -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "(dvojklik pro nastavení vlastností)" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "Prosím čekejte, aktualizuji data..." @@ -24284,6 +24583,9 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -26264,6 +26566,15 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"Současná location je <%(loc)s>.\n" +"Současný mapset je <%(mapset)s>." + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 #, python-format @@ -26304,20 +26615,24 @@ msgstr "Chcete uložit současné nastavení do souboru pracovní plochy?" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " @@ -26326,30 +26641,38 @@ msgstr "" "Databázové nastavení není pro vektorovou mapu <%s> definováno v souboru DB. " "Toto nastavení můžete provést v panelu 'Správa vrstev'." -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "Prosím čekejte, načítají se atributová data..." -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "Procházet data" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "Správa tabulek" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "Správa vrstev" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Zavřít Správce atributových tabulek" ======= #: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1850 msgid "Prints/sets general DB connection for current mapset." msgstr "" +<<<<<<< HEAD #: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1851 msgid "Login" @@ -27061,541 +27384,2352 @@ msgstr "Zobrazit informace o Grafickém modelování" msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2074 -msgid "Load instruction file" +#: ../gui/wxpython/menustrings.py:2074 +msgid "Load instruction file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2075 ../gui/wxpython/psmap/toolbars.py:68 +msgid "Load text file with mapping instructions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2076 +msgid "Export instruction file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2077 ../gui/wxpython/psmap/toolbars.py:66 +msgid "Generate text file with mapping instructions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2078 +msgid "Export to PostScript" +msgstr "Exportovat do PostScriptu" + +#: ../gui/wxpython/menustrings.py:2079 ../gui/wxpython/psmap/toolbars.py:70 +msgid "Generate PostScript output" +msgstr "Vytvořit výstupní PostScript" + +#: ../gui/wxpython/menustrings.py:2080 +msgid "Export to PDF" +msgstr "Exportovat do PDF" + +#: ../gui/wxpython/menustrings.py:2081 ../gui/wxpython/psmap/toolbars.py:72 +msgid "Generate PDF output" +msgstr "Vytvořit výstupní PDF" + +#: ../gui/wxpython/menustrings.py:2082 ../gui/wxpython/menustrings.py:2083 +msgid "Launch ps.map dialog" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2085 +msgid "Close Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2086 +msgid "&Insert" +msgstr "&Vložit" + +#: ../gui/wxpython/menustrings.py:2087 ../gui/wxpython/psmap/toolbars.py:80 +#: ../gui/wxpython/psmap/dialogs.py:837 ../gui/wxpython/psmap/dialogs.py:891 +msgid "Map frame" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2088 +msgid "Add or edit map frame" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2090 +msgid "Add or edit raster map" +msgstr "Přidat nebo upravit rastrovou vrstvu" + +#: ../gui/wxpython/menustrings.py:2092 +msgid "Add or edit vector map" +msgstr "Přidat nebo upravit vektorovou vrstvu" + +#: ../gui/wxpython/menustrings.py:2093 +msgid "Map legend" +msgstr "Legenda mapy" + +#: ../gui/wxpython/menustrings.py:2094 +msgid "Add or edit raster and vector legend" +msgstr "Přidat nebo upravit legendu rastrů a vektorů" + +#: ../gui/wxpython/menustrings.py:2095 ../gui/wxpython/psmap/toolbars.py:91 +msgid "Map info" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2096 +msgid "Add or edit map info" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2098 +msgid "Add or edit scale bar" +msgstr "Přidat nebo upravit měřítko" + +#: ../gui/wxpython/menustrings.py:2106 ../gui/wxpython/psmap/toolbars.py:83 +msgid "Delete selected object" +msgstr "Smazat vybraný objekt" + +#: ../gui/wxpython/menustrings.py:2109 +msgid "Display the HTML man pages of Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2110 +msgid "About Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2111 +msgid "Display information about Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:204 +#, python-brace-format +msgid "ZIP file is unreadable: {0}" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:223 +#, python-brace-format +msgid "Archive file is unreadable: {0}" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:233 +msgid "Download in progress, wait until it is finished 0%" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:243 +#, python-brace-format +msgid "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, {3:.0f} seconds passed" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:257 +#, python-brace-format +msgid "Download file from <{url}>, return status code {code}, " +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:261 +#, python-brace-format +msgid "Download file from <{url}>, failed. Check internet connection." +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:279 +#, python-brace-format +msgid "Download of <{url}> failed or file <{name}> is not a ZIP file" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:304 +#, python-brace-format +msgid "Unknown format '{0}'." +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:320 +msgid "Downloaded location is not valid" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:379 +msgid "Abort" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:380 +msgid "Abort download location" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:384 +msgid "Select sample location to download:" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:436 +#: ../gui/wxpython/startup/locdownload.py:572 +msgid "Download selected location" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:445 +#: ../gui/wxpython/startup/locdownload.py:511 +msgid "Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:452 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Download in progress, wait until it is finished" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:466 +#, python-format +msgid "Location named <%s> already exists, download canceled" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:475 +#, python-format +msgid "Download failed: %s" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:478 +msgid "Download completed. The downloaded sample data is listed in the location/mapset tabs upon closing of this window" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:509 +#, python-format +msgid "Location named <%s> already exists, rename it first" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:563 +msgid "Location Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:611 +msgid "Do you want to cancel location download?" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:612 +msgid "Abort download" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:80 +msgid "Invalid mapset name" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:106 +msgid "Invalid location name" +msgstr "Neplatný název lokace" + +#: ../gui/wxpython/startup/guiutils.py:131 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:469 +#, python-format +msgid "Invalid line in GISRC file (%s):%s\n" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:171 +msgid "Name for the new mapset:" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:186 +msgid "Unable to create new mapset: {}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:212 +#, fuzzy +msgid "Do you want to import {}to the newly created location?" +msgstr "Přejete si založit lokaci GRASSu <%s>?" + +#: ../gui/wxpython/startup/guiutils.py:217 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:537 +msgid "Import data?" +msgstr "Importovat data?" + +#: ../gui/wxpython/startup/guiutils.py:265 +#, python-brace-format +msgid "" +"Cannot rename mapset <{mapset}> for the following reason:\n" +"\n" +"{reason}\n" +"\n" +"No mapset will be renamed." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:269 +msgid "Unable to rename selected mapset" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:280 +#: ../gui/wxpython/startup/guiutils.py:334 +msgid "" +"Current name: {}\n" +"\n" +"Enter new name:" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:294 +msgid "" +"Unable to rename mapset.\n" +"\n" +"{}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:319 +#, python-brace-format +msgid "" +"Cannot rename location <{location}> for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No location will be renamed." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:323 +msgid "Unable to rename selected location" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:347 +msgid "" +"Unable to rename location.\n" +"\n" +"{}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:410 +#, python-brace-format +msgid "" +"Cannot delete one or more mapsets for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No mapsets will be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:414 +msgid "Unable to delete selected mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:430 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following mapsets?\n" +"\n" +"{deletes}\n" +"\n" +"All maps included in these mapsets will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:435 +msgid "Delete selected mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:448 +msgid "Error when deleting mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:450 +#, python-brace-format +msgid "" +"The following error occured when deleting mapset <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of mapsets was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:495 +#, python-brace-format +msgid "" +"Cannot delete one or more locations for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No locations will be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:499 +msgid "Unable to delete selected locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:515 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following locations?\n" +"\n" +"{deletes}\n" +"\n" +"All mapsets included in these locations will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:520 +msgid "Delete selected locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:533 +msgid "Error when deleting locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:535 +#, python-brace-format +msgid "" +"The following error occured when deleting location <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of locations was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:568 +#, python-brace-format +msgid "" +"Cannot delete GRASS database from disk for the following reason:\n" +"\n" +"{reasons}\n" +"\n" +"GRASS database will not be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:572 +msgid "Unable to delete selected GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:580 +#, python-brace-format +msgid "" +"Do you want to delete the following GRASS database from disk?\n" +"\n" +"{grassdb}\n" +"\n" +"The directory will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:585 +msgid "Delete selected GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:597 +msgid "Error when deleting GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:599 +#, python-brace-format +msgid "" +"The following error occured when deleting database <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of GRASS database was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:631 +#, python-brace-format +msgid "" +"User {user} is already running GRASS in selected mapset <{mapset}>\n" +" (file {lockpath} created {timestamp} found).\n" +"\n" +"Concurrent use not allowed.\n" +"\n" +"Do you want to stay in the current mapset or remove .gislock and switch to selected mapset?" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:641 +msgid "Mapset is in use" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:653 +msgid "Error when removing lock file" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:654 +#, python-brace-format +msgid "" +"Unable to remove {lockpath}.\n" +"\n" +" Details: {error}." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:693 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:593 +#, python-format +msgid "" +"Import of <%(name)s> failed.\n" +"Reason: %(msg)s" +msgstr "" +"Import <%(name)s> selhal.\n" +"Důvod: %(msg)s" + +#: ../gui/wxpython/startup/guiutils.py:700 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:600 +#, python-format +msgid "Data file <%(name)s> imported successfully. The location's default region was set from this imported map." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:717 +#, python-format +msgid "" +"Current GRASS database is <%(dbase)s>.\n" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:743 +#, python-format +msgid "Current mapset is <%s>." +msgstr "Současný mapset je <%s>." + +#: ../gui/wxpython/dbmgr/base.py:170 +#, python-format +msgid "Attribute table <%s> not found. For creating the table switch to 'Manage layers' tab." +msgstr "Atributová tabulka <%s> nebyla nalezena. Pro vytvoření tabulky se přepněte do záložky Správa tabulek'." + +#: ../gui/wxpython/dbmgr/base.py:181 +#, python-format +msgid "Column <%(column)s> not found in in the table <%(table)s>." +msgstr "Sloupec <%(column)s> nebyl v tabulce <%(table)s> nalezen." + +#: ../gui/wxpython/dbmgr/base.py:262 +msgid "Can display only 256 columns." +msgstr "Lze zobrazit pouze 256 sloupců." + +#: ../gui/wxpython/dbmgr/base.py:282 +#, python-brace-format +msgid "Incorrect encoding {enc} used. Set encoding in GUI Settings or set GRASS_DB_ENCODING variable." +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main + +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1851 +msgid "Login" +msgstr "Přihlášení" + +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1852 +msgid "Sets user/password for DB driver/database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1853 +msgid "Create database" +msgstr "Vytvořit databázi" + +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1854 +msgid "Creates an empty database." +msgstr "Vytvořit prázdnou databázi" + +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1855 +msgid "Drop database" +msgstr "Smazat databázi" + +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1856 +msgid "Removes an existing database." +msgstr "Odstraní existující databázi." + +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1857 +msgid "Drop table" +msgstr "Smazat tabulku" + +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1858 +msgid "Drops an attribute table." +msgstr "Odstraní atributovou tabulku." + +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1859 +msgid "Copy table" +msgstr "Kopírovat tabulku" + +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1860 +msgid "Copy a table. Either 'from_table' (optionally with 'where') can be used or 'select' option, but not 'from_table' and 'select' at the same time." +msgstr "Kopíruj tabulku. Použita může být buď volba 'from_table' (volitelně s 'where') nebo volba 'select', ale nikoliv 'from_table' a 'select' současně." + +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:936 +#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:1881 +msgid "Drop column" +msgstr "Odstranit sloupec" + +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1862 +msgid "Drops a column from selected attribute table." +msgstr "Odstraní sloupec z vybrané atributové tabulky." + +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1863 +msgid "Test" +msgstr "Test" + +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1864 +msgid "Test database driver, database must exist and set by db.connect." +msgstr "Otestuj ovladač databáze, databáze musí existovat a nastavena pomocí db.connect" + +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:117 +msgid "Query" +msgstr "Dotaz" + +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1866 +msgid "Query any table" +msgstr "Dotazovat jakoukoliv tabulku" + +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1867 +msgid "Selects data from attribute table. Performs SQL query statement(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1870 +msgid "SQL statement" +msgstr "SQL příkaz" + +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1871 +msgid "Executes any SQL statement. For SELECT statements use 'db.select'." +msgstr "" + +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1872 +msgid "Vector database connections" +msgstr "Databázové spojení" + +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1873 +msgid "New table" +msgstr "Vytvořit tabulku" + +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1874 +msgid "Creates and connects a new attribute table to a given layer of an existing vector map." +msgstr "Vytvoří a připojí novou atributovou tabulku k dané vrstvě vektorové mapy." + +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1875 +msgid "Remove table" +msgstr "Odstranit tabulku" + +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1876 +msgid "Removes existing attribute table of a vector map." +msgstr "Odstraní existující atributovou tabulku z vektorové mapy." + +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1877 +msgid "Join table" +msgstr "Spojit tabulky" + +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1878 +msgid "Joins a database table to a vector map table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1879 +msgid "Add columns" +msgstr "Přidat sloupce" + +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1880 +msgid "Adds one or more columns to the attribute table connected to a given vector map." +msgstr "Přidá jeden nebo více sloupců k atributové tabulce připojené k zadané vektorové vrstvě." + +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1882 +msgid "Drops a column from the attribute table connected to a given vector map." +msgstr "Odstraní sloupec z atributové tabulky připojené k zadané vektorové vrstvě." + +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/dbmgr/base.py:2385 +msgid "Rename column" +msgstr "Přejmenovat sloupec" + +#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1884 +msgid "Renames a column in the attribute table connected to a given vector map." +msgstr "Přejmenuje sloupec v atributové tabulce připojené k zadané vektorové mapě." + +#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1885 +msgid "Change values" +msgstr "Změnit atributy" + +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1886 +msgid "Updates a column in the attribute table connected to a vector map." +msgstr "Aktualizuje sloupec atributové tabulky připojené k vektorové vrstvě." + +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1887 +msgid "Drop row" +msgstr "Odstranit řádek" + +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1888 +msgid "Removes a vector feature from a vector map through attribute selection." +msgstr "" + +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1889 +msgid "Reconnect vectors to database" +msgstr "Znovu navázat spojení vektoru s databází" + +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1890 +msgid "Reconnects attribute tables for all vector maps from the current mapset to a new database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1891 +msgid "Set vector map - database connection" +msgstr "Databázové spojení" + +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1892 +msgid "Prints/sets DB connection for a vector map to attribute table." +msgstr "Vytiskne/nastaví připojení databáze pro vektorovou mapu k atributové tabulce" + +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1893 +msgid "&Temporal" +msgstr "&Časový" + +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1894 +msgid "Manage datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1895 +msgid "Connect temporal database" +msgstr "" + +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1896 +msgid "Prints/sets general temporal GIS database connection for current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1898 +msgid "Creates a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1900 +msgid "Renames a space time dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1902 +msgid "Removes space time datasets from temporal database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1903 +msgid "Update metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1904 +msgid "Modifies the metadata of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1905 +msgid "Merge" +msgstr "" + +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1906 +msgid "Merges several space time datasets into a single space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1907 +msgid "Temporally shift" +msgstr "" + +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1908 +msgid "Shifts temporally the maps of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1909 +msgid "Snap maps of dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1910 +msgid "Snaps temporally the maps of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1912 +msgid "Lists space time datasets and maps registered in the temporal database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1913 +msgid "Manage maps in datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1914 +msgid "Register maps in datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:970 ../gui/wxpython/menustrings.py:1915 +msgid "Assigns timestamps and registers raster, vector and raster3d maps in a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1916 +msgid "Unregister maps from datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1917 +msgid "Unregisters raster, vector and raster3d maps from the temporal database or a specific space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1918 +msgid "List raster dataset maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1919 +msgid "Lists registered maps of a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1920 +msgid "List vector dataset maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1921 +msgid "Lists registered maps of a space time vector dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1922 +msgid "List 3D raster dataset maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1923 +msgid "Lists registered maps of a space time raster3d dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1924 +msgid "Import" +msgstr "Import" + +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1925 +msgid "Import raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1926 +msgid "Imports space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1927 +msgid "Import vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1928 +msgid "Imports a space time vector dataset from a GRASS GIS specific archive file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1930 +msgid "Export raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1931 +msgid "Exports space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1932 +msgid "Export raster dataset as VTK time series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1933 +msgid "Exports space time raster dataset as VTK time series." +msgstr "" + +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1934 +msgid "Export vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1935 +msgid "Exports a space time vector dataset as GRASS GIS specific archive file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1936 +msgid "Convert raster dataset to 3D raster" +msgstr "Převést rastrový dataset do 3D rastru" + +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1937 +msgid "Converts a space time raster dataset into a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1938 +msgid "Extraction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1939 +msgid "Extract subset of raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1940 +msgid "Extracts a subset of a space time raster datasets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1941 +msgid "Extract subset of vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1942 +msgid "Extracts a subset of a space time vector dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1943 +msgid "Extract subset of 3D raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1944 +msgid "Extracts a subset of a space time 3D raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1945 +msgid "Query vector dataset attribute data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1946 +msgid "Prints attributes of vector maps registered in a space time vector dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1947 +msgid "Raster dataset color table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1948 +msgid "Creates/modifies the color table associated with each raster map of the space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1949 +msgid "Raster calculations" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1950 +msgid "Performs spatio-temporal mapcalc expressions on temporally sampled maps of space time raster datasets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1951 +msgid "3D raster calculations" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1952 +msgid "Performs r3.mapcalc expressions on maps of sampled space time 3D raster datasets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1953 +msgid "Interpolate gaps in raster datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1954 +msgid "Replaces gaps in a space time raster dataset with interpolated raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1955 +msgid "Aggregation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1956 +msgid "Neighborhood analysis in raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1957 +msgid "Performs a neighborhood analysis for each map in a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1958 +msgid "Aggregation in raster datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1959 +msgid "Performs different aggregation algorithms from r.series on all or a subset of raster maps in a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1960 +msgid "Temporal aggregation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1961 +msgid "Aggregates temporally the maps of a space time raster dataset by a user defined granularity." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1962 +msgid "Temporal aggregation by dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1963 +msgid "Aggregates data of an existing space time raster dataset using the time intervals of a second space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1964 +msgid "Sampling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1965 +msgid "Sample a space time raster dataset at point coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1966 +msgid "Sample a space time raster dataset at specific vector point coordinates and write the output to stdout using different layouts" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1967 +msgid "Query raster dataset by vector points dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1968 +msgid "Stores raster map values at spatial and temporal positions of vector points as vector attributes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1969 +msgid "Observe specific locations in raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1970 +msgid "Observes specific locations in a space time raster dataset over a period of time using vector points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1971 +msgid "Temporal sampling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1972 +msgid "Samples the input space time dataset(s) with a sample space time dataset and print the result to stdout." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1974 +msgid "Space time datasets metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1975 +msgid "Lists information about space time datasets and maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1976 +msgid "Univariate raster dataset statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1977 +msgid "Calculates univariate statistics from the non-null cells for each registered raster map of a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1978 +msgid "Univariate vector dataset statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1979 +msgid "Calculates univariate statistics of attributes for each registered vector map of a space time vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1980 +msgid "Univariate 3D raster dataset statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1981 +msgid "Calculates univariate statistics from the non-null cells for each registered 3D raster map of a space time 3D raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:1982 +msgid "Report temporal topology" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:1983 +msgid "Lists temporal topology of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1991 +msgid "GUI tools" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:2015 +msgid "Timeline tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:2016 +msgid "Plot temporal extents." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:2013 +msgid "Temporal plot tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:2014 +msgid "Plot temporal values." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2064 +#: ../gui/wxpython/menustrings.py:2107 +msgid "&Help" +msgstr "Ná&pověda" + +#: ../gui/wxpython/menustrings.py:1047 +msgid "GRASS help" +msgstr "Nápověda GRASS GIS" + +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:1050 +msgid "Display the HTML man pages of GRASS GIS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1049 +msgid "GUI help" +msgstr "Nápověda wxGUI" + +#: ../gui/wxpython/menustrings.py:1051 +msgid "About system" +msgstr "O systému" + +#: ../gui/wxpython/menustrings.py:1052 +msgid "Prints system information" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:1054 +#: ../gui/wxpython/gui_core/ghelp.py:60 +msgid "About GRASS GIS" +msgstr "O GIS GRASS" + +#: ../gui/wxpython/menustrings.py:1057 +msgid "Import, export and link data" +msgstr "Import, export a připojení dat" + +#: ../gui/wxpython/menustrings.py:1994 +msgid "Attribute table manager" +msgstr "Správce atributových tabulek" + +#: ../gui/wxpython/menustrings.py:2000 +msgid "Launch Data Catalog." +msgstr "" + +#: ../gui/wxpython/menustrings.py:2007 +msgid "Managing GCPs for 3D correction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2018 +msgid "Interactive editing and digitization of vector maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:2023 +msgid "Create new model" +msgstr "Vytvořit nový model" + +#: ../gui/wxpython/menustrings.py:2025 +msgid "Load model from file" +msgstr "Načíst model ze souboru" + +#: ../gui/wxpython/menustrings.py:2029 +msgid "Save model to file" +msgstr "Uložit model do souboru" + +#: ../gui/wxpython/menustrings.py:2031 +msgid "Close model file" +msgstr "Zavřít soubor modelu" + +#: ../gui/wxpython/menustrings.py:2032 +msgid "Export to image" +msgstr "Export do obrazu" + +#: ../gui/wxpython/menustrings.py:2033 +msgid "Export model to image" +msgstr "Export modelu do obrázku" + +#: ../gui/wxpython/menustrings.py:2034 +msgid "Export to Python" +msgstr "Export do Pythonu" + +#: ../gui/wxpython/menustrings.py:2035 +msgid "Export model to Python script" +msgstr "Export modelu do skriptu Pythonu" + +#: ../gui/wxpython/menustrings.py:2036 +msgid "Quit modeler" +msgstr "Ukončit modelování" + +#: ../gui/wxpython/menustrings.py:2037 +msgid "Close modeler window" +msgstr "Zavřít okno modelování" + +#: ../gui/wxpython/menustrings.py:2041 +msgid "&Model" +msgstr "&Modelování" + +#: ../gui/wxpython/menustrings.py:2042 +msgid "Add command" +msgstr "Přidat příkaz" + +#: ../gui/wxpython/menustrings.py:2043 +msgid "Add action (GRASS command) to model" +msgstr "Přidat do modelu akci (příkaz GRASSu)" + +#: ../gui/wxpython/menustrings.py:2044 +msgid "Add data" +msgstr "Přidat data" + +#: ../gui/wxpython/menustrings.py:2045 +msgid "Add data item to model" +msgstr "Přidat data do modelu" + +#: ../gui/wxpython/menustrings.py:2046 +msgid "Define relation" +msgstr "Definovat vztah" + +#: ../gui/wxpython/menustrings.py:2047 +msgid "Define relation between data and action items" +msgstr "Definovat vztah mezi daty a akcemi" + +#: ../gui/wxpython/menustrings.py:2048 +msgid "Add loop / series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2049 +msgid "Adds loop (series) to model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2050 +msgid "Add condition" +msgstr "Přidat podmínku" + +#: ../gui/wxpython/menustrings.py:2051 +msgid "Adds condition (if/else) to model" +msgstr "Přidá podmínky (if/else) do modelu" + +#: ../gui/wxpython/menustrings.py:2053 +msgid "Adds comment to model" +msgstr "Přidá do modelu komentář" + +#: ../gui/wxpython/menustrings.py:2054 +msgid "Remove item" +msgstr "Odstranit prvek" + +#: ../gui/wxpython/menustrings.py:2055 +msgid "Remove action/data from model" +msgstr "Odstranit data/akce z modelu" + +#: ../gui/wxpython/menustrings.py:2057 +msgid "Model properties (name, purpose, etc.)" +msgstr "Vlastnosti modelu (jméno, účel, atd.)" + +#: ../gui/wxpython/menustrings.py:2058 +msgid "Delete intermediate data" +msgstr "Smazat dočasná data" + +#: ../gui/wxpython/menustrings.py:2059 +msgid "Delete intermediate data defined in the model" +msgstr "Smazat průběžná data definovaná v modelu" + +#: ../gui/wxpython/menustrings.py:2061 +msgid "Run entire model" +msgstr "Spustit celý model" + +#: ../gui/wxpython/menustrings.py:2062 +msgid "Validate model" +msgstr "Vyhodnotit model" + +#: ../gui/wxpython/menustrings.py:2063 +msgid "Validate entire model" +msgstr "Vyhodnotit celý model" + +#: ../gui/wxpython/menustrings.py:2066 +msgid "Display the HTML man pages of Graphical modeler" +msgstr "Zobrazit manuálové HTML stránky Grafického modelování" + +#: ../gui/wxpython/menustrings.py:2067 +msgid "About Graphical Modeler" +msgstr "O grafickém modelování" + +#: ../gui/wxpython/menustrings.py:2068 +msgid "Display information about Graphical Modeler" +msgstr "Zobrazit informace o Grafickém modelování" + +#: ../gui/wxpython/menustrings.py:2073 ../gui/wxpython/psmap/toolbars.py:75 +msgid "Specify paper size, margins and orientation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2074 +msgid "Load instruction file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2075 ../gui/wxpython/psmap/toolbars.py:68 +msgid "Load text file with mapping instructions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2076 +msgid "Export instruction file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2077 ../gui/wxpython/psmap/toolbars.py:66 +msgid "Generate text file with mapping instructions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2078 +msgid "Export to PostScript" +msgstr "Exportovat do PostScriptu" + +#: ../gui/wxpython/menustrings.py:2079 ../gui/wxpython/psmap/toolbars.py:70 +msgid "Generate PostScript output" +msgstr "Vytvořit výstupní PostScript" + +#: ../gui/wxpython/menustrings.py:2080 +msgid "Export to PDF" +msgstr "Exportovat do PDF" + +#: ../gui/wxpython/menustrings.py:2081 ../gui/wxpython/psmap/toolbars.py:72 +msgid "Generate PDF output" +msgstr "Vytvořit výstupní PDF" + +#: ../gui/wxpython/menustrings.py:2082 ../gui/wxpython/menustrings.py:2083 +msgid "Launch ps.map dialog" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2085 +msgid "Close Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2086 +msgid "&Insert" +msgstr "&Vložit" + +#: ../gui/wxpython/menustrings.py:2087 ../gui/wxpython/psmap/toolbars.py:80 +#: ../gui/wxpython/psmap/dialogs.py:837 ../gui/wxpython/psmap/dialogs.py:891 +msgid "Map frame" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2088 +msgid "Add or edit map frame" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2090 +msgid "Add or edit raster map" +msgstr "Přidat nebo upravit rastrovou vrstvu" + +#: ../gui/wxpython/menustrings.py:2092 +msgid "Add or edit vector map" +msgstr "Přidat nebo upravit vektorovou vrstvu" + +#: ../gui/wxpython/menustrings.py:2093 +msgid "Map legend" +msgstr "Legenda mapy" + +#: ../gui/wxpython/menustrings.py:2094 +msgid "Add or edit raster and vector legend" +msgstr "Přidat nebo upravit legendu rastrů a vektorů" + +#: ../gui/wxpython/menustrings.py:2095 ../gui/wxpython/psmap/toolbars.py:91 +msgid "Map info" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2096 +msgid "Add or edit map info" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2098 +msgid "Add or edit scale bar" +msgstr "Přidat nebo upravit měřítko" + +#: ../gui/wxpython/menustrings.py:2106 ../gui/wxpython/psmap/toolbars.py:83 +msgid "Delete selected object" +msgstr "Smazat vybraný objekt" + +#: ../gui/wxpython/menustrings.py:2109 +msgid "Display the HTML man pages of Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2110 +msgid "About Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2111 +msgid "Display information about Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:204 +#, python-brace-format +msgid "ZIP file is unreadable: {0}" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:223 +#, python-brace-format +msgid "Archive file is unreadable: {0}" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:233 +msgid "Download in progress, wait until it is finished 0%" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:243 +#, python-brace-format +msgid "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, {3:.0f} seconds passed" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:257 +#, python-brace-format +msgid "Download file from <{url}>, return status code {code}, " +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:261 +#, python-brace-format +msgid "Download file from <{url}>, failed. Check internet connection." +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:279 +#, python-brace-format +msgid "Download of <{url}> failed or file <{name}> is not a ZIP file" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:304 +#, python-brace-format +msgid "Unknown format '{0}'." +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:320 +msgid "Downloaded location is not valid" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:379 +msgid "Abort" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:380 +msgid "Abort download location" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:384 +msgid "Select sample location to download:" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:436 +#: ../gui/wxpython/startup/locdownload.py:572 +msgid "Download selected location" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:445 +#: ../gui/wxpython/startup/locdownload.py:511 +msgid "Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:452 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Download in progress, wait until it is finished" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:466 +#, python-format +msgid "Location named <%s> already exists, download canceled" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:475 +#, python-format +msgid "Download failed: %s" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:478 +msgid "Download completed. The downloaded sample data is listed in the location/mapset tabs upon closing of this window" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:509 +#, python-format +msgid "Location named <%s> already exists, rename it first" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:563 +msgid "Location Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:611 +msgid "Do you want to cancel location download?" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:612 +msgid "Abort download" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:80 +msgid "Invalid mapset name" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:106 +msgid "Invalid location name" +msgstr "Neplatný název lokace" + +#: ../gui/wxpython/startup/guiutils.py:131 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:469 +#, python-format +msgid "Invalid line in GISRC file (%s):%s\n" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:171 +msgid "Name for the new mapset:" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:186 +msgid "Unable to create new mapset: {}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:212 +#, fuzzy +msgid "Do you want to import {}to the newly created location?" +msgstr "Přejete si založit lokaci GRASSu <%s>?" + +#: ../gui/wxpython/startup/guiutils.py:217 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:537 +msgid "Import data?" +msgstr "Importovat data?" + +#: ../gui/wxpython/startup/guiutils.py:265 +#, python-brace-format +msgid "" +"Cannot rename mapset <{mapset}> for the following reason:\n" +"\n" +"{reason}\n" +"\n" +"No mapset will be renamed." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:269 +msgid "Unable to rename selected mapset" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:280 +#: ../gui/wxpython/startup/guiutils.py:334 +msgid "" +"Current name: {}\n" +"\n" +"Enter new name:" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:294 +msgid "" +"Unable to rename mapset.\n" +"\n" +"{}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:319 +#, python-brace-format +msgid "" +"Cannot rename location <{location}> for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No location will be renamed." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:323 +msgid "Unable to rename selected location" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:347 +msgid "" +"Unable to rename location.\n" +"\n" +"{}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:410 +#, python-brace-format +msgid "" +"Cannot delete one or more mapsets for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No mapsets will be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:414 +msgid "Unable to delete selected mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:430 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following mapsets?\n" +"\n" +"{deletes}\n" +"\n" +"All maps included in these mapsets will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:435 +msgid "Delete selected mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:448 +msgid "Error when deleting mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:450 +#, python-brace-format +msgid "" +"The following error occured when deleting mapset <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of mapsets was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:495 +#, python-brace-format +msgid "" +"Cannot delete one or more locations for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No locations will be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:499 +msgid "Unable to delete selected locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:515 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following locations?\n" +"\n" +"{deletes}\n" +"\n" +"All mapsets included in these locations will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:520 +msgid "Delete selected locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:533 +msgid "Error when deleting locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:535 +#, python-brace-format +msgid "" +"The following error occured when deleting location <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of locations was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:568 +#, python-brace-format +msgid "" +"Cannot delete GRASS database from disk for the following reason:\n" +"\n" +"{reasons}\n" +"\n" +"GRASS database will not be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:572 +msgid "Unable to delete selected GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:580 +#, python-brace-format +msgid "" +"Do you want to delete the following GRASS database from disk?\n" +"\n" +"{grassdb}\n" +"\n" +"The directory will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:585 +msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 ../gui/wxpython/psmap/toolbars.py:68 -msgid "Load text file with mapping instructions" +#: ../gui/wxpython/startup/guiutils.py:597 +msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/menustrings.py:2076 -msgid "Export instruction file" +#: ../gui/wxpython/startup/guiutils.py:599 +#, python-brace-format +msgid "" +"The following error occured when deleting database <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/menustrings.py:2077 ../gui/wxpython/psmap/toolbars.py:66 -msgid "Generate text file with mapping instructions" +#: ../gui/wxpython/startup/guiutils.py:631 +#, python-brace-format +msgid "" +"User {user} is already running GRASS in selected mapset <{mapset}>\n" +" (file {lockpath} created {timestamp} found).\n" +"\n" +"Concurrent use not allowed.\n" +"\n" +"Do you want to stay in the current mapset or remove .gislock and switch to selected mapset?" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 -msgid "Export to PostScript" -msgstr "Exportovat do PostScriptu" - -#: ../gui/wxpython/menustrings.py:2079 ../gui/wxpython/psmap/toolbars.py:70 -msgid "Generate PostScript output" -msgstr "Vytvořit výstupní PostScript" - -#: ../gui/wxpython/menustrings.py:2080 -msgid "Export to PDF" -msgstr "Exportovat do PDF" - -#: ../gui/wxpython/menustrings.py:2081 ../gui/wxpython/psmap/toolbars.py:72 -msgid "Generate PDF output" -msgstr "Vytvořit výstupní PDF" +#: ../gui/wxpython/startup/guiutils.py:641 +msgid "Mapset is in use" +msgstr "" -#: ../gui/wxpython/menustrings.py:2082 ../gui/wxpython/menustrings.py:2083 -msgid "Launch ps.map dialog" +#: ../gui/wxpython/startup/guiutils.py:653 +msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 -msgid "Close Cartographic Composer" +#: ../gui/wxpython/startup/guiutils.py:654 +#, python-brace-format +msgid "" +"Unable to remove {lockpath}.\n" +"\n" +" Details: {error}." msgstr "" -#: ../gui/wxpython/menustrings.py:2086 -msgid "&Insert" -msgstr "&Vložit" +#: ../gui/wxpython/startup/guiutils.py:693 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:593 +#, python-format +msgid "" +"Import of <%(name)s> failed.\n" +"Reason: %(msg)s" +msgstr "" +"Import <%(name)s> selhal.\n" +"Důvod: %(msg)s" -#: ../gui/wxpython/menustrings.py:2087 ../gui/wxpython/psmap/toolbars.py:80 -#: ../gui/wxpython/psmap/dialogs.py:837 ../gui/wxpython/psmap/dialogs.py:891 -msgid "Map frame" +#: ../gui/wxpython/startup/guiutils.py:700 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:600 +#, python-format +msgid "Data file <%(name)s> imported successfully. The location's default region was set from this imported map." msgstr "" -#: ../gui/wxpython/menustrings.py:2088 -msgid "Add or edit map frame" +#: ../gui/wxpython/startup/guiutils.py:717 +#, python-format +msgid "" +"Current GRASS database is <%(dbase)s>.\n" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/menustrings.py:2090 -msgid "Add or edit raster map" -msgstr "Přidat nebo upravit rastrovou vrstvu" +#: ../gui/wxpython/startup/guiutils.py:743 +#, python-format +msgid "Current mapset is <%s>." +msgstr "Současný mapset je <%s>." -#: ../gui/wxpython/menustrings.py:2092 -msgid "Add or edit vector map" -msgstr "Přidat nebo upravit vektorovou vrstvu" +#: ../gui/wxpython/dbmgr/base.py:170 +#, python-format +msgid "Attribute table <%s> not found. For creating the table switch to 'Manage layers' tab." +msgstr "Atributová tabulka <%s> nebyla nalezena. Pro vytvoření tabulky se přepněte do záložky Správa tabulek'." -#: ../gui/wxpython/menustrings.py:2093 -msgid "Map legend" -msgstr "Legenda mapy" +#: ../gui/wxpython/dbmgr/base.py:181 +#, python-format +msgid "Column <%(column)s> not found in in the table <%(table)s>." +msgstr "Sloupec <%(column)s> nebyl v tabulce <%(table)s> nalezen." -#: ../gui/wxpython/menustrings.py:2094 -msgid "Add or edit raster and vector legend" -msgstr "Přidat nebo upravit legendu rastrů a vektorů" +#: ../gui/wxpython/dbmgr/base.py:262 +msgid "Can display only 256 columns." +msgstr "Lze zobrazit pouze 256 sloupců." -#: ../gui/wxpython/menustrings.py:2095 ../gui/wxpython/psmap/toolbars.py:91 -msgid "Map info" +#: ../gui/wxpython/dbmgr/base.py:282 +#, python-brace-format +msgid "Incorrect encoding {enc} used. Set encoding in GUI Settings or set GRASS_DB_ENCODING variable." msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/menustrings.py:2096 -msgid "Add or edit map info" +#: ../gui/wxpython/dbmgr/manager.py:157 +msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:2098 -msgid "Add or edit scale bar" -msgstr "Přidat nebo upravit měřítko" - -#: ../gui/wxpython/menustrings.py:2106 ../gui/wxpython/psmap/toolbars.py:83 -msgid "Delete selected object" -msgstr "Smazat vybraný objekt" - -#: ../gui/wxpython/menustrings.py:2109 -msgid "Display the HTML man pages of Cartographic Composer" +#: ../gui/wxpython/dbmgr/manager.py:160 +msgid "Reload all attribute data (drop current selection)" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 -msgid "About Cartographic Composer" -msgstr "" +#: ../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 +#, python-format +msgid "Number of loaded records: %d" +msgstr "Počet nahraných záznamů: %d" -#: ../gui/wxpython/menustrings.py:2111 -msgid "Display information about Cartographic Composer" +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#, python-format +msgid "Loading attribute data for vector map <%s>..." msgstr "" -#: ../gui/wxpython/startup/locdownload.py:204 -#, python-brace-format -msgid "ZIP file is unreadable: {0}" +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:55 +msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 -#, python-brace-format -msgid "Archive file is unreadable: {0}" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 +msgid "Database connection" +msgstr "Databázové spojení" -#: ../gui/wxpython/startup/locdownload.py:233 -msgid "Download in progress, wait until it is finished 0%" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 +msgid "Set SQL statement to default" +msgstr "Nastavit SQL příkaz jako výchozí" -#: ../gui/wxpython/startup/locdownload.py:243 -#, python-brace-format -msgid "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, {3:.0f} seconds passed" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 +msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:257 -#, python-brace-format -msgid "Download file from <{url}>, return status code {code}, " -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 +msgid "Close the dialog" +msgstr "Zavřít dialog " -#: ../gui/wxpython/startup/locdownload.py:261 -#, python-brace-format -msgid "Download file from <{url}>, failed. Check internet connection." -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 +msgid "Columns" +msgstr "Sloupce" -#: ../gui/wxpython/startup/locdownload.py:279 -#, python-brace-format -msgid "Download of <{url}> failed or file <{name}> is not a ZIP file" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 +msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:304 -#, python-brace-format -msgid "Unknown format '{0}'." -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 +msgid "Values" +msgstr "Hodnoty" -#: ../gui/wxpython/startup/locdownload.py:320 -msgid "Downloaded location is not valid" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 +msgid "Get all values" +msgstr "Získat všechny hodnoty" -#: ../gui/wxpython/startup/locdownload.py:379 -msgid "Abort" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 +msgid "Get sample" +msgstr "Získat vzorek" -#: ../gui/wxpython/startup/locdownload.py:380 -msgid "Abort download location" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 +msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:384 -msgid "Select sample location to download:" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 +msgid "Go to:" +msgstr "Přejít na:" -#: ../gui/wxpython/startup/locdownload.py:436 -#: ../gui/wxpython/startup/locdownload.py:572 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 +msgid "Close dialog on apply" +msgstr "Zavřít dialog při souhlasu" -#: ../gui/wxpython/startup/locdownload.py:445 -#: ../gui/wxpython/startup/locdownload.py:511 -msgid "Download" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 +#, python-format +msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:452 -#: ../gui/wxpython/startup/locdownload.py:491 -msgid "Download in progress, wait until it is finished" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 +msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:466 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 +msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:475 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format -msgid "Download failed: %s" +msgid "Example: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:478 -msgid "Download completed. The downloaded sample data is listed in the location/mapset tabs upon closing of this window" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 +msgid "Verify" +msgstr "Ověřit" -#: ../gui/wxpython/startup/locdownload.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 +msgid "Verify SQL statement" +msgstr "Ověřit SQL příkaz" + +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 +msgid "SQL statement not verified" +msgstr "SQL příkaz nebyl ověřen" + +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 +msgid "SQL statement is not valid" +msgstr "SQL příkaz není platný" + +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format -msgid "Location named <%s> already exists, rename it first" +msgid "" +"SQL statement is not valid.\n" +"\n" +"%s" msgstr "" +"SQL příkaz není platný.\n" +"\n" +"%s" + +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 +msgid "SQL statement is valid" +msgstr "SQL příkaz je platný" -#: ../gui/wxpython/startup/locdownload.py:563 -msgid "Location Download" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:611 -msgid "Do you want to cancel location download?" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 +msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:612 -msgid "Abort download" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 +msgid "Functions" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:80 -msgid "Invalid mapset name" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:106 -msgid "Invalid location name" -msgstr "Neplatný název lokace" - -#: ../gui/wxpython/startup/guiutils.py:131 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:469 -#, python-format -msgid "Invalid line in GISRC file (%s):%s\n" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 +msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:171 -msgid "Name for the new mapset:" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 +msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:186 -msgid "Unable to create new mapset: {}" +#: ../gui/wxpython/dbmgr/base.py:185 +#, python-format +msgid "" +"Attribute table <%s> not found. For creating the table switch to 'Manage " +"layers' tab." msgstr "" +"Atributová tabulka <%s> nebyla nalezena. Pro vytvoření tabulky se přepněte " +"do záložky Správa tabulek'." -#: ../gui/wxpython/startup/guiutils.py:212 -#, fuzzy -msgid "Do you want to import {}to the newly created location?" -msgstr "Přejete si založit lokaci GRASSu <%s>?" +#: ../gui/wxpython/dbmgr/base.py:201 +#, python-format +msgid "Column <%(column)s> not found in in the table <%(table)s>." +msgstr "Sloupec <%(column)s> nebyl v tabulce <%(table)s> nalezen." -#: ../gui/wxpython/startup/guiutils.py:217 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:537 -msgid "Import data?" -msgstr "Importovat data?" +#: ../gui/wxpython/dbmgr/base.py:279 +msgid "Can display only 256 columns." +msgstr "Lze zobrazit pouze 256 sloupců." -#: ../gui/wxpython/startup/guiutils.py:265 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" -"Cannot rename mapset <{mapset}> for the following reason:\n" -"\n" -"{reason}\n" -"\n" -"No mapset will be renamed." -msgstr "" - -#: ../gui/wxpython/startup/guiutils.py:269 -msgid "Unable to rename selected mapset" +"Incorrect encoding {enc} used. Set encoding in GUI Settings or set " +"GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:280 -#: ../gui/wxpython/startup/guiutils.py:334 +#: ../gui/wxpython/dbmgr/base.py:328 +#, python-brace-format msgid "" -"Current name: {}\n" -"\n" -"Enter new name:" +"Unable to read the table <{table}> from the database due to seemingly " +"inconsistent number of columns in the data transfer. Check row: {row}... " +"Likely, a newline character is present in the attribute value starting with: " +"'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:294 -msgid "" -"Unable to rename mapset.\n" -"\n" -"{}" +#: ../gui/wxpython/dbmgr/base.py:344 +msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:319 -#, python-brace-format -msgid "" -"Cannot rename location <{location}> for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No location will be renamed." -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:392 +msgid "Unknown value" +msgstr "Neznámá hodnota" -#: ../gui/wxpython/startup/guiutils.py:323 -msgid "Unable to rename selected location" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:400 +msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." +msgstr "Nelze překódovat hodnotu. Změňte kódování v nastavení GUI ('Atributy')" -#: ../gui/wxpython/startup/guiutils.py:347 +#: ../gui/wxpython/dbmgr/base.py:413 +#, python-format msgid "" -"Unable to rename location.\n" +"Error loading attribute data. Record number: %(rec)d. Unable to convert " +"value '%(val)s' in key column (%(key)s) to integer.\n" "\n" -"{}" +"Details: %(detail)s" msgstr "" - -#: ../gui/wxpython/startup/guiutils.py:410 -#, python-brace-format -msgid "" -"Cannot delete one or more mapsets for the following reasons:\n" -"\n" -"{reasons}\n" +"Chyba při načítání atributových dat. Záznam číslo %(rec)d. Nelze převést " +"hodnotu '%(val)s' v klíčovém sloupci(%(key)s) na integer.\n" "\n" -"No mapsets will be deleted." -msgstr "" +"Detaily: %(detail)s" -#: ../gui/wxpython/startup/guiutils.py:414 -msgid "Unable to delete selected mapsets" +#: ../gui/wxpython/dbmgr/base.py:500 +msgid "Sort ascending" +msgstr "Seřadit vzestupně" + +#: ../gui/wxpython/dbmgr/base.py:501 +msgid "Sort descending" +msgstr "seřadit sestupně" + +#: ../gui/wxpython/dbmgr/base.py:506 +msgid "Calculate (only numeric columns)" +msgstr "Spočítat (pouze číselné sloupce)" + +#: ../gui/wxpython/dbmgr/base.py:508 +msgid "Field calculator" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:430 -#, python-brace-format -msgid "" -"Do you want to continue with deleting one or more of the following mapsets?\n" -"\n" -"{deletes}\n" -"\n" -"All maps included in these mapsets will be permanently deleted!" +#: ../gui/wxpython/dbmgr/base.py:527 +msgid "Area size" +msgstr "Velikost plochy" + +#: ../gui/wxpython/dbmgr/base.py:528 +msgid "Line length" +msgstr "Délka linie" + +#: ../gui/wxpython/dbmgr/base.py:529 +msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:435 -msgid "Delete selected mapsets" +#: ../gui/wxpython/dbmgr/base.py:532 +msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:448 -msgid "Error when deleting mapsets" +#: ../gui/wxpython/dbmgr/base.py:534 +msgid "Perimeter length of an area" +msgstr "Délka obvodu plochy" + +#: ../gui/wxpython/dbmgr/base.py:535 +msgid "Number of features for each category" +msgstr "Počet prvků pro každou kategorii" + +#: ../gui/wxpython/dbmgr/base.py:536 +msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:450 -#, python-brace-format -msgid "" -"The following error occured when deleting mapset <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of mapsets was interrupted." +#: ../gui/wxpython/dbmgr/base.py:537 +msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:495 -#, python-brace-format -msgid "" -"Cannot delete one or more locations for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No locations will be deleted." +#: ../gui/wxpython/dbmgr/base.py:538 +msgid "Line azimuth" +msgstr "Azimut linie" + +#: ../gui/wxpython/dbmgr/base.py:665 +#, python-format +msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:499 -msgid "Unable to delete selected locations" +#: ../gui/wxpython/dbmgr/base.py:1062 +msgid "Unable to add column to the table. No column name defined." msgstr "" +"Nelze přidat sloupec do atributové tabulky. Nebyl zadáno jméno sloupce." -#: ../gui/wxpython/startup/guiutils.py:515 -#, python-brace-format -msgid "" -"Do you want to continue with deleting one or more of the following locations?\n" -"\n" -"{deletes}\n" -"\n" -"All mapsets included in these locations will be permanently deleted!" +#: ../gui/wxpython/dbmgr/base.py:1077 +#, python-format +msgid "Column <%(column)s> already exists in table <%(table)s>." +msgstr "Sloupec <%(column)s> již v tabulce <%(table)s> existuje." + +#: ../gui/wxpython/dbmgr/base.py:1166 +msgid "Attribute data - right-click to edit/manage records" +msgstr "Atributová data - editace/správa záznamů pravé tlačítko myši" + +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 +msgid "Table" +msgstr "Tabulka" + +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 +msgid " (read-only)" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:520 -msgid "Delete selected locations" +#: ../gui/wxpython/dbmgr/base.py:1200 +msgid "SQL Query" +msgstr "Dotaz SQL" + +#: ../gui/wxpython/dbmgr/base.py:1224 +msgid "Simple" +msgstr "Jednoduchý" + +#: ../gui/wxpython/dbmgr/base.py:1227 +msgid "Apply SELECT statement and reload data records" +msgstr "použít SELECT a znovu načíst data" + +#: ../gui/wxpython/dbmgr/base.py:1268 +msgid "Builder" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 -msgid "Error when deleting locations" +#: ../gui/wxpython/dbmgr/base.py:1271 +msgid "SQL Builder" +msgstr "SQL Pomocník" + +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 +msgid "Insert new record" +msgstr "Vložit nový záznam" + +#: ../gui/wxpython/dbmgr/base.py:1456 +msgid "Delete selected record(s)" +msgstr "Smazat vybrané záznamy" + +#: ../gui/wxpython/dbmgr/base.py:1457 +msgid "Delete all records" +msgstr "Smazat všechny záznamy" + +#: ../gui/wxpython/dbmgr/base.py:1467 +msgid "Highlight selected features and zoom" +msgstr "Zvýraznit vybrané prvky a přiblížit" + +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 +msgid "Extract selected features" +msgstr "Extrahovat vybrané prvky" + +#: ../gui/wxpython/dbmgr/base.py:1472 +msgid "Delete selected features" +msgstr "Odstranit zvolené prvky" + +#: ../gui/wxpython/dbmgr/base.py:1533 +msgid "Update existing record" +msgstr "Modifikovat existující záznam" + +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 +#, python-format +msgid "Value '%(value)s' needs to be entered as %(type)s." +msgstr "Hodnota '%(value)s' musí být vložena jako %(type)s." + +#: ../gui/wxpython/dbmgr/base.py:1579 +#, python-format +msgid "" +"Unable to update existing record.\n" +"%s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:535 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:1655 +#, python-format +msgid "Record with category number %d already exists in the table." +msgstr "Záznam kategorie %d již v atributové tabulce existuje." + +#: ../gui/wxpython/dbmgr/base.py:1669 +#, python-format +msgid "Category number (column %s) is missing." +msgstr "Kategorie (sloupec %s) chybí." + +#: ../gui/wxpython/dbmgr/base.py:1699 +#, python-format msgid "" -"The following error occured when deleting location <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of locations was interrupted." +"Unable to insert new record.\n" +"%s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:568 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:1753 +#, python-format msgid "" -"Cannot delete GRASS database from disk for the following reason:\n" -"\n" -"{reasons}\n" -"\n" -"GRASS database will not be deleted." +"Selected data records (%d) will be permanently deleted from table. Do you " +"want to delete them?" msgstr "" +"Vybrané záznamy dat (%d) budou natrvalo smazány z tabulky. Přejete si je " +"smazat?" -#: ../gui/wxpython/startup/guiutils.py:572 -msgid "Unable to delete selected GRASS database" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 +msgid "Delete records" +msgstr "Smazat záznamy" -#: ../gui/wxpython/startup/guiutils.py:580 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:1803 +#, python-format msgid "" -"Do you want to delete the following GRASS database from disk?\n" -"\n" -"{grassdb}\n" -"\n" -"The directory will be permanently deleted!" +"All data records (%d) will be permanently deleted from table. Do you want to " +"delete them?" msgstr "" +"Všechny záznamy dat (%d) budou natrvalo smazány z tabulky. přejete se je " +"smazat?" -#: ../gui/wxpython/startup/guiutils.py:585 -msgid "Delete selected GRASS database" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:2004 +msgid "Nothing to extract." +msgstr "Nebylo zvoleno nic pro extrahování." -#: ../gui/wxpython/startup/guiutils.py:597 -msgid "Error when deleting GRASS database" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:2045 +msgid "Nothing to delete." +msgstr "Není co smazat" -#: ../gui/wxpython/startup/guiutils.py:599 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 +#, python-format msgid "" -"The following error occured when deleting database <{path}>:\n" -"\n" -"{error}\n" +"Loading attribute data failed.\n" "\n" -"Deleting of GRASS database was interrupted." +"%s" msgstr "" +"Selhalo načtení atributových dat.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:631 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:2140 +#, python-format msgid "" -"User {user} is already running GRASS in selected mapset <{mapset}>\n" -" (file {lockpath} created {timestamp} found).\n" -"\n" -"Concurrent use not allowed.\n" +"Loading attribute data failed.\n" +"Invalid SQL select statement.\n" "\n" -"Do you want to stay in the current mapset or remove .gislock and switch to selected mapset?" +"%s" msgstr "" +"Selhalo načtení atributových dat\n" +"Neplatný příkaz SQL.\n" +"\n" +"'%s'" -#: ../gui/wxpython/startup/guiutils.py:641 -msgid "Mapset is in use" +#: ../gui/wxpython/dbmgr/base.py:2379 +#, python-format +msgid "Table <%s> - right-click to delete column(s)" +msgstr "Tabulka <%s> - klikněte pravým tlačítkem pro vymazání sloupce" + +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 +msgid "Column" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:653 -msgid "Error when removing lock file" +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 +msgid "Length" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:654 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 +msgid "Add" +msgstr "Přidat" + +#: ../gui/wxpython/dbmgr/base.py:2606 +msgid "Unable to rename column. No column name defined." +msgstr "Nelze přejmenovat sloupec. Nebyl zadáno jméno sloupce." + +#: ../gui/wxpython/dbmgr/base.py:2616 +#, python-format msgid "" -"Unable to remove {lockpath}.\n" -"\n" -" Details: {error}." +"Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " +"exists in the table <%(table)s>." msgstr "" +"Nelze přejmenovat sloupec <%(column)s>. Sloupec <%(columnTo)s> již v tabulce " +"<%(table)s> existuje." -#: ../gui/wxpython/startup/guiutils.py:693 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:593 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Import of <%(name)s> failed.\n" -"Reason: %(msg)s" +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -"Import <%(name)s> selhal.\n" -"Důvod: %(msg)s" +"Nelze přejmenovat sloupec. Sloupec <%(column)s> v tabulce <%(table)s> " +"neexistuje." -#: ../gui/wxpython/startup/guiutils.py:700 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:600 +#: ../gui/wxpython/dbmgr/base.py:2672 +msgid "Drop selected column" +msgstr "Odstranit zvolený sloupec" + +#: ../gui/wxpython/dbmgr/base.py:2680 +msgid "Drop all columns" +msgstr "Odstranit všechny sloupce" + +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format -msgid "Data file <%(name)s> imported successfully. The location's default region was set from this imported map." +msgid "" +"Selected %s will PERMANENTLY removed from table. Do you want to drop the " +"column?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:717 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 +msgid "Drop column(s)" +msgstr "Odstranit sloupec" + +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" -"Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" -"Current mapset is <%(mapset)s>." +"Selected columns\n" +"%s\n" +"will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" +"Vybrané sloupce\n" +"%s\n" +"budou NAVŽDY odstraněny z tabulky. Chcete smazat tyto sloupce?" -#: ../gui/wxpython/startup/guiutils.py:743 -#, python-format -msgid "Current mapset is <%s>." -msgstr "Současný mapset je <%s>." +#: ../gui/wxpython/dbmgr/base.py:2882 +msgid "List of layers" +msgstr "Seznam vrstev" -#: ../gui/wxpython/dbmgr/base.py:170 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format -msgid "Attribute table <%s> not found. For creating the table switch to 'Manage layers' tab." -msgstr "Atributová tabulka <%s> nebyla nalezena. Pro vytvoření tabulky se přepněte do záložky Správa tabulek'." +msgid "Drop also linked attribute table (%s)" +msgstr "Odstranit také připojenou atributovou tabulku (%s)" -#: ../gui/wxpython/dbmgr/base.py:181 -#, python-format -msgid "Column <%(column)s> not found in in the table <%(table)s>." -msgstr "Sloupec <%(column)s> nebyl v tabulce <%(table)s> nalezen." +#: ../gui/wxpython/dbmgr/base.py:3006 +msgid "Column name" +msgstr "Název sloupce" -#: ../gui/wxpython/dbmgr/base.py:262 -msgid "Can display only 256 columns." -msgstr "Lze zobrazit pouze 256 sloupců." +#: ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data length" +msgstr "Datová délka" -#: ../gui/wxpython/dbmgr/base.py:282 -#, python-brace-format -msgid "Incorrect encoding {enc} used. Set encoding in GUI Settings or set GRASS_DB_ENCODING variable." +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 +msgid "Driver" +msgstr "Ovladač" + +#: ../gui/wxpython/dbmgr/base.py:3064 +msgid "Key" +msgstr "Klíč" + +#: ../gui/wxpython/dbmgr/base.py:3172 +msgid "Add layer" +msgstr "Přidat vrstvu" + +#: ../gui/wxpython/dbmgr/base.py:3182 +msgid "Layer description" +msgstr "Popis vrstvy" + +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 +msgid "Key column" +msgstr "Sloupec s klíčem" + +#: ../gui/wxpython/dbmgr/base.py:3251 +msgid "Insert record for each category into table" +msgstr "Vložit záznam pro každou kategorii v tabulce" + +#: ../gui/wxpython/dbmgr/base.py:3274 +msgid "You need to add categories by v.category module." +msgstr "Je potřeba přidat kategorie pomocí modulu v.category." + +#: ../gui/wxpython/dbmgr/base.py:3279 +msgid "Table description" +msgstr "Popis tabulky" + +#: ../gui/wxpython/dbmgr/base.py:3290 +msgid "Table name" +msgstr "Název tabulky" + +#: ../gui/wxpython/dbmgr/base.py:3315 +msgid "&Create table" +msgstr "Vytvořit &tabulku" + +#: ../gui/wxpython/dbmgr/base.py:3321 +msgid "&Set default" +msgstr "Nastavit výc&hozí" + +#: ../gui/wxpython/dbmgr/base.py:3393 +msgid "Remove layer" +msgstr "Odstranit vrstvu" + +#: ../gui/wxpython/dbmgr/base.py:3396 +msgid "Layer to remove" +msgstr "Vrstva k odstranění" + +#: ../gui/wxpython/dbmgr/base.py:3427 +msgid "&Remove layer" msgstr "" ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/dbmgr/manager.py:156 -msgid "Reload currently selected attribute data" +#: ../gui/wxpython/dbmgr/base.py:3456 +msgid "Modify layer" +msgstr "Upravit vrstvu" + +#: ../gui/wxpython/dbmgr/base.py:3559 +msgid "&Modify layer" +msgstr "&Upravit vrstvu" + +#: ../gui/wxpython/dbmgr/base.py:3602 +msgid "" +"Unable to get list of tables.\n" +"Please use db.connect to set database parameters." msgstr "" +"Nelze získat seznam tabulek.\n" +"Prosím použijte db.connect pro nastavení parametrů databáze." -#: ../gui/wxpython/dbmgr/manager.py:159 -msgid "Reload all attribute data (drop current selection)" +#: ../gui/wxpython/dbmgr/base.py:3708 +msgid "Unable to create new table. Table name or key column name is missing." msgstr "" +"Nelze vytvořit novou atributovou tabulku. Nebyl zadán název tabulky nebo " +"sloupec s klíčem." -#: ../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 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format -msgid "Number of loaded records: %d" -msgstr "Počet nahraných záznamů: %d" +msgid "Unable to create new table. Table <%s> already exists in the database." +msgstr "" +"Nelze vytvořit novou atributovou tabulku. Tabulka <%s> již existuje v " +"databázi." -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format -msgid "Loading attribute data for vector map <%s>..." +msgid "" +"Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " +"exists." msgstr "" +"Nelze přidat novou vrstvu k vektorové mapě <%(vector)s>. Vrstva %(layer)d " +"již existuje." -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:55 -msgid "Attribute Table Manager - GRASS GIS" +#: ../gui/wxpython/dbmgr/base.py:3951 +msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 -msgid "Database connection" -msgstr "Databázové spojení" +#: ../gui/wxpython/dbmgr/base.py:3974 +msgid "Copy statistics the clipboard (Ctrl+C)" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:4035 +msgid "Statistics is not support for DBF tables." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:4062 +msgid "Unable to calculte statistics." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:4071 +#, python-format +msgid "" +"Unable to calculte statistics. Invalid number of lines %d (should be %d)." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:4098 +msgid "Unable to calculte standard deviation." +msgstr "Nelze vypočítat směrodatnou odchylku." + +#: ../gui/wxpython/dbmgr/base.py:4106 +#, python-format +msgid "Field statistics <%s>" +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/dialogs.py:80 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main +#: ../gui/wxpython/dbmgr/dialogs.py:79 +======= +#: ../gui/wxpython/dbmgr/sqlbuilder.py:133 msgid "Set SQL statement to default" msgstr "Nastavit SQL příkaz jako výchozí" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:135 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:137 msgid "Close the dialog" msgstr "Zavřít dialog " -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:224 msgid "Columns" msgstr "Sloupce" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:239 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:253 msgid "Values" msgstr "Hodnoty" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:263 msgid "Get all values" msgstr "Získat všechny hodnoty" @@ -27607,53 +29741,47 @@ msgstr "Získat vzorek" msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:288 msgid "Go to:" msgstr "Přejít na:" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:301 msgid "Close dialog on apply" msgstr "Zavřít dialog při souhlasu" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:482 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:627 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:855 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:631 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 -#, python-format -msgid "Example: %s" -msgstr "" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:502 msgid "Verify" msgstr "Ověřit" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:503 msgid "Verify SQL statement" msgstr "Ověřit SQL příkaz" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "SQL statement not verified" msgstr "SQL příkaz nebyl ověřen" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:555 msgid "SQL statement is not valid" msgstr "SQL příkaz není platný" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:557 #, python-format msgid "" "SQL statement is not valid.\n" @@ -27664,1776 +29792,1805 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:559 msgid "SQL statement is valid" msgstr "SQL příkaz je platný" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:630 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:632 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:704 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:737 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:739 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:773 msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:184 -#, python-format -msgid "" -"Attribute table <%s> not found. For creating the table switch to 'Manage " -"layers' tab." +#: ../gui/wxpython/dbmgr/manager.py:78 +msgid "Attribute Table Manager" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:81 +#, python-brace-format +msgid "{document} (read-only)" msgstr "" -"Atributová tabulka <%s> nebyla nalezena. Pro vytvoření tabulky se přepněte " -"do záložky Správa tabulek'." -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/manager.py:100 #, python-format -msgid "Column <%(column)s> not found in in the table <%(table)s>." -msgstr "Sloupec <%(column)s> nebyl v tabulce <%(table)s> nalezen." +msgid "Database connection for vector map <%s> is not defined in DB file. You can define new connection in 'Manage layers' tab." +msgstr "Databázové nastavení není pro vektorovou mapu <%s> definováno v souboru DB. Toto nastavení můžete provést v panelu 'Správa vrstev'." -#: ../gui/wxpython/dbmgr/base.py:275 -msgid "Can display only 256 columns." -msgstr "Lze zobrazit pouze 256 sloupců." +#: ../gui/wxpython/dbmgr/manager.py:106 +msgid "Please wait, loading attribute data..." +msgstr "Prosím čekejte, načítají se atributová data..." -#: ../gui/wxpython/dbmgr/base.py:304 -#, python-brace-format -msgid "" -"Incorrect encoding {enc} used. Set encoding in GUI Settings or set " -"GRASS_DB_ENCODING variable." -msgstr "" +#: ../gui/wxpython/dbmgr/manager.py:115 +msgid "Browse data" +msgstr "Procházet data" -#: ../gui/wxpython/dbmgr/base.py:323 -#, python-brace-format -msgid "" -"Unable to read the table <{table}> from the database due to seemingly " -"inconsistent number of columns in the data transfer. Check row: {row}... " -"Likely, a newline character is present in the attribute value starting with: " -"'{value}' Use the v.db.select module to investigate." -msgstr "" +#: ../gui/wxpython/dbmgr/manager.py:123 +msgid "Manage tables" +msgstr "Správa tabulek" -#: ../gui/wxpython/dbmgr/base.py:337 -msgid "Viewing limit: 100000 records." -msgstr "" +#: ../gui/wxpython/dbmgr/manager.py:130 +msgid "Manage layers" +msgstr "Správa vrstev" -#: ../gui/wxpython/dbmgr/base.py:385 -msgid "Unknown value" -msgstr "Neznámá hodnota" +#: ../gui/wxpython/dbmgr/manager.py:141 +msgid "Close Attribute Table Manager" +msgstr "Zavřít Správce atributových tabulek" -#: ../gui/wxpython/dbmgr/base.py:393 -msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." -msgstr "Nelze překódovat hodnotu. Změňte kódování v nastavení GUI ('Atributy')" +#: ../gui/wxpython/dbmgr/manager.py:144 +msgid "Reload currently selected attribute data" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:147 +msgid "Reload all attribute data (drop current selection)" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/dialogs.py:76 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" -"Error loading attribute data. Record number: %(rec)d. Unable to convert " -"value '%(val)s' in key column (%(key)s) to integer.\n" +"No attribute table found.\n" "\n" -"Details: %(detail)s" +"Do you want to create a new attribute table and defined a link to vector map " +"<%s>?" msgstr "" -"Chyba při načítání atributových dat. Záznam číslo %(rec)d. Nelze převést " -"hodnotu '%(val)s' v klíčovém sloupci(%(key)s) na integer.\n" -"\n" -"Detaily: %(detail)s" -#: ../gui/wxpython/dbmgr/base.py:493 -msgid "Sort ascending" -msgstr "Seřadit vzestupně" +#: ../gui/wxpython/dbmgr/dialogs.py:85 +msgid "Create table?" +msgstr "Vytvořit tabulku?" -#: ../gui/wxpython/dbmgr/base.py:494 -msgid "Sort descending" -msgstr "seřadit sestupně" +#: ../gui/wxpython/dbmgr/dialogs.py:107 +msgid "Close dialog on submit" +msgstr "Zavřít dialog při zápis" -#: ../gui/wxpython/dbmgr/base.py:499 -msgid "Calculate (only numeric columns)" -msgstr "Spočítat (pouze číselné sloupce)" +#: ../gui/wxpython/dbmgr/dialogs.py:119 +msgid "No attributes found" +msgstr "Nenalezeny žádné atributy" -#: ../gui/wxpython/dbmgr/base.py:501 -msgid "Field calculator" +#: ../gui/wxpython/dbmgr/dialogs.py:128 +msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 -msgid "Area size" -msgstr "Velikost plochy" +#: ../gui/wxpython/dbmgr/dialogs.py:130 +msgid "Display attributes" +msgstr "Zobrazit atributy" -#: ../gui/wxpython/dbmgr/base.py:521 -msgid "Line length" -msgstr "Délka linie" +#: ../gui/wxpython/dbmgr/dialogs.py:134 +msgid "&Reload" +msgstr "Znovu &nahrát" -#: ../gui/wxpython/dbmgr/base.py:522 -msgid "Compactness of an area" -msgstr "" +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 +msgid "&Submit" +msgstr "&Zapsat" -#: ../gui/wxpython/dbmgr/base.py:525 -msgid "Fractal dimension of boundary defining a polygon" +#: ../gui/wxpython/dbmgr/dialogs.py:241 +#, python-format +msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 -msgid "Perimeter length of an area" -msgstr "Délka obvodu plochy" +#: ../gui/wxpython/dbmgr/dialogs.py:454 +msgid "Unknown" +msgstr "Neznámý" -#: ../gui/wxpython/dbmgr/base.py:528 -msgid "Number of features for each category" -msgstr "Počet prvků pro každou kategorii" +<<<<<<< HEAD +#: ../gui/wxpython/animation/temporal_manager.py:107 +======= +#: ../gui/wxpython/dbmgr/dialogs.py:504 ../gui/wxpython/dbmgr/dialogs.py:632 +#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/dialogs.py:122 ../gui/wxpython/vdigit/dialogs.py:576 +msgid "Category" +msgstr "Kategorie" -#: ../gui/wxpython/dbmgr/base.py:529 -msgid "Slope steepness of 3D line" +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#, python-format +msgid "Loading attribute data for vector map <%s>..." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 -msgid "Line sinuousity" +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:56 +msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 -msgid "Line azimuth" -msgstr "Azimut linie" - -#: ../gui/wxpython/dbmgr/base.py:658 -#, python-format -msgid "Add column to table <%s>" +#: ../gui/wxpython/web_services/widgets.py:136 +msgid " Requested data settings " msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 -msgid "Unable to add column to the table. No column name defined." +#: ../gui/wxpython/web_services/widgets.py:166 +msgid "Request" msgstr "" -"Nelze přidat sloupec do atributové tabulky. Nebyl zadáno jméno sloupce." -#: ../gui/wxpython/dbmgr/base.py:1068 -#, python-format -msgid "Column <%(column)s> already exists in table <%(table)s>." -msgstr "Sloupec <%(column)s> již v tabulce <%(table)s> existuje." - -#: ../gui/wxpython/dbmgr/base.py:1157 -msgid "Attribute data - right-click to edit/manage records" -msgstr "Atributová data - editace/správa záznamů pravé tlačítko myši" - -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 -msgid "Table" -msgstr "Tabulka" +#: ../gui/wxpython/web_services/widgets.py:171 +msgid "List of layers " +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 -msgid " (read-only)" +#: ../gui/wxpython/web_services/widgets.py:189 +msgid "Source projection:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 -msgid "SQL Query" -msgstr "Dotaz SQL" +#: ../gui/wxpython/web_services/widgets.py:251 +msgid "Advanced request settings" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 -msgid "Simple" -msgstr "Jednoduchý" +#: ../gui/wxpython/web_services/widgets.py:259 +msgid "Order of layers in raster" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1218 -msgid "Apply SELECT statement and reload data records" -msgstr "použít SELECT a znovu načíst data" +#: ../gui/wxpython/web_services/widgets.py:264 +#: ../gui/wxpython/psmap/dialogs.py:1774 ../gui/wxpython/psmap/dialogs.py:3666 +msgid "Up" +msgstr "Nahoru" -#: ../gui/wxpython/dbmgr/base.py:1259 -msgid "Builder" +#: ../gui/wxpython/web_services/widgets.py:266 +#: ../gui/wxpython/psmap/dialogs.py:1775 ../gui/wxpython/psmap/dialogs.py:3667 +msgid "Down" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 -msgid "SQL Builder" -msgstr "SQL Pomocník" +#: ../gui/wxpython/web_services/widgets.py:272 +msgid "Reprojection method:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 -msgid "Insert new record" -msgstr "Vložit nový záznam" +#: ../gui/wxpython/web_services/widgets.py:279 +msgid "Nearest neighbor" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1447 -msgid "Delete selected record(s)" -msgstr "Smazat vybrané záznamy" +#: ../gui/wxpython/web_services/widgets.py:280 +msgid "Linear interpolation" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1448 -msgid "Delete all records" -msgstr "Smazat všechny záznamy" +#: ../gui/wxpython/web_services/widgets.py:281 +msgid "Cubic interpolation" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1458 -msgid "Highlight selected features and zoom" -msgstr "Zvýraznit vybrané prvky a přiblížit" +#: ../gui/wxpython/web_services/widgets.py:282 +msgid "Cubic spline interpolation" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 -msgid "Extract selected features" -msgstr "Extrahovat vybrané prvky" +#: ../gui/wxpython/web_services/widgets.py:286 +msgid "Maximum columns to request from server at time:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 -msgid "Delete selected features" -msgstr "Odstranit zvolené prvky" +#: ../gui/wxpython/web_services/widgets.py:292 +msgid "Maximum rows to request from server at time:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1524 -msgid "Update existing record" -msgstr "Modifikovat existující záznam" +#: ../gui/wxpython/web_services/widgets.py:309 +msgid "Do not request transparent data" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 -#, python-format -msgid "Value '%(value)s' needs to be entered as %(type)s." -msgstr "Hodnota '%(value)s' musí být vložena jako %(type)s." +#: ../gui/wxpython/web_services/widgets.py:324 +msgid "Additional query parameters for server:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/web_services/widgets.py:539 #, python-format +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgid "" -"Unable to update existing record.\n" -"%s" +"It is not allowed to display data with different temporal types (absolute " +"and relative)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/animation/temporal_manager.py:123 #, python-format -msgid "Record with category number %d already exists in the table." -msgstr "Záznam kategorie %d již v atributové tabulce existuje." +msgid "It is not allowed to display data with different units (%s)." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 -#, python-format -msgid "Category number (column %s) is missing." -msgstr "Kategorie (sloupec %s) chybí." +#: ../gui/wxpython/animation/temporal_manager.py:136 +msgid "" +"You are going to display data with different temporal types of maps " +"(interval and point). It is recommended to use data of one temporal type to " +"avoid confusion." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format -msgid "" -"Unable to insert new record.\n" -"%s" +msgid "Topology of Space time dataset %s is invalid." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/animation/nviztask.py:53 #, python-format -msgid "" -"Selected data records (%d) will be permanently deleted from table. Do you " -"want to delete them?" +msgid "No 3d view information in workspace file <%s>." msgstr "" -"Vybrané záznamy dat (%d) budou natrvalo smazány z tabulky. Přejete si je " -"smazat?" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 -msgid "Delete records" -msgstr "Smazat záznamy" +#: ../gui/wxpython/animation/nviztask.py:309 +msgid "Please add only one layer in the list." +msgstr "" + +#: ../gui/wxpython/animation/nviztask.py:315 +msgid "No map series nor space-time dataset is added." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/animation/controller.py:244 +#: ../gui/wxpython/animation/dialogs.py:856 #, python-format +msgid "Maximum number of animations is %d." +msgstr "" + +#: ../gui/wxpython/animation/controller.py:270 +#: ../gui/wxpython/animation/dialogs.py:909 msgid "" -"All data records (%d) will be permanently deleted from table. Do you want to " -"delete them?" +"More animations are using one window. Please select different window for " +"each animation." msgstr "" -"Všechny záznamy dat (%d) budou natrvalo smazány z tabulky. přejete se je " -"smazat?" -#: ../gui/wxpython/dbmgr/base.py:1995 -msgid "Nothing to extract." -msgstr "Nebylo zvoleno nic pro extrahování." +#: ../gui/wxpython/animation/controller.py:450 +msgid "Failed to display legend." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 -msgid "Nothing to delete." -msgstr "Není co smazat" +#: ../gui/wxpython/animation/controller.py:482 +msgid "Inconsistent number of maps, please check input data." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 -#, python-format -msgid "" -"Loading attribute data failed.\n" -"\n" -"%s" +#: ../gui/wxpython/animation/controller.py:507 +msgid "No animation to export." +msgstr "" + +#: ../gui/wxpython/animation/controller.py:543 +msgid "Preparing export, please wait..." msgstr "" -"Selhalo načtení atributových dat.\n" -"\n" -"%s" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format -msgid "" -"Loading attribute data failed.\n" -"Invalid SQL select statement.\n" -"\n" -"%s" +msgid "%(from)s %(dash)s %(to)s" msgstr "" -"Selhalo načtení atributových dat\n" -"Neplatný příkaz SQL.\n" -"\n" -"'%s'" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/animation/controller.py:605 #, python-format -msgid "Table <%s> - right-click to delete column(s)" -msgstr "Tabulka <%s> - klikněte pravým tlačítkem pro vymazání sloupce" +msgid "%(start)s %(unit)s" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 -msgid "Column" +#: ../gui/wxpython/animation/controller.py:627 +msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 -msgid "Length" +#: ../gui/wxpython/animation/data.py:67 +msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 -msgid "Add" -msgstr "Přidat" +#: ../gui/wxpython/animation/data.py:134 +msgid "No workspace file selected." +msgstr "Nebyl vybrán soubor pracovní plochy." -#: ../gui/wxpython/dbmgr/base.py:2595 -msgid "Unable to rename column. No column name defined." -msgstr "Nelze přejmenovat sloupec. Nebyl zadáno jméno sloupce." +#: ../gui/wxpython/animation/data.py:137 +#, python-format +msgid "File %s not found" +msgstr "Soubor %s nebyl nalezen" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/animation/data.py:146 #, python-format +msgid "Animation %d" +msgstr "" + +#: ../gui/wxpython/animation/utils.py:188 +msgid "The number of maps in space-time datasets has to be the same." +msgstr "" + +#: ../gui/wxpython/animation/utils.py:194 msgid "" -"Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " -"exists in the table <%(table)s>." +"The temporal type (absolute/relative) of space-time datasets has to be the " +"same." msgstr "" -"Nelze přejmenovat sloupec <%(column)s>. Sloupec <%(columnTo)s> již v tabulce " -"<%(table)s> existuje." -#: ../gui/wxpython/dbmgr/base.py:2629 -#, python-format +#: ../gui/wxpython/animation/utils.py:202 msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"The map type (point/interval) of space-time datasets has to be the same." msgstr "" -"Nelze přejmenovat sloupec. Sloupec <%(column)s> v tabulce <%(table)s> " -"neexistuje." -#: ../gui/wxpython/dbmgr/base.py:2661 -msgid "Drop selected column" -msgstr "Odstranit zvolený sloupec" +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main +#: ../gui/wxpython/animation/utils.py:209 +======= +#: ../gui/wxpython/gui_core/gselect.py:886 +msgid "No table linked to layer <{}>." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2669 -msgid "Drop all columns" -msgstr "Odstranit všechny sloupce" +#: ../gui/wxpython/gui_core/gselect.py:1399 +msgid "Output settings" +msgstr "Nastavení výstupu" -#: ../gui/wxpython/dbmgr/base.py:2700 -#, python-format -msgid "" -"Selected %s will PERMANENTLY removed from table. Do you want to drop the " -"column?" +#: ../gui/wxpython/gui_core/gselect.py:1401 +msgid "Source input" +msgstr "Zdroj vstupu" + +#: ../gui/wxpython/gui_core/gselect.py:1412 +msgid "Native" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 -msgid "Drop column(s)" -msgstr "Odstranit sloupec" +#: ../gui/wxpython/gui_core/gselect.py:1418 +msgid "File" +msgstr "Soubor" -#: ../gui/wxpython/dbmgr/base.py:2749 -#, python-format -msgid "" -"Selected columns\n" -"%s\n" -"will PERMANENTLY removed from table. Do you want to drop the columns?" -msgstr "" -"Vybrané sloupce\n" -"%s\n" -"budou NAVŽDY odstraněny z tabulky. Chcete smazat tyto sloupce?" +#: ../gui/wxpython/gui_core/gselect.py:1422 +#: ../gui/wxpython/gui_core/forms.py:1939 +msgid "Directory" +msgstr "Adresář" -#: ../gui/wxpython/dbmgr/base.py:2870 -msgid "List of layers" -msgstr "Seznam vrstev" +#: ../gui/wxpython/gui_core/gselect.py:1430 +msgid "Protocol" +msgstr "Protokol" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 -#, python-format -msgid "Drop also linked attribute table (%s)" -msgstr "Odstranit také připojenou atributovou tabulku (%s)" +#: ../gui/wxpython/gui_core/gselect.py:1441 +msgid "Output type" +msgstr "Typ výstupu" -#: ../gui/wxpython/dbmgr/base.py:2994 -msgid "Column name" -msgstr "Název sloupce" +#: ../gui/wxpython/gui_core/gselect.py:1443 +msgid "Source type" +msgstr "Typ zdroje" -#: ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data length" -msgstr "Datová délka" +#: ../gui/wxpython/gui_core/gselect.py:1465 +msgid "All files" +msgstr "Všechny soubory" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 -msgid "Driver" -msgstr "Ovladač" +#: ../gui/wxpython/gui_core/gselect.py:1481 +msgid "ZIP files" +msgstr "Soubory ZIP" -#: ../gui/wxpython/dbmgr/base.py:3052 -msgid "Key" -msgstr "Klíč" +#: ../gui/wxpython/gui_core/gselect.py:1482 +msgid "GZIP files" +msgstr "Soubory GZIP" -#: ../gui/wxpython/dbmgr/base.py:3159 -msgid "Add layer" -msgstr "Přidat vrstvu" +#: ../gui/wxpython/gui_core/gselect.py:1483 +msgid "TAR files" +msgstr "Soubory TAR" -#: ../gui/wxpython/dbmgr/base.py:3169 -msgid "Layer description" -msgstr "Popis vrstvy" +#: ../gui/wxpython/gui_core/gselect.py:1485 +msgid "TARGZ files" +msgstr "Soubory TARGZ" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 -msgid "Key column" -msgstr "Sloupec s klíčem" +#: ../gui/wxpython/gui_core/gselect.py:1493 +msgid "File:" +msgstr "Soubor:" -#: ../gui/wxpython/dbmgr/base.py:3238 -msgid "Insert record for each category into table" -msgstr "Vložit záznam pro každou kategorii v tabulce" +#: ../gui/wxpython/gui_core/gselect.py:1494 +msgid "Choose file to import" +msgstr "Vyberte soubor pro import" -#: ../gui/wxpython/dbmgr/base.py:3261 -msgid "You need to add categories by v.category module." -msgstr "Je potřeba přidat kategorie pomocí modulu v.category." +#: ../gui/wxpython/gui_core/gselect.py:1510 +#: ../gui/wxpython/gui_core/gselect.py:1593 +msgid "Choose input directory" +msgstr "Vyberte vstupní adresář" -#: ../gui/wxpython/dbmgr/base.py:3266 -msgid "Table description" -msgstr "Popis tabulky" +#: ../gui/wxpython/gui_core/gselect.py:1527 +msgid "Extension:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3277 -msgid "Table name" -msgstr "Název tabulky" +#: ../gui/wxpython/gui_core/gselect.py:1557 +msgid "Choose file" +msgstr "Vyberte soubor" -#: ../gui/wxpython/dbmgr/base.py:3302 -msgid "&Create table" -msgstr "Vytvořit &tabulku" +#: ../gui/wxpython/gui_core/gselect.py:1578 +#: ../gui/wxpython/gui_core/gselect.py:2340 +msgid "Feature type:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 -msgid "&Set default" -msgstr "Nastavit výc&hozí" +#: ../gui/wxpython/gui_core/gselect.py:1580 +msgid "simple features" +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:1581 +msgid "topological" +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:1694 +#: ../gui/wxpython/gui_core/gselect.py:1725 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1814 +msgid "Creation options:" +msgstr "Možnosti vytvoření:" -#: ../gui/wxpython/dbmgr/base.py:3380 -msgid "Remove layer" -msgstr "Odstranit vrstvu" +#: ../gui/wxpython/gui_core/gselect.py:1708 +#: ../gui/wxpython/gui_core/gselect.py:1747 +#: ../gui/wxpython/gui_core/gselect.py:1799 +msgid "Format:" +msgstr "Formát:" -#: ../gui/wxpython/dbmgr/base.py:3383 -msgid "Layer to remove" -msgstr "Vrstva k odstranění" +#: ../gui/wxpython/gui_core/gselect.py:1806 +msgid "Protocol:" +msgstr "Protokol:" -#: ../gui/wxpython/dbmgr/base.py:3414 -msgid "&Remove layer" -msgstr "" +#: ../gui/wxpython/gui_core/gselect.py:1829 +msgid "No settings available" +msgstr "Nejsou k dispozici žádná nastavení" -#: ../gui/wxpython/dbmgr/base.py:3443 -msgid "Modify layer" -msgstr "Upravit vrstvu" +#: ../gui/wxpython/gui_core/gselect.py:2332 +#: ../gui/wxpython/vdigit/preferences.py:799 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:6267 +msgid "Point" +msgstr "Bod" -#: ../gui/wxpython/dbmgr/base.py:3544 -msgid "&Modify layer" -msgstr "&Upravit vrstvu" +#: ../gui/wxpython/gui_core/gselect.py:2332 +msgid "LineString" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 -msgid "" -"Unable to get list of tables.\n" -"Please use db.connect to set database parameters." +#: ../gui/wxpython/gui_core/gselect.py:2332 +msgid "Polygon" msgstr "" -"Nelze získat seznam tabulek.\n" -"Prosím použijte db.connect pro nastavení parametrů databáze." -#: ../gui/wxpython/dbmgr/base.py:3693 -msgid "Unable to create new table. Table name or key column name is missing." +#: ../gui/wxpython/gui_core/gselect.py:2551 +msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -"Nelze vytvořit novou atributovou tabulku. Nebyl zadán název tabulky nebo " -"sloupec s klíčem." -#: ../gui/wxpython/dbmgr/base.py:3703 -#, python-format -msgid "Unable to create new table. Table <%s> already exists in the database." +#: ../gui/wxpython/gui_core/gselect.py:2567 +msgid "Input vector map is not selected" msgstr "" -"Nelze vytvořit novou atributovou tabulku. Tabulka <%s> již existuje v " -"databázi." -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/gui_core/gselect.py:2571 #, python-format -msgid "" -"Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " -"exists." +msgid "Input vector map <%s> and selected map <%s> in layer manager are different. Operation canceled." msgstr "" -"Nelze přidat novou vrstvu k vektorové mapě <%(vector)s>. Vrstva %(layer)d " -"již existuje." -#: ../gui/wxpython/dbmgr/base.py:3936 -msgid "Field statistics" +#: ../gui/wxpython/gui_core/gselect.py:2747 +msgid "No vector map selected" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 -msgid "Copy statistics the clipboard (Ctrl+C)" +#: ../gui/wxpython/gui_core/pyedit.py:295 +msgid "Permission denied <{}>. Please change file permission for reading." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 -msgid "Statistics is not support for DBF tables." +#: ../gui/wxpython/gui_core/pyedit.py:303 +msgid "Couldn't read file <{}>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 -msgid "Unable to calculte statistics." +#: ../gui/wxpython/gui_core/pyedit.py:323 +msgid "Permission denied <{}>. Please change file permission for writting.{}" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 -#, python-format -msgid "" -"Unable to calculte statistics. Invalid number of lines %d (should be %d)." +#: ../gui/wxpython/gui_core/pyedit.py:334 +msgid "Couldn't write file <{}>.{}" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 -msgid "Unable to calculte standard deviation." -msgstr "Nelze vypočítat směrodatnou odchylku." +#: ../gui/wxpython/gui_core/pyedit.py:448 +msgid "Open file" +msgstr "Otevřít soubor" -#: ../gui/wxpython/dbmgr/base.py:4091 -#, python-format -msgid "Field statistics <%s>" +#: ../gui/wxpython/gui_core/pyedit.py:489 +msgid "File <{}> doesn't exist.It was probably moved or deleted." msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/dbmgr/dialogs.py:79 -======= -#: ../gui/wxpython/dbmgr/sqlbuilder.py:133 -msgid "Set SQL statement to default" -msgstr "Nastavit SQL příkaz jako výchozí" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:135 -msgid "Apply SQL statement" +#: ../gui/wxpython/gui_core/pyedit.py:554 +msgid "Replace the content by the template?" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:137 -msgid "Close the dialog" -msgstr "Zavřít dialog " - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:224 -msgid "Columns" -msgstr "Sloupce" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:239 -msgid "Interactive insertion" +#: ../gui/wxpython/gui_core/pyedit.py:556 +msgid "Replace the content by the example?" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:253 -msgid "Values" -msgstr "Hodnoty" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:263 -msgid "Get all values" -msgstr "Získat všechny hodnoty" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 -msgid "Get sample" -msgstr "Získat vzorek" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 -msgid "Get first 256 unique values as sample" +#: ../gui/wxpython/gui_core/pyedit.py:558 +msgid "Replace the current content by the file content?" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:288 -msgid "Go to:" -msgstr "Přejít na:" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:301 -msgid "Close dialog on apply" -msgstr "Zavřít dialog při souhlasu" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:482 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:627 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:855 -#, python-format -msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" +#: ../gui/wxpython/gui_core/pyedit.py:564 +msgid "Replace content" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -msgid "Column to show (SELECT clause)" +#: ../gui/wxpython/gui_core/pyedit.py:576 +msgid "Set parameters for the script" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:631 -msgid "Constraint for query (WHERE clause)" +#: ../gui/wxpython/gui_core/pyedit.py:577 +msgid "Specify command line parameters for the script separated by spaces:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:502 -msgid "Verify" -msgstr "Ověřit" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:503 -msgid "Verify SQL statement" -msgstr "Ověřit SQL příkaz" +#: ../gui/wxpython/gui_core/pyedit.py:627 +msgid "Open (Ctrl+O)" +msgstr "Otevřít (Ctrl+O)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 -msgid "SQL statement not verified" -msgstr "SQL příkaz nebyl ověřen" +#: ../gui/wxpython/gui_core/pyedit.py:629 +msgid "Save (Ctrl+S)" +msgstr "Uložit (Ctrl+S)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:555 -msgid "SQL statement is not valid" -msgstr "SQL příkaz není platný" +#: ../gui/wxpython/gui_core/pyedit.py:631 +msgid "Run (Ctrl+R)" +msgstr "Spustit (Ctrl+R)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:557 -#, python-format -msgid "" -"SQL statement is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/gui_core/pyedit.py:634 +msgid "Activate overwrite" msgstr "" -"SQL příkaz není platný.\n" -"\n" -"%s" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:559 -msgid "SQL statement is valid" -msgstr "SQL příkaz je platný" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:630 -msgid "Column to set (SET clause)" +#: ../gui/wxpython/gui_core/pyedit.py:636 +msgid "Deactive overwrite" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:632 -msgid "Calculate column value to set" +#: ../gui/wxpython/gui_core/pyedit.py:638 +msgid "Quit Simple Python Editor" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:704 -msgid "Functions" -msgstr "" +#: ../gui/wxpython/gui_core/goutput.py:126 +msgid "Command prompt" +msgstr "Příkazový řádek" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:737 -msgid "SQL statement was not applied" -msgstr "" +#: ../gui/wxpython/gui_core/goutput.py:131 +msgid "Output window" +msgstr "Okno s výstupem" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:739 -msgid "SQL statement applied" -msgstr "" +#: ../gui/wxpython/gui_core/goutput.py:138 +msgid "Clear output window content" +msgstr "Vyčistit obsah okna s výstupem" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:773 -msgid "Dbf driver does not support usage of SQL functions." -msgstr "" +#: ../gui/wxpython/gui_core/goutput.py:140 +msgid "Clear command prompt content" +msgstr "Vyčistit obsah příkazového řádku" -#: ../gui/wxpython/dbmgr/manager.py:78 -msgid "Attribute Table Manager" -msgstr "" +#: ../gui/wxpython/gui_core/goutput.py:143 +msgid "Save output window content to the file" +msgstr "Uložit obsah okna s výstupem do souboru" -#: ../gui/wxpython/dbmgr/manager.py:81 -#, python-brace-format -msgid "{document} (read-only)" -msgstr "" +#: ../gui/wxpython/gui_core/goutput.py:145 +msgid "Abort running command" +msgstr "Zrušit běžící příkaz" -#: ../gui/wxpython/dbmgr/manager.py:100 -#, python-format -msgid "Database connection for vector map <%s> is not defined in DB file. You can define new connection in 'Manage layers' tab." -msgstr "Databázové nastavení není pro vektorovou mapu <%s> definováno v souboru DB. Toto nastavení můžete provést v panelu 'Správa vrstev'." +#: ../gui/wxpython/gui_core/goutput.py:149 +msgid "&Log file" +msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:106 -msgid "Please wait, loading attribute data..." -msgstr "Prosím čekejte, načítají se atributová data..." +#: ../gui/wxpython/gui_core/goutput.py:151 +msgid "Toggle to save list of executed commands into a file; content saved when switching off." +msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:115 -msgid "Browse data" -msgstr "Procházet data" +#: ../gui/wxpython/gui_core/goutput.py:371 +#: ../gui/wxpython/gui_core/goutput.py:466 +msgid "Save file as..." +msgstr "Uložit soubor jako..." -#: ../gui/wxpython/dbmgr/manager.py:123 -msgid "Manage tables" -msgstr "Správa tabulek" +#: ../gui/wxpython/gui_core/goutput.py:373 +#: ../gui/wxpython/gui_core/goutput.py:468 +#, python-format +msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" +msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:130 -msgid "Manage layers" -msgstr "Správa vrstev" +#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:469 +msgid "Text files" +msgstr "Textové soubory" -#: ../gui/wxpython/dbmgr/manager.py:141 -msgid "Close Attribute Table Manager" -msgstr "Zavřít Správce atributových tabulek" +#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/gui_core/goutput.py:470 +msgid "Files" +msgstr "Soubory" -#: ../gui/wxpython/dbmgr/manager.py:144 -msgid "Reload currently selected attribute data" +#: ../gui/wxpython/gui_core/goutput.py:388 +#, python-format +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 "" -#: ../gui/wxpython/dbmgr/manager.py:147 -msgid "Reload all attribute data (drop current selection)" +#: ../gui/wxpython/animation/utils.py:222 +msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:76 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#, python-format +#: ../gui/wxpython/animation/utils.py:230 msgid "" -"No attribute table found.\n" -"\n" -"Do you want to create a new attribute table and defined a link to vector map " -"<%s>?" +"The number of maps to animate has to be the same as the number of maps in " +"temporal dataset." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 -msgid "Create table?" -msgstr "Vytvořit tabulku?" +#: ../gui/wxpython/animation/toolbars.py:28 +msgid "Change animation speed" +msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 -msgid "Close dialog on submit" -msgstr "Zavřít dialog při zápis" +#: ../gui/wxpython/animation/toolbars.py:29 +msgid "Play forward" +msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 -msgid "No attributes found" -msgstr "Nenalezeny žádné atributy" +#: ../gui/wxpython/animation/toolbars.py:30 +msgid "Play back" +msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 -msgid "Define attributes" +#: ../gui/wxpython/animation/toolbars.py:33 +msgid "Repeat" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 -msgid "Display attributes" -msgstr "Zobrazit atributy" +#: ../gui/wxpython/animation/toolbars.py:35 +msgid "Play back and forward" +msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 -msgid "&Reload" -msgstr "Znovu &nahrát" +#: ../gui/wxpython/animation/toolbars.py:38 +#: ../gui/wxpython/animation/dialogs.py:347 +msgid "Add new animation" +msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 -msgid "&Submit" -msgstr "&Zapsat" +#: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 +msgid "Add, edit or remove animation" +msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 -#, python-format -msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." +#: ../gui/wxpython/animation/toolbars.py:46 +#: ../gui/wxpython/animation/dialogs.py:930 +msgid "Export animation" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 -msgid "Unknown" -msgstr "Neznámý" +#: ../gui/wxpython/animation/toolbars.py:56 +msgid "Add space-time dataset or series of map layers" +msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/animation/temporal_manager.py:107 -======= -#: ../gui/wxpython/dbmgr/dialogs.py:504 ../gui/wxpython/dbmgr/dialogs.py:632 -#: ../gui/wxpython/vdigit/preferences.py:611 -#: ../gui/wxpython/vdigit/dialogs.py:122 ../gui/wxpython/vdigit/dialogs.py:576 -msgid "Category" -msgstr "Kategorie" +#: ../gui/wxpython/animation/toolbars.py:57 +msgid "Add space-time dataset or series of map layers for animation" +msgstr "" -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#: ../gui/wxpython/animation/g.gui.animation.py:93 #, python-format -msgid "Loading attribute data for vector map <%s>..." +msgid "%s=, %s=, %s= and %s= are mutually exclusive." msgstr "" -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:56 -msgid "Attribute Table Manager - GRASS GIS" +#: ../gui/wxpython/animation/g.gui.animation.py:137 +msgid "Animation Tool - GRASS GIS" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:136 -msgid " Requested data settings " +#: ../gui/wxpython/animation/dialogs.py:81 +msgid "Adjust speed of animation" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:166 -msgid "Request" +#: ../gui/wxpython/animation/dialogs.py:134 +msgid "Simple mode" +msgstr "Jednoduchý režim" + +#: ../gui/wxpython/animation/dialogs.py:139 +msgid "Frame duration:" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:171 -msgid "List of layers " +#: ../gui/wxpython/animation/dialogs.py:140 +#: ../gui/wxpython/animation/dialogs.py:175 +msgid "ms" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:189 -msgid "Source projection:" +#: ../gui/wxpython/animation/dialogs.py:166 +msgid "Temporal mode" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:251 -msgid "Advanced request settings" +#: ../gui/wxpython/animation/dialogs.py:171 +msgid "Time unit:" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:259 -msgid "Order of layers in raster" +#: ../gui/wxpython/animation/dialogs.py:173 +msgid "Duration of time unit:" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:264 -#: ../gui/wxpython/psmap/dialogs.py:1774 ../gui/wxpython/psmap/dialogs.py:3666 -msgid "Up" -msgstr "Nahoru" +#: ../gui/wxpython/animation/dialogs.py:239 +msgid "year" +msgstr "" -#: ../gui/wxpython/web_services/widgets.py:266 -#: ../gui/wxpython/psmap/dialogs.py:1775 ../gui/wxpython/psmap/dialogs.py:3667 -msgid "Down" +#: ../gui/wxpython/animation/dialogs.py:240 +msgid "month" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:272 -msgid "Reprojection method:" +#: ../gui/wxpython/animation/dialogs.py:241 +msgid "day" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:279 -msgid "Nearest neighbor" +#: ../gui/wxpython/animation/dialogs.py:242 +msgid "hour" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:280 -msgid "Linear interpolation" +#: ../gui/wxpython/animation/dialogs.py:243 +msgid "minute" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:281 -msgid "Cubic interpolation" +#: ../gui/wxpython/animation/dialogs.py:244 +msgid "second" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:282 -msgid "Cubic spline interpolation" +#: ../gui/wxpython/animation/dialogs.py:309 +msgid "Animation speed is too high." msgstr "" -#: ../gui/wxpython/web_services/widgets.py:286 -msgid "Maximum columns to request from server at time:" +#: ../gui/wxpython/animation/dialogs.py:349 +msgid "Edit animation" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:292 -msgid "Maximum rows to request from server at time:" +#: ../gui/wxpython/animation/dialogs.py:361 +msgid "Advanced" +msgstr "Rozšířené" + +#: ../gui/wxpython/animation/dialogs.py:387 +msgid "top left" +msgstr "vlevo nahoře" + +#: ../gui/wxpython/animation/dialogs.py:388 +msgid "top right" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:309 -msgid "Do not request transparent data" +#: ../gui/wxpython/animation/dialogs.py:389 +msgid "bottom left" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:324 -msgid "Additional query parameters for server:" +#: ../gui/wxpython/animation/dialogs.py:390 +msgid "bottom right" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:539 -#, python-format ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -msgid "" -"It is not allowed to display data with different temporal types (absolute " -"and relative)." +#: ../gui/wxpython/animation/dialogs.py:406 +msgid "Select 2D or 3D view" msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:123 -#, python-format -msgid "It is not allowed to display data with different units (%s)." +#: ../gui/wxpython/animation/dialogs.py:416 +msgid "Window position:" msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:136 +#: ../gui/wxpython/animation/dialogs.py:421 +msgid "View mode:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:429 msgid "" -"You are going to display data with different temporal types of maps " -"(interval and point). It is recommended to use data of one temporal type to " -"avoid confusion." +"For 3D animation, please select only one space-time dataset\n" +"or one series of map layers." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 -#, python-format -msgid "Topology of Space time dataset %s is invalid." +#: ../gui/wxpython/animation/dialogs.py:460 +#: ../gui/wxpython/psmap/dialogs.py:3435 +msgid "Show raster legend" +msgstr "Zobrazit legendu rastru" + +#: ../gui/wxpython/animation/dialogs.py:479 +msgid "3D view parameters" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:53 -#, python-format -msgid "No 3d view information in workspace file <%s>." +#: ../gui/wxpython/animation/dialogs.py:488 +msgid "Workspace file:" +msgstr "Soubor pracovní plochy:" + +#: ../gui/wxpython/animation/dialogs.py:489 +msgid "Choose workspace file to import 3D view parameters" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:309 -msgid "Please add only one layer in the list." +#: ../gui/wxpython/animation/dialogs.py:498 +msgid "Parameter for animation:" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:315 -msgid "No map series nor space-time dataset is added." +#: ../gui/wxpython/animation/dialogs.py:523 +msgid "Set spatial extent in 2D view" msgstr "" -#: ../gui/wxpython/animation/controller.py:243 -#: ../gui/wxpython/animation/dialogs.py:856 -#, python-format -msgid "Maximum number of animations is %d." +#: ../gui/wxpython/animation/dialogs.py:527 +msgid "Use saved region:" msgstr "" -#: ../gui/wxpython/animation/controller.py:269 -#: ../gui/wxpython/animation/dialogs.py:909 -msgid "" -"More animations are using one window. Please select different window for " -"each animation." +#: ../gui/wxpython/animation/dialogs.py:536 +msgid "Animate region change" msgstr "" -#: ../gui/wxpython/animation/controller.py:449 -msgid "Failed to display legend." +#: ../gui/wxpython/animation/dialogs.py:545 +msgid "End region:" msgstr "" -#: ../gui/wxpython/animation/controller.py:481 -msgid "Inconsistent number of maps, please check input data." +#: ../gui/wxpython/animation/dialogs.py:551 +msgid "Zoom value:" msgstr "" -#: ../gui/wxpython/animation/controller.py:506 -msgid "No animation to export." +#: ../gui/wxpython/animation/dialogs.py:553 +msgid "N-S/E-W distances in map units used to gradually reduce region." msgstr "" -#: ../gui/wxpython/animation/controller.py:542 -msgid "Preparing export, please wait..." +#: ../gui/wxpython/animation/dialogs.py:561 +msgid "N-S:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:568 +msgid "E-W:" msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 -#, python-format -msgid "%(from)s %(dash)s %(to)s" +#: ../gui/wxpython/animation/dialogs.py:681 +msgid "Only one series or space-time dataset is accepted for 3D mode." msgstr "" -#: ../gui/wxpython/animation/controller.py:604 -#, python-format -msgid "%(start)s %(unit)s" +#: ../gui/wxpython/animation/dialogs.py:689 +msgid "No map series or space-time dataset added." msgstr "" -#: ../gui/wxpython/animation/controller.py:626 -msgid "Exporting animation, please wait..." +#: ../gui/wxpython/animation/dialogs.py:731 +#: ../gui/wxpython/animation/dialogs.py:742 +msgid "Region information is not complete" msgstr "" -#: ../gui/wxpython/animation/data.py:66 -msgid "No animation name selected." +#: ../gui/wxpython/animation/dialogs.py:763 +msgid "Add, edit or remove animations" msgstr "" -#: ../gui/wxpython/animation/data.py:133 -msgid "No workspace file selected." -msgstr "Nebyl vybrán soubor pracovní plochy." - -#: ../gui/wxpython/animation/data.py:136 -#, python-format -msgid "File %s not found" -msgstr "Soubor %s nebyl nalezen" +#: ../gui/wxpython/animation/dialogs.py:772 +msgid "List of animations" +msgstr "Seznam animací" -#: ../gui/wxpython/animation/data.py:145 -#, python-format -msgid "Animation %d" +#: ../gui/wxpython/animation/dialogs.py:786 +msgid "Edit" msgstr "" -#: ../gui/wxpython/animation/utils.py:187 -msgid "The number of maps in space-time datasets has to be the same." +#: ../gui/wxpython/animation/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:603 +msgid "Format" +msgstr "Formát" + +#: ../gui/wxpython/animation/dialogs.py:1016 +msgid "Add time stamp" msgstr "" -#: ../gui/wxpython/animation/utils.py:193 -msgid "" -"The temporal type (absolute/relative) of space-time datasets has to be the " -"same." +#: ../gui/wxpython/animation/dialogs.py:1047 +msgid "Add time stamp, image or text decoration by one of the buttons above." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 -msgid "" -"The map type (point/interval) of space-time datasets has to be the same." +#: ../gui/wxpython/animation/dialogs.py:1050 +msgid "Add image or text decoration by one of the buttons above." msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/animation/utils.py:209 -======= -#: ../gui/wxpython/gui_core/gselect.py:886 -msgid "No table linked to layer <{}>." +#: ../gui/wxpython/animation/dialogs.py:1064 +msgid "Font settings:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1399 -msgid "Output settings" -msgstr "Nastavení výstupu" +#: ../gui/wxpython/animation/dialogs.py:1069 +msgid "Sample text" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1401 -msgid "Source input" -msgstr "Zdroj vstupu" +#: ../gui/wxpython/animation/dialogs.py:1090 +msgid "Image file:" +msgstr "Soubor obrázku:" -#: ../gui/wxpython/gui_core/gselect.py:1412 -msgid "Native" +#: ../gui/wxpython/animation/dialogs.py:1091 +msgid "Choose image file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1418 -msgid "File" -msgstr "Soubor" - -#: ../gui/wxpython/gui_core/gselect.py:1422 -#: ../gui/wxpython/gui_core/forms.py:1939 -msgid "Directory" -msgstr "Adresář" +#: ../gui/wxpython/animation/dialogs.py:1104 +msgid "Text:" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1430 -msgid "Protocol" -msgstr "Protokol" +#: ../gui/wxpython/animation/dialogs.py:1124 +msgid "Placement as percentage of screen coordinates (X: 0, Y: 0 is top left):" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1441 -msgid "Output type" -msgstr "Typ výstupu" +#: ../gui/wxpython/animation/dialogs.py:1140 +#: ../gui/wxpython/psmap/dialogs.py:284 +msgid "X:" +msgstr "X:" -#: ../gui/wxpython/gui_core/gselect.py:1443 -msgid "Source type" -msgstr "Typ zdroje" +#: ../gui/wxpython/animation/dialogs.py:1145 +#: ../gui/wxpython/psmap/dialogs.py:285 +msgid "Y:" +msgstr "Y:" -#: ../gui/wxpython/gui_core/gselect.py:1465 -msgid "All files" -msgstr "Všechny soubory" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "image sequence" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1481 -msgid "ZIP files" -msgstr "Soubory ZIP" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "animated GIF" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1482 -msgid "GZIP files" -msgstr "Soubory GZIP" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "SWF" +msgstr "SWF" -#: ../gui/wxpython/gui_core/gselect.py:1483 -msgid "TAR files" -msgstr "Soubory TAR" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "AVI" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1485 -msgid "TARGZ files" -msgstr "Soubory TARGZ" +#: ../gui/wxpython/animation/dialogs.py:1166 +msgid "Export to:" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1493 -msgid "File:" -msgstr "Soubor:" +#: ../gui/wxpython/animation/dialogs.py:1184 +msgid "animation_" +msgstr "animation_" -#: ../gui/wxpython/gui_core/gselect.py:1494 -msgid "Choose file to import" -msgstr "Vyberte soubor pro import" +#: ../gui/wxpython/animation/dialogs.py:1193 +msgid "Choose directory for export" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1510 -#: ../gui/wxpython/gui_core/gselect.py:1593 -msgid "Choose input directory" -msgstr "Vyberte vstupní adresář" +#: ../gui/wxpython/animation/dialogs.py:1220 +msgid "GIF file:" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1527 -msgid "Extension:" +#: ../gui/wxpython/animation/dialogs.py:1221 +#: ../gui/wxpython/animation/dialogs.py:1244 +#: ../gui/wxpython/animation/dialogs.py:1275 +msgid "Choose file to save animation" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1557 -msgid "Choose file" -msgstr "Vyberte soubor" +#: ../gui/wxpython/animation/dialogs.py:1243 +msgid "SWF file:" +msgstr "SWF soubor:" -#: ../gui/wxpython/gui_core/gselect.py:1578 -#: ../gui/wxpython/gui_core/gselect.py:2340 -msgid "Feature type:" +#: ../gui/wxpython/animation/dialogs.py:1265 +msgid "" +"Program 'ffmpeg' was not found.\n" +"Please install it first and make sure\n" +"it's in the PATH variable." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1580 -msgid "simple features" +#: ../gui/wxpython/animation/dialogs.py:1274 +msgid "AVI file:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1581 -msgid "topological" +#: ../gui/wxpython/animation/dialogs.py:1281 +msgid "Video codec:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1694 -#: ../gui/wxpython/gui_core/gselect.py:1725 -#: ../gui/wxpython/gui_core/gselect.py:1776 -#: ../gui/wxpython/gui_core/gselect.py:1814 -msgid "Creation options:" -msgstr "Možnosti vytvoření:" - -#: ../gui/wxpython/gui_core/gselect.py:1708 -#: ../gui/wxpython/gui_core/gselect.py:1747 -#: ../gui/wxpython/gui_core/gselect.py:1799 -msgid "Format:" -msgstr "Formát:" +#: ../gui/wxpython/animation/dialogs.py:1284 +msgid "Additional options:" +msgstr "Další volby:" -#: ../gui/wxpython/gui_core/gselect.py:1806 -msgid "Protocol:" -msgstr "Protokol:" +#: ../gui/wxpython/animation/dialogs.py:1288 +msgid "" +"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " +"Options depend on ffmpeg version." +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1829 -msgid "No settings available" -msgstr "Nejsou k dispozici žádná nastavení" +#: ../gui/wxpython/animation/dialogs.py:1320 +#, python-format +msgid "Current frame rate: %.2f fps" +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2332 -#: ../gui/wxpython/vdigit/preferences.py:799 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:6267 -msgid "Point" -msgstr "Bod" +#: ../gui/wxpython/animation/dialogs.py:1447 +#, python-format +msgid "File %s not found." +msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2332 -msgid "LineString" +#: ../gui/wxpython/animation/dialogs.py:1451 +msgid "Decoration image file is missing." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2332 -msgid "Polygon" +#: ../gui/wxpython/animation/dialogs.py:1459 +#, python-format +msgid "Directory %s not found." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2551 -msgid "No vector map selected in layer manager. Operation canceled." +#: ../gui/wxpython/animation/dialogs.py:1461 +msgid "Export directory is missing." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2567 -msgid "Input vector map is not selected" +#: ../gui/wxpython/animation/dialogs.py:1520 +msgid "Time stamp" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2571 -#, python-format -msgid "Input vector map <%s> and selected map <%s> in layer manager are different. Operation canceled." +#: ../gui/wxpython/animation/dialogs.py:1544 +#, python-brace-format +msgid "Exported file directory '{base_dir}' does not exist." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2747 -msgid "No vector map selected" +#: ../gui/wxpython/animation/dialogs.py:1547 +msgid "Export file is missing." msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:295 -msgid "Permission denied <{}>. Please change file permission for reading." +#: ../gui/wxpython/animation/dialogs.py:1568 +#, python-brace-format +msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:303 -msgid "Couldn't read file <{}>." +#: ../gui/wxpython/animation/dialogs.py:1654 +msgid "Add space-time dataset layer" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:323 -msgid "Permission denied <{}>. Please change file permission for writting.{}" +#: ../gui/wxpython/animation/dialogs.py:1676 +msgid "Multiple raster maps" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:334 -msgid "Couldn't write file <{}>.{}" +#: ../gui/wxpython/animation/dialogs.py:1677 +msgid "Multiple vector maps" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:448 -msgid "Open file" -msgstr "Otevřít soubor" +#: ../gui/wxpython/animation/dialogs.py:1678 +msgid "Multiple 3D raster maps" +msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:489 -msgid "File <{}> doesn't exist.It was probably moved or deleted." +#: ../gui/wxpython/animation/dialogs.py:1679 +msgid "Space time raster dataset" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:554 -msgid "Replace the content by the template?" +#: ../gui/wxpython/animation/dialogs.py:1680 +msgid "Space time vector dataset" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:556 -msgid "Replace the content by the example?" +#: ../gui/wxpython/animation/dialogs.py:1681 +msgid "Space time 3D raster dataset" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:558 -msgid "Replace the current content by the file content?" +#: ../gui/wxpython/animation/dialogs.py:1720 +msgid "Input data type:" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:564 -msgid "Replace content" +#: ../gui/wxpython/animation/dialogs.py:1797 +msgid "Select raster/vector maps." msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:576 -msgid "Set parameters for the script" +#: ../gui/wxpython/animation/dialogs.py:1825 +msgid "Please select maps or dataset first." msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:577 -msgid "Specify command line parameters for the script separated by spaces:" +#: ../gui/wxpython/animation/dialogs.py:1855 +msgid "Animation Tool settings" +msgstr "Nastavení nástroje pro animace" + +#: ../gui/wxpython/animation/dialogs.py:1919 +msgid "Number of parallel processes:" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:627 -msgid "Open (Ctrl+O)" -msgstr "Otevřít (Ctrl+O)" +#: ../gui/wxpython/animation/dialogs.py:1940 +msgid "Text foreground color:" +msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:629 -msgid "Save (Ctrl+S)" -msgstr "Uložit (Ctrl+S)" +#: ../gui/wxpython/animation/dialogs.py:1956 +msgid "Text background color:" +msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:631 -msgid "Run (Ctrl+R)" -msgstr "Spustit (Ctrl+R)" +#: ../gui/wxpython/animation/dialogs.py:1989 +msgid "Absolute time format:" +msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:634 -msgid "Activate overwrite" +#: ../gui/wxpython/animation/dialogs.py:2007 +msgid "" +"Click and then press key up or down to preview different date and time " +"formats. Type custom format string." msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:636 -msgid "Deactive overwrite" +#: ../gui/wxpython/animation/dialogs.py:2025 +msgid "Learn more about formatting options" +msgstr "Další informace o možnostech formátování" + +#: ../gui/wxpython/animation/dialogs.py:2039 +msgid "Display instances with no data" msgstr "" -#: ../gui/wxpython/gui_core/pyedit.py:638 -msgid "Quit Simple Python Editor" +#: ../gui/wxpython/animation/dialogs.py:2042 +msgid "" +"When animating instant-based data which have irregular timestamps you can " +"display 'no data frame' (checked option) or keep last frame." msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:126 -msgid "Command prompt" -msgstr "Příkazový řádek" +<<<<<<< HEAD +#: ../gui/wxpython/animation/dialogs.py:2073 +msgid "Invalid" +======= +#: ../gui/wxpython/gui_core/preferences.py:1721 +msgid "EPSG code:" +msgstr "Kód EPSG:" -#: ../gui/wxpython/gui_core/goutput.py:131 -msgid "Output window" -msgstr "Okno s výstupem" +#: ../gui/wxpython/gui_core/preferences.py:1739 +msgid "PROJ string (required):" +msgstr "Řetězec PROJ (vyžadováno):" -#: ../gui/wxpython/gui_core/goutput.py:138 -msgid "Clear output window content" -msgstr "Vyčistit obsah okna s výstupem" +#: ../gui/wxpython/gui_core/preferences.py:1756 +msgid "EPSG file:" +msgstr "Soubor s kódy EPSG:" -#: ../gui/wxpython/gui_core/goutput.py:140 -msgid "Clear command prompt content" -msgstr "Vyčistit obsah příkazového řádku" +#: ../gui/wxpython/gui_core/preferences.py:1773 +msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." +msgstr "Načíst kódy EPSG (buďte trpěliví), vložit kód EPSG nebo vložit přímo řetězec PROJ." -#: ../gui/wxpython/gui_core/goutput.py:143 -msgid "Save output window content to the file" -msgstr "Uložit obsah okna s výstupem do souboru" +#: ../gui/wxpython/gui_core/preferences.py:1781 +msgid "&Load EPSG codes" +msgstr "&Načíst kódy EPSG" -#: ../gui/wxpython/gui_core/goutput.py:145 -msgid "Abort running command" -msgstr "Zrušit běžící příkaz" +#: ../gui/wxpython/gui_core/preferences.py:1801 +msgid "Coordinates format" +msgstr "Formát souřadnic" -#: ../gui/wxpython/gui_core/goutput.py:149 -msgid "&Log file" +#: ../gui/wxpython/gui_core/preferences.py:1809 +msgid "Lat/long projections" +<<<<<<< HEAD msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:151 -msgid "Toggle to save list of executed commands into a file; content saved when switching off." -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:1830 +msgid "Precision:" +msgstr "Přesnost:" -#: ../gui/wxpython/gui_core/goutput.py:371 -#: ../gui/wxpython/gui_core/goutput.py:466 -msgid "Save file as..." -msgstr "Uložit soubor jako..." +#: ../gui/wxpython/gui_core/preferences.py:1916 +#, python-format +msgid "Unable to read EPSG codes: %s" +msgstr "Nelze přečíst kódy EPSG: %s" -#: ../gui/wxpython/gui_core/goutput.py:373 -#: ../gui/wxpython/gui_core/goutput.py:468 +#: ../gui/wxpython/gui_core/preferences.py:1949 +#: ../gui/wxpython/gui_core/preferences.py:1961 +#: ../gui/wxpython/gui_core/preferences.py:1973 #, python-format -msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" +msgid "EPSG code %s not found" +msgstr "Kód EPSG %s nebyl nalezen" + +#: ../gui/wxpython/gui_core/preferences.py:1983 +msgid "Select default display font" +msgstr "Vybrat výchozí písmo" + +#: ../gui/wxpython/gui_core/preferences.py:1997 +msgid "Failed to set default display font. Try different font." +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 -#: ../gui/wxpython/gui_core/goutput.py:469 -msgid "Text files" -msgstr "Textové soubory" +#: ../gui/wxpython/gui_core/preferences.py:1830 +msgid "Precision:" +msgstr "Přesnost:" -#: ../gui/wxpython/gui_core/goutput.py:375 -#: ../gui/wxpython/gui_core/goutput.py:470 -msgid "Files" -msgstr "Soubory" +#: ../gui/wxpython/gui_core/preferences.py:1916 +#, python-format +msgid "Unable to read EPSG codes: %s" +msgstr "Nelze přečíst kódy EPSG: %s" -#: ../gui/wxpython/gui_core/goutput.py:388 +#: ../gui/wxpython/gui_core/preferences.py:1949 +#: ../gui/wxpython/gui_core/preferences.py:1961 +#: ../gui/wxpython/gui_core/preferences.py:1973 #, python-format +msgid "EPSG code %s not found" +msgstr "Kód EPSG %s nebyl nalezen" + +#: ../gui/wxpython/gui_core/preferences.py:1983 +msgid "Select default display font" +msgstr "Vybrat výchozí písmo" + +#: ../gui/wxpython/gui_core/preferences.py:1997 +msgid "Failed to set default display font. Try different font." >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -msgid "" -"The temporal extents of maps in space-time datasets have to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:221 -msgid "The number of maps to animate has to be the same for each map series." +#: ../gui/wxpython/animation/provider.py:444 +msgid "Rendering map layers" msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" +======= +#: ../gui/wxpython/gui_core/preferences.py:2105 +msgid "Manage access to mapsets" +msgstr "Správa přístupu do mapsetů" + +#: ../gui/wxpython/gui_core/preferences.py:2120 msgid "" -"The number of maps to animate has to be the same as the number of maps in " -"temporal dataset." +"Check a mapset to make it accessible, uncheck it to hide it.\n" +" Notes:\n" +" - The current mapset is always accessible.\n" +" - You may only write to the current mapset.\n" +" - You may only write to mapsets which you own." msgstr "" +"Zaškrtnutím mapset zpřístupníte, zrušením zaškrtnutí skryjete.\n" +"Poznámka:\n" +" - Současný mapset je vždy přístupný.\n" +" - Můžete zapisovat pouze do současného mapsetu.\n" +" - Můžete zapisovat pouze do mapsetu, který vlastníte." -#: ../gui/wxpython/animation/toolbars.py:27 -msgid "Change animation speed" -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:2197 +msgid "Owner" +msgstr "Vlastník" -#: ../gui/wxpython/animation/toolbars.py:28 -msgid "Play forward" +#: ../gui/wxpython/gui_core/dialogs.py:74 +msgid "Required item is not set." +<<<<<<< HEAD msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 -msgid "Play back" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:105 +msgid "Select GRASS location and mapset" +msgstr "Vybrat GRASS location a mapset" -#: ../gui/wxpython/animation/toolbars.py:32 -msgid "Repeat" +#: ../gui/wxpython/gui_core/dialogs.py:125 +msgid "Location or mapset is not defined." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 -msgid "Play back and forward" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:135 +msgid "Name of GRASS location:" +msgstr "Název lokace GRASSu:" + +#: ../gui/wxpython/gui_core/dialogs.py:146 +#: ../gui/wxpython/gui_core/dialogs.py:203 +msgid "Name of mapset:" +msgstr "Název mapsetu:" + +#: ../gui/wxpython/gui_core/dialogs.py:175 +msgid "Select mapset in GRASS location" +msgstr "Vybrat mapset v lokaci GRASSu" + +#: ../gui/wxpython/gui_core/dialogs.py:195 +msgid "Name of mapset is missing." +msgstr "Chybí název mapsetu." + +#: ../gui/wxpython/gui_core/dialogs.py:216 +#: ../gui/wxpython/vdigit/toolbars.py:840 +#: ../gui/wxpython/vdigit/toolbars.py:997 +#: ../gui/wxpython/vdigit/toolbars.py:1095 +msgid "Select vector map" +msgstr "Vybrat vektorovou mapu" -#: ../gui/wxpython/animation/toolbars.py:37 -#: ../gui/wxpython/animation/dialogs.py:347 -msgid "Add new animation" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:230 +msgid "Name of vector map is missing." +msgstr "Chybí název vektorové vrstvy." -#: ../gui/wxpython/animation/toolbars.py:41 -#: ../gui/wxpython/animation/toolbars.py:42 -msgid "Add, edit or remove animation" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:292 +msgid "Create attribute table" +msgstr "Vyvořit atributovou tabulku" -#: ../gui/wxpython/animation/toolbars.py:45 -#: ../gui/wxpython/animation/dialogs.py:930 -msgid "Export animation" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:326 +msgid "Name of new vector map is missing." +msgstr "Chybí název nové vektorové vrstvy." -#: ../gui/wxpython/animation/toolbars.py:55 -msgid "Add space-time dataset or series of map layers" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:348 +msgid "Name for new vector map:" +msgstr "Název nové vektorové mapy:" -#: ../gui/wxpython/animation/toolbars.py:56 -msgid "Add space-time dataset or series of map layers for animation" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:450 +#, python-format +msgid "Unable to create vector map <%s>." +msgstr "Nelze vytvořit vektorovou mapu <%s>." -#: ../gui/wxpython/animation/g.gui.animation.py:93 +#: ../gui/wxpython/gui_core/dialogs.py:455 #, python-format -msgid "%s=, %s=, %s= and %s= are mutually exclusive." +msgid "" +"Invalid or empty key column.\n" +"Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/animation/g.gui.animation.py:137 -msgid "Animation Tool - GRASS GIS" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:486 +#, python-format +msgid "Vector map <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "Vektorová mapa <%s> již existuje v současném mapsetu. Přejete si tuto mapu přepsat?" -#: ../gui/wxpython/animation/dialogs.py:81 -msgid "Adjust speed of animation" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:576 +msgid "Load region:" +msgstr "Načíst region:" -#: ../gui/wxpython/animation/dialogs.py:134 -msgid "Simple mode" -msgstr "Jednoduchý režim" +#: ../gui/wxpython/gui_core/dialogs.py:582 +msgid "Save region:" +msgstr "Uložit region:" -#: ../gui/wxpython/animation/dialogs.py:139 -msgid "Frame duration:" +#: ../gui/wxpython/gui_core/dialogs.py:634 +msgid "Name cannot begin with '.' and must not contain space, quotes, '/', ''', '@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:140 -#: ../gui/wxpython/animation/dialogs.py:175 -msgid "ms" +#: ../gui/wxpython/gui_core/dialogs.py:650 +msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:166 -msgid "Temporal mode" +#: ../gui/wxpython/gui_core/dialogs.py:684 +msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:171 -msgid "Time unit:" +#: ../gui/wxpython/gui_core/dialogs.py:685 +msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:173 -msgid "Duration of time unit:" +#: ../gui/wxpython/gui_core/dialogs.py:686 +msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:239 -msgid "year" +#: ../gui/wxpython/gui_core/dialogs.py:727 +#: ../gui/wxpython/gui_core/dialogs.py:1524 +msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:240 -msgid "month" +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:241 -msgid "day" +#: ../gui/wxpython/gui_core/dialogs.py:745 +msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:242 -msgid "hour" +#: ../gui/wxpython/gui_core/dialogs.py:758 +msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:243 -msgid "minute" +#: ../gui/wxpython/gui_core/dialogs.py:791 +#: ../gui/wxpython/gui_core/dialogs.py:859 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +msgid "Pattern:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:244 -msgid "second" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:809 +#: ../gui/wxpython/gui_core/dialogs.py:877 +#: ../gui/wxpython/gui_core/dialogs.py:1533 +msgid "List of maps:" +msgstr "Seznam map:" -#: ../gui/wxpython/animation/dialogs.py:309 -msgid "Animation speed is too high." +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:349 -msgid "Edit animation" +#: ../gui/wxpython/gui_core/dialogs.py:830 +msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:361 -msgid "Advanced" -msgstr "Rozšířené" - -#: ../gui/wxpython/animation/dialogs.py:387 -msgid "top left" -msgstr "vlevo nahoře" - -#: ../gui/wxpython/animation/dialogs.py:388 -msgid "top right" +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:389 -msgid "bottom left" +#: ../gui/wxpython/gui_core/dialogs.py:1051 +msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:390 -msgid "bottom right" +#: ../gui/wxpython/gui_core/dialogs.py:1188 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:406 -msgid "Select 2D or 3D view" +#: ../gui/wxpython/gui_core/dialogs.py:1191 +#: ../gui/wxpython/gui_core/dialogs.py:1207 +msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:416 -msgid "Window position:" +#: ../gui/wxpython/gui_core/dialogs.py:1204 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:421 -msgid "View mode:" +#: ../gui/wxpython/gui_core/dialogs.py:1261 +msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:429 -msgid "" -"For 3D animation, please select only one space-time dataset\n" -"or one series of map layers." +#: ../gui/wxpython/gui_core/dialogs.py:1290 +#, python-format +msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 -msgid "Show raster legend" -msgstr "Zobrazit legendu rastru" - -#: ../gui/wxpython/animation/dialogs.py:479 -msgid "3D view parameters" +#: ../gui/wxpython/gui_core/dialogs.py:1293 +#, python-format +msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:488 -msgid "Workspace file:" -msgstr "Soubor pracovní plochy:" - -#: ../gui/wxpython/animation/dialogs.py:489 -msgid "Choose workspace file to import 3D view parameters" +#: ../gui/wxpython/gui_core/dialogs.py:1295 +#, python-format +msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:498 -msgid "Parameter for animation:" +#: ../gui/wxpython/gui_core/dialogs.py:1298 +#, python-format +msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:523 -msgid "Set spatial extent in 2D view" +#: ../gui/wxpython/gui_core/dialogs.py:1300 +#, python-format +msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:527 -msgid "Use saved region:" +#: ../gui/wxpython/gui_core/dialogs.py:1339 +msgid "No group selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:536 -msgid "Animate region change" +#: ../gui/wxpython/gui_core/dialogs.py:1344 +msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:545 -msgid "End region:" +#: ../gui/wxpython/gui_core/dialogs.py:1451 +msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:551 -msgid "Zoom value:" +#: ../gui/wxpython/gui_core/dialogs.py:1477 +msgid "Map type:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:553 -msgid "N-S/E-W distances in map units used to gradually reduce region." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1492 +msgid "Select toggle" +msgstr "Vybrat přepínač" -#: ../gui/wxpython/animation/dialogs.py:561 -msgid "N-S:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1499 +msgid "Mapset:" +msgstr "Mapset:" -#: ../gui/wxpython/animation/dialogs.py:568 -msgid "E-W:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1593 +msgid "Invert selection" +msgstr "Obrátit výběr" -#: ../gui/wxpython/animation/dialogs.py:681 -msgid "Only one series or space-time dataset is accepted for 3D mode." +#: ../gui/wxpython/gui_core/dialogs.py:1736 +#, python-format +msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:689 -msgid "No map series or space-time dataset added." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1763 +msgid "Set Map Layer Opacity" +msgstr "Nastavit průhlednost mapové vrstvy" -#: ../gui/wxpython/animation/dialogs.py:731 -#: ../gui/wxpython/animation/dialogs.py:742 -msgid "Region information is not complete" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1794 +#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 +#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 +msgid "transparent" +msgstr "Průhledný" -#: ../gui/wxpython/animation/dialogs.py:763 -msgid "Add, edit or remove animations" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1797 +msgid "opaque" +msgstr "Neprůhledný" + +#: ../gui/wxpython/gui_core/dialogs.py:1898 +msgid "Set image size" +msgstr "Nastavit velikost obrázku" + +#: ../gui/wxpython/gui_core/dialogs.py:1913 +msgid "Image size" +msgstr "Velikost obrázku" -#: ../gui/wxpython/animation/dialogs.py:772 -msgid "List of animations" -msgstr "Seznam animací" +#: ../gui/wxpython/gui_core/dialogs.py:1960 +msgid "Template:" +msgstr "Šablona:" -#: ../gui/wxpython/animation/dialogs.py:786 -msgid "Edit" +#: ../gui/wxpython/gui_core/dialogs.py:2000 +msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 -msgid "Format" -msgstr "Formát" +#: ../gui/wxpython/gui_core/dialogs.py:2016 +msgid " SQL statement " +msgstr "SQL příkaz" -#: ../gui/wxpython/animation/dialogs.py:1016 -msgid "Add time stamp" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2064 +msgid "Symbols" +msgstr "Symboly" -#: ../gui/wxpython/animation/dialogs.py:1047 -msgid "Add time stamp, image or text decoration by one of the buttons above." +#: ../gui/wxpython/gui_core/dialogs.py:2099 +msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1050 -msgid "Add image or text decoration by one of the buttons above." +#: ../gui/wxpython/gui_core/dialogs.py:2111 +msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1064 -msgid "Font settings:" +#: ../gui/wxpython/gui_core/dialogs.py:2364 +msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1069 -msgid "Sample text" +#: ../gui/wxpython/gui_core/dialogs.py:2369 +msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1090 -msgid "Image file:" -msgstr "Soubor obrázku:" +#: ../gui/wxpython/gui_core/dialogs.py:2448 +msgid "Select font:" +msgstr "Vybrat písmo:" -#: ../gui/wxpython/animation/dialogs.py:1091 -msgid "Choose image file" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2479 +msgid "Character encoding:" +msgstr "Kódování znaků:" -#: ../gui/wxpython/animation/dialogs.py:1104 -msgid "Text:" +#: ../gui/wxpython/gui_core/dialogs.py:2497 +#: ../gui/wxpython/psmap/dialogs.py:397 ../gui/wxpython/psmap/dialogs.py:4980 +msgid "Font size:" +msgstr "Velikost písma:" + +#: ../gui/wxpython/gui_core/dialogs.py:2549 +msgid "Example" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1124 -msgid "Placement as percentage of screen coordinates (X: 0, Y: 0 is top left):" +#: ../gui/wxpython/gui_core/wrap.py:208 +msgid "Clear" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1140 -#: ../gui/wxpython/psmap/dialogs.py:284 -msgid "X:" -msgstr "X:" +#: ../gui/wxpython/gui_core/wrap.py:210 +msgid "&Clear" +msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1145 -#: ../gui/wxpython/psmap/dialogs.py:285 -msgid "Y:" -msgstr "Y:" +#: ../gui/wxpython/gui_core/wrap.py:223 +msgid "&Cancel" +msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "image sequence" +#: ../gui/wxpython/gui_core/wrap.py:235 +msgid "&Close" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "animated GIF" +#: ../gui/wxpython/gui_core/wrap.py:245 +msgid "Apply" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "SWF" -msgstr "SWF" +#: ../gui/wxpython/gui_core/forms.py:564 +msgid "Enter parameters for '" +msgstr "Definujte parametry pro '" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "AVI" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:576 +msgid "Close this window without executing the command (Ctrl+Q)" +msgstr "Zavři toto okno bez spuštění příkazu (Ctrl+Q)" -#: ../gui/wxpython/animation/dialogs.py:1166 -msgid "Export to:" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:607 +msgid "Run the command (Ctrl+R)" +msgstr "Spustit příkaz (Ctrl+R)" -#: ../gui/wxpython/animation/dialogs.py:1184 -msgid "animation_" -msgstr "animation_" +#: ../gui/wxpython/gui_core/forms.py:631 +msgid "Show manual page of the command (Ctrl+H)" +msgstr "Ukázat manuálovou stránku příkazu (Ctrl+H)" -#: ../gui/wxpython/animation/dialogs.py:1193 -msgid "Choose directory for export" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:670 +msgid "Add created map(s) into layer tree" +msgstr "Přidat vytvořenou mapu do stromu vrstev" -#: ../gui/wxpython/animation/dialogs.py:1220 -msgid "GIF file:" +#: ../gui/wxpython/gui_core/forms.py:700 +msgid "Close dialog when command is successfully finished. Change this settings in Preferences dialog ('Command' tab)." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1221 -#: ../gui/wxpython/animation/dialogs.py:1244 -#: ../gui/wxpython/animation/dialogs.py:1275 -msgid "Choose file to save animation" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:885 +#, python-format +msgid "'%s' copied to clipboard" +msgstr "'%s' zkopírováno do schránky" -#: ../gui/wxpython/animation/dialogs.py:1243 -msgid "SWF file:" -msgstr "SWF soubor:" +#: ../gui/wxpython/gui_core/forms.py:975 ../gui/wxpython/gui_core/forms.py:989 +msgid "Required" +msgstr "Požadováno" -#: ../gui/wxpython/animation/dialogs.py:1265 -msgid "" -"Program 'ffmpeg' was not found.\n" -"Please install it first and make sure\n" -"it's in the PATH variable." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:978 ../gui/wxpython/gui_core/forms.py:990 +msgid "Optional" +msgstr "Volitelné" -#: ../gui/wxpython/animation/dialogs.py:1274 -msgid "AVI file:" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1073 +#: ../gui/wxpython/gui_core/forms.py:2105 +msgid "Parameterized in model" +msgstr "Parametrizace v modelu" -#: ../gui/wxpython/animation/dialogs.py:1281 -msgid "Video codec:" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1163 +msgid "[multiple]" +msgstr "[mnohonásobné]" -#: ../gui/wxpython/animation/dialogs.py:1284 -msgid "Additional options:" -msgstr "Další volby:" +#: ../gui/wxpython/gui_core/forms.py:1221 +msgid "valid range" +msgstr "platný rozsah" -#: ../gui/wxpython/animation/dialogs.py:1288 -msgid "" -"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " -"Options depend on ffmpeg version." +#: ../gui/wxpython/gui_core/forms.py:1578 +msgid "Show graphical representation of temporal extent of dataset(s) ." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1320 +#: ../gui/wxpython/gui_core/forms.py:1845 +#: ../gui/wxpython/gui_core/forms.py:1936 #, python-format -msgid "Current frame rate: %.2f fps" -msgstr "" +msgid "Choose %s" +msgstr "Vybrat %s" -#: ../gui/wxpython/animation/dialogs.py:1447 -#, python-format -msgid "File %s not found." +#: ../gui/wxpython/gui_core/forms.py:1890 +msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1451 -msgid "Decoration image file is missing." +#: ../gui/wxpython/gui_core/forms.py:1893 +msgid "&Save as" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1459 -#, python-format -msgid "Directory %s not found." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1895 +msgid "Save content to a file for further use" +msgstr "Uložit obsah do souboru pro pozdější použití" -#: ../gui/wxpython/animation/dialogs.py:1461 -msgid "Export directory is missing." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1900 +msgid "or enter values directly:" +msgstr "nebo zadejte hodnoty přímo:" -#: ../gui/wxpython/animation/dialogs.py:1520 -msgid "Time stamp" +#: ../gui/wxpython/gui_core/forms.py:1902 +msgid "Enter file content directly instead of specifying a file. Temporary file will be automatically created." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1544 -#, python-brace-format -msgid "Exported file directory '{base_dir}' does not exist." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:2318 +msgid "Manual" +msgstr "Manuálová stránka" -#: ../gui/wxpython/animation/dialogs.py:1547 -msgid "Export file is missing." +#: ../gui/wxpython/gui_core/forms.py:2362 +msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1568 -#, python-brace-format -msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" +#: ../gui/wxpython/gui_core/forms.py:2370 +#, python-format +msgid "" +"Unable to load file.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1654 -msgid "Add space-time dataset layer" +#: ../gui/wxpython/gui_core/forms.py:2400 +msgid "Save input as..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1676 -msgid "Multiple raster maps" +#: ../gui/wxpython/gui_core/forms.py:2733 +msgid "No dataset given." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1677 -msgid "Multiple vector maps" +#: ../gui/wxpython/gui_core/forms.py:2902 +#: ../gui/wxpython/gui_core/forms.py:2919 +#, python-format +msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1678 -msgid "Multiple 3D raster maps" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:2926 +#, python-format +msgid "%(cmd)s: parameter '%(key)s' not available" +msgstr "%(cmd)s: parametr '%(key)s' není dostupný" -#: ../gui/wxpython/animation/dialogs.py:1679 -msgid "Space time raster dataset" +#: ../gui/wxpython/gui_core/forms.py:3008 +msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1680 -msgid "Space time vector dataset" +#: ../gui/wxpython/gui_core/menu.py:155 +msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1681 -msgid "Space time 3D raster dataset" +#: ../gui/wxpython/gui_core/menu.py:157 +#, python-format +msgid "Do advanced search using %s module" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1720 -msgid "Input data type:" +#: ../gui/wxpython/gui_core/menu.py:161 +msgid "Double-click to run selected module" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1797 -msgid "Select raster/vector maps." +#: ../gui/wxpython/gui_core/menu.py:164 +msgid "&Run..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1825 -msgid "Please select maps or dataset first." +#: ../gui/wxpython/gui_core/menu.py:165 +msgid "Run selected module from the tree" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1855 -msgid "Animation Tool settings" -msgstr "Nastavení nástroje pro animace" +#: ../gui/wxpython/gui_core/menu.py:166 +msgid "H&elp" +msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1919 -msgid "Number of parallel processes:" +#: ../gui/wxpython/gui_core/menu.py:168 +msgid "Show manual for selected module from the tree" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1940 -msgid "Text foreground color:" +#: ../gui/wxpython/gui_core/menu.py:278 +#, python-format +msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1956 -msgid "Text background color:" +#: ../gui/wxpython/gui_core/menu.py:356 +msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1989 -msgid "Absolute time format:" +#: ../gui/wxpython/icons/icon.py:39 +#, python-format +msgid "Unknown iconset '%s', using default 'grass'...\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2007 -msgid "" -"Click and then press key up or down to preview different date and time " -"formats. Type custom format string." +#: ../gui/wxpython/icons/icon.py:57 +#, python-format +msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2025 -msgid "Learn more about formatting options" -msgstr "Další informace o možnostech formátování" +#: ../gui/wxpython/gcp/mapdisplay.py:48 ../gui/wxpython/gcp/manager.py:994 +#: ../gui/wxpython/image2target/ii2t_manager.py:952 +msgid "Manage Ground Control Points" +msgstr "Spravovat Vlicovací body (GCP)" -#: ../gui/wxpython/animation/dialogs.py:2039 -msgid "Display instances with no data" -msgstr "" +#: ../gui/wxpython/gcp/manager.py:150 +#: ../gui/wxpython/image2target/ii2t_manager.py:179 +msgid "Setup for georectification" +msgstr "Nastavení georektifikace" -#: ../gui/wxpython/animation/dialogs.py:2042 -msgid "" -"When animating instant-based data which have irregular timestamps you can " -"display 'no data frame' (checked option) or keep last frame." -msgstr "" +#: ../gui/wxpython/gcp/manager.py:183 ../gui/wxpython/gcp/manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:212 +#: ../gui/wxpython/image2target/ii2t_manager.py:216 +msgid "Georectifying setup canceled." +msgstr "Nastavení georektifikace zrušeno" -<<<<<<< HEAD -#: ../gui/wxpython/animation/dialogs.py:2073 -msgid "Invalid" -======= -#: ../gui/wxpython/gui_core/preferences.py:1721 -msgid "EPSG code:" -msgstr "Kód EPSG:" +#: ../gui/wxpython/gcp/manager.py:374 +#: ../gui/wxpython/image2target/ii2t_manager.py:381 +msgid "Select map type and location/mapset" +msgstr "Vybrat typ mapy a lokaci/mapset" -#: ../gui/wxpython/gui_core/preferences.py:1739 -msgid "PROJ string (required):" -msgstr "Řetězec PROJ (vyžadováno):" +#: ../gui/wxpython/gcp/manager.py:388 +#: ../gui/wxpython/image2target/ii2t_manager.py:395 +msgid "Map type to georectify" +msgstr "Typ mapy pro georektifikaci" -#: ../gui/wxpython/gui_core/preferences.py:1756 -msgid "EPSG file:" -msgstr "Soubor s kódy EPSG:" +#: ../gui/wxpython/gcp/manager.py:399 +#: ../gui/wxpython/image2target/ii2t_manager.py:406 +msgid "Select source location:" +msgstr "Vybrat zdrojovou lokaci:" -#: ../gui/wxpython/gui_core/preferences.py:1773 -msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." -msgstr "Načíst kódy EPSG (buďte trpěliví), vložit kód EPSG nebo vložit přímo řetězec PROJ." +#: ../gui/wxpython/gcp/manager.py:420 +#: ../gui/wxpython/image2target/ii2t_manager.py:427 +msgid "Select source mapset:" +msgstr "Vybrat zdrojový mapset:" -#: ../gui/wxpython/gui_core/preferences.py:1781 -msgid "&Load EPSG codes" -msgstr "&Načíst kódy EPSG" +#: ../gui/wxpython/gcp/manager.py:476 +#: ../gui/wxpython/image2target/ii2t_manager.py:483 +msgid "You must select a valid location before selecting a mapset" +msgstr "Před vybráním mapsetu musíte vybrat platnou lokaci" -#: ../gui/wxpython/gui_core/preferences.py:1801 -msgid "Coordinates format" -msgstr "Formát souřadnic" +#: ../gui/wxpython/gcp/manager.py:489 +#: ../gui/wxpython/image2target/ii2t_manager.py:496 +msgid "You must select a valid location and mapset in order to continue" +msgstr "Abyste mohli pokračovat, musíte vybrat platnou lokaci a mapset" -#: ../gui/wxpython/gui_core/preferences.py:1809 -msgid "Lat/long projections" +#: ../gui/wxpython/gcp/manager.py:511 +#: ../gui/wxpython/image2target/ii2t_manager.py:518 +msgid "Select image/map group to georectify" +msgstr "Vybrat obrazovou/mapovou skupinu pro georektifikaci" + +#: ../gui/wxpython/gcp/manager.py:533 +msgid "Select/create group:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1830 -msgid "Precision:" -msgstr "Přesnost:" +#: ../gui/wxpython/gcp/manager.py:550 +#: ../gui/wxpython/image2target/ii2t_manager.py:557 +msgid "Create group if none exists" +msgstr "vytvořit skupinu pokud žádná neexistuje" -#: ../gui/wxpython/gui_core/preferences.py:1916 -#, python-format -msgid "Unable to read EPSG codes: %s" -msgstr "Nelze přečíst kódy EPSG: %s" +#: ../gui/wxpython/gcp/manager.py:564 +#: ../gui/wxpython/image2target/ii2t_manager.py:571 +msgid "Add vector map to group..." +msgstr "Přidat vektorovou vrstvu do skupiny...." -#: ../gui/wxpython/gui_core/preferences.py:1949 -#: ../gui/wxpython/gui_core/preferences.py:1961 -#: ../gui/wxpython/gui_core/preferences.py:1973 -#, python-format -msgid "EPSG code %s not found" -msgstr "Kód EPSG %s nebyl nalezen" +#: ../gui/wxpython/gcp/manager.py:655 +msgid "No vector maps." +msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1983 -msgid "Select default display font" -msgstr "Vybrat výchozí písmo" +#: ../gui/wxpython/gcp/manager.py:662 +#: ../gui/wxpython/image2target/ii2t_manager.py:655 +msgid "You must select a valid image/map group in order to continue" +msgstr "Musíte vybrat platnou skupinu obrazů/map pokud chcete dále pokračovat" -#: ../gui/wxpython/gui_core/preferences.py:1997 -msgid "Failed to set default display font. Try different font." ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -msgstr "" +#: ../gui/wxpython/gcp/manager.py:669 +#: ../gui/wxpython/image2target/ii2t_manager.py:662 +msgid "You must enter an map name extension in order to continue" +msgstr "Musíte vložit příponu k mapě pokud chcete dále pokračovat" -#: ../gui/wxpython/animation/provider.py:443 -msgid "Rendering map layers" -msgstr "" +#: ../gui/wxpython/gcp/manager.py:738 +#: ../gui/wxpython/image2target/ii2t_manager.py:731 +msgid "Select maps to display for ground control point (GCP) creation" +msgstr "Vyberte mapy zobrazené pro vytvoření vlicovacích bodů" -<<<<<<< HEAD -#: ../gui/wxpython/animation/provider.py:559 -msgid "Overlaying map layers" -======= -#: ../gui/wxpython/gui_core/preferences.py:2105 -msgid "Manage access to mapsets" -msgstr "Správa přístupu do mapsetů" +#: ../gui/wxpython/gcp/manager.py:743 +msgid "Map Display Web Service Layer(s)" +msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2120 -msgid "" -"Check a mapset to make it accessible, uncheck it to hide it.\n" -" Notes:\n" -" - The current mapset is always accessible.\n" -" - You may only write to the current mapset.\n" -" - You may only write to mapsets which you own." +#: ../gui/wxpython/gcp/manager.py:802 ../gui/wxpython/gcp/manager.py:3060 +#: ../gui/wxpython/image2target/ii2t_manager.py:792 +#: ../gui/wxpython/image2target/ii2t_manager.py:2982 +msgid "Select target vector map to display:" msgstr "" -"Zaškrtnutím mapset zpřístupníte, zrušením zaškrtnutí skryjete.\n" -"Poznámka:\n" -" - Současný mapset je vždy přístupný.\n" -" - Můžete zapisovat pouze do současného mapsetu.\n" -" - Můžete zapisovat pouze do mapsetu, který vlastníte." -#: ../gui/wxpython/gui_core/preferences.py:2197 -msgid "Owner" -msgstr "Vlastník" +#: ../gui/wxpython/gcp/manager.py:874 +#: ../gui/wxpython/image2target/ii2t_manager.py:864 +msgid "You must select a source map in order to continue" +msgstr "Abyste mohli pokračovat, musíte vybrat zdrojovou mapu" -#: ../gui/wxpython/gui_core/dialogs.py:74 -msgid "Required item is not set." +#: ../gui/wxpython/gcp/manager.py:901 ../gui/wxpython/gcp/manager.py:920 +#: ../gui/wxpython/image2target/ii2t_manager.py:891 +#: ../gui/wxpython/image2target/ii2t_manager.py:922 +#, python-format +msgid "" +"No maps in selected group <%s>.\n" +"Please edit group or select another group." +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main msgstr "" #: ../gui/wxpython/gui_core/dialogs.py:105 @@ -30018,29 +32175,29 @@ msgid "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/animation/provider.py:789 +#: ../gui/wxpython/animation/provider.py:792 #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "Načítání dat" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -30983,17 +33140,17 @@ msgid "" msgstr "" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "" @@ -31019,26 +33176,26 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" "Unknown format %(for)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -31047,39 +33204,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "palec" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "bod" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "centimetr" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "milimetr" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "námořní míle" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "pixel" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "metr" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "stupeň" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -31151,455 +33308,455 @@ msgstr "" "Pozice od levého horního\n" "okraje papíru" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "Písmo:" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "Vyberte barvu:" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "Zavřít dialog a uložit změny" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "Jednotky" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "Výška" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "Výběr vrstvy" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "Vrstva:" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "Měřítko a střed vrstvy" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "Střed:" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "V:" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "S:" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "Měřítko:" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "Maximální rozlišení vrstvy (DPI):" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "Rámeček" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "barva rámečku" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "šířka rámečku (v bodech):" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "Nebyla vybrána žádná mapa!" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "rastr:" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "Nejprve vytvořte rámeček mapy." -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "Přidat mapu" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "body" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "linie" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "plochy" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "centroidy" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "hranice" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "Databázové spojení není definováno v DB souboru." -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "Vybrat vrstvu:" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "vyberte barvu:" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "Zadejte název souboru nebo zvolte soubor po klepnutí na Procházet" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "Vyberte soubor" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "Legenda rastru" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "Zdrojový rastr" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "aktuální rastr" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "vybrat rastr" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "Typ legendy" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "Rozšířené nastavení legendy" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "Legenda vektoru" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "Zobrazit legendu vektoru" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "Zdrojové vektorové vrstvy" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "Zvolte vektorové vrstvy a jejich pořadí v legendě" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "Upravit popisek" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "nakreslit rámeček okolo legendy" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "Velikost a pozice" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "Ponecháte-li pole prázdné, použijí se výchozí hodnoty." -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" @@ -31607,239 +33764,239 @@ msgstr "" "Šířka barevného symbolu (u linií)\n" "před textem legendy" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "Sloupce:" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "Nastavení barev" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "použít barvu rámečku:" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "použít barvu pozadí:" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "Délka:" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "Délka měřítka je zadána v mapových jednotkách" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "Výška měřítka odpovídá skutečné výšce na papíru" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "výchozí" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "Typ:" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "Počet částí:" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "Popsat každé" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "části" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "průhledné pozadí textu" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "Není určena délka měřítka" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "Vložte text:" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "Efekty pro text" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "pozadí textu" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "zvýraznění" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "rámeček textu" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "Posun" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "vodorovně (body):" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "svisle (body):" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "Otočení textu" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "otočit text (proti směru hodinových ručiček)" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "Neby zadán žádný text!" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "Vyberte adresář s obrázky" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "Poznámka: podporován je pouze formát EPS" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "Měřítko a otočení" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "Úhel otočení (stupně):" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "Otočení proti směru hodinových ručiček ve stupních" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "Nelze načíst soubor %s" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "Nebyl vybrán žádný obrázek" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "Nastavení směrové růžice" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "Barva obrysu:" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "Barva výplně:" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "Velikost a otočení" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "Velikost (body):" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "Velikost symbolu v bodech" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "Nastavení obdélníku" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "Nastavení linie" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "Šířka linie v bodech" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -31866,139 +34023,149 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "Vytváření PDF..." -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "Vytváření náhledu..." -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 #, fuzzy msgid "Program {} is not available." msgstr "Náhled není k dispozici" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "PDF vytvořeno" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "Soubor PostScriptu vytvořen" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "Náhled není k dispozici" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "Náhled vytvořen" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "Uložit soubor jako" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "Náhled vytvoříte stisknutím tlačítka s ikonou zeleného trojúhelníku." -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "MĚŘÍTKO" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "SMĚROVÁ RŮŽICE" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "popisky:" +#~ msgid "Location Name:" +#~ msgstr "Název lokace:" + +#~ msgid "Change location and mapset" +#~ msgstr "Změnit lokaci a mapset" + +#, fuzzy +#~ msgid "(Un)dock Map Display" +#~ msgstr "Mapové okno" + #~ msgid "Show comp. extent" #~ msgstr "Zobr. výpoč. region" @@ -32024,13 +34191,6 @@ msgstr "popisky:" #~ msgid "Unable to display the map" #~ msgstr "Nelze odstranit mapset" -#, fuzzy, python-format -#~ msgid "Unable to rename mapset: %s" -#~ msgstr "" -#~ "Nelze přejmenovat mapset. \n" -#~ "\n" -#~ "%s" - #, fuzzy, python-format #~ msgid "Unable to rename location: %s" #~ msgstr "" @@ -32199,11 +34359,14 @@ msgstr "popisky:" #~ "Vytvoří rastrovou vrstvu a bodovou vektorovou vrstvu obsahující náhodně " #~ "rozmístěné body." +<<<<<<< HEAD +======= #, fuzzy <<<<<<< HEAD #~ msgid "Do you want to import {}to the newly created location?" #~ msgstr "Přejete si založit lokaci GRASSu <%s>?" +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) #~ msgid "Command prompt" #~ msgstr "Příkazový řádek" @@ -32216,9 +34379,6 @@ msgstr "popisky:" #~ msgid "Save output window content to the file" #~ msgstr "Uložit obsah okna s výstupem do souboru" -#~ msgid "Module dialog style:" -#~ msgstr "Styl dialogu pro moduly:" - #~ msgid "Module dialog settings" #~ msgstr "Nastavení dialogu pro moduly" @@ -32253,9 +34413,6 @@ msgstr "popisky:" #~ msgid "Point dataset:" #~ msgstr "bodová data:" -#~ msgid "Numeric column:" -#~ msgstr "Číselný sloupec:" - #~ msgid "Kriging" #~ msgstr "Krigování" @@ -32501,9 +34658,6 @@ msgstr "popisky:" #~ msgid "Select space time raster dataset(s):" #~ msgstr "Vybrat zdrojový mapset:" -#~ msgid "Choose project location and mapset" -#~ msgstr "Vybrat lokaci a mapset projektu" - #~ msgid "Manage" #~ msgstr "Spravovat" @@ -33262,6 +35416,10 @@ msgid "Create new location?" msgstr "Vytvořit novou lokaci?" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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 dbb105c6cb4..ed27341e503 100644 --- a/locale/po/grasswxpy_de.po +++ b/locale/po/grasswxpy_de.po @@ -1771,6 +1771,7 @@ msgid "" "messages." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:49 @@ -1781,6 +1782,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/iclass/frame.py:1169 #, python-format msgid "No area in category %s. Category skipped." @@ -2038,6 +2041,9 @@ msgid "Data Catalog - GRASS GIS" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2450,6 +2456,7 @@ msgstr "" msgid "Download sample location to current GRASS database" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/datacatalog/toolbars.py:49 @@ -2459,6 +2466,8 @@ msgid "Import raster data [r.import]" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/datacatalog/toolbars.py:45 msgid "Import raster data [r.import]" ======= @@ -2469,6 +2478,9 @@ msgid "Import raster data [r.import]" msgid "Import raster data [r.import]" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2901,6 +2913,7 @@ msgstr "" #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:1999 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2912,6 +2925,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -4284,6 +4302,7 @@ msgid "Animation Tool" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4295,6 +4314,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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%" @@ -9128,8 +9152,8 @@ msgstr "SIMWE Oberflächenabflussmodellierung" #: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -"Hydrologische Simulation des Oberflächenabfluss mittels \"path sampling" -"\" (SIMWE)." +"Hydrologische Simulation des Oberflächenabfluss mittels \"path " +"sampling\" (SIMWE)." #: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Sediment flux modeling" @@ -9140,8 +9164,8 @@ msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -"Sedimenttransport und Erosions-/Deposition-Simulation mittels \"path sampling" -"\" (SIMWE)." +"Sedimenttransport und Erosions-/Deposition-Simulation mittels \"path " +"sampling\" (SIMWE)." #: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 msgid "Topographic index map" @@ -9758,6 +9782,7 @@ msgid "Show simple linear regression line" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9769,6 +9794,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -15920,13 +15950,13 @@ msgstr "" #: ../gui/wxpython/image2target/ii2t_gis_set.py:811 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -"Wollen Sie mit dem Löschen des Mapsets <%(mapset)s> der Location <" -"%(location)s> fortfahren?\n" +"Wollen Sie mit dem Löschen des Mapsets <%(mapset)s> der Location " +"<%(location)s> fortfahren?\n" "\n" "ALLE KARTEN in diesem Mapset werden UNWIDERRUFLICH GELÖSCHT!" @@ -16542,6 +16572,7 @@ msgstr "" msgid "Base raster map <{}> not found in current mapset." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -16553,6 +16584,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 @@ -17185,6 +17221,9 @@ msgid "Map Display {number}" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -18203,6 +18242,7 @@ msgstr "" #: ../gui/wxpython/modules/histogram.py:296 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18214,6 +18254,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -18584,6 +18629,7 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18595,6 +18641,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -18847,8 +18898,8 @@ msgstr "" #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" #: ../gui/wxpython/iscatt/controllers.py:351 @@ -19596,6 +19647,7 @@ msgstr "" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19607,6 +19659,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -19698,6 +19755,7 @@ msgstr "Werkzeugleiste 3D-Ansicht" msgid "Console" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/mapwin/decorations.py:203 @@ -19706,6 +19764,8 @@ msgid "Text properties" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 #, fuzzy msgid "Map Swipe Tool" @@ -19716,6 +19776,9 @@ msgid "Text properties" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25032,6 +25095,7 @@ msgstr "Vektorkarte <%s> hinzugefügt" #, python-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25043,17 +25107,25 @@ 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?" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Aktuelles Projekt ist nicht leer. Wollen Sie die aktuellen Einstellungen in " "einer Projektdatei speichern?" ======= @@ -25061,6 +25133,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25664,8 +25739,8 @@ msgstr "" #: ../gui/wxpython/dbmgr/base.py:2629 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" "Kann die Spalte nicht umbenennen. Die Spalte <%(column)s> existiert nicht in " "der Tabelle <%(table)s>." @@ -29723,6 +29798,9 @@ msgid "Cartographic Composer - GRASS GIS" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -30381,6 +30459,11 @@ msgid "GRASS GIS Raster Map Calculator" msgstr "GRASS GIS Rasterkartenrechner" <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/gmodeler/dialogs.py:318 #, fuzzy, python-format msgid "" @@ -30393,6 +30476,7 @@ msgstr "" "\n" "Kann keine neue Aktion zum Modell hinzufügen." +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #~ msgid "GRASS GIS 3D Raster Map Calculator" #~ msgstr "GRASS GIS 3D Raster Map Calculator" ======= @@ -30552,6 +30636,10 @@ msgid "GRASS GIS 3D Raster Map Calculator" msgstr "GRASS GIS 3D Raster Map Calculator" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -30577,6 +30665,7 @@ msgstr "Location-Titel (optional, Sie können dieses Feld leer lassen)." msgid "Choose method for creating a new location" msgstr "Wählen Sie eine Methode, um die neue Location zu erzeugen" +<<<<<<< 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" @@ -30625,6 +30714,8 @@ msgstr "Wählen Sie eine Methode, um die neue Location zu erzeugen" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "" #~ "Read projection and datum terms from a Well Known Text (WKT) .prj file" #~ msgstr "" @@ -30703,6 +30794,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30710,6 +30804,7 @@ msgstr "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwähl msgid "Location Title:" msgstr "Location-Titel:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Location wizard canceled. Location not created." @@ -30806,6 +30901,8 @@ msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "Location wizard canceled. Location not created." #~ msgstr "" #~ "Location-Assistent wurde abgebrochen. Die Location wurde nicht erzeugt." @@ -30982,6 +31079,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -30995,6 +31095,7 @@ msgstr "Möchten Sie die GRASS Location <%s> erzeugen?" msgid "Create new location?" msgstr "Neue Location erzeugen?" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "GRASS GIS SQL Query Utility" @@ -31004,6 +31105,8 @@ msgstr "GRASS GIS SQL Abfragewerkzeug" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "GRASS GIS SQL Query Utility" #~ msgstr "GRASS GIS SQL Abfragewerkzeug" @@ -31026,6 +31129,9 @@ msgid "GRASS GIS SQL Query Utility" msgstr "GRASS GIS SQL Abfragewerkzeug" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasswxpy_el.po b/locale/po/grasswxpy_el.po index d321733ba9e..5a4d6079ca6 100644 --- a/locale/po/grasswxpy_el.po +++ b/locale/po/grasswxpy_el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2013-02-07 20:23+0200\n" "Last-Translator: Nikos Ves \n" "Language-Team: Greek \n" @@ -24,12 +24,12 @@ msgstr "Προβολή" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "Δεδομένα" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "Εμφάνηση" @@ -37,838 +37,838 @@ msgstr "Εμφάνηση" msgid "Analysis" msgstr "Ανάλυση" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "κλίση:" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "Ύψος:" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "εδώ" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "κέντρο" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "Επαναφορά της προβολής στην αρχική προκαθορισμένη θέση " -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "κατακόρυφο" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "επαναφορά" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "Επαναφορά στην αρχική προβολή" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "Χρώμα φόντου : " -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "Εγραφή" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "Αναπαραγωγή" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "Παύση" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "Σταμάτημα" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "Συνολικός αριθμός καρέ :" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "Ρυθμός καρέ (FPS) : " -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "Τα καρέ εγράφονται με την δεδομένη συχνότητα (FPS)." -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "Αποθήκευση σειράς εικόνων : " -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "Επιλέξτε ενα φάκελο :" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "Επιλέξτε έναν φάκελο για τις εικόνες" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "Πρόθεμα αρχείου" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" "Τα παραγωμενα αρχεία θα μοιάζουν κάπως έτσι : prefix_1.ppm, prefix_2.ppm, ..." -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "Φορμάτ αρχείου: " -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "Επιφάνια" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "Συνεχόμενη επιφάνεια" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "Δυάνυσματικού" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "3D raster" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "Φωτισμός" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "Χάρτης raster" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "Σχεδίαση" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "Σκίαση :" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "επίπεδο" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "ανάλυση: " -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "στύλ:" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Χρώμα" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "Μάσκα" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "Διαυγεια" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "χάρτης" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "σταθερά" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "Θέση" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "Επαναφορά" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "Επαναφορά στην αρχική θέση" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "εκκαθάριση" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "Μίξη" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "Οριζόντεο Χ:" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "Οριζόντιο Υ:" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "Περιστροφή:" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Νέο" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "Διαγραφή" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Τιμη;" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "Διαύγεια" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "Χρώμα:" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "Διανυσματικός Χάρτης" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "Διανυσματικές γραμμές" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Γραμμή:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "πλάτος:" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "χρώμα:" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "Ύψος πάνω απο την επιφάνεια;" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "Προβολή διανυσματικών σημείων" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "Διανυσματικά σημεία" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Εικονίδιο:" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "μεγεθος" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "σύμβολο:" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "3D raster χάρτης" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "Ανάλυση:" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "Β && Δ" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "Β && Α" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "Ν && Δ" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "Ν && Α" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "Επιλογές" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "Κλίμακα" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "Μήκος κλίμακας (σε μονάδες χάρτη)" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "Χρώμα κλίμακας:" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "Δεν έχει δοθεί πρόθεμα." -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "Ο φάκελος %s δεν υπάρχει," -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "σταθερή#" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "Δ" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "Β" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "Ν" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "Α" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "ΒΔ" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "ΒΑ" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "ΝΑ" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "ΝΔ" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "Επίπεδο" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "ανένα" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "Επίπεδο" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "Ο διανυσματικός χάρτης είναι 3D" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "Ο διανυσματικός χάρτης είναι 2D" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "όριο:" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "Βόριο όριο:" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "Νότιο όριο:" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "Δυτικό όριο:" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "Ανατολικό όριο:" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "Υψόμετρο(Ζ)" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1066,8 +1066,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "Πλάτος: " @@ -1116,7 +1116,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1224,14 +1224,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "Εξαγωγή" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "" @@ -1341,8 +1341,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1413,12 +1413,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1480,115 +1480,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Δημιουργία/τροποποίηση ομάδος..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Όνομα raster χάρτη:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Όνομα διανυσματικού χάρτη:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1629,7 +1629,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1640,169 +1640,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Εργαλειοθήκη Χάρτη" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "Το αρχείο υπάρχει." -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1911,13 +1911,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Εισαγωγή raster δεδομένων" @@ -1988,56 +1988,61 @@ msgid "Data catalog" msgstr "" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" msgstr "" +"Η Τοποθεσία <%s> δημιουργήθηκε.\n" +"\n" +"Θέλετε να γίνει αλλαγή στην νέα Τοποθεσία;" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Δημιουργία πίνακα;" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2045,316 +2050,320 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "Αντικατάσταση;" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "Μετεονομασ&ία" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "Διαγραφή εγγραφών" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "Μετεονομασ&ία" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" +msgstr "Μετονομασία επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "Διαγραφή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2374,23 +2383,30 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" +msgid "Create new mapset in current project" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/datacatalog/toolbars.py:46 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/datacatalog/toolbars.py:45 ======= #: ../gui/wxpython/datacatalog/toolbars.py:49 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2402,13 +2418,23 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/datacatalog/toolbars.py:55 @@ -2417,8 +2443,15 @@ msgid "Select another import option" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/datacatalog/toolbars.py:52 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/datacatalog/toolbars.py:51 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Select another import option" ======= #: ../gui/wxpython/datacatalog/toolbars.py:55 @@ -2428,7 +2461,21 @@ msgid "Select another import option" msgid "Select another import option" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/datacatalog/toolbars.py:72 +#: ../gui/wxpython/modules/extensions.py:74 +#: ../gui/wxpython/gui_core/menu.py:152 +msgid "Search" +msgstr "" + +#: ../gui/wxpython/datacatalog/toolbars.py:91 +msgid "Type to search database by map type or name. Use Python regular expressions to refine your search." +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main msgstr "" @@ -2444,55 +2491,61 @@ msgid "Type to search database by map type or name. Use Python regular expressio >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -2844,6 +2897,7 @@ msgstr "" #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:1999 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2855,6 +2909,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Data Catalog" msgstr "" @@ -2867,9 +2930,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Εργαλεία" @@ -2930,7 +2993,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Κλεισιμο" @@ -2954,27 +3017,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "Εργαλειοθήκη Misc" @@ -2984,6 +3047,13 @@ msgid "Map <%s> not found. " msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 +======= +<<<<<<< HEAD +>>>>>>> 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 ======= @@ -3648,27 +3718,31 @@ msgstr "" #: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #: ../gui/wxpython/lmgr/layertree.py:2055 ../gui/wxpython/mapswipe/frame.py:406 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Map <%s> not found." msgstr "Ο χάρτης <%s> δεν βρέθηκε." #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -3684,12 +3758,23 @@ msgstr "" "Αδυναμία φόρτωσης του θέματος (εικονίδια). Αιτία: %s. Κλείσιμο του wxGUI.." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/history/tree.py:79 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, fuzzy msgid "Double-click to open the tool" msgstr "(Διπλό κλικ για να οριστούν οι ιδιότητες)" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" ======= @@ -3964,186 +4049,301 @@ msgid "Remove" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "Αφαίρεση" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Μετονομασία στήλης" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +msgid "Timestamp:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Περιστροφή:" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Κλίμακα" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Μάσκα" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Μάσκα" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Βοράς" + #: ../gui/wxpython/history/browser.py:46 +#, fuzzy +msgid "South:" +msgstr "Νότος" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Δύση" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Ανατολή" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "Ανάλυση Β-Ν" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Ανάλυση Α-Δ" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Αριθμών φορτωμένων εγραφών: %d" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Όνομα αντικειμένου" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Όνομα αντικειμένου" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d δεύτερα" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "Γενικά" + +#: ../gui/wxpython/history/browser.py:138 +msgid "Computational region during command execution" +msgstr "" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +msgid "Update current region" +msgstr "" + +#: ../gui/wxpython/history/browser.py:271 +msgid "Region match" +msgstr "" + +#: ../gui/wxpython/history/browser.py:294 +msgid "Set current computational region to the region of executed command" +msgstr "" + +#: ../gui/wxpython/history/browser.py:359 msgid "History browser" msgstr "" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 msgid "&Export history" msgstr "" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Αποθήκευση σρχείου ως..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "Όλα τα αρχεία" + +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "Αρχεία" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "Αρχεία κειμένου" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "Αρχεία" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Αποθήκευση σρχείου ως..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample project to download:" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" +msgstr "Διαγραγή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" +#: ../gui/wxpython/startup/locdownload.py:439 +msgid "Dataset Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Διαγραγή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Θέλετε να διαγράψετε οριστικά τα αρχεία;%s" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" +msgstr "Μη έγκυρη εισαγωγή" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" msgstr "" +"Η Τοποθεσία <%s> δημιουργήθηκε.\n" +"\n" +"Θέλετε να γίνει αλλαγή στην νέα Τοποθεσία;" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -4153,82 +4353,83 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Σφάλμα" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" +msgstr "Αδυναμία ανάγνωσης της λίστας : %s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" msgstr "Μετονομασία επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" -msgstr "" +msgstr "Αδυναμία ανάγνωσης της λίστας : %s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -4238,11 +4439,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -4252,15 +4453,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -4270,50 +4471,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Αδυναμία διαγραφής επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Διαγραγή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:497 +#, fuzzy +msgid "Error when deleting projects" +msgstr "Σφάλμα κατα την ανάγνωση του αρχείου '%s'." -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -4323,11 +4527,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -4337,15 +4541,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -4355,14 +4559,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "άγνωστο" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -4374,15 +4579,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -4390,103 +4595,103 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"Η τρέχουσα Τοποθεσία ειναι <%(loc)s>.\n" +"Η τρέχουσα Συλλογή Χαρτών είναι η <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "Η τρέχουσα Τοποθεσία ειναι <%(loc)s>.\n" "Η τρέχουσα Συλλογή Χαρτών είναι η <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "" #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "raster" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -4495,19 +4700,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "Δημιουργία ομάδος αν δεν υπάρχει" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "Προσθήκη διανύσματικού χάρτη στην ομάδα" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "" @@ -4516,17 +4721,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -4534,34 +4739,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -4569,42 +4774,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "Διαχείριση φωτοσταθερών σημείων" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "πηγή" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "στόχος" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -4614,37 +4819,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -4654,331 +4859,332 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "Αποθήκευση φωτοσταθερών σημείων;" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "" -#: ../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 +#: ../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 msgid "source E" msgstr "αρχικό Α" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "αρχικό Β" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "τελικό Α" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "τελικό Β" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "Φωτοσταθερό Νου:" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Κλείσιμο διαλόγου" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "1ης τάξης" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "2ης Τάξης" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "3ης Τάξης" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "Επιλογή μεθόδους παρεμβολής:" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/timeline/g.gui.timeline.py:63 @@ -4987,10 +5193,19 @@ msgid "Timeline Tool - GRASS GIS" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/gcp/manager.py:3574 #: ../gui/wxpython/image2target/ii2t_manager.py:3481 #: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -5025,10 +5240,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -5037,7 +5252,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -5046,7 +5261,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -5060,14 +5275,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "" @@ -5080,14 +5295,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Αριθμός κατηγορίας" @@ -5098,11 +5313,22 @@ msgid "Timeline Tool - GRASS GIS" #: ../gui/wxpython/timeline/g.gui.timeline.py:63 msgid "Timeline Tool - GRASS GIS" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" +#: ../gui/wxpython/timeline/frame.py:38 +#, python-brace-format +msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some systems also python-matplotlib-wx) package(s) to be installed. {0}" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +msgstr "" +>>>>>>> osgeo-main + #: ../gui/wxpython/timeline/frame.py:38 #, python-brace-format msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some systems also python-matplotlib-wx) package(s) to be installed. {0}" @@ -5110,21 +5336,21 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Έγκυρα Όρια:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "Σφάλμα RMS" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -5154,7 +5380,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -5190,462 +5416,520 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +msgid "Define new GRASS project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Όνομα" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" +msgstr "Επιλογή φακέλου δεδομένων GIS " -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Περιγραφή" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/location_wizard/wizard.py:271 +msgid "Project will be created in GRASS database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Κωδικός" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Κωδικός Προβολής:" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Ευρεση στην περιγραφή;" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "Αδυναμία ανάγνωσης της λίστας : %s" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "Επιλογή παραμέτρων προβολής:" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "Επιλογή Datum η ελλειψοειδούς (επόμενη σελίδα)" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "Datums με συσχετικά ελλειψοειδεί" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "Ελλειψοειδεί μόν" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "Όχι" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Ναί" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "ελλειψοειδή" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Κωδικός Datum: " -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Παράμετροι" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Περίληψη" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Κωδικός Προβολής:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Περιγραφή:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Προβολή" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2530 +#: ../gui/wxpython/location_wizard/wizard.py:2531 #, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" +msgstr "Αδυναμία δημιουργίας φακέλου ρυθμίσεων" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +msgid "Project already exists in GRASS Database." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "Δεν υπάρχει ο κωδικός EPSG." -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Γραμμές: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Στήλες: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Κελιά: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Βάθος: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Βοράς" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Δύση" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Ανατολή" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Νότος" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "Ανάλυση Β-Ν" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "Ανάλυση Α-Δ" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Αφαίρεση" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Απενεργοποίηση" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Ενεργοποίηση" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Ιδιότητες" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -5662,7 +5946,6 @@ msgid "Disabled:" msgstr "Απενεργοποιημένο" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "" @@ -5671,10 +5954,10 @@ msgid "GRASS API:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Εντολή" @@ -5700,7 +5983,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Τύπος" @@ -5729,13 +6012,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Μεταδεδομένα" @@ -5744,7 +6027,7 @@ msgid "Commands" msgstr "Εντολές" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -5755,19 +6038,19 @@ msgid "Apply properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Όνομα" @@ -5776,96 +6059,455 @@ msgstr "Όνομα" msgid "Author(s):" msgstr "Συγγραφέας(-είς)" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Μοντέλο" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Αντικείμενα" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Μεταβλητές" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" +#: ../gui/wxpython/gmodeler/panels.py:189 +msgid "Script editor" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d δεύτερα" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" +msgstr "%(min)d λεπ %(sec)d δευτ" + +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "Παρακαλώ περιμένετε, φόρτωση μοντέλων..." + +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" -msgstr "Ιδιότητες Δεδομένου" +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" -msgstr "Όνομα αντικειμένου" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "Δημιουργεία νέα μοντέλου;" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "Επιλογή αρχείου μοντέλου" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "Αρχείο Μοντέλου GRASS (*.gxm)|*.gxm" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "Το αρχείο Μοντέλου <%s> υπάρχει. Θέλετε να γίνει αντικατάσταση;" + +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" +msgstr "Το αρχείο <%s> αποθηκεύτηκε" + +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "Επιλέξτε το αρχείο που θα αποθηκευτεί το μοντέλο" + +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "Το μονέλο εξάχθηκε στο <%s>" + +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." +msgstr "Δεν υπάρχουν ενδιάμεσα αρχεία προς διαγραφή" + +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "Θέλετε να διαγράψετε οριστικά τα αρχεία;%s" + +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "Διαγραφή ενδιάμεσων τιμών;" + +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "Το μοντέλο είναι κενό. Τίποτα προς επικαιροποίηση." + +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Επικαιροποίησημοντέλου...." + +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" +msgstr "" +"Το Μοντέλο είναι άκυρο.\n" +"\n" +"%s" + +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "Το Μοντέλο είναι έγκυρο." + +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "wxGUI Graphical Modeler" + +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Επανασχεδίαση μοντέλου..." + +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Θέλετε να αποθηκευσετε τις αλλαγές στο μοντέλο;" + +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Κλείσιμο Graphical Manager" + +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "Λίστα μεταβλητών - δεξί κλικ για διαγραφή" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Τύπος δεδομένων" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "Προκαθορισμένη τιμή" + +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "Προσθήκη νέας μεταβλητής" + +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" +msgstr "integer" + +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "float" + +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "αρχείο" + +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "Προσθήκη νέας μεταβλητής στο μοντέλο" + +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Python script" + +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "Εκτέλεση Python Script" + +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Αποθήκευση Python script σε αρχείο" + +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Python script" + +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" +msgstr "Ανανέωση" + +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Python script (*.py)|*.py" + +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "Επιλογή αρχείου για αποθήκευση" + +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "Το αρχείο <%s> υπάρχει. Θέλετε να γίνει αντικατάσταση του αρχείου;" + +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "Αποθηκευση αρχείου" + +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" +msgstr "Αδυναμία εκτέλεσης Python Script. %s" + +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Αποθήκευση Επιφάνειας εργασίας σε αρχείο" + +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "Ιδιότητες σχέσης" + +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" +msgstr "" + +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" +msgstr "Ιδιότητες Δεδομένου" + +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" +msgstr "Όνομα αντικειμένου" + +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" +msgstr "" + +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" +msgstr "" + +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" #: ../gui/wxpython/gmodeler/dialogs.py:308 @@ -5891,7 +6533,7 @@ msgstr "Ιδιότητες σχέσης" msgid "From" msgstr "Από" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 msgid "To" msgstr "Σε" @@ -5934,12 +6576,6 @@ msgstr "" msgid "Condition" msgstr "Όροι" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "" - #: ../gui/wxpython/gmodeler/dialogs.py:564 msgid "Loop properties" msgstr "" @@ -5986,50 +6622,46 @@ msgstr "" msgid "Delete variables" msgstr "Διαγραφή μεταβλητών" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 #: ../gui/wxpython/vdigit/dialogs.py:304 msgid "Delete selected" msgstr "Διαγραφή επιλεγμένου" -#: ../gui/wxpython/gmodeler/dialogs.py:914 +#: ../gui/wxpython/gmodeler/dialogs.py:913 #: ../gui/wxpython/vdigit/dialogs.py:308 msgid "Delete all" msgstr "Διαγραφή όλων" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 msgid "Reload" msgstr "Επαναφόρτηση" -#: ../gui/wxpython/gmodeler/model.py:74 +#: ../gui/wxpython/gmodeler/model.py:80 msgid "model" msgstr "μοντέλο" -#: ../gui/wxpython/gmodeler/model.py:75 +#: ../gui/wxpython/gmodeler/model.py:81 msgid "Script generated by wxGUI Graphical Modeler." msgstr "Το script δημιουργήθηκε απο το wxGUI Graphical Modeler." -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 #, python-format msgid "undefined variable '%s'" msgstr "απροσδιόριστη μεταβλητή '%s'" -#: ../gui/wxpython/gmodeler/model.py:612 +#: ../gui/wxpython/gmodeler/model.py:618 msgid "Running model..." msgstr "Εκτέλεση μοντέλου..." -#: ../gui/wxpython/gmodeler/model.py:633 +#: ../gui/wxpython/gmodeler/model.py:639 msgid "Model is empty. Nothing to run." msgstr "Το μοντέλο είναι κενό. Δεν υπάρχει τίποτα προς εκτέλεση." -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Επικαιροποίησημοντέλου...." - -#: ../gui/wxpython/gmodeler/model.py:650 +#: ../gui/wxpython/gmodeler/model.py:656 #, python-format msgid "" "Model is not valid. Do you want to run the model anyway?\n" @@ -6040,59 +6672,73 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/gmodeler/model.py:653 +#: ../gui/wxpython/gmodeler/model.py:659 msgid "Run model?" msgstr "Εκτέλεση μοντέλου;" -#: ../gui/wxpython/gmodeler/model.py:688 +#: ../gui/wxpython/gmodeler/model.py:696 msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 +#: ../gui/wxpython/gmodeler/model.py:809 msgid "Raster maps" msgstr "Χάρτες raster" -#: ../gui/wxpython/gmodeler/model.py:804 +#: ../gui/wxpython/gmodeler/model.py:812 msgid "3D raster maps" msgstr "3D raster χάρτες" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 msgid "Vector maps" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 +#: ../gui/wxpython/gmodeler/model.py:1564 msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 +#: ../gui/wxpython/gmodeler/model.py:1758 msgid "Condition: " msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1752 +#: ../gui/wxpython/gmodeler/model.py:1760 msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1894 +#: ../gui/wxpython/gmodeler/model.py:1902 msgid "if-else" msgstr "if-else" -#: ../gui/wxpython/gmodeler/model.py:2000 +#: ../gui/wxpython/gmodeler/model.py:2008 msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 +#: ../gui/wxpython/gmodeler/model.py:2009 #, python-brace-format msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Προσοχή" + +#: ../gui/wxpython/gmodeler/model.py:3643 msgid "Model parameters" msgstr "Παράμετροι μοντέλου" -#: ../gui/wxpython/gmodeler/model.py:3500 +#: ../gui/wxpython/gmodeler/model.py:3665 msgid "Delete intermediate data when finish" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 +======= #: ../gui/wxpython/gmodeler/model.py:3508 #: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 #: ../gui/wxpython/modules/mcalc_builder.py:169 @@ -6939,6 +7585,7 @@ msgstr "" #: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 #: ../gui/wxpython/menustrings.py:2105 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "&File" msgstr "&Αρχείο" @@ -6950,7 +7597,7 @@ msgstr "Επιφάνεια εργασίας" msgid "Create new workspace" msgstr "Δημιουργία νέας Επιφάνειας Εργασίας" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Αν&οιγμα" @@ -6958,7 +7605,7 @@ msgstr "Αν&οιγμα" msgid "Load workspace from file" msgstr "Φόρτωση Επιφάνειας Εργασίας απο αρχείο" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Αποθήκευση" @@ -6968,7 +7615,7 @@ msgstr "Αποθήκευση" msgid "Save workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Αποθήκευση ως" @@ -6981,7 +7628,7 @@ msgid "Close workspace file" msgstr "Κλείσιμο της επιφάνειας εργασίας" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "" @@ -7018,7 +7665,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -7059,542 +7706,546 @@ msgstr "" msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "Εισαγωγή SPOT NDVI" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "Εισαγωγή SRTM HGT" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Εισαγωγή terra ASTER HDF" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +msgid "Module not installed" msgstr "" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +msgid "Re-projects a raster map from given project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "Εισαγωγή DXF" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "Εισαγωγή ESRI e00" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +msgid "Reproject vector map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +msgid "Re-projects a vector map from one project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "Εισαγωγή δεδομένων 3D raster." -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "εισαγωγή 3D ASCII" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "εξαγωγή MPEG-1" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "εξαγωγή PNG" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "εξαγωγή PPM" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "εξαγωγή POV-Ray" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "εξαγωγή VRML" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "εξαγωγή VKT" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "εξαγωγή DXF" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "εξαγωγή SVG" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "εξαγωγή ASCII 3D" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "εξαγωγή Vis5D" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "εξαγωγή Βάση δεδομένων" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/tplot/frame.py:209 ../gui/wxpython/tplot/frame.py:264 @@ -7604,114 +8255,121 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Manage maps" msgstr "" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "Αντιγραφή" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "Λίστα" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "Μετονομασία" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "Raster σε διανυσματικό" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "Διανυσματικό σε raster" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "" @@ -7719,20 +8377,20 @@ msgstr "" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "" @@ -7750,13 +8408,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "" @@ -7770,16 +8428,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "Χαρτογραφική Σύνθεση" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -7799,7 +8457,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "" @@ -7807,8 +8465,8 @@ msgstr "" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "" @@ -7816,42 +8474,42 @@ msgstr "" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" @@ -7864,7 +8522,7 @@ msgid "Mapset access" msgstr "" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +msgid "Set/unset access to other mapsets in current project" msgstr "" #: ../gui/wxpython/menustrings.py:234 @@ -7888,11 +8546,12 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "Στοχεύει μια ομάδα εικόνων σε μια τοποθεσία και συλλογή χαρτών GRASS" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +msgid "Change current project and mapset." msgstr "" #: ../gui/wxpython/menustrings.py:240 @@ -7926,15 +8585,18 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" -msgstr "" +#, fuzzy +msgid "Create new project (location)" +msgstr "Μετονομασία επιλεγμένης Τοποθεσίας" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" #: ../gui/wxpython/menustrings.py:252 @@ -7958,8 +8620,7 @@ msgstr "" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -7990,7 +8651,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "" @@ -7998,411 +8659,411 @@ msgstr "" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " "regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "Χρωματικοί πίνακες" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "Εξαγωγή χρωματικών κανόνων" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "Μίξη 2 χρωμάτικών raster" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "Δημιοιυργία RGB" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "RGB σε HIS " -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "Κοντινότερα σημεία" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "Γειτονικά σημεία" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "Συραφή χαρτών raster" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -8413,22 +9074,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -8436,127 +9097,127 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " "represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -8567,323 +9228,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "Μοντελοποίηση υπογείων νερών" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -8891,21 +9552,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -8914,203 +9575,203 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "IDW απο σημεία raster" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "IDW απο διανυσματικα σημεία" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -9118,106 +9779,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "Γενικές στατιστικές" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -9226,34 +9887,34 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "Γραμμική συσχέτιση" ======= @@ -9267,477 +9928,487 @@ msgid "Show simple linear regression line" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "Υπολογίζει την γραμμικη συσχέτιση δυο raster: y = a + b*x" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "&Διανυσματικό" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "Παράλληλες γραμμές" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -9745,96 +10416,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "Εκκεντρότητα" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "Δέντρο Steiner" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -9842,293 +10513,293 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "Διαγράμματα Voronoi/Πολύγωνα Thiessen" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "Δημιουργία σημείων " -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "Δημιουργία απο βάση δεδομένων" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" "Δημιουργία νέο διανυσματικό χάρτη (σημειακό) απο μια βάση δεδομένων που " "περιέχει συντεταγμένες/" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "Δημιουργία σημείων σε πάνω σε γραμμές" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "Δημιουργία απο τυχαία σημεία" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "Βασικά διανυσματικά δεδομένα" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "Τεστ κανονικότητας" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "Δημιουργία/επεξεργασία ομάδων" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "Δημιουργεί, επεξεργάζεται και εμφανίζει ομάδες εικόνων" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "Στοχεύει μια ομάδα εικόνων σε μια τοποθεσία και συλλογή χαρτών GRASS" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "Δημιουργία μοσαϊκού εικόνων" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "Διαχείριση χρωμάτων εικόνων" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "Χρωματική προσαρμοργή των RGB" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "HIS σε RGB" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." @@ -10136,7 +10807,7 @@ msgstr "" "Μετατρέπει ψηφιδωτούς χάρτες από χρωματικό χώρο HIS (Hue-Intensity-" "Saturation) σε RGB (Red-Green-Blue)" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." @@ -10144,108 +10815,108 @@ msgstr "" "Μετατρέπει ψηφιδωτούς χάρτες από χρωματικό χώρο RGB (Red-Green-Blue) σε HIS " "(Hue-Intensity-Saturation) " -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "Ιστογραμμα" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "Εισαγωγή για επιβλεπόμενο SMAP" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "Εισαγωγή για επιβλεπόμενο SMAP" @@ -10256,6 +10927,7 @@ msgid "Temporal Plot Tool - GRASS GIS" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10267,419 +10939,424 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "Διαχείριση χρωμάτων εικόνων" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "ατμοσφαιρική διόρθωση" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -10687,999 +11364,991 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "&Βάση δεδομένων" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "Ερώτημα" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "Μετονομασία στήλης" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "αλλαγή τιμών" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "Σχετικα με το σύστημα" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "Σχετικα με το GRASS GIS" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 -msgid "Interactive editing and digitization of raster maps." -msgstr "" - #: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "Προσθήκη όρου (if/else) στο μοντέλο" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "Σχετικά για τον Graphical Modeler" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "Έξοδος" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -11712,7 +12381,7 @@ msgid "Text settings" msgstr "" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -11773,74 +12442,74 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "Προφίλ του" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "Απόσταση (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" "Reason: %s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -11864,7 +12533,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "Στατιστικά" @@ -11910,11 +12579,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "Μη έγκυρη εισαγωγή" @@ -11939,11 +12608,11 @@ msgid "Label font size (pts):" msgstr "Μέγεθος ταμπλέλας (pts):" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "" @@ -11959,402 +12628,401 @@ msgstr "Στύλ:" msgid "Weight:" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Προσοχή" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "Χρώμα γραμμής" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "Πάχος γραμμής" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "Χ-Άξονας" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Υ-Άξονας" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "Κλίμακα" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "Λογαριθμική κλίμακα" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "Εμφάνηση υπομνήματος" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "Επιλογή φακέλου δεδομένων GIS " -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "Αρχείο" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "Φάκελος" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "Βάση Δεδομένων" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "Πρωτόκολλο" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "Όλα τα αρχεία" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "Αρχείο:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "Επιλογή αρχείου προς εισαγωγή" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "Επιλογή Αρχείου" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "Επιλογές δημιουργίας:" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "Φορμά:" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "Πρωτόκολλο:" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -12394,13 +13062,13 @@ msgstr "Μεταφραστές" msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "" @@ -12416,106 +13084,106 @@ msgstr "" msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "Γλώσσα" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "%s αρχείο λείπει" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "Σφάλμα κατα την ανάγνωση του αρχείου '%s'." -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "Γραμμές:" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "E-mail" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "Χώρα" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "OSGeo_ID" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "Eπ&όμενο" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "Προηγο&ύμενο" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Αποθήκευση Επιφάνειας εργασίας σε αρχείο" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "Τερματισμός εκτελούμενης εντολης" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -12523,7 +13191,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "" @@ -12606,7 +13274,7 @@ msgstr "" msgid "category" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "" @@ -12627,8 +13295,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -12654,427 +13322,441 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "Επιλογές Χρήστη" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "Η στήλη κλειδιού δενμπορεί να είναι άδεια." -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "Επιλογές GUI" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:348 #, fuzzy -msgid "History" -msgstr "Ιστογραμμα" +msgid "Layout settings" +msgstr "επιλογές GUI" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:387 -msgid "Data Catalog settings" +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" msgstr "" #: ../gui/wxpython/gui_core/preferences.py:392 +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 +#, fuzzy +msgid "History" +msgstr "Ιστογραμμα" + +#: ../gui/wxpython/gui_core/preferences.py:457 +msgid "Data Catalog settings" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" +#: ../gui/wxpython/gui_core/preferences.py:522 +msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." +#: ../gui/wxpython/gui_core/preferences.py:531 +msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:475 -msgid "Region settings" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:484 -msgid "Align region to resolution" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 msgid "Window layout settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 msgid "Font for manual pages:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "Επιλογή γλώσσας (απαιτείται αποθήκευση και επανεκίνηση του GRASS)" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "Ενέργεια ροδέλας ποντικίου:" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "Προκαθορισμένος χρωματικός πίνακας" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "Διαφάνια" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "Επισήμανση επιλεγμένων εγγραφών" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "Μέγεθος γραμμής (σε pixel)" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "Δημιουργία πίνακα" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "Στήλη κλειδιού:" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "Προβολή" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "Κωδικός EPSG" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "PROJ ορισμός (απαιτείται)" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "Αρχείο EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "Φόρτωση κωδικών EPSG (αναμείνατε), εισάγετε κωδικό EPSG ή απευθείας ορισμό " "PROJ " -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "Φ&όρτωση κωδικών EPSG" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "Φορματ συντενταγμένων" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "Ακρίβεια:" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "Αδυναμία ανάγνωσης κωδικών EPSG : %s" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "Ο κωδικός EPSG %s δεν βρέθηκε" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -13083,7 +13765,7 @@ msgid "" " - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "" @@ -13100,7 +13782,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "" @@ -13222,7 +13904,7 @@ msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "Επιλοφή γραμματοσηράς" @@ -13257,7 +13939,7 @@ msgid "Map Display Settings" msgstr "Επίπεδα χαρτη" #: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +msgid "(Un)dock" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 @@ -13281,7 +13963,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -13337,7 +14019,7 @@ msgid "Optional" msgstr "Προερετικό" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "" @@ -13349,79 +14031,79 @@ msgstr "[πολλαπλό]" msgid "valid range" msgstr "Εγκυρα όριο" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "Επιλογή Χρώματος" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "ID επιπέδου" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "Όνομα επιπέδου" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "Εγχειρίδιο" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -13429,94 +14111,94 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "" @@ -13524,381 +14206,383 @@ msgstr "" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" +msgstr "Διαγραγή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." +msgstr "Ο διανυσματικός χάρτης δεν είναι 3D. Η ενέργεια ακυρώθηκε." -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +msgid "Name of GRASS project:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +msgid "Select mapset in GRASS project" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "Επιλεξτε διανυσματικό χάρτη" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " "overwrite it?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "Επιλογή όλων" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "Λίστα χαρτών:" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "Τύπος χάρτη:" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "Συλλογή χαρτών:" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "Αντιστροφή επιλογής" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "Αποεπιλογή όλων" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "διαφάνια" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "αδιαφάνεια" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "Διαστασεις εικονας" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "Σύμβολα" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "Φάκελος συμβόλων" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "Όνομα συμβόλων" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "Επιλογή γραμματοσειράς:" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "Κωδικοποίηση χαρακτήρων:" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "Μέγεθος γραμματοσειράς:" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -13978,9 +14662,9 @@ msgid "Snap also to vertex" msgstr "" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "" @@ -14002,226 +14686,226 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "Αποθήκευση αλλαγών" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "Αποθήκευση αλλαγών κατά την έξοδο" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "μήκος" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "μικρότερο από" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "μεγαλύτερο από" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Επίπεδο" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Κατηγορία" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "Αριθμός κατηγορίας" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "περιοχή" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "περίμετρος" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "Επισήμανση" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "Επισήμανση (διπλών)" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "Κόμβος" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Κατεύθυνση" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -14239,204 +14923,204 @@ msgstr "" msgid "Topology missing" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "Ψηφιοποίηση νέας γραμμής" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "Αριστερά: νέο σημείο" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "Ψηφιοποίηση νέας γραμμής" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 msgid "Digitize new boundary (Ctrl+B)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 msgid "Digitize new centroid (Ctrl+C)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Διαγραφή επιλεγμένων εγγραφών" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 msgid "Display/update attributes (Ctrl+K)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "Αριστερά: Επιλογή" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 msgid "Display/update categories (Ctrl+J)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 msgid "Edit selected line/boundary (Ctrl+E)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 msgid "Remove selected vertex (Ctrl+X)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "Επιλογές" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "Έξοδος απο τον ψηφιοποιητή και αποθήκευση των αλλαγών" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Εμφανιση εγχειριδιου" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "Εμφάνιση εγχειρίδιου διανυσματικού ψηφιοποιητή" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "Αναίρεση προηγούμενων μεταβολών" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "Αναίρεση προηγούμενων μεταβολών" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "Αντιγραφή κατηγοριών" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "Ο διανυσματικός χάρτης δεν είναι 3D. Η ενέργεια ακυρώθηκε." -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -14445,43 +15129,43 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "" "Παρακαλώ περιμένετε, άνοιγμα του διανυσματικού χάρτη <%s> προς επεξεργασία..." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "Θέλετε να αποθηκευσετε τις αλλαγές στο διανυσματικό αρχείο <%s>;" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "Αποθήκευση αλλαγών;" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "H eπεξεργασία του διανυσματικού χάρτη <%s> ολοκληρώθηκε με επιτυχία." -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "Νέος διανυσματικός χαρτης" @@ -14494,8 +15178,8 @@ msgid "Add new category" msgstr "Εισαγωγή νέας κατηγορίας" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "Εφαρμογή μετατροπών" @@ -14504,11 +15188,11 @@ msgid "Ignore changes and close dialog" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "Εφαρμογή αλλαγών και κλείσιμο διαλόγου" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "" @@ -14553,24 +15237,24 @@ msgstr "" msgid "Layer (Categories)" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "Σφάλμα ψηφιοποίησης" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -14578,97 +15262,97 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -14680,19 +15364,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -14711,32 +15395,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "" @@ -14846,100 +15530,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "Δημιουργ&ία επιπέδου" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -14968,12 +15652,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "" @@ -15047,11 +15731,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -15062,50 +15746,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "Επιλογή ομάδας:" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -15121,116 +15805,128 @@ msgstr "" msgid "3. Select GRASS Mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." msgstr "" #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Μετονομασία επιλεγμένης Τοποθεσίας" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Διαγραφή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Διαγραγή επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be renamed." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -15238,14 +15934,14 @@ msgid "" "Enter new name:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Μήνυμα" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -15253,7 +15949,7 @@ msgid "" "Mapset <%s> already exists in location." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -15261,7 +15957,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -15269,7 +15965,7 @@ msgid "" "Location <%s> already exists in GRASS database." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -15277,27 +15973,27 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be deleted." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "Αδυναμία διαγραφής Τοποθεσίας" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -15305,37 +16001,37 @@ msgid "" "ALL MAPS included in this location will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "Αδυναμία διαγραφής επιλεγμένης Τοποθεσίας" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -15344,16 +16040,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -15365,12 +16061,12 @@ msgid "" "this operation) and continue?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -15383,7 +16079,7 @@ msgstr "" "αυτή μπορεί να διαφθείρει τα δεδομένά. Ελέγξτε ακόμια μια φορά της ενεργές " "διεργασίες για να είστε σίγουροι..." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -15391,164 +16087,164 @@ msgid "" "Details: %(reason)s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " "ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " "located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -15556,7 +16252,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -15564,45 +16260,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -15610,38 +16306,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -15738,117 +16434,117 @@ msgstr "" msgid "Output" msgstr "Έξοδος" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "" @@ -15865,15 +16561,23 @@ msgid "Raster Digitizer - GRASS GIS" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" ======= #: ../gui/wxpython/rdigit/g.gui.rdigit.py:158 msgid "Raster map <{}> not found in current mapset." +<<<<<<< HEAD msgstr "" #: ../gui/wxpython/rdigit/g.gui.rdigit.py:174 @@ -15891,35 +16595,45 @@ msgid "Base raster map <{}> not found in current mapset." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/rdigit/g.gui.rdigit.py:174 +msgid "Base raster map <{}> not found in current mapset." +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -15961,7 +16675,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "" @@ -16277,19 +16991,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "" @@ -16313,25 +17027,25 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -16343,8 +17057,8 @@ msgstr "Λόγος" msgid "Execution failed:" msgstr "H εκτέλεση απέτυχε:" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "Λεπτομέριες:" @@ -16394,7 +17108,7 @@ msgstr "Διπλό κλειδί: %s\n" msgid "Unable to create file '%s'\n" msgstr "Αδυναμία δημιουργίας αρχείου '%s'\n" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -16403,21 +17117,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -16438,147 +17152,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "Συμπτυξη όλων εκτός του PERMANENT και του τρέχοντος" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "Συμπτυξη όλων εκτός του PERMANENT" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "Συμπτυξη όλων εκτός του τρέχοντος" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "Συμπτυξη όλων" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "Επέκταση όλων" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "Τίποτα" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "Κουτί" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "σφαίρα" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "κύβος" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "διαμάντι" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "aster" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "Ιστόγραμμα" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "Αδυναμία ανάγνωσης αρχείου ρυθμίσεων: <%s>\n" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -16586,11 +17300,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "Αδυναμία δημιουργίας φακέλου ρυθμίσεων" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -16598,15 +17312,16 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -16614,6 +17329,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/core/render.py:186 #, python-format msgid "<%(name)s>: layer type <%(type)s> is not supported" @@ -16676,22 +17393,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -16721,22 +17438,22 @@ msgstr "Γραμμή %d:" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -16745,33 +17462,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "" @@ -16818,39 +17535,39 @@ msgstr "" msgid "Status bar" msgstr "Κλίμακα" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "Κλίμακα χάρτη" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "Συντεταγμένες" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "Εμφάνηση γεωμετρίας" ======= @@ -16859,6 +17576,9 @@ msgstr "Εμφάνηση γεωμετρίας" msgid "Map Display {number}" ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -16866,6 +17586,15 @@ msgid "Map Display {number}" #, python-brace-format msgid "Map Display {number}" msgstr "" +<<<<<<< HEAD + +#: ../gui/wxpython/lmgr/frame.py:2179 +msgid "Add selected map layers into layer tree" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main #: ../gui/wxpython/lmgr/frame.py:2179 msgid "Add selected map layers into layer tree" @@ -16873,12 +17602,19 @@ msgid "Add selected map layers into layer tree" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "Συντεταγμένες" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/mapdisp/statusbar.py:829 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/mapdisp/statusbar.py:825 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, fuzzy msgid "Display extent" msgstr "Εμφάνηση γεωμετρίας" @@ -17488,6 +18224,7 @@ msgid "Histogram Tool [d.histogram]" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17499,6 +18236,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)" @@ -17570,14 +18312,14 @@ msgid "Click mouse to unzoom" msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "2D προβολή" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "3D προβολή" @@ -17597,47 +18339,47 @@ msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -17647,59 +18389,59 @@ msgid "" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -17801,7 +18543,7 @@ msgstr "" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "" @@ -17868,8 +18610,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "Προσθήκη στήλης" @@ -17952,6 +18694,7 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17963,6 +18706,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -17978,7 +18726,7 @@ msgid "List of %s layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -17992,13 +18740,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "&Εισαγωγή" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "%Εισαγωγή επιλεγμένων επιπέδων." @@ -18021,82 +18769,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "Δεν έχει επιλεχθεί κανένας επίπεδο. Η διεργασία ακυρώθηκε." -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "Εισαγωγή DXF επιπέδου" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "Επιλογή αρχείου DXF προς εξαγωγή" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -18394,14 +19142,14 @@ msgstr "" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -18409,15 +19157,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "Φόρτωση δεδομένων..." -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -18427,7 +19175,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -18439,30 +19187,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -18473,114 +19221,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "Εισαγωγή νέου κόμβου" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "Μετακίνηση κόμβου" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "Απομάκρυνση κόμβου" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -18648,99 +19396,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -19094,7 +19843,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -19102,7 +19851,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -19206,6 +19955,7 @@ msgstr "" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19217,10 +19967,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main -msgid "Setup for r.li modules" -msgstr "" - -#: ../gui/wxpython/rlisetup/frame.py:150 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "Setup for r.li modules" +msgstr "" + +#: ../gui/wxpython/rlisetup/frame.py:150 msgid "Available sampling area configuration files" msgstr "" @@ -19269,7 +20024,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -19277,33 +20032,34 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "Εργαλειοθήκη Επιφάνειας Εργασίας" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "Εργαλειοθήκη εργαλείων" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/mapwin/decorations.py:203 @@ -19312,11 +20068,17 @@ 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" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 #, fuzzy msgid "Map Swipe Tool" msgstr "Εργαλειοθήκη Χάρτη" @@ -19326,22 +20088,38 @@ msgid "Text properties" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" +#: ../gui/wxpython/mapwin/decorations.py:226 +msgid "Remove scale bar" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +msgstr "" +>>>>>>> osgeo-main + #: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "Επιλογή μοντέλων για επεξεργασία" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -19524,51 +20302,61 @@ msgstr "" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " "layer instead." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "Το επιλεγμένο επίπεδο χάρτη δεν είναι διανυσματικό." -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -19662,70 +20450,83 @@ msgstr "" #: ../gui/wxpython/wxplot/scatter.py:271 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "" +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "Δεν έχει επιλεχθεί κανένας επίπεδο. Η διεργασία ακυρώθηκε." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Πληροφορίες Συστήματος" ======= #: ../gui/wxpython/iclass/dialogs.py:545 msgid "Zoom to training areas of selected class" msgstr "" +<<<<<<< HEAD #: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" @@ -24234,2449 +25035,7875 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 -msgid "GRASS version" -msgstr "Έκδωση GRASS" - -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 -msgid "Code revision" +#: ../gui/wxpython/iclass/dialogs.py:606 +msgid "Save signature file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 -msgid "Build date" +#: ../gui/wxpython/iclass/dialogs.py:667 +msgid "Enter name of signature file:" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 -msgid "Build platform" -======= -#: ../gui/wxpython/startup/guiutils.py:186 -msgid "Unable to create new mapset: {}" +#: ../gui/wxpython/iclass/dialogs.py:679 +msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:212 -#, fuzzy -msgid "Do you want to import {}to the newly created location?" ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +#: ../gui/wxpython/iclass/dialogs.py:729 +msgid "Export training areas" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 -msgid "Platform" -msgstr "Πλατφόρμα" - -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 -msgid "Close all Map Displays" +#: ../gui/wxpython/iclass/dialogs.py:792 +msgid "Export attribute table containing computed statistical data" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 -msgid "Enter new name:" -msgstr "Εισαγωγή νέου ονόματος:" - -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 -msgid "Rename Map Display" +#: ../gui/wxpython/iclass/dialogs.py:831 +#, python-format +msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 -======= -#: ../gui/wxpython/startup/guiutils.py:269 -msgid "Unable to rename selected mapset" +#: ../gui/wxpython/iclass/dialogs.py:834 +#, python-format +msgid "Vector <%s> exists" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:280 -#: ../gui/wxpython/startup/guiutils.py:334 -msgid "" -"Current name: {}\n" -"\n" -"Enter new name:" +#: ../gui/wxpython/iclass/statistics.py:29 +msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:294 -msgid "" -"Unable to rename mapset.\n" -"\n" -"{}" +#: ../gui/wxpython/iclass/plots.py:72 +msgid "Histograms" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:319 -#, python-brace-format -msgid "" -"Cannot rename location <{location}> for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No location will be renamed." +#: ../gui/wxpython/iclass/plots.py:73 +msgid "Coincident plots" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:323 -msgid "Unable to rename selected location" +#: ../gui/wxpython/iclass/plots.py:74 +msgid "Scatter plots" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:347 +#: ../gui/wxpython/iclass/plots.py:98 +#, python-format msgid "" -"Unable to rename location.\n" +"Scatter plot functionality is disabled.\n" "\n" -"{}" +"Reason: Unable to import packages needed for scatter plot.\n" +"%s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:410 -#, python-brace-format +#: ../gui/wxpython/iclass/frame.py:36 +#, python-format msgid "" -"Cannot delete one or more mapsets for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No mapsets will be deleted." +"Loading imagery lib failed.\n" +"%s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:414 -msgid "Unable to delete selected mapsets" +#: ../gui/wxpython/iclass/frame.py:76 +msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:430 -#, python-brace-format -msgid "" -"Do you want to continue with deleting one or more of the following mapsets?\n" -"\n" -"{deletes}\n" -"\n" -"All maps included in these mapsets will be permanently deleted!" +#: ../gui/wxpython/iclass/frame.py:315 +msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:435 -msgid "Delete selected mapsets" +#: ../gui/wxpython/iclass/frame.py:327 +msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:448 -msgid "Error when deleting mapsets" +#: ../gui/wxpython/iclass/frame.py:354 +msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:450 -#, python-brace-format -msgid "" -"The following error occured when deleting mapset <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of mapsets was interrupted." +#: ../gui/wxpython/iclass/frame.py:372 +msgid "Plots" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:495 -#, python-brace-format -msgid "" -"Cannot delete one or more locations for the following reasons:\n" -"\n" -"{reasons}\n" -"\n" -"No locations will be deleted." +#: ../gui/wxpython/iclass/frame.py:392 +msgid "Preview Display" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:499 -msgid "Unable to delete selected locations" +#: ../gui/wxpython/iclass/frame.py:395 +msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:515 -#, python-brace-format -msgid "" -"Do you want to continue with deleting one or more of the following locations?\n" -"\n" -"{deletes}\n" -"\n" -"All mapsets included in these locations will be permanently deleted!" +#: ../gui/wxpython/iclass/frame.py:469 +msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:520 -msgid "Delete selected locations" +#: ../gui/wxpython/iclass/frame.py:471 +msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 -msgid "Error when deleting locations" +#: ../gui/wxpython/iclass/frame.py:473 +msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:535 -#, python-brace-format -msgid "" -"The following error occured when deleting location <{path}>:\n" -"\n" -"{error}\n" -"\n" -"Deleting of locations was interrupted." +#: ../gui/wxpython/iclass/frame.py:475 +msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:568 -#, python-brace-format -msgid "" -"Cannot delete GRASS database from disk for the following reason:\n" -"\n" -"{reasons}\n" -"\n" -"GRASS database will not be deleted." +#: ../gui/wxpython/iclass/frame.py:548 +msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:572 -msgid "Unable to delete selected GRASS database" +#: ../gui/wxpython/iclass/frame.py:557 +msgid "Import vector map" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:580 -#, python-brace-format -msgid "" -"Do you want to delete the following GRASS database from disk?\n" -"\n" -"{grassdb}\n" -"\n" -"The directory will be permanently deleted!" +#: ../gui/wxpython/iclass/frame.py:577 +#, python-format +msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:585 -msgid "Delete selected GRASS database" +#: ../gui/wxpython/iclass/frame.py:579 +#, python-format +msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:597 -msgid "Error when deleting GRASS database" +#: ../gui/wxpython/iclass/frame.py:606 +#, python-format +msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:599 -#, python-brace-format +#: ../gui/wxpython/iclass/frame.py:617 +#, python-format +msgid "Unable to copy vector features from <%s>" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:629 +msgid "Unable to open temporary vector map" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:725 +msgid "No training areas to export." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:738 +#, python-format +msgid "%d training areas (%d classes) exported to vector map <%s>." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:978 +msgid "Failed to create temporary vector map." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1074 +#, python-format +msgid "No area in category %s. Category skipped." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1078 +msgid "Analysis failed." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1085 +msgid "results" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1091 +msgid "No imagery group selected." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1098 +msgid "Due to recent changes in classes, signatures can be outdated and should be recalculated. Do you still want to continue?" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1101 +msgid "Outdated signatures" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1119 +#, python-format +msgid "" +"A signature file named %s already exists.\n" +"Do you want to replace it?" +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1172 +msgid "No imagery group selected. Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1183 +#, python-format +msgid "Group <%(group)s> does not have enough files (it has %(files)d files). Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1191 +msgid "No areas given. Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/frame.py:1206 +msgid "Vector features are outside raster layers. Operation canceled." +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:73 +msgid "Name of subgroup required" +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:82 +#, python-format +msgid "Subgroup <%s> not found" +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:114 +msgid "Supervised Classification Tool - GRASS GIS" +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:121 +#, python-format +msgid "Loading raster map <%s>..." +msgstr "" + +#: ../gui/wxpython/iclass/g.gui.iclass.py:124 +#, python-format +msgid "Loading training map <%s>..." +msgstr "" + +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2021 +#: ../gui/wxpython/menustrings.py:2071 +msgid "&File" +msgstr "&Αρχείο" + +#: ../gui/wxpython/menustrings.py:4 +msgid "Workspace" +msgstr "Επιφάνεια εργασίας" + +#: ../gui/wxpython/menustrings.py:6 +msgid "Create new workspace" +msgstr "Δημιουργία νέας Επιφάνειας Εργασίας" + +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2024 +msgid "Open" +msgstr "Αν&οιγμα" + +#: ../gui/wxpython/menustrings.py:8 +msgid "Load workspace from file" +msgstr "Φόρτωση Επιφάνειας Εργασίας απο αρχείο" + +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2028 +msgid "Save as" +msgstr "Αποθήκευση ως" + +#: ../gui/wxpython/menustrings.py:12 +msgid "Save workspace to file" +msgstr "Αποθήκευση Επιφάνειας εργασίας σε αρχείο" + +#: ../gui/wxpython/menustrings.py:14 +msgid "Close workspace file" +msgstr "Κλείσιμο της επιφάνειας εργασίας" + +#: ../gui/wxpython/menustrings.py:15 +msgid "Load GRC file (Tcl/Tk GUI)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:16 +msgid "Load map layers from GRC file to layer tree" +msgstr "" + +#: ../gui/wxpython/menustrings.py:17 +#: ../gui/wxpython/web_services/dialogs.py:869 +msgid "Map display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:18 +msgid "Add raster" +msgstr "Προσθήκη raster" + +#: ../gui/wxpython/menustrings.py:19 +msgid "Add raster map layer to current display" +msgstr "Προσθήκη επιπέδου χάρτη Raster στην ενεργή προβολή" + +#: ../gui/wxpython/menustrings.py:20 +msgid "Add vector" +msgstr "Προσθήκη διανύσματικού" + +#: ../gui/wxpython/menustrings.py:21 +msgid "Add vector map layer to current display" +msgstr "Προσθήκη επιπέδοθυ διανύσματικού χάρτη στην ενεργή προβολή" + +#: ../gui/wxpython/menustrings.py:22 +msgid "Add multiple rasters or vectors" +msgstr "" + +#: ../gui/wxpython/menustrings.py:23 +msgid "Add multiple raster or vector map layers to current display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:24 +msgid "Add RGB raster layer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:25 +msgid "Add RGB raster map layer to current display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:26 ../gui/wxpython/menustrings.py:27 +#: ../gui/wxpython/web_services/dialogs.py:521 +msgid "Add web service layer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:28 +msgid "New map display window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:29 +msgid "Open new map display window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:30 +msgid "Render all map displays" +msgstr "" + +#: ../gui/wxpython/menustrings.py:31 +msgid "Re-render maps in all open map display windows" +msgstr "" + +#: ../gui/wxpython/menustrings.py:32 ../gui/wxpython/menustrings.py:33 +msgid "Close current map display window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:35 +msgid "Close all open map display windows" +msgstr "" + +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1059 +msgid "Simplified raster import with reprojection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:38 ../gui/wxpython/menustrings.py:40 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:1062 +msgid "Imports raster data into a GRASS raster map using GDAL library." +msgstr "" + +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1061 +msgid "Import of common raster formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1063 +msgid "ASCII x,y,z point import and gridding" +msgstr "" + +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1064 +msgid "Creates a raster map from an assemblage of many coordinates using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1065 +msgid "ASCII grid import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1066 +msgid "Converts a GRASS ASCII raster file to binary raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1067 +msgid "ASCII polygons, lines, and point import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1068 +msgid "Creates raster maps from ASCII polygon/line/point data files." +msgstr "" + +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1069 +msgid "Raw binary array import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1070 +msgid "Import a binary raster file into a GRASS raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1071 +msgid "GRIDATB.FOR import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1072 +msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1073 +msgid "Matlab 2D array import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1074 +msgid "Imports a binary MAT-File(v4) to a GRASS raster." +msgstr "" + +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1075 +msgid "PNG import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1076 +msgid "Imports non-georeferenced PNG format image." +msgstr "" + +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1077 +msgid "SPOT NDVI import" +msgstr "Εισαγωγή SPOT NDVI" + +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1078 +msgid "Imports SPOT VGT NDVI data into a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1079 +msgid "SRTM HGT import" +msgstr "Εισαγωγή SRTM HGT" + +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1080 +msgid "Imports SRTM HGT files into raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:1081 +msgid "Terra ASTER HDF import" +msgstr "Εισαγωγή terra ASTER HDF" + +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:1082 +msgid "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs using gdalwarp." +msgstr "" + +#: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:86 +#: ../gui/wxpython/menustrings.py:1083 ../gui/wxpython/menustrings.py:1108 +msgid "LAS LiDAR points import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1084 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1085 +msgid "Unpack raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1086 +msgid "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:292 +#: ../gui/wxpython/menustrings.py:1087 ../gui/wxpython/menustrings.py:1237 +msgid "Reproject raster map from different GRASS location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:293 +#: ../gui/wxpython/menustrings.py:1088 ../gui/wxpython/menustrings.py:1238 +msgid "Re-projects a raster map from given location to the current location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:1090 +msgid "Simplified vector import with reprojection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:71 +#: ../gui/wxpython/menustrings.py:1091 ../gui/wxpython/menustrings.py:1093 +msgid "Imports vector data into a GRASS vector map using OGR library." +msgstr "" + +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1092 +msgid "Import of common vector formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1094 +msgid "ASCII points or GRASS ASCII format" +msgstr "" + +#: ../gui/wxpython/menustrings.py:73 ../gui/wxpython/menustrings.py:1095 +msgid "Creates a vector map from an ASCII points file or ASCII vector file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1096 +msgid "ASCII points as a vector lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1097 +msgid "Imports ASCII x,y[,z] coordinates as a series of lines." +msgstr "" + +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1098 +msgid "DXF import" +msgstr "Εισαγωγή DXF" + +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1099 +msgid "Converts files in DXF format to GRASS vector map format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1100 +msgid "WFS" +msgstr "WFS" + +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1101 +msgid "Imports GetFeature from a WFS server." +msgstr "" + +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1102 +msgid "ESRI e00 import" +msgstr "Εισαγωγή ESRI e00" + +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1103 +msgid "Imports E00 file into a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1104 +msgid "Geonames import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1105 +msgid "Imports geonames.org country files into a vector points map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1106 +msgid "Matlab array or Mapgen format import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1107 +msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." +msgstr "" + +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1109 +msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." +msgstr "" + +#: ../gui/wxpython/menustrings.py:88 ../gui/wxpython/menustrings.py:1110 +msgid "Unpack vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1111 +msgid "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:90 ../gui/wxpython/menustrings.py:575 +#: ../gui/wxpython/menustrings.py:1112 ../gui/wxpython/menustrings.py:1520 +msgid "Reproject vector map from different GRASS location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:576 +#: ../gui/wxpython/menustrings.py:1113 ../gui/wxpython/menustrings.py:1521 +msgid "Re-projects a vector map from one location to the current location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1114 +msgid "Import 3D raster data" +msgstr "Εισαγωγή δεδομένων 3D raster." + +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1115 +msgid "ASCII 3D import" +msgstr "εισαγωγή 3D ASCII" + +#: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:1116 +msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:1117 +msgid "Raw binary array 3D import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1118 +msgid "Imports a binary raster file into a GRASS 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1119 +msgid "Vis5D import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1120 +msgid "Import 3-dimensional Vis5D files." +msgstr "" + +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1121 +msgid "Import database table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1122 +msgid "Common import formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1123 +msgid "Imports attribute tables in various formats." +msgstr "" + +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1124 +msgid "Export raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:132 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:1154 ../gui/wxpython/menustrings.py:1180 +msgid "Common export formats" +msgstr "" + +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1126 +msgid "Exports GRASS raster maps into GDAL supported formats." +msgstr "" + +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1127 +msgid "ASCII grid export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1128 +msgid "Converts a raster map layer into a GRASS ASCII text file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:1129 +msgid "ASCII x,y,z points export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1130 +msgid "Exports a raster map to a text file as x,y,z values based on cell centers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1131 +msgid "GRIDATB.FOR export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1132 +msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1133 +msgid "Matlab 2D array export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1134 +msgid "Exports a GRASS raster to a binary MAT-File." +msgstr "" + +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1135 +msgid "Raw binary array export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1136 +msgid "Exports a GRASS raster to a binary array." +msgstr "" + +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1137 +msgid "MPEG-1 export" +msgstr "εξαγωγή MPEG-1" + +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1138 +msgid "Converts raster map series to MPEG movie." +msgstr "" + +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1139 +msgid "PNG export" +msgstr "εξαγωγή PNG" + +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1140 +msgid "Export a GRASS raster map as a non-georeferenced PNG image." +msgstr "" + +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1141 +msgid "PPM export" +msgstr "εξαγωγή PPM" + +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1142 +msgid "Converts a GRASS raster map to a PPM image file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1143 +msgid "PPM from RGB export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1144 +msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:140 +#: ../gui/wxpython/menustrings.py:1145 ../gui/wxpython/menustrings.py:1162 +msgid "POV-Ray export" +msgstr "εξαγωγή POV-Ray" + +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1146 +msgid "Converts a raster map layer into a height-field file for POV-Ray." +msgstr "" + +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1147 +msgid "VRML export" +msgstr "εξαγωγή VRML" + +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1148 +msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:1166 ../gui/wxpython/menustrings.py:1177 +msgid "VTK export" +msgstr "εξαγωγή VKT" + +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1150 +msgid "Converts raster maps into the VTK-ASCII format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1151 +msgid "Pack raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1152 +msgid "Exports a raster map as GRASS GIS specific archive file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:1153 +msgid "Export vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1155 +msgid "Exports a vector map layer to any of the supported OGR vector formats. By default a vector map layer is exported to OGC GeoPackage format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1156 +msgid "ASCII points or GRASS ASCII vector export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1157 +msgid "Exports a vector map to a GRASS ASCII vector representation. By default only features with category are exported. To export all features use 'layer=-1'." +msgstr "" + +#: ../gui/wxpython/menustrings.py:136 ../gui/wxpython/menustrings.py:1158 +msgid "DXF export" +msgstr "εξαγωγή DXF" + +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1159 +msgid "Exports vector map to DXF file format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1160 +msgid "PostGIS export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1161 +msgid "Exports a vector map layer to PostGIS feature table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1163 +msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1164 +msgid "SVG export" +msgstr "εξαγωγή SVG" + +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1165 +msgid "Exports a vector map to SVG file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1167 +msgid "Converts a vector map to VTK ASCII output." +msgstr "" + +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1168 +msgid "Pack vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1169 +msgid "Exports a vector map as GRASS GIS specific archive file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:148 ../gui/wxpython/menustrings.py:1170 +msgid "Export 3D raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1171 +msgid "ASCII 3D export" +msgstr "εξαγωγή ASCII 3D" + +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1172 +msgid "Converts a 3D raster map layer into a ASCII text file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1173 +msgid "Raw binary array 3D export" +msgstr "" + +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1174 +msgid "Exports a GRASS 3D raster map to a binary array." +msgstr "" + +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1175 +msgid "Vis5D export" +msgstr "εξαγωγή Vis5D" + +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1176 +msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1178 +msgid "Converts 3D raster maps into the VTK-ASCII format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1179 +msgid "Export database table" +msgstr "εξαγωγή Βάση δεδομένων" + +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1181 +msgid "Exports attribute tables into various formats." +msgstr "" + +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1184 +msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1186 +msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1187 +msgid "Output format for raster data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1188 +msgid "Redirects raster output to file utilizing GDAL library rather than storing in GRASS raster format." +msgstr "" + +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1189 +msgid "Output format for vector data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1190 +msgid "Defines vector output format utilizing OGR library." +msgstr "" + +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1191 +msgid "Manage maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1193 +msgid "Creates copies of maps and other elements Copies available data files in the current mapset search path to the user's current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:966 +#: ../gui/wxpython/menustrings.py:1194 ../gui/wxpython/menustrings.py:1911 +msgid "List" +msgstr "Λίστα" + +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1195 +msgid "Lists available GRASS data base files of the user-specified data type optionally using the search pattern." +msgstr "" + +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1197 +msgid "Renames data base element files in the user's current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1199 +msgid "Removes data base element files from the user's current mapset using the search pattern." +msgstr "" + +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:316 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:867 +#: ../gui/wxpython/menustrings.py:1261 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:1812 +msgid "Map type conversions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:317 +#: ../gui/wxpython/menustrings.py:1262 +msgid "Raster to vector" +msgstr "Raster σε διανυσματικό" + +#: ../gui/wxpython/menustrings.py:180 ../gui/wxpython/menustrings.py:318 +#: ../gui/wxpython/menustrings.py:1263 +msgid "Converts a raster map into a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:319 +#: ../gui/wxpython/menustrings.py:1264 +msgid "Raster series to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 +#: ../gui/wxpython/menustrings.py:1265 +msgid "Converts 2D raster map slices to one 3D raster volume map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 +#: ../gui/wxpython/menustrings.py:1266 +msgid "Raster 2.5D to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 +#: ../gui/wxpython/menustrings.py:1267 +msgid "Creates a 3D volume map based on 2D elevation and value raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:614 +#: ../gui/wxpython/menustrings.py:1559 +msgid "Vector to raster" +msgstr "Διανυσματικό σε raster" + +#: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:615 +#: ../gui/wxpython/menustrings.py:1560 +msgid "Converts (rasterize) a vector map into a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:616 +#: ../gui/wxpython/menustrings.py:1561 +msgid "Vector to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:617 +#: ../gui/wxpython/menustrings.py:1562 +msgid "Converts a vector map (only points) into a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:618 +#: ../gui/wxpython/menustrings.py:1563 +msgid "2D vector to 3D vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:619 +#: ../gui/wxpython/menustrings.py:1564 +msgid "Performs transformation of 2D vector features to 3D." +msgstr "" + +#: ../gui/wxpython/menustrings.py:191 +msgid "3D raster to raster series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:869 +#: ../gui/wxpython/menustrings.py:1814 +msgid "Converts 3D raster maps to 2D raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:2001 +msgid "Georectify" +msgstr "" + +#: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:2002 +msgid "Manage Ground Control Points for Georectification" +msgstr "" + +#: ../gui/wxpython/menustrings.py:195 ../gui/wxpython/menustrings.py:2003 +msgid "Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:2004 +msgid "Launch Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:197 ../gui/wxpython/menustrings.py:2060 +msgid "Run model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:198 +msgid "Run model prepared by Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:199 +msgid "3D image rendering" +msgstr "" + +#: ../gui/wxpython/menustrings.py:200 +msgid "Creates a 3D rendering of GIS data. Renders surfaces (raster data), 2D/3D vector data, and volumes (3D raster data) in 3D." +msgstr "" + +#: ../gui/wxpython/menustrings.py:201 ../gui/wxpython/menustrings.py:1040 +#: ../gui/wxpython/menustrings.py:1985 ../gui/wxpython/menustrings.py:1992 +msgid "Animation tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:202 ../gui/wxpython/menustrings.py:1041 +#: ../gui/wxpython/menustrings.py:1986 ../gui/wxpython/menustrings.py:1993 +msgid "Launch animation tool." +msgstr "" + +#: ../gui/wxpython/menustrings.py:203 +msgid "Bearing/distance to coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:204 +msgid "A simple utility for converting bearing and distance measurements to coordinates and vice versa. It assumes a cartesian coordinate system" +msgstr "" + +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1996 +msgid "Launch Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:208 ../gui/wxpython/menustrings.py:2010 +msgid "Launch Map Swipe" +msgstr "" + +#: ../gui/wxpython/menustrings.py:209 +msgid "Launch script" +msgstr "" + +#: ../gui/wxpython/menustrings.py:210 +msgid "Launches script file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:211 ../gui/wxpython/gui_core/pyedit.py:691 +msgid "Simple Python Editor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:212 +msgid "Launches Simple Python Editor." +msgstr "" + +#: ../gui/wxpython/menustrings.py:213 ../gui/wxpython/gui_core/dialogs.py:2375 +msgid "Close GUI" +msgstr "" + +#: ../gui/wxpython/menustrings.py:214 +msgid "Close graphical user interface." +msgstr "" + +#: ../gui/wxpython/menustrings.py:215 ../gui/wxpython/gui_core/dialogs.py:2345 +#: ../gui/wxpython/gui_core/dialogs.py:2379 +msgid "Quit GRASS GIS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:216 +msgid "Close GUI and exit GRASS GIS shell." +msgstr "" + +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/menustrings.py:2038 +msgid "&Settings" +msgstr "" + +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/menustrings.py:1201 +msgid "Show current region" +msgstr "" + +#: ../gui/wxpython/menustrings.py:220 ../gui/wxpython/menustrings.py:222 +#: ../gui/wxpython/menustrings.py:1202 ../gui/wxpython/menustrings.py:1204 +msgid "Shows the extent and resolution of the computational region." +msgstr "" + +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:1203 +msgid "Show region using latitude and longitude" +msgstr "" + +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1205 +msgid "Show current region extent in Map Display" +msgstr "" + +#: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:1206 +msgid "Shows the extent of the computational region in Map Display." +msgstr "" + +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1207 +msgid "Set region" +msgstr "" + +#: ../gui/wxpython/menustrings.py:226 ../gui/wxpython/menustrings.py:1208 +msgid "Manages the boundary definitions for the geographic region." +msgstr "" + +#: ../gui/wxpython/menustrings.py:227 +msgid "GRASS working environment" +msgstr "" + +#: ../gui/wxpython/menustrings.py:228 +msgid "Mapset access" +msgstr "" + +#: ../gui/wxpython/menustrings.py:229 +msgid "Set/unset access to other mapsets in current location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:230 +msgid "User access" +msgstr "" + +#: ../gui/wxpython/menustrings.py:231 +msgid "Controls access to the current mapset for other users on the system. If no option given, prints current status." +msgstr "" + +#: ../gui/wxpython/menustrings.py:232 +msgid "Change working environment" +msgstr "" + +#: ../gui/wxpython/menustrings.py:233 +msgid "Changes/reports current mapset. Optionally create new mapset or list available mapsets in given location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:234 +msgid "Change location and mapset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:235 +msgid "Change current location and mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:236 +msgid "Change mapset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:237 +msgid "Change current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:238 ../gui/wxpython/menustrings.py:239 +msgid "Change working directory" +msgstr "" + +#: ../gui/wxpython/menustrings.py:240 +msgid "Show settings" +msgstr "" + +#: ../gui/wxpython/menustrings.py:241 +msgid "Outputs and modifies the user's current GRASS variable settings." +msgstr "" + +#: ../gui/wxpython/menustrings.py:242 +msgid "Change settings" +msgstr "" + +#: ../gui/wxpython/menustrings.py:243 +msgid "Outputs and modifies the user's current GRASS variable settings. Prints all defined GRASS variables if no option is given." +msgstr "" + +#: ../gui/wxpython/menustrings.py:244 +msgid "Create new location" +msgstr "" + +#: ../gui/wxpython/menustrings.py:245 +msgid "Launches location wizard to create new GRASS location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:246 ../gui/wxpython/startup/guiutils.py:172 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:933 +msgid "Create new mapset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:247 +msgid "Creates new mapset in the current location, changes current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:248 +msgid "Version and copyright" +msgstr "" + +#: ../gui/wxpython/menustrings.py:249 +msgid "Displays version and copyright information." +msgstr "" + +#: ../gui/wxpython/menustrings.py:250 +msgid "Map projections" +msgstr "Προβολές Χάρτη" + +#: ../gui/wxpython/menustrings.py:251 +msgid "Display map projection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:252 +msgid "Converts co-ordinate system descriptions (i.e. projection information) between various formats (including GRASS format)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:253 +msgid "Manage projections" +msgstr "" + +#: ../gui/wxpython/menustrings.py:254 +msgid "Prints or modifies GRASS projection information files (in various co-ordinate system descriptions). Can also be used to create new GRASS locations." +msgstr "" + +#: ../gui/wxpython/menustrings.py:255 +msgid "Convert coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:256 +msgid "Converts coordinates from one projection to another (cs2cs frontend)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:257 +msgid "Addons extensions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:258 +msgid "Install extension from addons" +msgstr "" + +#: ../gui/wxpython/menustrings.py:259 +msgid "Installs new extension from GRASS AddOns repository." +msgstr "" + +#: ../gui/wxpython/menustrings.py:260 +msgid "Manage installed extension" +msgstr "" + +#: ../gui/wxpython/menustrings.py:261 +msgid "Updates or removes installed GRASS AddOns extension(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:262 ../gui/wxpython/menustrings.py:2039 +msgid "Preferences" +msgstr "" + +#: ../gui/wxpython/menustrings.py:263 +msgid "User GUI preferences (display font, commands, digitizer, etc.)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:1209 +msgid "&Raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:265 ../gui/wxpython/menustrings.py:1210 +msgid "Develop raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1211 +msgid "Compress/decompress" +msgstr "" + +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1212 +msgid "Compresses and decompresses raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1213 +msgid "Region boundaries" +msgstr "" + +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1214 +msgid "Sets the boundary definitions for a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1215 +msgid "Manage NULL values" +msgstr "" + +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1216 +msgid "Manages NULL-values of given raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1217 +msgid "Quantization" +msgstr "" + +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1218 +msgid "Produces the quantization file for a floating-point map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1219 +msgid "Timestamp" +msgstr "" + +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1220 +msgid "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1221 +msgid "Resample using aggregate statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1222 +msgid "Resamples raster map layers to a coarser grid using aggregation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1223 +msgid "Resample using multiple methods" +msgstr "" + +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1224 +msgid "Resamples raster map to a finer grid using interpolation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1225 +msgid "Resample using nearest neighbor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1226 +msgid "GRASS raster map layer data resampling capability." +msgstr "" + +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1227 +msgid "Resample using spline tension" +msgstr "" + +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1228 +msgid "Reinterpolates and optionally computes topographic analysis from input raster map to a new raster map (possibly with different resolution) using regularized spline with tension and smoothing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1229 +msgid "Resample using bspline" +msgstr "" + +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1230 +msgid "Performs bilinear or bicubic spline interpolation with Tykhonov regularization." +msgstr "" + +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1231 +msgid "Resample using analytic kernel" +msgstr "" + +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1232 +msgid "Resamples raster map layers using an analytic kernel." +msgstr "" + +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:577 +#: ../gui/wxpython/menustrings.py:1233 ../gui/wxpython/menustrings.py:1522 +msgid "Support file maintenance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1234 +msgid "Allows creation and/or modification of raster map layer support files." +msgstr "" + +#: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:1235 +msgid "Update map statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1236 +msgid "Update raster map statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:294 ../gui/wxpython/menustrings.py:1239 +msgid "Tiling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:295 ../gui/wxpython/menustrings.py:1240 +msgid "Produces tilings of the source projection for use in the destination region and projection." +msgstr "" + +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:596 +#: ../gui/wxpython/menustrings.py:1241 ../gui/wxpython/menustrings.py:1541 +msgid "Manage colors" +msgstr "" + +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:597 +#: ../gui/wxpython/menustrings.py:1242 ../gui/wxpython/menustrings.py:1542 +msgid "Color tables" +msgstr "Χρωματικοί πίνακες" + +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1243 +msgid "Creates/modifies the color table associated with a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1244 +msgid "Color tables (stddev)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:1245 +msgid "Sets color rules based on stddev from a raster map's mean value." +msgstr "" + +#: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:599 +#: ../gui/wxpython/menustrings.py:1246 ../gui/wxpython/menustrings.py:1544 +msgid "Manage color rules interactively" +msgstr "" + +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1247 +msgid "Interactive management of raster color tables." +msgstr "" + +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:601 +#: ../gui/wxpython/menustrings.py:1248 ../gui/wxpython/menustrings.py:1546 +msgid "Export color table" +msgstr "Εξαγωγή χρωματικών κανόνων" + +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1249 +msgid "Exports the color table associated with a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:1250 +msgid "Blend 2 color rasters" +msgstr "Μίξη 2 χρωμάτικών raster" + +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1251 +msgid "Blends color components of two raster maps by a given ratio." +msgstr "" + +#: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:1252 +msgid "Create RGB" +msgstr "Δημιοιυργία RGB" + +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1253 +msgid "Combines red, green and blue raster maps into a single composite raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:769 +#: ../gui/wxpython/menustrings.py:1254 ../gui/wxpython/menustrings.py:1714 +msgid "RGB to HIS" +msgstr "RGB σε HIS " + +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1255 +msgid "Generates red, green and blue (RGB) raster map layers combining hue, intensity and saturation (HIS) values from user-specified input raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1256 +msgid "Query raster maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1257 +msgid "Query values by coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:1258 +msgid "Queries raster maps on their category values and category labels." +msgstr "" + +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1259 +msgid "Query colors by value" +msgstr "" + +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1260 +msgid "Queries colors for a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:323 ../gui/wxpython/menustrings.py:1268 +msgid "Raster buffers and distance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:324 ../gui/wxpython/menustrings.py:1269 +msgid "Buffer rasters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:325 ../gui/wxpython/menustrings.py:1270 +msgid "Creates a raster map showing buffer zones surrounding cells that contain non-NULL category values." +msgstr "" + +#: ../gui/wxpython/menustrings.py:326 ../gui/wxpython/menustrings.py:1271 +msgid "Concentric circles" +msgstr "" + +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1272 +msgid "Creates a raster map containing concentric rings around a given point." +msgstr "" + +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1273 +msgid "Closest points" +msgstr "Κοντινότερα σημεία" + +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1274 +msgid "Locates the closest points between objects in two raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1275 +msgid "Grow by one cell" +msgstr "" + +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:399 +#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1344 +msgid "Generates a raster map layer with contiguous areas grown by one cell." +msgstr "" + +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:391 +#: ../gui/wxpython/menustrings.py:1277 ../gui/wxpython/menustrings.py:1336 +msgid "Distance to features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:392 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1337 +msgid "Generates a raster map containing distances to nearest raster features and/or the value of the nearest non-null cell." +msgstr "" + +#: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:1280 +msgid "Creates a MASK for limiting raster operation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:339 +#: ../gui/wxpython/menustrings.py:1281 ../gui/wxpython/menustrings.py:1284 +msgid "Raster map calculator" +msgstr "" + +#: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:1282 +msgid "Simplified raster map calculator" +msgstr "" + +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1283 +msgid "Calculates a new raster map from a simple r.mapcalc expression." +msgstr "" + +#: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:1285 +msgid "Raster map calculator." +msgstr "" + +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1286 +msgid "Neighborhood analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:343 ../gui/wxpython/menustrings.py:1288 +msgid "Makes each cell category value a function of the category values assigned to the cells around it, and stores new cell values in an output raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1289 +msgid "Neighborhood points" +msgstr "Γειτονικά σημεία" + +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1290 +msgid "Neighborhood analysis tool for vector point maps. 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 in an output raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1291 +msgid "Overlay rasters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1292 +msgid "Cross product" +msgstr "" + +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1293 +msgid "Creates a cross product of the category values from multiple raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1294 +msgid "Patch raster maps" +msgstr "Συραφή χαρτών raster" + +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1295 +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." +msgstr "" + +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1296 +msgid "Raster series aggregation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1297 +msgid "Makes each output cell value a function of the values assigned to the corresponding cells in the input raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1298 +msgid "Raster series accumulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1299 +msgid "Makes each output cell value a accumulationfunction of the values assigned to the corresponding cells in the input raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1300 +msgid "Statistical overlay" +msgstr "" + +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1301 +msgid "Calculates category or object oriented statistics (accumulator-based statistics)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1302 +msgid "Quantiles overlay" +msgstr "" + +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1303 +msgid "Compute category quantiles using two passes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1304 +msgid "Solar radiance and shadows" +msgstr "" + +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1305 +msgid "LatLong map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1306 +msgid "Creates a latitude/longitude raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1307 +msgid "Solar irradiance and irradiation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1308 +msgid "Solar irradiance and irradiation model. Computes direct (beam), diffuse and reflected solar irradiation raster maps for given day, latitude, surface and atmospheric conditions. Solar parameters (e.g. sunrise, sunset times, declination, extraterrestrial irradiance, daylight length) are saved in the map history file. Alternatively, a local time can be specified to compute solar incidence angle and/or irradiance raster maps. The shadowing effect of the topography is optionally incorporated." +msgstr "" + +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1309 +msgid "Shadows map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1310 +msgid "Calculates cast shadow areas from sun position and elevation raster map. Either exact sun position (A) is specified, or date/time to calculate the sun position (B) by r.sunmask itself." +msgstr "" + +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1311 +msgid "Sunshine hours and solar angles" +msgstr "" + +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1312 +msgid "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: the angle between the direction of the geometric center of the sun's apparent disk and the (idealized) horizon. Solar azimuth: the angle from due north in clockwise direction." +msgstr "" + +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1313 +msgid "Terrain analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1314 +msgid "Generate contour lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1315 +msgid "Produces a vector map of specified contours from a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1316 +msgid "Cost surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1317 +msgid "Creates a raster map showing the cumulative cost of moving between different geographic locations on an input raster map whose cell category values represent cost." +msgstr "" + +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1318 +msgid "Cumulative movement costs" +msgstr "" + +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1319 +msgid "Creates a raster map showing the anisotropic cumulative cost of moving between different geographic locations on an input raster map whose cell category values represent cost." +msgstr "" + +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1320 +msgid "Least cost route or flow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1321 +msgid "Traces a flow through an elevation model or cost surface on a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1322 +msgid "Compute shaded relief" +msgstr "" + +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1323 +msgid "Creates shaded relief map from an elevation map (DEM). " +msgstr "" + +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1324 +msgid "Apply shade to raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1325 +msgid "Drapes a color raster over an shaded relief or aspect map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1326 +msgid "Slope and aspect" +msgstr "" + +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1327 +msgid "Generates raster maps of slope, aspect, curvatures and partial derivatives from an elevation raster map. Aspect is calculated counterclockwise from east." +msgstr "" + +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1328 +msgid "Landforms" +msgstr "" + +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1329 +msgid "Calculates geomorphons (terrain forms) and associated geometry using machine vision approach." +msgstr "" + +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1330 +msgid "Terrain parameters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1331 +msgid "Extracts terrain parameters from a DEM. Uses a multi-scale approach by taking fitting quadratic parameters to any size window (via least squares)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1332 +msgid "Textural features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1333 +msgid "Generate images with textural features from a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1334 +msgid "Visibility" +msgstr "" + +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1335 +msgid "Computes the viewshed of a point on an elevation raster map. Default format: NULL (invisible), vertical angle wrt viewpoint (visible)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1338 +msgid "Horizon angle" +msgstr "" + +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1339 +msgid "Computes horizon angle height from a digital elevation model. The module has two different modes of operation: 1. Computes the entire horizon around a single point whose coordinates are given with the 'coord' option. The horizon height (in radians). 2. Computes one or more raster maps of the horizon height in a single direction. The input for this is the angle (in degrees), which is measured counterclockwise with east=0, north=90 etc. The output is the horizon height in radians." +msgstr "" + +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1340 +msgid "Transform features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1341 +msgid "Clump" +msgstr "" + +#: ../gui/wxpython/menustrings.py:397 ../gui/wxpython/menustrings.py:1342 +msgid "Recategorizes data in a raster map by grouping cells that form physically discrete areas into unique categories." +msgstr "" + +#: ../gui/wxpython/menustrings.py:398 ../gui/wxpython/menustrings.py:1343 +msgid "Grow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1345 +msgid "Thin" +msgstr "" + +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1346 +msgid "Thins non-null cells that denote linear features in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1347 +msgid "Hydrologic modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1348 +msgid "Carve stream channels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1349 +msgid "Generates stream channels. Takes vector stream data, transforms it to raster and subtracts depth from the output DEM." +msgstr "" + +#: ../gui/wxpython/menustrings.py:405 ../gui/wxpython/menustrings.py:1350 +msgid "Fill lake" +msgstr "" + +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1351 +msgid "Fills lake at given point to given level." +msgstr "" + +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1352 +msgid "Depressionless map and flowlines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1353 +msgid "Filters and generates a depressionless elevation map and a flow direction map from a given elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1354 +msgid "Flow accumulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1355 +msgid "Performs flow computation for massive grids." +msgstr "" + +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1356 +msgid "Flow lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1357 +msgid "Constructs flowlines. Computes flowlines, flowpath lengths, and flowaccumulation (contributing areas) from a elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1358 +msgid "Watershed analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1359 +msgid "Calculates hydrological parameters and RUSLE factors." +msgstr "" + +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1360 +msgid "Watershed subbasins" +msgstr "" + +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1361 +msgid "Generates watershed subbasins raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1362 +msgid "Watershed basin creation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1363 +msgid "Creates watershed basins from a drainage direction map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1364 +msgid "Extraction of stream networks" +msgstr "" + +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1365 +msgid "Performs stream network extraction." +msgstr "" + +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1366 +msgid "SIMWE Overland flow modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1367 +msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1368 +msgid "SIMWE Sediment flux modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1369 +msgid "Sediment transport and erosion/deposition simulation using path sampling method (SIMWE)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1370 +msgid "Topographic index map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1371 +msgid "Creates a topographic index (wetness index) raster map from an elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1372 +msgid "TOPMODEL simulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1373 +msgid "Simulates TOPMODEL which is a physically based hydrologic model." +msgstr "" + +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1374 +msgid "USLE K-factor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1375 +msgid "Computes USLE Soil Erodibility Factor (K)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1376 +msgid "USLE R-factor" +msgstr "" + +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1377 +msgid "Computes USLE R factor, Rainfall erosivity index." +msgstr "" + +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:880 +#: ../gui/wxpython/menustrings.py:1378 ../gui/wxpython/menustrings.py:1825 +msgid "Groundwater modeling" +msgstr "Μοντελοποίηση υπογείων νερών" + +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1379 +msgid "Groundwater flow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1380 +msgid "Numerical calculation program for transient, confined and unconfined groundwater flow in two dimensions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1381 +msgid "Groundwater solute transport" +msgstr "" + +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1382 +msgid "Numerical calculation program for transient, confined and unconfined solute transport in two dimensions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1383 +msgid "Landscape patch analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:2011 +msgid "Set up sampling and analysis framework" +msgstr "" + +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:2012 +msgid "Configuration editor for r.li.'index'" +msgstr "" + +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1386 +msgid "Edge density" +msgstr "" + +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1387 +msgid "Calculates edge density index on a raster map, using a 4 neighbour algorithm" +msgstr "" + +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1388 +msgid "Contrast weighted edge density" +msgstr "" + +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1389 +msgid "Calculates contrast weighted edge density index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1390 +msgid "Patch area mean" +msgstr "" + +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1391 +msgid "Calculates mean patch size index on a raster map, using a 4 neighbour algorithm" +msgstr "" + +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1392 +msgid "Patch area range" +msgstr "" + +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1393 +msgid "Calculates range of patch area size on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1394 +msgid "Patch area Std Dev" +msgstr "" + +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1395 +msgid "Calculates standard deviation of patch area a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1396 +msgid "Patch area Coeff Var" +msgstr "" + +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1397 +msgid "Calculates coefficient of variation of patch area on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1398 +msgid "Patch density" +msgstr "" + +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1399 +msgid "Calculates patch density index on a raster map, using a 4 neighbour algorithm" +msgstr "" + +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1400 +msgid "Patch number" +msgstr "" + +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1401 +msgid "Calculates patch number index on a raster map, using a 4 neighbour algorithm." +msgstr "" + +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1402 +msgid "Dominance's diversity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1403 +msgid "Calculates dominance's diversity index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1404 +msgid "Shannon's diversity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1405 +msgid "Calculates Shannon's diversity index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1406 +msgid "Simpson's diversity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1407 +msgid "Calculates Simpson's diversity index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1408 +msgid "Richness" +msgstr "" + +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1409 +msgid "Calculates richness index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1410 +msgid "Shape index" +msgstr "" + +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1411 +msgid "Calculates shape index on a raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1412 +msgid "Wildfire modeling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1413 +msgid "Rate of spread" +msgstr "" + +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1414 +msgid "Generates rate of spread raster maps. Generates three, or four raster map layers showing the base (perpendicular) rate of spread (ROS), the maximum (forward) ROS, the direction of the maximum ROS, and optionally the maximum potential spotting distance for fire spread simulation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1415 +msgid "Least-cost spread paths" +msgstr "" + +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1416 +msgid "Recursively traces the least cost path backwards to cells from which the cumulative cost was determined." +msgstr "" + +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1417 +msgid "Anisotropic spread simulation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1418 +msgid "Simulates elliptically anisotropic spread. Generates a raster map of the cumulative time of spread, given raster maps containing the rates of spread (ROS), the ROS directions and the spread origins. It optionally produces raster maps to contain backlink UTM coordinates for tracing spread paths. Usable for fire spread simulations." +msgstr "" + +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1419 +msgid "Change category values and labels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:525 +#: ../gui/wxpython/menustrings.py:1420 ../gui/wxpython/menustrings.py:1470 +msgid "Manage category information" +msgstr "" + +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:526 +#: ../gui/wxpython/menustrings.py:1421 ../gui/wxpython/menustrings.py:1471 +msgid "Manages category values and labels associated with user-specified raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1422 +msgid "Interactively edit category values" +msgstr "" + +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1423 +msgid "Edits cell values in a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1424 +msgid "Reclassify by size" +msgstr "" + +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1425 +msgid "Reclasses a raster map greater or less than user specified area size (in hectares)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:700 +#: ../gui/wxpython/menustrings.py:1426 ../gui/wxpython/menustrings.py:1645 +msgid "Reclassify" +msgstr "" + +#: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:1427 +msgid "Reclassify raster map based on category values. Creates a new raster map whose category values are based upon a reclassification of the categories in an existing raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1428 +msgid "Recode" +msgstr "" + +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1429 +msgid "Recodes categorical raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1430 +msgid "Rescale" +msgstr "" + +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1431 +msgid "Rescales the range of category values in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:1432 +msgid "Rescale with histogram" +msgstr "" + +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1433 +msgid "Rescales histogram equalized the range of category values in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1434 +msgid "Generate random cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1435 +msgid "Random cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1436 +msgid "Generates random cell values with spatial dependence." +msgstr "" + +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1437 +msgid "Random cells and vector points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1438 +msgid "Creates a raster map layer and vector point map containing randomly located points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1439 +msgid "Generate surfaces" +msgstr "" + +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1440 +msgid "Fractal surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1441 +msgid "Creates a fractal surface of a given fractal dimension." +msgstr "" + +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1442 +msgid "Gaussian kernel density surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1443 +msgid "Generates a raster density map from vector points map. Density is computed using a moving kernel. Optionally generates a vector density map on a vector network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1444 +msgid "Gaussian deviates surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1445 +msgid "Generates a raster map using gaussian random number generator. Mean and standard deviation of gaussian deviates can be expressed by the user." +msgstr "" + +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1447 +msgid "Creates raster plane map given dip (inclination), aspect (azimuth) and one point." +msgstr "" + +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1448 +msgid "Random deviates surface" +msgstr "" + +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1449 +msgid "Produces a raster surface map of uniform random deviates with defined range." +msgstr "" + +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1450 +msgid "Random surface with spatial dependence" +msgstr "" + +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1451 +msgid "Generates random surface(s) with spatial dependence." +msgstr "" + +#: ../gui/wxpython/menustrings.py:507 ../gui/wxpython/menustrings.py:1452 +msgid "Interpolate surfaces" +msgstr "" + +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1453 +msgid "Bilinear and bicubic from vector points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1454 +msgid "Performs bicubic or bilinear spline interpolation with Tykhonov regularization." +msgstr "" + +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1455 +msgid "IDW from raster points" +msgstr "IDW απο σημεία raster" + +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1456 +msgid "Provides surface interpolation from raster point data by Inverse Distance Squared Weighting." +msgstr "" + +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1457 +msgid "IDW from vector points" +msgstr "IDW απο διανυσματικα σημεία" + +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1458 +msgid "Provides surface interpolation from vector point data by Inverse Distance Squared Weighting." +msgstr "" + +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1459 +msgid "Raster contours" +msgstr "" + +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1460 +msgid "Generates surface raster map from rasterized contours." +msgstr "" + +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1461 +msgid "Regularized spline tension" +msgstr "" + +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1462 +msgid "Performs surface interpolation from vector points map by splines. Spatial approximation and topographic analysis from given point or isoline data in vector format to floating point raster format using regularized spline with tension." +msgstr "" + +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1463 +msgid "Raster series interpolation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1464 +msgid "Interpolates raster maps located (temporal or spatial) in between input raster maps at specific sampling positions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1465 +msgid "Fill NULL cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1466 +msgid "Fills no-data areas in raster maps using spline interpolation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:739 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:884 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:1684 ../gui/wxpython/menustrings.py:1801 +#: ../gui/wxpython/menustrings.py:1829 ../gui/wxpython/menustrings.py:1973 +msgid "Reports and statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1468 +msgid "Basic raster metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1469 +msgid "Outputs basic information about a raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1472 +msgid "General statistics" +msgstr "Γενικές στατιστικές" + +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1473 +msgid "Generates area statistics for raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1474 +msgid "Quantiles for large data sets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:1475 +msgid "Compute quantiles using two passes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1476 +msgid "Range of category values" +msgstr "" + +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1477 +msgid "Prints terse list of category values found in a raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:533 ../gui/wxpython/menustrings.py:1478 +msgid "Sum area by raster map and category" +msgstr "" + +#: ../gui/wxpython/menustrings.py:534 ../gui/wxpython/menustrings.py:1479 +msgid "Reports statistics for raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1480 +msgid "Statistics for clumped cells" +msgstr "" + +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1481 +msgid "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector points map containing the calculated centroids of these clumps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1482 +msgid "Total corrected area" +msgstr "" + +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1483 +msgid "Prints estimation of surface area for raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1485 +msgid "Calculates univariate statistics from the non-null cells of a raster map. Statistics include number of cells counted, minimum and maximum cell values, range, arithmetic mean, population variance, standard deviation, coefficient of variation, and sum." +msgstr "" + +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:750 +#: ../gui/wxpython/menustrings.py:1486 ../gui/wxpython/menustrings.py:1695 +msgid "Sample transects" +msgstr "" + +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1487 +msgid "Outputs the raster map layer values lying on user-defined line(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1488 +msgid "Sample transects (bearing/distance)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1489 +msgid "Outputs raster map layer values lying along user defined transect line(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1490 +msgid "Covariance/correlation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1491 +msgid "Outputs a covariance/correlation matrix for user-specified raster map layer(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1492 +msgid "Linear regression" +msgstr "Γραμμική συσχέτιση" + +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1493 +msgid "Calculates linear regression from two raster maps: y = a + b*x." +msgstr "Υπολογίζει την γραμμικη συσχέτιση δυο raster: y = a + b*x" + +#: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:1494 +msgid "Multiple regression" +msgstr "" + +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1495 +msgid "Calculates multiple linear regression from raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1496 +msgid "Mutual category occurrences" +msgstr "" + +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1497 +msgid "Tabulates the mutual occurrence (coincidence) of categories for two raster map layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1498 +msgid "&Vector" +msgstr "&Διανυσματικό" + +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1499 +msgid "Develop vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/gui_core/dialogs.py:270 +#: ../gui/wxpython/gui_core/dialogs.py:417 +msgid "Create new vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1501 +msgid "Create new empty vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1502 +msgid "Edit vector map (non-interactively)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1503 +msgid "Edits a vector map, allows adding, deleting and modifying selected vector features." +msgstr "" + +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1504 +msgid "Convert object types" +msgstr "" + +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1505 +msgid "Changes type of vector features." +msgstr "" + +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1506 +msgid "Parallel lines" +msgstr "Παράλληλες γραμμές" + +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1507 +msgid "Creates parallel line to input vector lines." +msgstr "" + +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1508 +msgid "Dissolve boundaries" +msgstr "" + +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1509 +msgid "Dissolves boundaries between adjacent areas sharing a common category number or attribute." +msgstr "" + +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1510 +msgid "Create 3D vector over raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1511 +msgid "Converts 2D vector features to 3D by sampling of elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1512 +msgid "Extrude 3D vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1513 +msgid "Extrudes flat vector features to 3D vector features with defined height. Optionally the height can be derived from sampling of elevation raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1514 +msgid "Create labels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1515 +msgid "Creates paint labels for a vector map from attached attributes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1516 +msgid "Reposition vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1517 +msgid "Performs an affine transformation (shift, scale and rotate) on vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1518 +msgid "Rectify vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1519 +msgid "Rectifies a vector by computing a coordinate transformation for each object in the vector based on the control points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1523 +msgid "Updates vector map metadata." +msgstr "" + +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1524 +msgid "Topology maintenance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1525 +msgid "Create or rebuild topology" +msgstr "" + +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1526 +msgid "Creates topology for vector map. Optionally also checks for topological errors." +msgstr "" + +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1527 +msgid "Rebuild topology on all vector maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:583 ../gui/wxpython/menustrings.py:1528 +msgid "Rebuilds topology on all vector maps in the current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:584 ../gui/wxpython/menustrings.py:1529 +msgid "Build polylines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:585 ../gui/wxpython/menustrings.py:1530 +msgid "Builds polylines from lines or boundaries." +msgstr "" + +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1531 +msgid "Split lines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1532 +msgid "Splits vector lines to shorter segments." +msgstr "" + +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1533 +msgid "Split polylines" +msgstr "" + +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1534 +msgid "Creates points/segments from input vector lines and positions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1535 +msgid "Clean vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1536 +msgid "Toolset for cleaning topology of vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1537 +msgid "Smooth or simplify" +msgstr "" + +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1538 +msgid "Performs vector based generalization." +msgstr "" + +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1539 +msgid "Add centroids" +msgstr "" + +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1540 +msgid "Adds missing centroids to closed boundaries." +msgstr "" + +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1543 +msgid "Creates/modifies the color table associated with a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1545 +msgid "Interactive management of vector color tables." +msgstr "" + +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1547 +msgid "Exports the color table associated with a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1548 +msgid "Query vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1549 +msgid "Query with coordinate(s)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1550 +msgid "Queries a vector map at given locations." +msgstr "" + +#: ../gui/wxpython/menustrings.py:606 ../gui/wxpython/menustrings.py:923 +#: ../gui/wxpython/menustrings.py:1551 ../gui/wxpython/menustrings.py:1868 +msgid "Query vector attribute data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:607 ../gui/wxpython/menustrings.py:924 +#: ../gui/wxpython/menustrings.py:1552 ../gui/wxpython/menustrings.py:1869 +msgid "Prints vector map attributes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1553 +msgid "Feature selection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:609 ../gui/wxpython/menustrings.py:1554 +msgid "Select by attributes" +msgstr "" + +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1555 +msgid "Selects vector features from an existing vector map and creates a new vector map containing only the selected features." +msgstr "" + +#: ../gui/wxpython/menustrings.py:611 ../gui/wxpython/menustrings.py:1556 +msgid "Select by another map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1557 +msgid "Selects features from vector map (A) by features from other vector map (B)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1565 +msgid "Buffer vectors" +msgstr "" + +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1566 +msgid "Creates a buffer around vector features of given type." +msgstr "" + +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1567 +msgid "Point analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:636 +#: ../gui/wxpython/menustrings.py:1568 ../gui/wxpython/menustrings.py:1581 +msgid "Identify and remove outliers" +msgstr "" + +#: ../gui/wxpython/menustrings.py:624 ../gui/wxpython/menustrings.py:637 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1681 +msgid "Removes outliers from vector point data." +msgstr "" + +#: ../gui/wxpython/menustrings.py:625 ../gui/wxpython/menustrings.py:1570 +msgid "Identify point clusters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:626 ../gui/wxpython/menustrings.py:1571 +msgid "Performs cluster identification." +msgstr "" + +#: ../gui/wxpython/menustrings.py:627 ../gui/wxpython/menustrings.py:1572 +msgid "Indices for quadrat counts of vector point lists" +msgstr "" + +#: ../gui/wxpython/menustrings.py:628 ../gui/wxpython/menustrings.py:753 +#: ../gui/wxpython/menustrings.py:1573 ../gui/wxpython/menustrings.py:1698 +msgid "Indices for quadrat counts of vector point lists." +msgstr "" + +#: ../gui/wxpython/menustrings.py:629 ../gui/wxpython/menustrings.py:733 +#: ../gui/wxpython/menustrings.py:1574 ../gui/wxpython/menustrings.py:1678 +msgid "Perturb points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:734 +#: ../gui/wxpython/menustrings.py:1575 ../gui/wxpython/menustrings.py:1679 +msgid "Random location perturbations of vector points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:737 +#: ../gui/wxpython/menustrings.py:1576 ../gui/wxpython/menustrings.py:1682 +msgid "Test/training point sets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:738 +#: ../gui/wxpython/menustrings.py:1577 ../gui/wxpython/menustrings.py:1683 +msgid "Randomly partition points into test/train sets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:1578 +msgid "Tests for normality for vector points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:755 +#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1700 +msgid "Tests for normality for vector points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1580 +msgid "Lidar analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:1583 +msgid "Detect edges" +msgstr "" + +#: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:1584 +msgid "Detects the object's edges from a LIDAR data set." +msgstr "" + +#: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:1585 +msgid "Detect interiors" +msgstr "" + +#: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:1586 +msgid "Building contour determination and Region Growing algorithm for determining the building inside" +msgstr "" + +#: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:1587 +msgid "Correct and reclassify objects" +msgstr "" + +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1588 +msgid "Corrects the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering." +msgstr "" + +#: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:1589 +msgid "Linear referencing" +msgstr "" + +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1590 +msgid "Create LRS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:646 ../gui/wxpython/menustrings.py:1591 +msgid "Creates a linear reference system." +msgstr "" + +#: ../gui/wxpython/menustrings.py:647 ../gui/wxpython/menustrings.py:1592 +msgid "Create stationing" +msgstr "" + +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1593 +msgid "Creates stationing from input lines, and linear reference system." +msgstr "" + +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1594 +msgid "Create points/segments" +msgstr "" + +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1595 +msgid "Creates points/segments from input lines, linear reference system and positions read from stdin or a file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1596 +msgid "Find line id and offset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1597 +msgid "Finds line id and real km+offset for given points in vector map using linear reference system." +msgstr "" + +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1598 +msgid "Nearest features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1599 +msgid "Finds the nearest element in vector map 'to' for elements in vector map 'from'." +msgstr "" + +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1600 +msgid "Network analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1602 +msgid "Tool for interactive vector network analysis." +msgstr "" + +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1603 +msgid "Network preparation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1604 +msgid "Performs network maintenance." +msgstr "" + +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1605 +msgid "Allocate subnets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1606 +msgid "Allocates subnets for nearest centers. Center node must be opened (costs >= 0). Costs of center node are used in calculation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1607 +msgid "Split net" +msgstr "" + +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1608 +msgid "Splits subnets for nearest centers by cost isolines. Splits net to bands between cost isolines (direction from center). Center node must be opened (costs >= 0). Costs of center node are used in calculation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1609 +msgid "Shortest path" +msgstr "" + +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1610 +msgid "Finds shortest path on vector network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1611 +msgid "Shortest path for sets of features" +msgstr "" + +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1612 +msgid "Computes shortest distance via the network between the given sets of features. Finds the shortest paths from each 'from' point to the nearest 'to' feature and various information about this relation are uploaded to the attribute table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1613 +msgid "Shortest path using timetables" +msgstr "" + +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1614 +msgid "Finds shortest path using timetables." +msgstr "" + +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1615 +msgid "Shortest path for all pairs" +msgstr "" + +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1616 +msgid "Computes the shortest path between all pairs of nodes in the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1617 +msgid "Visibility network" +msgstr "" + +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1618 +msgid "Performs visibility graph construction." +msgstr "" + +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1619 +msgid "Bridges and articulation points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1620 +msgid "Computes bridges and articulation points in the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1621 +msgid "Maximum flow" +msgstr "" + +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1622 +msgid "Computes the maximum flow between two sets of nodes in the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1623 +msgid "Vertex connectivity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1624 +msgid "Computes vertex connectivity between two sets of nodes in the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1625 +msgid "Components" +msgstr "" + +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1626 +msgid "Computes strongly and weakly connected components in the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1627 +msgid "Centrality" +msgstr "Εκκεντρότητα" + +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1628 +msgid "Computes degree, centrality, betweeness, closeness and eigenvector centrality measures in the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1629 +msgid "Steiner tree" +msgstr "Δέντρο Steiner" + +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1630 +msgid "Creates Steiner tree for the network and given terminals. Note that 'Minimum Steiner Tree' problem is NP-hard and heuristic algorithm is used in this module so the result may be sub optimal." +msgstr "" + +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1631 +msgid "Minimum spanning tree" +msgstr "" + +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1632 +msgid "Computes minimum spanning tree for the network." +msgstr "" + +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1633 +msgid "Traveling salesman analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1634 +msgid "Creates a cycle connecting given nodes (Traveling salesman problem). Note that TSP is NP-hard, heuristic algorithm is used by this module and created cycle may be sub optimal" +msgstr "" + +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:693 +#: ../gui/wxpython/menustrings.py:1635 ../gui/wxpython/menustrings.py:1638 +msgid "Overlay vector maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1636 +msgid "Clip vector maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1637 +msgid "Extracts features of input map which overlay features of clip map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1639 +msgid "Overlays two vector maps offering clip, intersection, difference, symmetrical difference, union operators." +msgstr "" + +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1640 +msgid "Patch vector maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1641 +msgid "Creates a new vector map by combining other vector maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1642 +msgid "Manage categories" +msgstr "" + +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1643 +msgid "Change or report categories" +msgstr "" + +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1644 +msgid "Attaches, deletes or reports vector categories to/from/of map geometry." +msgstr "" + +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1646 +msgid "Changes vector category values for an existing vector map according to results of SQL queries or a value in attribute table column." +msgstr "" + +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/dbmgr/dialogs.py:119 +msgid "Update attributes" +msgstr "" + +#: ../gui/wxpython/menustrings.py:703 ../gui/wxpython/menustrings.py:1648 +msgid "Update area attributes from raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1649 +msgid "Calculates univariate statistics from a raster map based on a vector map and uploads statistics to new attribute columns." +msgstr "" + +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1650 +msgid "Update area attributes from vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1651 +msgid "Count points in areas, calculate statistics from point attributes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1652 +msgid "Update point attributes from areas" +msgstr "" + +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1653 +msgid "Uploads vector values at positions of vector points to the table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1654 +msgid "Update database values from vector" +msgstr "" + +#: ../gui/wxpython/menustrings.py:710 ../gui/wxpython/menustrings.py:1655 +msgid "Populates attribute values from vector features." +msgstr "" + +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1656 +msgid "Sample raster maps at point locations" +msgstr "" + +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1657 +msgid "Uploads raster values at positions of vector points to the table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1658 +msgid "Sample raster neighborhood around points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1659 +msgid "Samples a raster map at vector point locations." +msgstr "" + +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1660 +msgid "Generate area for current region" +msgstr "" + +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1661 +msgid "Creates a vector polygon from the current region extent." +msgstr "" + +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1662 +msgid "Generate areas from points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1663 +msgid "Convex hull" +msgstr "" + +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1664 +msgid "Produces a 2D/3D convex hull for a given vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1665 +msgid "Delaunay triangles" +msgstr "" + +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1666 +msgid "Creates a Delaunay triangulation from an input vector map containing points or centroids." +msgstr "" + +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1667 +msgid "Voronoi diagram/Thiessen polygons" +msgstr "Διαγράμματα Voronoi/Πολύγωνα Thiessen" + +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1668 +msgid "Creates a Voronoi diagram constrained to the extents of the current region from an input vector map containing points or centroids." +msgstr "" + +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1669 +msgid "Generate grid" +msgstr "" + +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1670 +msgid "Creates a vector map of a user-defined grid." +msgstr "" + +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1671 +msgid "Generate points" +msgstr "Δημιουργία σημείων " + +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1672 +msgid "Generate from database" +msgstr "Δημιουργία απο βάση δεδομένων" + +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1673 +msgid "Creates new vector (points) map from database table containing coordinates." +msgstr "Δημιουργία νέο διανυσματικό χάρτη (σημειακό) απο μια βάση δεδομένων που περιέχει συντεταγμένες/" + +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1674 +msgid "Generate points along lines" +msgstr "Δημιουργία σημείων σε πάνω σε γραμμές" + +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1675 +msgid "Creates points along input lines in new vector map with 2 layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1676 +msgid "Generate random points" +msgstr "Δημιουργία απο τυχαία σημεία" + +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1677 +msgid "Generates random 2D/3D vector points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1680 +msgid "Remove outliers in point sets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1685 +msgid "Basic vector metadata" +msgstr "Βασικά διανυσματικά δεδομένα" + +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1686 +msgid "Outputs basic information about a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1687 +msgid "Classify attribute data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:743 ../gui/wxpython/menustrings.py:1688 +msgid "Classifies attribute data, e.g. for thematic mapping" +msgstr "" + +#: ../gui/wxpython/menustrings.py:744 ../gui/wxpython/menustrings.py:1689 +msgid "Report topology by category" +msgstr "" + +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1690 +msgid "Reports geometry statistics for vector maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1691 +msgid "Univariate attribute statistics for points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:747 ../gui/wxpython/menustrings.py:1692 +msgid "Calculates univariate statistics of vector map features. Variance and standard deviation is calculated only for points if specified." +msgstr "" + +#: ../gui/wxpython/menustrings.py:748 ../gui/wxpython/menustrings.py:1693 +msgid "Univariate statistics for attribute columns" +msgstr "" + +#: ../gui/wxpython/menustrings.py:749 ../gui/wxpython/menustrings.py:1694 +msgid "Calculates univariate statistics on selected table column for a GRASS vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1696 +msgid "Vector map profiling tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1697 +msgid "Quadrat indices" +msgstr "" + +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1699 +msgid "Test normality" +msgstr "Τεστ κανονικότητας" + +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1701 +msgid "&Imagery" +msgstr "" + +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1702 +msgid "Develop images and groups" +msgstr "" + +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1703 +msgid "Create/edit group" +msgstr "Δημιουργία/επεξεργασία ομάδων" + +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1704 +msgid "Creates, edits, and lists groups of imagery files." +msgstr "Δημιουργεί, επεξεργάζεται και εμφανίζει ομάδες εικόνων" + +#: ../gui/wxpython/menustrings.py:760 ../gui/wxpython/menustrings.py:1705 +msgid "Target group" +msgstr "" + +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1706 +msgid "Targets an imagery group to a GRASS location and mapset." +msgstr "Στοχεύει μια ομάδα εικόνων σε μια τοποθεσία και συλλογή χαρτών GRASS" + +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1707 +msgid "Mosaic images" +msgstr "Δημιουργία μοσαϊκού εικόνων" + +#: ../gui/wxpython/menustrings.py:763 ../gui/wxpython/menustrings.py:1708 +msgid "Mosaics several images and extends colormap." +msgstr "" + +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1709 +msgid "Manage image colors" +msgstr "Διαχείριση χρωμάτων εικόνων" + +#: ../gui/wxpython/menustrings.py:765 ../gui/wxpython/menustrings.py:1710 +msgid "Color balance for RGB" +msgstr "Χρωματική προσαρμοργή των RGB" + +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1711 +msgid "Performs auto-balancing of colors for RGB images." +msgstr "" + +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1712 +msgid "HIS to RGB" +msgstr "HIS σε RGB" + +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1713 +msgid "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to RGB (Red-Green-Blue) color space." +msgstr "Μετατρέπει ψηφιδωτούς χάρτες από χρωματικό χώρο HIS (Hue-Intensity-Saturation) σε RGB (Red-Green-Blue)" + +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1715 +msgid "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-Intensity-Saturation) color space." +msgstr "Μετατρέπει ψηφιδωτούς χάρτες από χρωματικό χώρο RGB (Red-Green-Blue) σε HIS (Hue-Intensity-Saturation) " + +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1716 +msgid "Rectify image or raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1717 +msgid "Rectifies an image by computing a coordinate transformation for each pixel in the image based on the control points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1719 +msgid "Generate histogram of image" +msgstr "" + +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1720 +msgid "Spectral response" +msgstr "" + +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1721 +msgid "Displays spectral response at user specified locations in group or images." +msgstr "" + +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1722 +msgid "Pan sharpening" +msgstr "" + +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1723 +msgid "Image fusion algorithms to sharpen multispectral with high-res panchromatic channels" +msgstr "" + +#: ../gui/wxpython/menustrings.py:779 ../gui/wxpython/menustrings.py:1724 +msgid "Classify image" +msgstr "" + +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1725 +msgid "Clustering input for unsupervised classification" +msgstr "" + +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1726 +msgid "Generates spectral signatures for land cover types in an image using a clustering algorithm. The resulting signature file is used as input for i.maxlik, to generate an unsupervised image classification." +msgstr "" + +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1727 +msgid "Input for supervised MLC" +msgstr "" + +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1728 +msgid "Generates statistics for i.maxlik from raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1729 +msgid "Maximum likelihood classification (MLC)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1730 +msgid "Classifies the cell spectral reflectances in imagery data. Classification is based on the spectral signature information generated by either i.cluster, g.gui.iclass, or i.gensig." +msgstr "" + +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:2005 +msgid "Interactive input for supervised classification" +msgstr "" + +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:2006 +msgid "Generates spectral signatures by allowing the user to outline training areas." +msgstr "" + +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1733 +msgid "Input for supervised SMAP" +msgstr "Εισαγωγή για επιβλεπόμενο SMAP" + +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1734 +msgid "Generates statistics for i.smap from raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1735 +msgid "Sequential maximum a posteriori classification (SMAP)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1736 +msgid "Performs contextual image classification using sequential maximum a posteriori (SMAP) estimation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1737 +msgid "Object segmentation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1738 +msgid "Identifies segments (objects) from imagery data." +msgstr "" + +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1739 +msgid "Filter image" +msgstr "" + +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1740 +msgid "Edge detection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1741 +msgid "Zero-crossing \"edge detection\" raster function for image processing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1742 +msgid "Matrix/convolving filter" +msgstr "" + +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1743 +msgid "Performs raster map matrix filter." +msgstr "" + +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1744 +msgid "Transform image" +msgstr "" + +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1745 +msgid "Canonical correlation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1746 +msgid "Canonical components analysis (CCA) program for image processing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1747 +msgid "Principal components" +msgstr "" + +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1748 +msgid "Principal components analysis (PCA) for image processing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1749 +msgid "Fast Fourier" +msgstr "" + +#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1750 +msgid "Fast Fourier Transform (FFT) for image processing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1751 +msgid "Inverse Fast Fourier" +msgstr "" + +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1752 +msgid "Inverse Fast Fourier Transform (IFFT) for image processing." +msgstr "" + +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1753 +msgid "Satellite images tools" +msgstr "" + +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1754 +msgid "Aster DN to radiance/reflectance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1755 +msgid "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature from ASTER DN." +msgstr "" + +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1756 +msgid "Landsat DN to radiance/reflectance" +msgstr "" + +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1757 +msgid "Calculates top-of-atmosphere radiance or reflectance and temperature for Landsat MSS/TM/ETM+/OLI" +msgstr "" + +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1758 +msgid "Landsat cloud cover assessment" +msgstr "" + +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1759 +msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1760 +msgid "Modis quality control" +msgstr "" + +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1761 +msgid "Extracts quality control parameters from MODIS QC layers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1762 +msgid "Atmospheric correction" +msgstr "ατμοσφαιρική διόρθωση" + +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1763 +msgid "Performs atmospheric correction using the 6S algorithm. 6S - Second Simulation of Satellite Signal in the Solar Spectrum." +msgstr "" + +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1764 +msgid "Topographic correction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1765 +msgid "Computes topographic correction of reflectance." +msgstr "" + +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1766 +msgid "Orthophoto tools" +msgstr "" + +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1767 +msgid "Manage GCPs for 3D correction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:2008 +msgid "Georectifies a map and allows managing GCP for 3D correction." +msgstr "" + +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:1997 +msgid "Corrects scanning distortions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:1998 +msgid "Corrects scanning distortions of a scanned aerial photo." +msgstr "" + +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1771 +msgid "Satellite images products" +msgstr "" + +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1772 +msgid "Vegetation indices" +msgstr "" + +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1773 +msgid "Calculates different types of vegetation indices. Uses red and nir bands mostly, and some indices require additional bands." +msgstr "" + +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1774 +msgid "Tasseled cap vegetation index" +msgstr "" + +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1775 +msgid "Performs Tasseled Cap (Kauth Thomas) transformation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1776 +msgid "Albedo" +msgstr "" + +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1777 +msgid "Computes broad band albedo from surface reflectance." +msgstr "" + +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1778 +msgid "Emissivity" +msgstr "" + +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1779 +msgid "Computes emissivity from NDVI, generic method for sparse land." +msgstr "" + +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1780 +msgid "Biomass growth" +msgstr "" + +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1781 +msgid "Computes biomass growth, precursor of crop yield calculation." +msgstr "" + +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1782 +msgid "Evapotranspiration calculation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1783 +msgid "Instantaneaous Net Radiation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1784 +msgid "Net radiation approximation (Bastiaanssen, 1995)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1785 +msgid "Soil heat flux" +msgstr "" + +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1786 +msgid "Soil heat flux approximation (Bastiaanssen, 1995)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1787 +msgid "Sensible heat flux" +msgstr "" + +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1788 +msgid "Computes sensible heat flux iteration SEBAL 01." +msgstr "" + +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1789 +msgid "Evaporative fraction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1790 +msgid "Computes evaporative fraction and root zone soil moisture." +msgstr "" + +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1791 +msgid "Actual Evapotranspiration" +msgstr "" + +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1792 +msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1793 +msgid "Temporal integration of ETa" +msgstr "" + +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1794 +msgid "Computes temporal integration of satellite ET actual (ETa) following the daily ET reference (ETo) from meteorological station(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1795 +msgid "Hargreaves methods Evapotranspiration" +msgstr "" + +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1796 +msgid "Computes evapotranspiration calculation modified or original Hargreaves formulation, 2001." +msgstr "" + +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1797 +msgid "Penman-Monteith Evapotranspiration" +msgstr "" + +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1798 +msgid "Computes potential evapotranspiration calculation with hourly Penman-Monteith." +msgstr "" + +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1799 +msgid "Priestley-Taylor Evapotranspiration" +msgstr "" + +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1800 +msgid "Computes evapotranspiration calculation Priestley and Taylor formulation, 1972." +msgstr "" + +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1802 +msgid "Kappa analysis" +msgstr "" + +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1803 +msgid "Calculates error matrix and kappa parameter for accuracy assessment of classification result." +msgstr "" + +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1804 +msgid "OIF for LandSat TM" +msgstr "" + +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1805 +msgid "Calculates Optimum-Index-Factor table for spectral bands" +msgstr "" + +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1806 +msgid "3D r&aster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1807 +msgid "Develop 3D raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1808 +msgid "Manage 3D NULL values" +msgstr "" + +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1809 +msgid "Explicitly create the 3D NULL-value bitmap file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1810 +msgid "Manage timestamp" +msgstr "" + +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1811 +msgid "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1813 +msgid "3D rasters to raster series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1815 +msgid "3D color tables" +msgstr "" + +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1816 +msgid "Creates/modifies the color table associated with a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1817 +msgid "Export 3D color table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1818 +msgid "Exports the color table associated with a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1819 +msgid "3D mask" +msgstr "" + +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1820 +msgid "Establishes the current working 3D raster mask." +msgstr "" + +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:877 +#: ../gui/wxpython/menustrings.py:1821 ../gui/wxpython/menustrings.py:1822 +msgid "3D raster map calculator" +msgstr "" + +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1823 +msgid "Cross section" +msgstr "" + +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1824 +msgid "Creates cross section 2D raster map from 3D raster map based on 2D elevation map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1826 +msgid "Numerical calculation program for transient, confined groundwater flow in three dimensions." +msgstr "" + +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1827 +msgid "Interpolate 3D raster from points" +msgstr "" + +#: ../gui/wxpython/menustrings.py:883 ../gui/wxpython/menustrings.py:1828 +msgid "Interpolates point data to a 3D raster map using regularized spline with tension (RST) algorithm." +msgstr "" + +#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1830 +msgid "Basic 3D raster metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1831 +msgid "Outputs basic information about a user-specified 3D raster map layer." +msgstr "" + +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1832 +msgid "3D raster statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1833 +msgid "Generates volume statistics for 3D raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1834 +msgid "Univariate statistics for 3D rasters" +msgstr "" + +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1835 +msgid "Calculates univariate statistics from the non-null cells of a 3D raster map. Statistics include number of cells counted, minimum and maximum cell values, range, arithmetic mean, population variance, standard deviation, coefficient of variation, and sum." +msgstr "" + +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1836 +msgid "&Database" +msgstr "&Βάση δεδομένων" + +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1837 +msgid "Database information" +msgstr "" + +#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1838 +msgid "List databases" +msgstr "" + +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1839 +msgid "Lists all databases for a given driver and location." +msgstr "" + +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1840 +msgid "List drivers" +msgstr "" + +#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1841 +msgid "Lists all database drivers." +msgstr "" + +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1842 +msgid "List tables" +msgstr "" + +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1843 +msgid "Lists all tables for a given database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1844 +msgid "Describe table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1845 +msgid "Describes a table in detail." +msgstr "" + +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1846 +msgid "List columns" +msgstr "" + +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1847 +msgid "List all columns for a given table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1848 +msgid "Manage databases" +msgstr "" + +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1849 +msgid "Connect" +msgstr "" + +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1850 +msgid "Prints/sets general DB connection for current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1851 +msgid "Login" +msgstr "" + +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1852 +msgid "Sets user/password for DB driver/database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1853 +msgid "Create database" +msgstr "" + +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1854 +msgid "Creates an empty database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1855 +msgid "Drop database" +msgstr "" + +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1856 +msgid "Removes an existing database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1857 +msgid "Drop table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1858 +msgid "Drops an attribute table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1859 +msgid "Copy table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1860 +msgid "Copy a table. Either 'from_table' (optionally with 'where') can be used or 'select' option, but not 'from_table' and 'select' at the same time." +msgstr "" + +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:936 +#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:1881 +msgid "Drop column" +msgstr "" + +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1862 +msgid "Drops a column from selected attribute table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1863 +msgid "Test" +msgstr "" + +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1864 +msgid "Test database driver, database must exist and set by db.connect." +msgstr "" + +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:117 +msgid "Query" +msgstr "Ερώτημα" + +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1866 +msgid "Query any table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1867 +msgid "Selects data from attribute table. Performs SQL query statement(s)." +msgstr "" + +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1870 +msgid "SQL statement" +msgstr "" + +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1871 +msgid "Executes any SQL statement. For SELECT statements use 'db.select'." +msgstr "" + +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1872 +msgid "Vector database connections" +msgstr "" + +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1873 +msgid "New table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1874 +msgid "Creates and connects a new attribute table to a given layer of an existing vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1875 +msgid "Remove table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1876 +msgid "Removes existing attribute table of a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1877 +msgid "Join table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1878 +msgid "Joins a database table to a vector map table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1879 +msgid "Add columns" +msgstr "" + +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1880 +msgid "Adds one or more columns to the attribute table connected to a given vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1882 +msgid "Drops a column from the attribute table connected to a given vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/dbmgr/base.py:2385 +msgid "Rename column" +msgstr "Μετονομασία στήλης" + +#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1884 +msgid "Renames a column in the attribute table connected to a given vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1885 +msgid "Change values" +msgstr "αλλαγή τιμών" + +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1886 +msgid "Updates a column in the attribute table connected to a vector map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1887 +msgid "Drop row" +msgstr "" + +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1888 +msgid "Removes a vector feature from a vector map through attribute selection." +msgstr "" + +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1889 +msgid "Reconnect vectors to database" +msgstr "" + +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1890 +msgid "Reconnects attribute tables for all vector maps from the current mapset to a new database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1891 +msgid "Set vector map - database connection" +msgstr "" + +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1892 +msgid "Prints/sets DB connection for a vector map to attribute table." +msgstr "" + +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1893 +msgid "&Temporal" +msgstr "" + +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1894 +msgid "Manage datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1895 +msgid "Connect temporal database" +msgstr "" + +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1896 +msgid "Prints/sets general temporal GIS database connection for current mapset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1898 +msgid "Creates a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1900 +msgid "Renames a space time dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1902 +msgid "Removes space time datasets from temporal database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1903 +msgid "Update metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1904 +msgid "Modifies the metadata of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1905 +msgid "Merge" +msgstr "" + +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1906 +msgid "Merges several space time datasets into a single space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1907 +msgid "Temporally shift" +msgstr "" + +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1908 +msgid "Shifts temporally the maps of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1909 +msgid "Snap maps of dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1910 +msgid "Snaps temporally the maps of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1912 +msgid "Lists space time datasets and maps registered in the temporal database." +msgstr "" + +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1913 +msgid "Manage maps in datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1914 +msgid "Register maps in datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:970 ../gui/wxpython/menustrings.py:1915 +msgid "Assigns timestamps and registers raster, vector and raster3d maps in a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1916 +msgid "Unregister maps from datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1917 +msgid "Unregisters raster, vector and raster3d maps from the temporal database or a specific space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1918 +msgid "List raster dataset maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1919 +msgid "Lists registered maps of a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1920 +msgid "List vector dataset maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1921 +msgid "Lists registered maps of a space time vector dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1922 +msgid "List 3D raster dataset maps" +msgstr "" + +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1923 +msgid "Lists registered maps of a space time raster3d dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1924 +msgid "Import" +msgstr "" + +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1925 +msgid "Import raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1926 +msgid "Imports space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1927 +msgid "Import vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1928 +msgid "Imports a space time vector dataset from a GRASS GIS specific archive file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1930 +msgid "Export raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1931 +msgid "Exports space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1932 +msgid "Export raster dataset as VTK time series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1933 +msgid "Exports space time raster dataset as VTK time series." +msgstr "" + +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1934 +msgid "Export vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1935 +msgid "Exports a space time vector dataset as GRASS GIS specific archive file." +msgstr "" + +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1936 +msgid "Convert raster dataset to 3D raster" +msgstr "" + +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1937 +msgid "Converts a space time raster dataset into a 3D raster map." +msgstr "" + +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1938 +msgid "Extraction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1939 +msgid "Extract subset of raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1940 +msgid "Extracts a subset of a space time raster datasets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1941 +msgid "Extract subset of vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1942 +msgid "Extracts a subset of a space time vector dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1943 +msgid "Extract subset of 3D raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1944 +msgid "Extracts a subset of a space time 3D raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1945 +msgid "Query vector dataset attribute data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1946 +msgid "Prints attributes of vector maps registered in a space time vector dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1947 +msgid "Raster dataset color table" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1948 +msgid "Creates/modifies the color table associated with each raster map of the space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1949 +msgid "Raster calculations" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1950 +msgid "Performs spatio-temporal mapcalc expressions on temporally sampled maps of space time raster datasets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1951 +msgid "3D raster calculations" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1952 +msgid "Performs r3.mapcalc expressions on maps of sampled space time 3D raster datasets." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1953 +msgid "Interpolate gaps in raster datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1954 +msgid "Replaces gaps in a space time raster dataset with interpolated raster maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1955 +msgid "Aggregation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1956 +msgid "Neighborhood analysis in raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1957 +msgid "Performs a neighborhood analysis for each map in a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1958 +msgid "Aggregation in raster datasets" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1959 +msgid "Performs different aggregation algorithms from r.series on all or a subset of raster maps in a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1960 +msgid "Temporal aggregation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1961 +msgid "Aggregates temporally the maps of a space time raster dataset by a user defined granularity." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1962 +msgid "Temporal aggregation by dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1963 +msgid "Aggregates data of an existing space time raster dataset using the time intervals of a second space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1964 +msgid "Sampling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1965 +msgid "Sample a space time raster dataset at point coordinates" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1966 +msgid "Sample a space time raster dataset at specific vector point coordinates and write the output to stdout using different layouts" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1967 +msgid "Query raster dataset by vector points dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1968 +msgid "Stores raster map values at spatial and temporal positions of vector points as vector attributes." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1969 +msgid "Observe specific locations in raster dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1970 +msgid "Observes specific locations in a space time raster dataset over a period of time using vector points." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1971 +msgid "Temporal sampling" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1972 +msgid "Samples the input space time dataset(s) with a sample space time dataset and print the result to stdout." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1974 +msgid "Space time datasets metadata" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1975 +msgid "Lists information about space time datasets and maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1976 +msgid "Univariate raster dataset statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1977 +msgid "Calculates univariate statistics from the non-null cells for each registered raster map of a space time raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1978 +msgid "Univariate vector dataset statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1979 +msgid "Calculates univariate statistics of attributes for each registered vector map of a space time vector dataset" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1980 +msgid "Univariate 3D raster dataset statistics" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1981 +msgid "Calculates univariate statistics from the non-null cells for each registered 3D raster map of a space time 3D raster dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:1982 +msgid "Report temporal topology" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:1983 +msgid "Lists temporal topology of a space time dataset." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1991 +msgid "GUI tools" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:2015 +msgid "Timeline tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:2016 +msgid "Plot temporal extents." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:2013 +msgid "Temporal plot tool" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:2014 +msgid "Plot temporal values." +msgstr "" + +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2064 +#: ../gui/wxpython/menustrings.py:2107 +msgid "&Help" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1047 +msgid "GRASS help" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:1050 +msgid "Display the HTML man pages of GRASS GIS" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1049 +msgid "GUI help" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1051 +msgid "About system" +msgstr "Σχετικα με το σύστημα" + +#: ../gui/wxpython/menustrings.py:1052 +msgid "Prints system information" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:1054 +#: ../gui/wxpython/gui_core/ghelp.py:60 +msgid "About GRASS GIS" +msgstr "Σχετικα με το GRASS GIS" + +#: ../gui/wxpython/menustrings.py:1057 +msgid "Import, export and link data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:1994 +msgid "Attribute table manager" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2000 +msgid "Launch Data Catalog." +msgstr "" + +#: ../gui/wxpython/menustrings.py:2007 +msgid "Managing GCPs for 3D correction" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2018 +msgid "Interactive editing and digitization of vector maps." +msgstr "" + +#: ../gui/wxpython/menustrings.py:2023 +msgid "Create new model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2025 +msgid "Load model from file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2029 +msgid "Save model to file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2031 +msgid "Close model file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2032 +msgid "Export to image" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2033 +msgid "Export model to image" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2034 +msgid "Export to Python" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2035 +msgid "Export model to Python script" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2036 +msgid "Quit modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2037 +msgid "Close modeler window" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2041 +msgid "&Model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2042 +msgid "Add command" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2043 +msgid "Add action (GRASS command) to model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2044 +msgid "Add data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2045 +msgid "Add data item to model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2046 +msgid "Define relation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2047 +msgid "Define relation between data and action items" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2048 +msgid "Add loop / series" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2049 +msgid "Adds loop (series) to model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2050 +msgid "Add condition" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2051 +msgid "Adds condition (if/else) to model" +msgstr "Προσθήκη όρου (if/else) στο μοντέλο" + +#: ../gui/wxpython/menustrings.py:2053 +msgid "Adds comment to model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2054 +msgid "Remove item" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2055 +msgid "Remove action/data from model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2057 +msgid "Model properties (name, purpose, etc.)" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2058 +msgid "Delete intermediate data" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2059 +msgid "Delete intermediate data defined in the model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2061 +msgid "Run entire model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2062 +msgid "Validate model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2063 +msgid "Validate entire model" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2066 +msgid "Display the HTML man pages of Graphical modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2067 +msgid "About Graphical Modeler" +msgstr "Σχετικά για τον Graphical Modeler" + +#: ../gui/wxpython/menustrings.py:2068 +msgid "Display information about Graphical Modeler" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2073 ../gui/wxpython/psmap/toolbars.py:75 +msgid "Specify paper size, margins and orientation" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2074 +msgid "Load instruction file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2075 ../gui/wxpython/psmap/toolbars.py:68 +msgid "Load text file with mapping instructions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2076 +msgid "Export instruction file" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2077 ../gui/wxpython/psmap/toolbars.py:66 +msgid "Generate text file with mapping instructions" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2078 +msgid "Export to PostScript" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2079 ../gui/wxpython/psmap/toolbars.py:70 +msgid "Generate PostScript output" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2080 +msgid "Export to PDF" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2081 ../gui/wxpython/psmap/toolbars.py:72 +msgid "Generate PDF output" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2082 ../gui/wxpython/menustrings.py:2083 +msgid "Launch ps.map dialog" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2085 +msgid "Close Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2086 +msgid "&Insert" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2087 ../gui/wxpython/psmap/toolbars.py:80 +#: ../gui/wxpython/psmap/dialogs.py:837 ../gui/wxpython/psmap/dialogs.py:891 +msgid "Map frame" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2088 +msgid "Add or edit map frame" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2090 +msgid "Add or edit raster map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2092 +msgid "Add or edit vector map" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2093 +msgid "Map legend" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2094 +msgid "Add or edit raster and vector legend" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2095 ../gui/wxpython/psmap/toolbars.py:91 +msgid "Map info" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2096 +msgid "Add or edit map info" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2098 +msgid "Add or edit scale bar" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2106 ../gui/wxpython/psmap/toolbars.py:83 +msgid "Delete selected object" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2109 +msgid "Display the HTML man pages of Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2110 +msgid "About Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/menustrings.py:2111 +msgid "Display information about Cartographic Composer" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:204 +#, python-brace-format +msgid "ZIP file is unreadable: {0}" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:223 +#, python-brace-format +msgid "Archive file is unreadable: {0}" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:233 +msgid "Download in progress, wait until it is finished 0%" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:243 +#, python-brace-format +msgid "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, {3:.0f} seconds passed" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:257 +#, python-brace-format +msgid "Download file from <{url}>, return status code {code}, " +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:261 +#, python-brace-format +msgid "Download file from <{url}>, failed. Check internet connection." +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:279 +#, python-brace-format +msgid "Download of <{url}> failed or file <{name}> is not a ZIP file" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:304 +#, python-brace-format +msgid "Unknown format '{0}'." +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:320 +msgid "Downloaded location is not valid" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:379 +msgid "Abort" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:380 +msgid "Abort download location" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:384 +msgid "Select sample location to download:" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:436 +#: ../gui/wxpython/startup/locdownload.py:572 +msgid "Download selected location" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:445 +#: ../gui/wxpython/startup/locdownload.py:511 +msgid "Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:452 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Download in progress, wait until it is finished" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:466 +#, python-format +msgid "Location named <%s> already exists, download canceled" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:475 +#, python-format +msgid "Download failed: %s" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:478 +msgid "Download completed. The downloaded sample data is listed in the location/mapset tabs upon closing of this window" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:509 +#, python-format +msgid "Location named <%s> already exists, rename it first" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:563 +msgid "Location Download" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:611 +msgid "Do you want to cancel location download?" +msgstr "" + +#: ../gui/wxpython/startup/locdownload.py:612 +msgid "Abort download" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:80 +msgid "Invalid mapset name" +msgstr "" +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) + +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 +msgid "GRASS version" +msgstr "Έκδωση GRASS" + +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 +msgid "Code revision" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 +msgid "Build date" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" +======= +#: ../gui/wxpython/startup/guiutils.py:186 +msgid "Unable to create new mapset: {}" +<<<<<<< HEAD +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:212 +#, fuzzy +msgid "Do you want to import {}to the newly created location?" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:212 +#, fuzzy +msgid "Do you want to import {}to the newly created location?" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 +msgid "Platform" +msgstr "Πλατφόρμα" + +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 +msgid "Close all Map Displays" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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:" +msgstr "Εισαγωγή νέου ονόματος:" + +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 +msgid "Rename Map Display" +msgstr "" + +<<<<<<< HEAD +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 +======= +#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +======= +#: ../gui/wxpython/startup/guiutils.py:269 +msgid "Unable to rename selected mapset" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:280 +#: ../gui/wxpython/startup/guiutils.py:334 +msgid "" +"Current name: {}\n" +"\n" +"Enter new name:" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:294 +msgid "" +"Unable to rename mapset.\n" +"\n" +"{}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:319 +#, python-brace-format +msgid "" +"Cannot rename location <{location}> for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No location will be renamed." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:323 +msgid "Unable to rename selected location" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:347 +msgid "" +"Unable to rename location.\n" +"\n" +"{}" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:410 +#, python-brace-format +msgid "" +"Cannot delete one or more mapsets for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No mapsets will be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:414 +msgid "Unable to delete selected mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:430 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following mapsets?\n" +"\n" +"{deletes}\n" +"\n" +"All maps included in these mapsets will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:435 +msgid "Delete selected mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:448 +msgid "Error when deleting mapsets" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:450 +#, python-brace-format +msgid "" +"The following error occured when deleting mapset <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of mapsets was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:495 +#, python-brace-format +msgid "" +"Cannot delete one or more locations for the following reasons:\n" +"\n" +"{reasons}\n" +"\n" +"No locations will be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:499 +msgid "Unable to delete selected locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:515 +#, python-brace-format +msgid "" +"Do you want to continue with deleting one or more of the following locations?\n" +"\n" +"{deletes}\n" +"\n" +"All mapsets included in these locations will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:520 +msgid "Delete selected locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:533 +msgid "Error when deleting locations" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:535 +#, python-brace-format +msgid "" +"The following error occured when deleting location <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of locations was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:568 +#, python-brace-format +msgid "" +"Cannot delete GRASS database from disk for the following reason:\n" +"\n" +"{reasons}\n" +"\n" +"GRASS database will not be deleted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:572 +msgid "Unable to delete selected GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:580 +#, python-brace-format +msgid "" +"Do you want to delete the following GRASS database from disk?\n" +"\n" +"{grassdb}\n" +"\n" +"The directory will be permanently deleted!" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:585 +msgid "Delete selected GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:597 +msgid "Error when deleting GRASS database" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:599 +#, python-brace-format +msgid "" +"The following error occured when deleting database <{path}>:\n" +"\n" +"{error}\n" +"\n" +"Deleting of GRASS database was interrupted." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:631 +#, python-brace-format +msgid "" +"User {user} is already running GRASS in selected mapset <{mapset}>\n" +" (file {lockpath} created {timestamp} found).\n" +"\n" +"Concurrent use not allowed.\n" +"\n" +"Do you want to stay in the current mapset or remove .gislock and switch to selected mapset?" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:641 +msgid "Mapset is in use" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:653 +msgid "Error when removing lock file" +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:654 +#, python-brace-format +msgid "" +"Unable to remove {lockpath}.\n" +"\n" +" Details: {error}." +msgstr "" + +#: ../gui/wxpython/startup/guiutils.py:693 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:593 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +#, python-format +msgid "" +"Unable to launch \"Supervised Classification Tool\".\n" +"\n" +"Reason: %s" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 +msgid "Unable to start Timeline Tool." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 +msgid "Unable to start Temporal Plot Tool." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 +msgid "Add selected map layers into layer tree" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 +#, python-format +msgid "Unsupported map layer type <%s>." +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +#, python-format +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +msgid "" +"Note that cell values can only be displayed for regions of less than 10,000 " +"cells." +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 +msgid "opacity:" +msgstr "διαύγεια" + +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 +#, python-format +msgid "" +"Do you want to remove map layer(s)\n" +"%s\n" +"from layer tree?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 +msgid "Do you want to remove selected map layer(s) from layer tree?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 +msgid "Remove map layer" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 +msgid "Quit GRASS GUI" +msgstr "Έξοδος απο GRASS GUI" + +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 +msgid "" +"Display resolution is currently not constrained to computational settings. " +"It's suggested to constrain map to region geometry. Do you want to constrain " +"the resolution?" +msgstr "" + +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 +msgid "Constrain map to region geometry?" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:99 +msgid "Please provide a group name to process" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:104 +msgid "Please provide a raster map name to process" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 +msgid "Please provide a camera name (generated by i.ortho.camera)" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:115 +msgid "Please provive an order value (1 if 4 Fiducials, 2 if 8 Fiducials)" +msgstr "" + +#: ../gui/wxpython/photo2image/g.gui.photo2image.py:121 +msgid "Please provive an output files extension (used by i.rectify)" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:45 +msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 +msgid "Manage Location of Fiducial Points on a Scanned Photo" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 +msgid "A POINTS file exists, renaming it to POINTS_BAK" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 +msgid "Opening CAMERA file failed" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 +msgid "Writing output image to group, please wait..." +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +msgid "source X" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 +msgid "source Y" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 +msgid "target X" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 +msgid "target Y" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 +msgid "source X:" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 +msgid "target X:" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 +msgid "source Y:" +msgstr "" + +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 +msgid "target Y:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:54 +msgid "Import data from WMS server" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:55 +msgid "Add command layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:59 +msgid "Add HIS map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:61 +msgid "Add shaded relief map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:63 +msgid "Add raster flow arrows" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:64 +msgid "Add raster cell numbers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:67 +msgid "Add thematic (choropleth) vector map layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:70 +msgid "Add thematic chart layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:72 +msgid "Add grid layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:74 +msgid "Add geodesic line layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:76 +msgid "Add rhumbline layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:77 ../gui/wxpython/psmap/toolbars.py:107 +msgid "Add labels" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:81 +msgid "Note that 3D raster data are rendered only in 3D view mode" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:83 +msgid "Add WMS layer." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:84 +#: ../gui/wxpython/animation/dialogs.py:462 +msgid "Set options" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:85 +msgid "Editing mode" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:86 +msgid "Background vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 +msgid "Map Layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:464 +msgid "Check selected layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:475 +msgid "Uncheck selected layers" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:526 +msgid "3D view properties" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:536 +msgid "Zoom to selected map(s)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:548 +msgid "Zoom to selected map(s) (ignore NULLs)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:559 +msgid "Set computational region from selected map(s)" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:572 +msgid "Align computational region to selected map" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:615 +msgid "Export common formats" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:629 +msgid "Export PostGIS" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 +msgid "Create pack" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 +msgid "Make a copy in the current mapset" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 +msgid "Set color table" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 +msgid "Set color table interactively" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:683 +msgid "Show attribute data" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:699 +msgid "Start editing" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:704 +msgid "Stop editing" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:727 +msgid "Rebuild topology" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:841 +msgid "Report raster statistics" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:849 +msgid "Profile" +msgstr "Προφίλ" + +#: ../gui/wxpython/lmgr/layertree.py:892 +msgid "Save web service layer" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1007 +msgid "Unable to create profile of raster map." +msgstr "Δεν ήταν δυνατή η δημιουργεία προφίλ για τον raster χάρτη." + +#: ../gui/wxpython/lmgr/layertree.py:1059 +#, python-format +msgid "Unsupported map type <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1065 +#, python-format +msgid "Enter name for the new %s in the current mapset:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1067 +#, python-format +msgid "Make a copy of %s <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1085 +#, python-format +msgid "" +"%s <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1098 +#, python-format +msgid "Unable to make copy of <%s>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1105 +#, python-format +msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1126 +msgid "Unable to display histogram of raster map. No map name defined." +msgstr "" +"Αδύνατη η εμφάνιση ιστογράμματος raster χάρτη. Δεν έχει οριστεί χάρτης." + +#: ../gui/wxpython/lmgr/layertree.py:1246 +msgid "Set opacity of <{}>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1485 +msgid "Layer group:" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 +msgid "Click to edit layer settings" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1556 +msgid "(double click to set properties)" +msgstr "(Διπλό κλικ για να οριστούν οι ιδιότητες)" + +#: ../gui/wxpython/lmgr/layertree.py:1838 +msgid "Please wait, updating data..." +msgstr "Παρακαλώ περιμένετε. γίνεται ενημέρωση ..." + +#: ../gui/wxpython/lmgr/statusbar.py:85 +msgid "Left mouse click to remove the MASK" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:137 +msgid "Are you sure that you want to remove the MASK?" +msgstr "" + +#: ../gui/wxpython/lmgr/statusbar.py:138 +#, fuzzy +msgid "Remove MASK" +msgstr "Αφαίρεση" + +#: ../gui/wxpython/lmgr/toolbars.py:46 +msgid "Create new workspace (Ctrl+N)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:49 +msgid "Open existing workspace file (Ctrl+O)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:52 +msgid "Save current workspace to file (Ctrl+S)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:58 +#, fuzzy +msgid "New workspace" +msgstr "Δημιουργία νέας Επιφάνειας Εργασίας" + +#: ../gui/wxpython/lmgr/toolbars.py:63 +#, fuzzy +msgid "Open workspace" +msgstr "Δημιουργία νέας Επιφάνειας Εργασίας" + +#: ../gui/wxpython/lmgr/toolbars.py:93 +msgid "Add multiple raster or vector map layers (Ctrl+Shift+L)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:96 +msgid "Add raster map layer (Ctrl+Shift+R)" +msgstr "Προσθήκη επιπέδου χάρτη Raster (Ctrl + Shift + R)" + +#: ../gui/wxpython/lmgr/toolbars.py:100 +msgid "Add various raster map layers (RGB, HIS, shaded relief...)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:103 +msgid "Add vector map layer (Ctrl+Shift+V)" +msgstr "Προσθήκη επιπέδοθυ διανύσματικού χάρτη (Ctrl + Shift + V)" + +#: ../gui/wxpython/lmgr/toolbars.py:107 +msgid "Add various vector map layers (thematic, chart...)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:111 +msgid "Add web service layer (WMS, WMTS, NASA OnEarth)" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:113 +msgid "Add group" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:114 ../gui/wxpython/lmgr/toolbars.py:153 +msgid "Add various overlays" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:117 +msgid "Remove selected map layer(s) from layer tree" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:119 +msgid "Edit selected vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:121 +msgid "Show attribute data for selected vector map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:128 +#, fuzzy +msgid "Add multiple map layers" +msgstr "Προσθήκη επιπέδου χάρτη Raster" + +#: ../gui/wxpython/lmgr/toolbars.py:138 +#, fuzzy +msgid "Add various raster maps" +msgstr "3D raster χάρτη" + +#: ../gui/wxpython/lmgr/toolbars.py:143 +#, fuzzy +msgid "Add vector map" +msgstr "Προσθήκη διανύσματικού" + +#: ../gui/wxpython/lmgr/toolbars.py:148 +#, fuzzy +msgid "Add various vector maps" +msgstr "Προσθήκη επιπέδοθυ διανύσματικού χάρτη" + +#: ../gui/wxpython/lmgr/toolbars.py:158 +msgid "Add web service map" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:169 +#, fuzzy +msgid "Delete map layer" +msgstr "Διαγραφή όλων" + +#: ../gui/wxpython/lmgr/toolbars.py:203 +msgid "Start new map display" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:209 +msgid "Georectifier" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:212 +msgid "Launch user-defined script" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:80 +msgid "Open a simple Python code editor" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:222 +msgid "New display" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:254 +#, fuzzy +msgid "Python code editor" +msgstr "Python script" + +#: ../gui/wxpython/lmgr/toolbars.py:276 +msgid "GUI settings" +msgstr "επιλογές GUI" + +#: ../gui/wxpython/lmgr/toolbars.py:277 +msgid "GRASS manual" +msgstr "Εγχειρίδιο GRASS" + +#: ../gui/wxpython/lmgr/toolbars.py:317 +msgid "Generate command for m.nviz.image" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:318 +msgid "Generate command for m.nviz.image based on current state" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:322 +msgid "3D view mode settings" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:323 +msgid "Show 3D view mode settings dialog" +msgstr "" + +#: ../gui/wxpython/lmgr/toolbars.py:325 +msgid "Show 3D view mode manual" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:48 +#, python-format +msgid "Welcome to wxGUI Interactive Python Shell %s" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:50 +#, python-format +msgid "Type %s for more GRASS scripting related information." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:52 +#, python-format +msgid "Type %s to add raster or vector to the layer tree." +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:74 +msgid "Delete all text from the shell" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:78 +msgid "Simple &editor" +msgstr "" + +#: ../gui/wxpython/lmgr/pyshell.py:135 +#, python-format +msgid "Raster or vector map <%s> not found" +msgstr "Ο raster χάρτης <%s> δεν βρέθηκε" + +#: ../gui/wxpython/lmgr/pyshell.py:141 +#, python-format +msgid "Raster map <%s> added" +msgstr "Ο raster χάρτης <%s> προστέθηκε" + +#: ../gui/wxpython/lmgr/pyshell.py:143 +#, python-format +msgid "Vector map <%s> added" +msgstr "Ο διανυσματικός χάρτης <%s> προστέθηκε" + +#: ../gui/wxpython/lmgr/workspace.py:72 msgid "" -"The following error occured when deleting database <{path}>:\n" -"\n" -"{error}\n" +"Current workspace is not empty. Do you want to store current settings to " +"workspace file?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:76 +msgid "Create new workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:105 +msgid "Choose workspace file" +msgstr "Επιλέξτε αρχείο Επιφάνειας εργασίας" + +#: ../gui/wxpython/lmgr/workspace.py:107 ../gui/wxpython/lmgr/workspace.py:366 +msgid "GRASS Workspace File (*.gxw)|*.gxw" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:136 +msgid "Most likely the database, location or mapset does not exist" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:139 +#, python-brace-format +msgid "" +"Unable to change to location and mapset specified in the workspace.\n" +"Reason: {reason}\n" +"Details: {details}\n" "\n" -"Deleting of GRASS database was interrupted." +"Do you want to proceed with opening the workspace anyway?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:148 +msgid "Proceed with opening of the workspace?" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"Η τρέχουσα Τοποθεσία ειναι <%(loc)s>.\n" +"Η τρέχουσα Συλλογή Χαρτών είναι η <%(mapset)s>." + +#: ../gui/wxpython/lmgr/workspace.py:179 +#: ../gui/wxpython/animation/nviztask.py:40 +#, python-format +msgid "" +"Reading workspace file <%s> failed.\n" +"Invalid file, unable to parse XML document." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:191 +msgid "Please wait, loading workspace..." +msgstr "Παρακαλώ περιμένετε, φορτώνεται η Επιφάνεια Εργασίας..." + +#: ../gui/wxpython/lmgr/workspace.py:364 +msgid "Choose file to save current workspace" +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:385 ../gui/wxpython/lmgr/workspace.py:408 +#, python-format +msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +msgstr "" +"Το αρχείο <%s> Επιφάνειας Εργασίας υπάρχει. Θέλετε να γίνει αντικατάσταση " +"του αρχείο;" + +#: ../gui/wxpython/lmgr/workspace.py:437 +msgid "Writing current settings to workspace file failed." +msgstr "" + +#: ../gui/wxpython/lmgr/workspace.py:467 +msgid "Do you want to save changes in the workspace?" +msgstr "Θέλετε να αποθηκεύσετε της αλλαγές στην Επιφάνεια Εργασίας;" + +#: ../gui/wxpython/lmgr/workspace.py:470 +msgid "Do you want to store current settings to workspace file?" +msgstr "" +"Θέλετε να αποθηκεύσετε τις τρέχουσες επιλογες στο αρχείο της Επιφάνεια " +"Εργασίας;" + +#: ../gui/wxpython/lmgr/workspace.py:554 +msgid "File <{}> doesn't exist. It was probably moved or deleted." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:141 +msgid "There were some issues when loading menu or Tools tab:" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 +msgid "Attribute Table Manager" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:95 +#, python-brace-format +msgid "{document} (read-only)" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:114 +#, python-format +msgid "" +"Database connection for vector map <%s> is not defined in DB file. You can " +"define new connection in 'Manage layers' tab." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:123 +msgid "Please wait, loading attribute data..." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:133 +msgid "Browse data" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:139 +msgid "Manage tables" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:144 +msgid "Manage layers" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:155 +msgid "Close Attribute Table Manager" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:157 +msgid "Reload currently selected attribute data" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:160 +msgid "Reload all attribute data (drop current selection)" +msgstr "" + +#: ../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 +#, python-format +msgid "Number of loaded records: %d" +msgstr "Αριθμών φορτωμένων εγραφών: %d" + +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#, python-format +msgid "Loading attribute data for vector map <%s>..." +msgstr "" + +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:55 +msgid "Attribute Table Manager - GRASS GIS" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +msgid "Sort descending" +<<<<<<< HEAD +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:474 +msgid "Calculate (only numeric columns)" +msgstr "Υπολογισμός (μόνο αριθμικές στήλες)" + +#: ../gui/wxpython/dbmgr/base.py:477 +msgid "Field calculator" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:496 +msgid "Area size" +msgstr "Μέγεθος περιοχής" + +#: ../gui/wxpython/dbmgr/base.py:497 +msgid "Line length" +msgstr "Μήκος γραμμής" + +#: ../gui/wxpython/dbmgr/base.py:500 +msgid "Compactness of an area" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:502 +msgid "Fractal dimension of boundary defining a polygon" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:505 +msgid "Perimeter length of an area" +msgstr "Μήκος περιμέτρου μιας περιοχής" + +#: ../gui/wxpython/dbmgr/base.py:507 +msgid "Number of features for each category" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:510 +msgid "Slope steepness of 3D line" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:511 +msgid "Line sinuousity" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:512 +msgid "Line azimuth" +msgstr "Αζιμούθειο γραμμής" + +#: ../gui/wxpython/dbmgr/base.py:646 +#, python-format +msgid "Add column to table <%s>" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1040 +msgid "Unable to add column to the table. No column name defined." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1054 +#, python-format +msgid "Column <%(column)s> already exists in table <%(table)s>." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1137 +msgid "Attribute data - right-click to edit/manage records" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1152 ../gui/wxpython/dbmgr/base.py:2275 +#: ../gui/wxpython/dbmgr/base.py:2970 ../gui/wxpython/dbmgr/base.py:3105 +#: ../gui/wxpython/dbmgr/base.py:3370 +msgid "Table" +msgstr "Πίνακας" + +#: ../gui/wxpython/dbmgr/base.py:1154 ../gui/wxpython/dbmgr/base.py:2277 +msgid " (read-only)" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1168 +msgid "SQL Query" +msgstr "ερώτηση SQL" + +#: ../gui/wxpython/dbmgr/base.py:1198 +msgid "Simple" +msgstr "Απλή" + +#: ../gui/wxpython/dbmgr/base.py:1205 +msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:631 -#, python-brace-format -msgid "" -"User {user} is already running GRASS in selected mapset <{mapset}>\n" -" (file {lockpath} created {timestamp} found).\n" -"\n" -"Concurrent use not allowed.\n" -"\n" -"Do you want to stay in the current mapset or remove .gislock and switch to selected mapset?" +#: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:498 +#, python-format +msgid "Example: %s" +msgstr "Παράδειγμα: %s" + +#: ../gui/wxpython/dbmgr/base.py:1239 +msgid "Builder" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:641 -msgid "Mapset is in use" +#: ../gui/wxpython/dbmgr/base.py:1244 +msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:653 -msgid "Error when removing lock file" +#: ../gui/wxpython/dbmgr/base.py:1426 ../gui/wxpython/dbmgr/base.py:1615 +msgid "Insert new record" +msgstr "Εισαγωγή νέας εγραφής" + +#: ../gui/wxpython/dbmgr/base.py:1427 +msgid "Delete selected record(s)" +msgstr "Διαγραφή επιλεγμένων εγγραφών" + +#: ../gui/wxpython/dbmgr/base.py:1428 +msgid "Delete all records" +msgstr "Διαγραφή όλων των εγγραφών" + +#: ../gui/wxpython/dbmgr/base.py:1434 ../gui/wxpython/gui_core/widgets.py:1109 +#: ../gui/wxpython/gui_core/dialogs.py:782 +#: ../gui/wxpython/gui_core/dialogs.py:850 +#: ../gui/wxpython/gui_core/dialogs.py:1592 +msgid "Select all" +msgstr "Επιλογή όλων" + +#: ../gui/wxpython/dbmgr/base.py:1435 ../gui/wxpython/gui_core/widgets.py:1110 +#: ../gui/wxpython/gui_core/dialogs.py:1594 +msgid "Deselect all" +msgstr "Αποεπιλογή όλων" + +#: ../gui/wxpython/dbmgr/base.py:1437 +#: ../gui/wxpython/gui_core/preferences.py:1506 +msgid "Highlight selected features" +msgstr "Επισήμανση επιλεγμένων εγγραφών" + +#: ../gui/wxpython/dbmgr/base.py:1440 +msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:654 -#, python-brace-format -msgid "" -"Unable to remove {lockpath}.\n" -"\n" -" Details: {error}." +#: ../gui/wxpython/dbmgr/base.py:1444 ../gui/wxpython/dbmgr/base.py:1955 +msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:693 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:593 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +#: ../gui/wxpython/dbmgr/base.py:1445 +msgid "Delete selected features" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1508 +msgid "Update existing record" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1535 ../gui/wxpython/dbmgr/base.py:1648 +#, python-format +msgid "Value '%(value)s' needs to be entered as %(type)s." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1554 #, python-format msgid "" -"Unable to launch \"Supervised Classification Tool\".\n" -"\n" -"Reason: %s" +"Unable to update existing record.\n" +"%s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 -msgid "Unable to start Timeline Tool." +#: ../gui/wxpython/dbmgr/base.py:1626 +#, python-format +msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 -msgid "Unable to start Temporal Plot Tool." +#: ../gui/wxpython/dbmgr/base.py:1636 +#, python-format +msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 -msgid "Add selected map layers into layer tree" +#: ../gui/wxpython/dbmgr/base.py:1660 +#, python-format +msgid "" +"Unable to insert new record.\n" +"%s" msgstr "" +"Αδυναμία εισαγωγής νέων εγγραφών.\n" +"%s" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/dbmgr/base.py:1713 #, python-format -msgid "Unsupported map layer type <%s>." +msgid "Selected data records (%d) will be permanently deleted from table. Do you want to delete them?" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 -======= -#: ../gui/wxpython/startup/guiutils.py:717 +#: ../gui/wxpython/dbmgr/base.py:1716 ../gui/wxpython/dbmgr/base.py:1766 +msgid "Delete records" +msgstr "Διαγραφή εγγραφών" + +#: ../gui/wxpython/dbmgr/base.py:1763 #, python-format -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= +msgid "All data records (%d) will be permanently deleted from table. Do you want to delete them?" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1950 +msgid "Nothing to extract." +msgstr "Τίποτα προς εξαγωγή/" + +#: ../gui/wxpython/dbmgr/base.py:1984 +msgid "Nothing to delete." +msgstr "Τίποτα προς διαγραφή" + +#: ../gui/wxpython/dbmgr/base.py:2055 ../gui/wxpython/dbmgr/base.py:2091 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"\n" +"%s" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:2074 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"Invalid SQL select statement.\n" +"\n" +"%s" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:2291 ../gui/wxpython/dbmgr/sqlbuilder.py:101 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +msgid "Database connection" +msgstr "Σύνδεση σε βάση δεδομένων" + +#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +msgid "Set SQL statement to default" ======= ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main -msgid "" -"Note that cell values can only be displayed for regions of less than 10,000 " -"cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 -msgid "opacity:" -msgstr "διαύγεια" +#: ../gui/wxpython/dbmgr/base.py:474 +msgid "Calculate (only numeric columns)" +msgstr "Υπολογισμός (μόνο αριθμικές στήλες)" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 -#, python-format -msgid "" -"Do you want to remove map layer(s)\n" -"%s\n" -"from layer tree?" +#: ../gui/wxpython/dbmgr/base.py:477 +msgid "Field calculator" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 -msgid "Do you want to remove selected map layer(s) from layer tree?" +#: ../gui/wxpython/dbmgr/base.py:496 +msgid "Area size" +msgstr "Μέγεθος περιοχής" + +#: ../gui/wxpython/dbmgr/base.py:497 +msgid "Line length" +msgstr "Μήκος γραμμής" + +#: ../gui/wxpython/dbmgr/base.py:500 +msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 -msgid "Remove map layer" +#: ../gui/wxpython/dbmgr/base.py:502 +msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 -msgid "Quit GRASS GUI" -msgstr "Έξοδος απο GRASS GUI" +#: ../gui/wxpython/dbmgr/base.py:505 +msgid "Perimeter length of an area" +msgstr "Μήκος περιμέτρου μιας περιοχής" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 -msgid "" -"Display resolution is currently not constrained to computational settings. " -"It's suggested to constrain map to region geometry. Do you want to constrain " -"the resolution?" +#: ../gui/wxpython/dbmgr/base.py:507 +msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 -msgid "Constrain map to region geometry?" +#: ../gui/wxpython/dbmgr/base.py:510 +msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:99 -msgid "Please provide a group name to process" +#: ../gui/wxpython/dbmgr/base.py:511 +msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:104 -msgid "Please provide a raster map name to process" +#: ../gui/wxpython/dbmgr/base.py:512 +msgid "Line azimuth" +msgstr "Αζιμούθειο γραμμής" + +#: ../gui/wxpython/dbmgr/base.py:646 +#, python-format +msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 -msgid "Please provide a camera name (generated by i.ortho.camera)" +#: ../gui/wxpython/dbmgr/base.py:1040 +msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:115 -msgid "Please provive an order value (1 if 4 Fiducials, 2 if 8 Fiducials)" +#: ../gui/wxpython/dbmgr/base.py:1054 +#, python-format +msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/photo2image/g.gui.photo2image.py:121 -msgid "Please provive an output files extension (used by i.rectify)" +#: ../gui/wxpython/dbmgr/base.py:1137 +msgid "Attribute data - right-click to edit/manage records" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1152 ../gui/wxpython/dbmgr/base.py:2275 +#: ../gui/wxpython/dbmgr/base.py:2970 ../gui/wxpython/dbmgr/base.py:3105 +#: ../gui/wxpython/dbmgr/base.py:3370 +msgid "Table" +msgstr "Πίνακας" + +#: ../gui/wxpython/dbmgr/base.py:1154 ../gui/wxpython/dbmgr/base.py:2277 +msgid " (read-only)" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:45 -msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" +#: ../gui/wxpython/dbmgr/base.py:1168 +msgid "SQL Query" +msgstr "ερώτηση SQL" + +#: ../gui/wxpython/dbmgr/base.py:1198 +msgid "Simple" +msgstr "Απλή" + +#: ../gui/wxpython/dbmgr/base.py:1205 +msgid "Apply SELECT statement and reload data records" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:498 +#, python-format +msgid "Example: %s" +msgstr "Παράδειγμα: %s" + +#: ../gui/wxpython/dbmgr/base.py:1239 +msgid "Builder" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 -msgid "Manage Location of Fiducial Points on a Scanned Photo" +#: ../gui/wxpython/dbmgr/base.py:1244 +msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 -msgid "A POINTS file exists, renaming it to POINTS_BAK" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1426 ../gui/wxpython/dbmgr/base.py:1615 +msgid "Insert new record" +msgstr "Εισαγωγή νέας εγραφής" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 -msgid "Opening CAMERA file failed" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1427 +msgid "Delete selected record(s)" +msgstr "Διαγραφή επιλεγμένων εγγραφών" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 -msgid "Writing output image to group, please wait..." -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1428 +msgid "Delete all records" +msgstr "Διαγραφή όλων των εγγραφών" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 -msgid "source X" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1434 ../gui/wxpython/gui_core/widgets.py:1109 +#: ../gui/wxpython/gui_core/dialogs.py:782 +#: ../gui/wxpython/gui_core/dialogs.py:850 +#: ../gui/wxpython/gui_core/dialogs.py:1592 +msgid "Select all" +msgstr "Επιλογή όλων" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 -msgid "source Y" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1435 ../gui/wxpython/gui_core/widgets.py:1110 +#: ../gui/wxpython/gui_core/dialogs.py:1594 +msgid "Deselect all" +msgstr "Αποεπιλογή όλων" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 -msgid "target X" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1437 +#: ../gui/wxpython/gui_core/preferences.py:1506 +msgid "Highlight selected features" +msgstr "Επισήμανση επιλεγμένων εγγραφών" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 -msgid "target Y" +#: ../gui/wxpython/dbmgr/base.py:1440 +msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 -msgid "source X:" +#: ../gui/wxpython/dbmgr/base.py:1444 ../gui/wxpython/dbmgr/base.py:1955 +msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 -msgid "target X:" +#: ../gui/wxpython/dbmgr/base.py:1445 +msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 -msgid "source Y:" +#: ../gui/wxpython/dbmgr/base.py:1508 +msgid "Update existing record" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 -msgid "target Y:" +#: ../gui/wxpython/dbmgr/base.py:1535 ../gui/wxpython/dbmgr/base.py:1648 +#, python-format +msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:54 -msgid "Import data from WMS server" +#: ../gui/wxpython/dbmgr/base.py:1554 +#, python-format +msgid "" +"Unable to update existing record.\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:55 -msgid "Add command layer" +#: ../gui/wxpython/dbmgr/base.py:1626 +#, python-format +msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:59 -msgid "Add HIS map layer" +#: ../gui/wxpython/dbmgr/base.py:1636 +#, python-format +msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:61 -msgid "Add shaded relief map layer" +#: ../gui/wxpython/dbmgr/base.py:1660 +#, python-format +msgid "" +"Unable to insert new record.\n" +"%s" msgstr "" +"Αδυναμία εισαγωγής νέων εγγραφών.\n" +"%s" -#: ../gui/wxpython/lmgr/layertree.py:63 -msgid "Add raster flow arrows" +#: ../gui/wxpython/dbmgr/base.py:1713 +#, python-format +msgid "Selected data records (%d) will be permanently deleted from table. Do you want to delete them?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:64 -msgid "Add raster cell numbers" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1716 ../gui/wxpython/dbmgr/base.py:1766 +msgid "Delete records" +msgstr "Διαγραφή εγγραφών" -#: ../gui/wxpython/lmgr/layertree.py:67 -msgid "Add thematic (choropleth) vector map layer" +#: ../gui/wxpython/dbmgr/base.py:1763 +#, python-format +msgid "All data records (%d) will be permanently deleted from table. Do you want to delete them?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:70 -msgid "Add thematic chart layer" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1950 +msgid "Nothing to extract." +msgstr "Τίποτα προς εξαγωγή/" -#: ../gui/wxpython/lmgr/layertree.py:72 -msgid "Add grid layer" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1984 +msgid "Nothing to delete." +msgstr "Τίποτα προς διαγραφή" -#: ../gui/wxpython/lmgr/layertree.py:74 -msgid "Add geodesic line layer" +#: ../gui/wxpython/dbmgr/base.py:2055 ../gui/wxpython/dbmgr/base.py:2091 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:76 -msgid "Add rhumbline layer" +#: ../gui/wxpython/dbmgr/base.py:2074 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"Invalid SQL select statement.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:77 ../gui/wxpython/psmap/toolbars.py:107 -msgid "Add labels" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:2291 ../gui/wxpython/dbmgr/sqlbuilder.py:101 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +msgid "Database connection" +msgstr "Σύνδεση σε βάση δεδομένων" -#: ../gui/wxpython/lmgr/layertree.py:81 -msgid "Note that 3D raster data are rendered only in 3D view mode" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 +msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:83 -msgid "Add WMS layer." +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 +msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:84 -#: ../gui/wxpython/animation/dialogs.py:462 -msgid "Set options" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 +msgid "Close the dialog" +msgstr "Κλείσιμο του διαλόγου" -#: ../gui/wxpython/lmgr/layertree.py:85 -msgid "Editing mode" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 +msgid "Columns" +msgstr "Στήλες" -#: ../gui/wxpython/lmgr/layertree.py:86 -msgid "Background vector map" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 +msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 -msgid "Map Layers" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 +msgid "Values" +msgstr "Τιμές" -#: ../gui/wxpython/lmgr/layertree.py:464 -msgid "Check selected layers" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 +msgid "Get all values" +msgstr "Εμφάνιση όλων των τιμών" -#: ../gui/wxpython/lmgr/layertree.py:475 -msgid "Uncheck selected layers" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 +msgid "Get sample" +msgstr "Εμφάνιση δείγματος" -#: ../gui/wxpython/lmgr/layertree.py:526 -msgid "3D view properties" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 +msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:536 -msgid "Zoom to selected map(s)" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 +msgid "Go to:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:548 -msgid "Zoom to selected map(s) (ignore NULLs)" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 +msgid "Close dialog on apply" +msgstr "Κλείσιμο του διαλόγου στην εφαρμογή" -#: ../gui/wxpython/lmgr/layertree.py:559 -msgid "Set computational region from selected map(s)" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 +#, python-format +msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:572 -msgid "Align computational region to selected map" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 +msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 -msgid "Export common formats" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 +msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 -msgid "Export PostGIS" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 +#, python-format +msgid "Example: %s" +msgstr "Παράδειγμα: %s" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 -msgid "Create pack" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 +msgid "Verify" +msgstr "Επαλήθευση" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 -msgid "Make a copy in the current mapset" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 +msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 -msgid "Set color table" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 +msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 -msgid "Set color table interactively" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 +msgid "SQL statement is not valid" +msgstr "Η δήλωση SQL δεν είναι έγκυρη" -#: ../gui/wxpython/lmgr/layertree.py:656 -msgid "Show attribute data" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#, python-format +msgid "" +"SQL statement is not valid.\n" +"\n" +"%s" msgstr "" +"Η δήλωση SQL δεν είναι έγκυρη.\n" +"\n" +"%s" -#: ../gui/wxpython/lmgr/layertree.py:672 -msgid "Start editing" -msgstr "" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 +msgid "SQL statement is valid" +msgstr "Η δήλωση SQL είναι έγκυρη" -#: ../gui/wxpython/lmgr/layertree.py:677 -msgid "Stop editing" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:694 -msgid "Rebuild topology" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 +msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:803 -msgid "Report raster statistics" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 +msgid "Functions" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:811 -msgid "Profile" -msgstr "Προφίλ" - -#: ../gui/wxpython/lmgr/layertree.py:854 -msgid "Save web service layer" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 -msgid "Unable to create profile of raster map." -msgstr "Δεν ήταν δυνατή η δημιουργεία προφίλ για τον raster χάρτη." - -#: ../gui/wxpython/lmgr/layertree.py:1021 -#, python-format -msgid "Unsupported map type <%s>" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 +msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 -#, python-format -msgid "Enter name for the new %s in the current mapset:" +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 +msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 -#, python-format -msgid "Make a copy of %s <%s>" +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/base.py:185 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main +#: ../gui/wxpython/dbmgr/base.py:184 +======= +#: ../gui/wxpython/dbmgr/manager.py:78 +msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 -#, python-format -msgid "" -"%s <%s> already exists in the current mapset. Do you want to overwrite it?" +#: ../gui/wxpython/dbmgr/manager.py:81 +#, python-brace-format +msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/dbmgr/manager.py:100 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format -msgid "Unable to make copy of <%s>" +msgid "" +"Attribute table <%s> not found. For creating the table switch to 'Manage " +"layers' tab." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format -msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." -msgstr "" - -#: ../gui/wxpython/lmgr/layertree.py:1088 -msgid "Unable to display histogram of raster map. No map name defined." +msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -"Αδύνατη η εμφάνιση ιστογράμματος raster χάρτη. Δεν έχει οριστεί χάρτης." -#: ../gui/wxpython/lmgr/layertree.py:1404 -msgid "Layer group:" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:279 +msgid "Can display only 256 columns." +msgstr "Γίνεται η προβολή μόνω 256 σειρών." -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 -msgid "Click to edit layer settings" +#: ../gui/wxpython/dbmgr/base.py:308 +#, python-brace-format +msgid "" +"Incorrect encoding {enc} used. Set encoding in GUI Settings or set " +"GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 -msgid "(double click to set properties)" -msgstr "(Διπλό κλικ για να οριστούν οι ιδιότητες)" - -#: ../gui/wxpython/lmgr/layertree.py:1757 -msgid "Please wait, updating data..." -msgstr "Παρακαλώ περιμένετε. γίνεται ενημέρωση ..." - -#: ../gui/wxpython/lmgr/statusbar.py:85 -msgid "Left mouse click to remove the MASK" +#: ../gui/wxpython/dbmgr/base.py:328 +#, python-brace-format +msgid "" +"Unable to read the table <{table}> from the database due to seemingly " +"inconsistent number of columns in the data transfer. Check row: {row}... " +"Likely, a newline character is present in the attribute value starting with: " +"'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:137 -msgid "Are you sure that you want to remove the MASK?" +#: ../gui/wxpython/dbmgr/base.py:344 +msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/lmgr/statusbar.py:138 -#, fuzzy -msgid "Remove MASK" -msgstr "Αφαίρεση" +#: ../gui/wxpython/dbmgr/base.py:392 +msgid "Unknown value" +msgstr "Άγνωστη τιμη" -#: ../gui/wxpython/lmgr/toolbars.py:46 -msgid "Create new workspace (Ctrl+N)" +#: ../gui/wxpython/dbmgr/base.py:400 +msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:49 -msgid "Open existing workspace file (Ctrl+O)" +#: ../gui/wxpython/dbmgr/base.py:413 +#, python-format +msgid "" +"Error loading attribute data. Record number: %(rec)d. Unable to convert " +"value '%(val)s' in key column (%(key)s) to integer.\n" +"\n" +"Details: %(detail)s" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:52 -msgid "Save current workspace to file (Ctrl+S)" +#: ../gui/wxpython/dbmgr/base.py:500 +msgid "Sort ascending" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:58 -#, fuzzy -msgid "New workspace" -msgstr "Δημιουργία νέας Επιφάνειας Εργασίας" - -#: ../gui/wxpython/lmgr/toolbars.py:63 -#, fuzzy -msgid "Open workspace" -msgstr "Δημιουργία νέας Επιφάνειας Εργασίας" - -#: ../gui/wxpython/lmgr/toolbars.py:93 -msgid "Add multiple raster or vector map layers (Ctrl+Shift+L)" +#: ../gui/wxpython/dbmgr/base.py:501 +msgid "Sort descending" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:96 -msgid "Add raster map layer (Ctrl+Shift+R)" -msgstr "Προσθήκη επιπέδου χάρτη Raster (Ctrl + Shift + R)" +#: ../gui/wxpython/dbmgr/base.py:506 +msgid "Calculate (only numeric columns)" +msgstr "Υπολογισμός (μόνο αριθμικές στήλες)" -#: ../gui/wxpython/lmgr/toolbars.py:100 -msgid "Add various raster map layers (RGB, HIS, shaded relief...)" +#: ../gui/wxpython/dbmgr/base.py:508 +msgid "Field calculator" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:103 -msgid "Add vector map layer (Ctrl+Shift+V)" -msgstr "Προσθήκη επιπέδοθυ διανύσματικού χάρτη (Ctrl + Shift + V)" +#: ../gui/wxpython/dbmgr/base.py:527 +msgid "Area size" +msgstr "Μέγεθος περιοχής" -#: ../gui/wxpython/lmgr/toolbars.py:107 -msgid "Add various vector map layers (thematic, chart...)" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:528 +msgid "Line length" +msgstr "Μήκος γραμμής" -#: ../gui/wxpython/lmgr/toolbars.py:111 -msgid "Add web service layer (WMS, WMTS, NASA OnEarth)" +#: ../gui/wxpython/dbmgr/base.py:529 +msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:113 -msgid "Add group" +#: ../gui/wxpython/dbmgr/base.py:532 +msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:114 ../gui/wxpython/lmgr/toolbars.py:153 -msgid "Add various overlays" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:534 +msgid "Perimeter length of an area" +msgstr "Μήκος περιμέτρου μιας περιοχής" -#: ../gui/wxpython/lmgr/toolbars.py:117 -msgid "Remove selected map layer(s) from layer tree" +#: ../gui/wxpython/dbmgr/base.py:535 +msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:119 -msgid "Edit selected vector map" +#: ../gui/wxpython/dbmgr/base.py:536 +msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:121 -msgid "Show attribute data for selected vector map" +#: ../gui/wxpython/dbmgr/base.py:537 +msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:128 -#, fuzzy -msgid "Add multiple map layers" -msgstr "Προσθήκη επιπέδου χάρτη Raster" - -#: ../gui/wxpython/lmgr/toolbars.py:138 -#, fuzzy -msgid "Add various raster maps" -msgstr "3D raster χάρτη" - -#: ../gui/wxpython/lmgr/toolbars.py:143 -#, fuzzy -msgid "Add vector map" -msgstr "Προσθήκη διανύσματικού" - -#: ../gui/wxpython/lmgr/toolbars.py:148 -#, fuzzy -msgid "Add various vector maps" -msgstr "Προσθήκη επιπέδοθυ διανύσματικού χάρτη" +#: ../gui/wxpython/dbmgr/base.py:538 +msgid "Line azimuth" +msgstr "Αζιμούθειο γραμμής" -#: ../gui/wxpython/lmgr/toolbars.py:158 -msgid "Add web service map" +#: ../gui/wxpython/dbmgr/base.py:665 +#, python-format +msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:169 -#, fuzzy -msgid "Delete map layer" -msgstr "Διαγραφή όλων" - -#: ../gui/wxpython/lmgr/toolbars.py:203 -msgid "Start new map display" +#: ../gui/wxpython/dbmgr/base.py:1062 +msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:209 -msgid "Georectifier" +#: ../gui/wxpython/dbmgr/base.py:1077 +#, python-format +msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:212 -msgid "Launch user-defined script" +#: ../gui/wxpython/dbmgr/base.py:1166 +msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:80 -msgid "Open a simple Python code editor" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 +msgid "Table" +msgstr "Πίνακας" -#: ../gui/wxpython/lmgr/toolbars.py:222 -msgid "New display" +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 +msgid " (read-only)" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:254 -#, fuzzy -msgid "Python code editor" -msgstr "Python script" - -#: ../gui/wxpython/lmgr/toolbars.py:276 -msgid "GUI settings" -msgstr "επιλογές GUI" +#: ../gui/wxpython/dbmgr/base.py:1200 +msgid "SQL Query" +msgstr "ερώτηση SQL" -#: ../gui/wxpython/lmgr/toolbars.py:277 -msgid "GRASS manual" -msgstr "Εγχειρίδιο GRASS" +#: ../gui/wxpython/dbmgr/base.py:1224 +msgid "Simple" +msgstr "Απλή" -#: ../gui/wxpython/lmgr/toolbars.py:317 -msgid "Generate command for m.nviz.image" +#: ../gui/wxpython/dbmgr/base.py:1227 +msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:318 -msgid "Generate command for m.nviz.image based on current state" +#: ../gui/wxpython/dbmgr/base.py:1268 +msgid "Builder" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:322 -msgid "3D view mode settings" +#: ../gui/wxpython/dbmgr/base.py:1271 +msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/lmgr/toolbars.py:323 -msgid "Show 3D view mode settings dialog" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 +msgid "Insert new record" +msgstr "Εισαγωγή νέας εγραφής" -#: ../gui/wxpython/lmgr/toolbars.py:325 -msgid "Show 3D view mode manual" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1456 +msgid "Delete selected record(s)" +msgstr "Διαγραφή επιλεγμένων εγγραφών" -#: ../gui/wxpython/lmgr/pyshell.py:48 -#, python-format -msgid "Welcome to wxGUI Interactive Python Shell %s" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1457 +msgid "Delete all records" +msgstr "Διαγραφή όλων των εγγραφών" -#: ../gui/wxpython/lmgr/pyshell.py:50 -#, python-format -msgid "Type %s for more GRASS scripting related information." +#: ../gui/wxpython/dbmgr/base.py:1467 +msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:52 -#, python-format -msgid "Type %s to add raster or vector to the layer tree." +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 +msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:74 -msgid "Delete all text from the shell" +#: ../gui/wxpython/dbmgr/base.py:1472 +msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:78 -msgid "Simple &editor" +#: ../gui/wxpython/dbmgr/base.py:1533 +msgid "Update existing record" msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:135 -#, python-format -msgid "Raster or vector map <%s> not found" -msgstr "Ο raster χάρτης <%s> δεν βρέθηκε" - -#: ../gui/wxpython/lmgr/pyshell.py:141 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format -msgid "Raster map <%s> added" -msgstr "Ο raster χάρτης <%s> προστέθηκε" +msgid "Value '%(value)s' needs to be entered as %(type)s." +msgstr "" -#: ../gui/wxpython/lmgr/pyshell.py:143 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format -msgid "Vector map <%s> added" -msgstr "Ο διανυσματικός χάρτης <%s> προστέθηκε" - -#: ../gui/wxpython/lmgr/workspace.py:72 msgid "" -"Current workspace is not empty. Do you want to store current settings to " -"workspace file?" -msgstr "" - -#: ../gui/wxpython/lmgr/workspace.py:76 -msgid "Create new workspace?" +"Unable to update existing record.\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:105 -msgid "Choose workspace file" -msgstr "Επιλέξτε αρχείο Επιφάνειας εργασίας" - -#: ../gui/wxpython/lmgr/workspace.py:107 ../gui/wxpython/lmgr/workspace.py:366 -msgid "GRASS Workspace File (*.gxw)|*.gxw" +#: ../gui/wxpython/dbmgr/base.py:1655 +#, python-format +msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:136 -msgid "Most likely the database, location or mapset does not exist" +#: ../gui/wxpython/dbmgr/base.py:1669 +#, python-format +msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:139 -#, python-brace-format +#: ../gui/wxpython/dbmgr/base.py:1699 +#, python-format msgid "" -"Unable to change to location and mapset specified in the workspace.\n" -"Reason: {reason}\n" -"Details: {details}\n" -"\n" -"Do you want to proceed with opening the workspace anyway?" +"Unable to insert new record.\n" +"%s" msgstr "" +"Αδυναμία εισαγωγής νέων εγγραφών.\n" +"%s" -#: ../gui/wxpython/lmgr/workspace.py:148 -msgid "Proceed with opening of the workspace?" +#: ../gui/wxpython/dbmgr/base.py:1753 +#, python-format +msgid "" +"Selected data records (%d) will be permanently deleted from table. Do you " +"want to delete them?" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:179 -#: ../gui/wxpython/animation/nviztask.py:40 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 +msgid "Delete records" +msgstr "Διαγραφή εγγραφών" + +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" -"Reading workspace file <%s> failed.\n" -"Invalid file, unable to parse XML document." +"All data records (%d) will be permanently deleted from table. Do you want to " +"delete them?" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:191 -msgid "Please wait, loading workspace..." -msgstr "Παρακαλώ περιμένετε, φορτώνεται η Επιφάνεια Εργασίας..." +#: ../gui/wxpython/dbmgr/base.py:2004 +msgid "Nothing to extract." +msgstr "Τίποτα προς εξαγωγή/" -#: ../gui/wxpython/lmgr/workspace.py:364 -msgid "Choose file to save current workspace" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:2045 +msgid "Nothing to delete." +msgstr "Τίποτα προς διαγραφή" -#: ../gui/wxpython/lmgr/workspace.py:385 ../gui/wxpython/lmgr/workspace.py:408 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format -msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +msgid "" +"Loading attribute data failed.\n" +"\n" +"%s" msgstr "" -"Το αρχείο <%s> Επιφάνειας Εργασίας υπάρχει. Θέλετε να γίνει αντικατάσταση " -"του αρχείο;" -#: ../gui/wxpython/lmgr/workspace.py:437 -msgid "Writing current settings to workspace file failed." +#: ../gui/wxpython/dbmgr/base.py:2140 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"Invalid SQL select statement.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/lmgr/workspace.py:467 -msgid "Do you want to save changes in the workspace?" -msgstr "Θέλετε να αποθηκεύσετε της αλλαγές στην Επιφάνεια Εργασίας;" +#: ../gui/wxpython/dbmgr/base.py:2379 +#, python-format +msgid "Table <%s> - right-click to delete column(s)" +msgstr "Πίνακας <%s> - δεξί-κλικ για την διαγραφή στηλης(-ών)" -#: ../gui/wxpython/lmgr/workspace.py:470 -msgid "Do you want to store current settings to workspace file?" -msgstr "" -"Θέλετε να αποθηκεύσετε τις τρέχουσες επιλογες στο αρχείο της Επιφάνεια " -"Εργασίας;" +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 +msgid "Column" +msgstr "Στηλη" -#: ../gui/wxpython/lmgr/workspace.py:554 -msgid "File <{}> doesn't exist. It was probably moved or deleted." -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 +msgid "Length" +msgstr "Μήκος" -#: ../gui/wxpython/lmgr/frame.py:140 -msgid "There were some issues when loading menu or Tools tab:" +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 +msgid "Add" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 -msgid "Attribute Table Manager" +#: ../gui/wxpython/dbmgr/base.py:2606 +msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 -#, python-brace-format -msgid "{document} (read-only)" +#: ../gui/wxpython/dbmgr/base.py:2616 +#, python-format +msgid "" +"Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " +"exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Database connection for vector map <%s> is not defined in DB file. You can " -"define new connection in 'Manage layers' tab." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 -msgid "Please wait, loading attribute data..." +#: ../gui/wxpython/dbmgr/base.py:2672 +msgid "Drop selected column" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 -msgid "Browse data" +#: ../gui/wxpython/dbmgr/base.py:2680 +msgid "Drop all columns" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 -msgid "Manage tables" +#: ../gui/wxpython/dbmgr/base.py:2711 +#, python-format +msgid "" +"Selected %s will PERMANENTLY removed from table. Do you want to drop the " +"column?" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 -msgid "Manage layers" +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 +msgid "Drop column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 -msgid "Close Attribute Table Manager" +#: ../gui/wxpython/dbmgr/base.py:2760 +#, python-format +msgid "" +"Selected columns\n" +"%s\n" +"will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:156 -msgid "Reload currently selected attribute data" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:2882 +msgid "List of layers" +msgstr "Λίστα επιπέδων" -#: ../gui/wxpython/dbmgr/manager.py:159 -msgid "Reload all attribute data (drop current selection)" +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 +#, python-format +msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../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 -#, python-format -msgid "Number of loaded records: %d" -msgstr "Αριθμών φορτωμένων εγραφών: %d" +#: ../gui/wxpython/dbmgr/base.py:3006 +msgid "Column name" +msgstr "Όνομα στήλης" -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 -#, python-format -msgid "Loading attribute data for vector map <%s>..." -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data length" +msgstr "Μήκος δεδομένων" -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:55 -msgid "Attribute Table Manager - GRASS GIS" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 +msgid "Driver" +msgstr "Οδηγός" -<<<<<<< HEAD -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 -======= -#: ../gui/wxpython/dbmgr/base.py:470 -msgid "Sort descending" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:3064 +msgid "Key" +msgstr "Κλειδί" -#: ../gui/wxpython/dbmgr/base.py:474 -msgid "Calculate (only numeric columns)" -msgstr "Υπολογισμός (μόνο αριθμικές στήλες)" +#: ../gui/wxpython/dbmgr/base.py:3172 +msgid "Add layer" +msgstr "Προσθήκη επιπέδου" -#: ../gui/wxpython/dbmgr/base.py:477 -msgid "Field calculator" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:3182 +msgid "Layer description" +msgstr "Περιγραφή επιπέδου" -#: ../gui/wxpython/dbmgr/base.py:496 -msgid "Area size" -msgstr "Μέγεθος περιοχής" +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 +msgid "Key column" +msgstr "Στήλη κλειδίου" -#: ../gui/wxpython/dbmgr/base.py:497 -msgid "Line length" -msgstr "Μήκος γραμμής" +#: ../gui/wxpython/dbmgr/base.py:3251 +msgid "Insert record for each category into table" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:500 -msgid "Compactness of an area" +#: ../gui/wxpython/dbmgr/base.py:3274 +msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:502 -msgid "Fractal dimension of boundary defining a polygon" +#: ../gui/wxpython/dbmgr/base.py:3279 +msgid "Table description" +msgstr "Περιγραφή πίνακα" + +#: ../gui/wxpython/dbmgr/base.py:3290 +msgid "Table name" +msgstr "Όνομα πίνακα" + +#: ../gui/wxpython/dbmgr/base.py:3315 +msgid "&Create table" +msgstr "Δημιουργ&ία πίνακα" + +#: ../gui/wxpython/dbmgr/base.py:3321 +msgid "&Set default" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:505 -msgid "Perimeter length of an area" -msgstr "Μήκος περιμέτρου μιας περιοχής" +#: ../gui/wxpython/dbmgr/base.py:3393 +msgid "Remove layer" +msgstr "Αφαίρεση επιπέδου" -#: ../gui/wxpython/dbmgr/base.py:507 -msgid "Number of features for each category" +#: ../gui/wxpython/dbmgr/base.py:3396 +msgid "Layer to remove" +msgstr "Επίπεδο προς αφαίρεση" + +#: ../gui/wxpython/dbmgr/base.py:3427 +msgid "&Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:510 -msgid "Slope steepness of 3D line" +#: ../gui/wxpython/dbmgr/base.py:3456 +msgid "Modify layer" +msgstr "Μετατροπή επιπέδου" + +#: ../gui/wxpython/dbmgr/base.py:3559 +msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:511 -msgid "Line sinuousity" +#: ../gui/wxpython/dbmgr/base.py:3602 +msgid "" +"Unable to get list of tables.\n" +"Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:512 -msgid "Line azimuth" -msgstr "Αζιμούθειο γραμμής" +#: ../gui/wxpython/dbmgr/base.py:3708 +msgid "Unable to create new table. Table name or key column name is missing." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:646 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format -msgid "Add column to table <%s>" +msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1040 -msgid "Unable to add column to the table. No column name defined." +#: ../gui/wxpython/dbmgr/base.py:3763 +#, python-format +msgid "" +"Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " +"exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1054 -#, python-format -msgid "Column <%(column)s> already exists in table <%(table)s>." +#: ../gui/wxpython/dbmgr/base.py:3951 +msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1137 -msgid "Attribute data - right-click to edit/manage records" +#: ../gui/wxpython/dbmgr/base.py:3974 +msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1152 ../gui/wxpython/dbmgr/base.py:2275 -#: ../gui/wxpython/dbmgr/base.py:2970 ../gui/wxpython/dbmgr/base.py:3105 -#: ../gui/wxpython/dbmgr/base.py:3370 -msgid "Table" -msgstr "Πίνακας" +#: ../gui/wxpython/dbmgr/base.py:4035 +msgid "Statistics is not support for DBF tables." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1154 ../gui/wxpython/dbmgr/base.py:2277 -msgid " (read-only)" +#: ../gui/wxpython/dbmgr/base.py:4062 +msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1168 -msgid "SQL Query" -msgstr "ερώτηση SQL" +#: ../gui/wxpython/dbmgr/base.py:4071 +#, python-format +msgid "" +"Unable to calculte statistics. Invalid number of lines %d (should be %d)." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1198 -msgid "Simple" -msgstr "Απλή" +#: ../gui/wxpython/dbmgr/base.py:4098 +msgid "Unable to calculte standard deviation." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1205 -msgid "Apply SELECT statement and reload data records" +#: ../gui/wxpython/dbmgr/base.py:4106 +#, python-format +msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:498 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format -msgid "Example: %s" -msgstr "Παράδειγμα: %s" +msgid "" +"No attribute table found.\n" +"\n" +"Do you want to create a new attribute table and defined a link to vector map " +"<%s>?" +msgstr "" + +#: ../gui/wxpython/dbmgr/dialogs.py:85 +msgid "Create table?" +msgstr "Δημιουργία πίνακα;" -#: ../gui/wxpython/dbmgr/base.py:1239 -msgid "Builder" +#: ../gui/wxpython/dbmgr/dialogs.py:107 +msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1244 -msgid "SQL Builder" +#: ../gui/wxpython/dbmgr/dialogs.py:119 +msgid "No attributes found" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1426 ../gui/wxpython/dbmgr/base.py:1615 -msgid "Insert new record" -msgstr "Εισαγωγή νέας εγραφής" +#: ../gui/wxpython/dbmgr/dialogs.py:128 +msgid "Define attributes" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1427 -msgid "Delete selected record(s)" -msgstr "Διαγραφή επιλεγμένων εγγραφών" +#: ../gui/wxpython/dbmgr/dialogs.py:130 +msgid "Display attributes" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1428 -msgid "Delete all records" -msgstr "Διαγραφή όλων των εγγραφών" +#: ../gui/wxpython/dbmgr/dialogs.py:134 +msgid "&Reload" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1434 ../gui/wxpython/gui_core/widgets.py:1109 -#: ../gui/wxpython/gui_core/dialogs.py:782 -#: ../gui/wxpython/gui_core/dialogs.py:850 -#: ../gui/wxpython/gui_core/dialogs.py:1592 -msgid "Select all" -msgstr "Επιλογή όλων" +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 +msgid "&Submit" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1435 ../gui/wxpython/gui_core/widgets.py:1110 -#: ../gui/wxpython/gui_core/dialogs.py:1594 -msgid "Deselect all" -msgstr "Αποεπιλογή όλων" +#: ../gui/wxpython/dbmgr/dialogs.py:241 +#, python-format +msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1437 -#: ../gui/wxpython/gui_core/preferences.py:1506 -msgid "Highlight selected features" -msgstr "Επισήμανση επιλεγμένων εγγραφών" +#: ../gui/wxpython/dbmgr/dialogs.py:454 +msgid "Unknown" +msgstr "Άγνωστο" -#: ../gui/wxpython/dbmgr/base.py:1440 -msgid "Highlight selected features and zoom" +#: ../gui/wxpython/animation/temporal_manager.py:107 +msgid "" +"It is not allowed to display data with different temporal types (absolute " +"and relative)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1444 ../gui/wxpython/dbmgr/base.py:1955 -msgid "Extract selected features" +#: ../gui/wxpython/animation/temporal_manager.py:123 +#, python-format +msgid "It is not allowed to display data with different units (%s)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1445 -msgid "Delete selected features" +#: ../gui/wxpython/animation/temporal_manager.py:136 +msgid "" +"You are going to display data with different temporal types of maps " +"(interval and point). It is recommended to use data of one temporal type to " +"avoid confusion." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1508 -msgid "Update existing record" +#: ../gui/wxpython/animation/temporal_manager.py:350 +#, python-format +msgid "Topology of Space time dataset %s is invalid." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1535 ../gui/wxpython/dbmgr/base.py:1648 +#: ../gui/wxpython/animation/nviztask.py:53 #, python-format -msgid "Value '%(value)s' needs to be entered as %(type)s." +msgid "No 3d view information in workspace file <%s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1554 -#, python-format -msgid "" -"Unable to update existing record.\n" -"%s" +#: ../gui/wxpython/animation/nviztask.py:309 +msgid "Please add only one layer in the list." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1626 -#, python-format -msgid "Record with category number %d already exists in the table." +#: ../gui/wxpython/animation/nviztask.py:315 +msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1636 +#: ../gui/wxpython/animation/controller.py:244 +#: ../gui/wxpython/animation/dialogs.py:856 #, python-format -msgid "Category number (column %s) is missing." +msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 -#, python-format +#: ../gui/wxpython/animation/controller.py:270 +#: ../gui/wxpython/animation/dialogs.py:909 msgid "" -"Unable to insert new record.\n" -"%s" +"More animations are using one window. Please select different window for " +"each animation." msgstr "" -"Αδυναμία εισαγωγής νέων εγγραφών.\n" -"%s" +"Πολλά κινούμενα εικονίδια σε ένα παράθυρο. Παρακαλώ διαλέξτε διαφορετικό " +"παράθυρο για κάθε ένα." -#: ../gui/wxpython/dbmgr/base.py:1713 -#, python-format -msgid "Selected data records (%d) will be permanently deleted from table. Do you want to delete them?" -msgstr "" +#: ../gui/wxpython/animation/controller.py:450 +msgid "Failed to display legend." +msgstr "Σφάλμα κατά την προβολή υπομνήματος" -#: ../gui/wxpython/dbmgr/base.py:1716 ../gui/wxpython/dbmgr/base.py:1766 -msgid "Delete records" -msgstr "Διαγραφή εγγραφών" +#: ../gui/wxpython/animation/controller.py:482 +msgid "Inconsistent number of maps, please check input data." +msgstr "Ο αριθμός των χαρτών δεν ταιριάζει, ελέγξτε τα δεδομένα." -#: ../gui/wxpython/dbmgr/base.py:1763 +#: ../gui/wxpython/animation/controller.py:507 +msgid "No animation to export." +msgstr "Δεν υπάρχει κινούμενο σχέδιο για εξαγωγή" + +#: ../gui/wxpython/animation/controller.py:543 +msgid "Preparing export, please wait..." +msgstr "Προετοιμασία για εξαγωγή, παρακαλώ περιμένετε..." + +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format -msgid "All data records (%d) will be permanently deleted from table. Do you want to delete them?" -msgstr "" +msgid "%(from)s %(dash)s %(to)s" +msgstr "%(από) %(παύλα) %(σε) " -#: ../gui/wxpython/dbmgr/base.py:1950 -msgid "Nothing to extract." -msgstr "Τίποτα προς εξαγωγή/" +#: ../gui/wxpython/animation/controller.py:605 +#, python-format +msgid "%(start)s %(unit)s" +msgstr "%(αρχή) %(μονάδα)ες " -#: ../gui/wxpython/dbmgr/base.py:1984 -msgid "Nothing to delete." -msgstr "Τίποτα προς διαγραφή" +#: ../gui/wxpython/animation/controller.py:627 +msgid "Exporting animation, please wait..." +msgstr "Εξαγωγή κινούμενου σχεδίου, παρακαλώ περιμένετε..." -#: ../gui/wxpython/dbmgr/base.py:2055 ../gui/wxpython/dbmgr/base.py:2091 +#: ../gui/wxpython/animation/data.py:67 +msgid "No animation name selected." +msgstr "Δεν έχει επιλεγεί κινούμενο σχέδιο" + +#: ../gui/wxpython/animation/data.py:134 +msgid "No workspace file selected." +msgstr "Δεν έχει επιλεγεί αρχείου χώρου εργασίας" + +#: ../gui/wxpython/animation/data.py:137 #, python-format -msgid "" -"Loading attribute data failed.\n" -"\n" -"%s" -msgstr "" +msgid "File %s not found" +msgstr "Το αρχείο %s δεν βρέθηκε" -#: ../gui/wxpython/dbmgr/base.py:2074 +#: ../gui/wxpython/animation/data.py:146 #, python-format -msgid "" -"Loading attribute data failed.\n" -"Invalid SQL select statement.\n" -"\n" -"%s" +msgid "Animation %d" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2291 ../gui/wxpython/dbmgr/sqlbuilder.py:101 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -msgid "Database connection" -msgstr "Σύνδεση σε βάση δεδομένων" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 -msgid "Set SQL statement to default" +#: ../gui/wxpython/animation/utils.py:188 +msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 -msgid "Apply SQL statement" +#: ../gui/wxpython/animation/utils.py:194 +msgid "" +"The temporal type (absolute/relative) of space-time datasets has to be the " +"same." msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 -msgid "Close the dialog" -msgstr "Κλείσιμο του διαλόγου" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 -msgid "Columns" -msgstr "Στήλες" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 -msgid "Interactive insertion" +#: ../gui/wxpython/animation/utils.py:202 +msgid "" +"The map type (point/interval) of space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 -msgid "Values" -msgstr "Τιμές" - -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 -msgid "Get all values" -msgstr "Εμφάνιση όλων των τιμών" +#: ../gui/wxpython/animation/utils.py:210 +msgid "" +"The temporal extents of maps in space-time datasets have to be the same." +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 -msgid "Get sample" -msgstr "Εμφάνιση δείγματος" +#: ../gui/wxpython/animation/utils.py:222 +msgid "The number of maps to animate has to be the same for each map series." +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 -msgid "Get first 256 unique values as sample" +#: ../gui/wxpython/animation/utils.py:230 +msgid "" +"The number of maps to animate has to be the same as the number of maps in " +"temporal dataset." msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 -msgid "Go to:" +#: ../gui/wxpython/animation/toolbars.py:28 +msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 -msgid "Close dialog on apply" -msgstr "Κλείσιμο του διαλόγου στην εφαρμογή" +#: ../gui/wxpython/animation/toolbars.py:29 +msgid "Play forward" +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 -#, python-format -msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" +#: ../gui/wxpython/animation/toolbars.py:30 +msgid "Play back" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 -msgid "Column to show (SELECT clause)" +#: ../gui/wxpython/animation/toolbars.py:33 +msgid "Repeat" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 -msgid "Constraint for query (WHERE clause)" +#: ../gui/wxpython/animation/toolbars.py:35 +msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 -#, python-format -msgid "Example: %s" -msgstr "Παράδειγμα: %s" +#: ../gui/wxpython/animation/toolbars.py:38 +#: ../gui/wxpython/animation/dialogs.py:347 +msgid "Add new animation" +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 -msgid "Verify" -msgstr "Επαλήθευση" +#: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 +msgid "Add, edit or remove animation" +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 -msgid "Verify SQL statement" +#: ../gui/wxpython/animation/toolbars.py:46 +#: ../gui/wxpython/animation/dialogs.py:930 +msgid "Export animation" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 -msgid "SQL statement not verified" +#: ../gui/wxpython/animation/toolbars.py:56 +msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 -msgid "SQL statement is not valid" -msgstr "Η δήλωση SQL δεν είναι έγκυρη" +#: ../gui/wxpython/animation/toolbars.py:57 +msgid "Add space-time dataset or series of map layers for animation" +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/animation/g.gui.animation.py:93 #, python-format -msgid "" -"SQL statement is not valid.\n" -"\n" -"%s" +msgid "%s=, %s=, %s= and %s= are mutually exclusive." msgstr "" -"Η δήλωση SQL δεν είναι έγκυρη.\n" -"\n" -"%s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 -msgid "SQL statement is valid" -msgstr "Η δήλωση SQL είναι έγκυρη" +#: ../gui/wxpython/animation/g.gui.animation.py:137 +msgid "Animation Tool - GRASS GIS" +msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 -msgid "Column to set (SET clause)" +#: ../gui/wxpython/animation/dialogs.py:81 +msgid "Adjust speed of animation" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 -msgid "Calculate column value to set" +#: ../gui/wxpython/animation/dialogs.py:134 +msgid "Simple mode" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 -msgid "Functions" +#: ../gui/wxpython/animation/dialogs.py:139 +msgid "Frame duration:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:140 +#: ../gui/wxpython/animation/dialogs.py:175 +msgid "ms" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 -msgid "SQL statement was not applied" +#: ../gui/wxpython/animation/dialogs.py:166 +msgid "Temporal mode" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 -msgid "SQL statement applied" +#: ../gui/wxpython/animation/dialogs.py:171 +msgid "Time unit:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 -msgid "Dbf driver does not support usage of SQL functions." +#: ../gui/wxpython/animation/dialogs.py:173 +msgid "Duration of time unit:" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/dbmgr/base.py:184 -======= -#: ../gui/wxpython/dbmgr/manager.py:78 -msgid "Attribute Table Manager" +#: ../gui/wxpython/animation/dialogs.py:239 +msgid "year" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:81 -#, python-brace-format -msgid "{document} (read-only)" +#: ../gui/wxpython/animation/dialogs.py:240 +msgid "month" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:100 ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#, python-format -msgid "" -"Attribute table <%s> not found. For creating the table switch to 'Manage " -"layers' tab." +#: ../gui/wxpython/animation/dialogs.py:241 +msgid "day" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 -#, python-format -msgid "Column <%(column)s> not found in in the table <%(table)s>." +#: ../gui/wxpython/animation/dialogs.py:242 +msgid "hour" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 -msgid "Can display only 256 columns." -msgstr "Γίνεται η προβολή μόνω 256 σειρών." +#: ../gui/wxpython/animation/dialogs.py:243 +msgid "minute" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:304 -#, python-brace-format -msgid "" -"Incorrect encoding {enc} used. Set encoding in GUI Settings or set " -"GRASS_DB_ENCODING variable." +#: ../gui/wxpython/animation/dialogs.py:244 +msgid "second" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 -#, python-brace-format -msgid "" -"Unable to read the table <{table}> from the database due to seemingly " -"inconsistent number of columns in the data transfer. Check row: {row}... " -"Likely, a newline character is present in the attribute value starting with: " -"'{value}' Use the v.db.select module to investigate." +#: ../gui/wxpython/animation/dialogs.py:309 +msgid "Animation speed is too high." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 -msgid "Viewing limit: 100000 records." +#: ../gui/wxpython/animation/dialogs.py:349 +msgid "Edit animation" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 -msgid "Unknown value" -msgstr "Άγνωστη τιμη" +#: ../gui/wxpython/animation/dialogs.py:361 +msgid "Advanced" +msgstr "Περίπλοκη" -#: ../gui/wxpython/dbmgr/base.py:393 -msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." +#: ../gui/wxpython/animation/dialogs.py:387 +msgid "top left" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 -#, python-format -msgid "" -"Error loading attribute data. Record number: %(rec)d. Unable to convert " -"value '%(val)s' in key column (%(key)s) to integer.\n" -"\n" -"Details: %(detail)s" +#: ../gui/wxpython/animation/dialogs.py:388 +msgid "top right" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 -msgid "Sort ascending" +#: ../gui/wxpython/animation/dialogs.py:389 +msgid "bottom left" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:494 -msgid "Sort descending" +#: ../gui/wxpython/animation/dialogs.py:390 +msgid "bottom right" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:499 -msgid "Calculate (only numeric columns)" -msgstr "Υπολογισμός (μόνο αριθμικές στήλες)" - -#: ../gui/wxpython/dbmgr/base.py:501 -msgid "Field calculator" +#: ../gui/wxpython/animation/dialogs.py:406 +msgid "Select 2D or 3D view" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 -msgid "Area size" -msgstr "Μέγεθος περιοχής" - -#: ../gui/wxpython/dbmgr/base.py:521 -msgid "Line length" -msgstr "Μήκος γραμμής" +#: ../gui/wxpython/animation/dialogs.py:416 +msgid "Window position:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:522 -msgid "Compactness of an area" +#: ../gui/wxpython/animation/dialogs.py:421 +msgid "View mode:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 -msgid "Fractal dimension of boundary defining a polygon" +#: ../gui/wxpython/animation/dialogs.py:429 +msgid "" +"For 3D animation, please select only one space-time dataset\n" +"or one series of map layers." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 -msgid "Perimeter length of an area" -msgstr "Μήκος περιμέτρου μιας περιοχής" +#: ../gui/wxpython/animation/dialogs.py:460 +#: ../gui/wxpython/psmap/dialogs.py:3435 +msgid "Show raster legend" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:528 -msgid "Number of features for each category" +#: ../gui/wxpython/animation/dialogs.py:479 +msgid "3D view parameters" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:529 -msgid "Slope steepness of 3D line" +#: ../gui/wxpython/animation/dialogs.py:488 +msgid "Workspace file:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 -msgid "Line sinuousity" +#: ../gui/wxpython/animation/dialogs.py:489 +msgid "Choose workspace file to import 3D view parameters" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 -msgid "Line azimuth" -msgstr "Αζιμούθειο γραμμής" +#: ../gui/wxpython/animation/dialogs.py:498 +msgid "Parameter for animation:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:658 -#, python-format -msgid "Add column to table <%s>" +#: ../gui/wxpython/animation/dialogs.py:523 +msgid "Set spatial extent in 2D view" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 -msgid "Unable to add column to the table. No column name defined." +#: ../gui/wxpython/animation/dialogs.py:527 +msgid "Use saved region:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 -#, python-format -msgid "Column <%(column)s> already exists in table <%(table)s>." +#: ../gui/wxpython/animation/dialogs.py:536 +msgid "Animate region change" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 -msgid "Attribute data - right-click to edit/manage records" +#: ../gui/wxpython/animation/dialogs.py:545 +msgid "End region:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 -msgid "Table" -msgstr "Πίνακας" +#: ../gui/wxpython/animation/dialogs.py:551 +msgid "Zoom value:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 -msgid " (read-only)" +#: ../gui/wxpython/animation/dialogs.py:553 +msgid "N-S/E-W distances in map units used to gradually reduce region." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 -msgid "SQL Query" -msgstr "ερώτηση SQL" +#: ../gui/wxpython/animation/dialogs.py:561 +msgid "N-S:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 -msgid "Simple" -msgstr "Απλή" +#: ../gui/wxpython/animation/dialogs.py:568 +msgid "E-W:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1218 -msgid "Apply SELECT statement and reload data records" +#: ../gui/wxpython/animation/dialogs.py:681 +msgid "Only one series or space-time dataset is accepted for 3D mode." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 -msgid "Builder" +#: ../gui/wxpython/animation/dialogs.py:689 +msgid "No map series or space-time dataset added." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 -msgid "SQL Builder" +#: ../gui/wxpython/animation/dialogs.py:731 +#: ../gui/wxpython/animation/dialogs.py:742 +msgid "Region information is not complete" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 -msgid "Insert new record" -msgstr "Εισαγωγή νέας εγραφής" +#: ../gui/wxpython/animation/dialogs.py:763 +msgid "Add, edit or remove animations" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1447 -msgid "Delete selected record(s)" -msgstr "Διαγραφή επιλεγμένων εγγραφών" +#: ../gui/wxpython/animation/dialogs.py:772 +msgid "List of animations" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1448 -msgid "Delete all records" -msgstr "Διαγραφή όλων των εγγραφών" +#: ../gui/wxpython/animation/dialogs.py:786 +msgid "Edit" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1458 -msgid "Highlight selected features and zoom" +#: ../gui/wxpython/animation/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:603 +msgid "Format" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 -msgid "Extract selected features" +#: ../gui/wxpython/animation/dialogs.py:1016 +msgid "Add time stamp" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 -msgid "Delete selected features" +#: ../gui/wxpython/animation/dialogs.py:1047 +msgid "Add time stamp, image or text decoration by one of the buttons above." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1524 -msgid "Update existing record" +#: ../gui/wxpython/animation/dialogs.py:1050 +msgid "Add image or text decoration by one of the buttons above." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 -#, python-format -msgid "Value '%(value)s' needs to be entered as %(type)s." +#: ../gui/wxpython/animation/dialogs.py:1064 +msgid "Font settings:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 -#, python-format -msgid "" -"Unable to update existing record.\n" -"%s" +#: ../gui/wxpython/animation/dialogs.py:1069 +msgid "Sample text" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 -#, python-format -msgid "Record with category number %d already exists in the table." +#: ../gui/wxpython/animation/dialogs.py:1090 +msgid "Image file:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 -#, python-format -msgid "Category number (column %s) is missing." +#: ../gui/wxpython/animation/dialogs.py:1091 +msgid "Choose image file" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 -#, python-format -msgid "" -"Unable to insert new record.\n" -"%s" +#: ../gui/wxpython/animation/dialogs.py:1104 +msgid "Text:" msgstr "" -"Αδυναμία εισαγωγής νέων εγγραφών.\n" -"%s" -#: ../gui/wxpython/dbmgr/base.py:1744 -#, python-format -msgid "" -"Selected data records (%d) will be permanently deleted from table. Do you " -"want to delete them?" +#: ../gui/wxpython/animation/dialogs.py:1124 +msgid "Placement as percentage of screen coordinates (X: 0, Y: 0 is top left):" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 -msgid "Delete records" -msgstr "Διαγραφή εγγραφών" +#: ../gui/wxpython/animation/dialogs.py:1140 +#: ../gui/wxpython/psmap/dialogs.py:284 +msgid "X:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1794 -#, python-format -msgid "" -"All data records (%d) will be permanently deleted from table. Do you want to " -"delete them?" +#: ../gui/wxpython/animation/dialogs.py:1145 +#: ../gui/wxpython/psmap/dialogs.py:285 +msgid "Y:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1995 -msgid "Nothing to extract." -msgstr "Τίποτα προς εξαγωγή/" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "image sequence" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 -msgid "Nothing to delete." -msgstr "Τίποτα προς διαγραφή" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "animated GIF" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 -#, python-format -msgid "" -"Loading attribute data failed.\n" -"\n" -"%s" +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "SWF" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1159 +msgid "AVI" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 -#, python-format -msgid "" -"Loading attribute data failed.\n" -"Invalid SQL select statement.\n" -"\n" -"%s" +#: ../gui/wxpython/animation/dialogs.py:1166 +msgid "Export to:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 -#, python-format -msgid "Table <%s> - right-click to delete column(s)" -msgstr "Πίνακας <%s> - δεξί-κλικ για την διαγραφή στηλης(-ών)" +#: ../gui/wxpython/animation/dialogs.py:1184 +msgid "animation_" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 -msgid "Column" -msgstr "Στηλη" +#: ../gui/wxpython/animation/dialogs.py:1193 +msgid "Choose directory for export" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 -msgid "Length" -msgstr "Μήκος" +#: ../gui/wxpython/animation/dialogs.py:1220 +msgid "GIF file:" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 -msgid "Add" +#: ../gui/wxpython/animation/dialogs.py:1221 +#: ../gui/wxpython/animation/dialogs.py:1244 +#: ../gui/wxpython/animation/dialogs.py:1275 +msgid "Choose file to save animation" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2595 -msgid "Unable to rename column. No column name defined." +#: ../gui/wxpython/animation/dialogs.py:1243 +msgid "SWF file:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 -#, python-format +#: ../gui/wxpython/animation/dialogs.py:1265 msgid "" -"Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " -"exists in the table <%(table)s>." +"Program 'ffmpeg' was not found.\n" +"Please install it first and make sure\n" +"it's in the PATH variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 -#, python-format -msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +#: ../gui/wxpython/animation/dialogs.py:1274 +msgid "AVI file:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 -msgid "Drop selected column" +#: ../gui/wxpython/animation/dialogs.py:1281 +msgid "Video codec:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2669 -msgid "Drop all columns" +#: ../gui/wxpython/animation/dialogs.py:1284 +msgid "Additional options:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2700 -#, python-format +#: ../gui/wxpython/animation/dialogs.py:1288 msgid "" -"Selected %s will PERMANENTLY removed from table. Do you want to drop the " -"column?" +"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " +"Options depend on ffmpeg version." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 -msgid "Drop column(s)" +#: ../gui/wxpython/animation/dialogs.py:1320 +#, python-format +msgid "Current frame rate: %.2f fps" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/animation/dialogs.py:1447 #, python-format -msgid "" -"Selected columns\n" -"%s\n" -"will PERMANENTLY removed from table. Do you want to drop the columns?" +msgid "File %s not found." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2870 -msgid "List of layers" -msgstr "Λίστα επιπέδων" +#: ../gui/wxpython/animation/dialogs.py:1451 +msgid "Decoration image file is missing." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/animation/dialogs.py:1459 #, python-format -msgid "Drop also linked attribute table (%s)" +msgid "Directory %s not found." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 -msgid "Column name" -msgstr "Όνομα στήλης" - -#: ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data length" -msgstr "Μήκος δεδομένων" - -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 -msgid "Driver" -msgstr "Οδηγός" - -#: ../gui/wxpython/dbmgr/base.py:3052 -msgid "Key" -msgstr "Κλειδί" - -#: ../gui/wxpython/dbmgr/base.py:3159 -msgid "Add layer" -msgstr "Προσθήκη επιπέδου" - -#: ../gui/wxpython/dbmgr/base.py:3169 -msgid "Layer description" -msgstr "Περιγραφή επιπέδου" - -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 -msgid "Key column" -msgstr "Στήλη κλειδίου" - -#: ../gui/wxpython/dbmgr/base.py:3238 -msgid "Insert record for each category into table" +#: ../gui/wxpython/animation/dialogs.py:1461 +msgid "Export directory is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3261 -msgid "You need to add categories by v.category module." +#: ../gui/wxpython/animation/dialogs.py:1520 +msgid "Time stamp" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3266 -msgid "Table description" -msgstr "Περιγραφή πίνακα" - -#: ../gui/wxpython/dbmgr/base.py:3277 -msgid "Table name" -msgstr "Όνομα πίνακα" - -#: ../gui/wxpython/dbmgr/base.py:3302 -msgid "&Create table" -msgstr "Δημιουργ&ία πίνακα" +#: ../gui/wxpython/animation/dialogs.py:1544 +#, python-brace-format +msgid "Exported file directory '{base_dir}' does not exist." +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 -msgid "&Set default" +#: ../gui/wxpython/animation/dialogs.py:1547 +msgid "Export file is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3380 -msgid "Remove layer" -msgstr "Αφαίρεση επιπέδου" +#: ../gui/wxpython/animation/dialogs.py:1568 +#, python-brace-format +msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3383 -msgid "Layer to remove" -msgstr "Επίπεδο προς αφαίρεση" +#: ../gui/wxpython/animation/dialogs.py:1654 +msgid "Add space-time dataset layer" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3414 -msgid "&Remove layer" +#: ../gui/wxpython/animation/dialogs.py:1676 +msgid "Multiple raster maps" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3443 -msgid "Modify layer" -msgstr "Μετατροπή επιπέδου" +#: ../gui/wxpython/animation/dialogs.py:1677 +msgid "Multiple vector maps" +msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3544 -msgid "&Modify layer" +#: ../gui/wxpython/animation/dialogs.py:1678 +msgid "Multiple 3D raster maps" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 -msgid "" -"Unable to get list of tables.\n" -"Please use db.connect to set database parameters." +#: ../gui/wxpython/animation/dialogs.py:1679 +msgid "Space time raster dataset" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 -msgid "Unable to create new table. Table name or key column name is missing." +#: ../gui/wxpython/animation/dialogs.py:1680 +msgid "Space time vector dataset" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 -#, python-format -msgid "Unable to create new table. Table <%s> already exists in the database." +#: ../gui/wxpython/animation/dialogs.py:1681 +msgid "Space time 3D raster dataset" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 -#, python-format -msgid "" -"Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " -"exists." +#: ../gui/wxpython/animation/dialogs.py:1720 +msgid "Input data type:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 -msgid "Field statistics" +#: ../gui/wxpython/animation/dialogs.py:1797 +msgid "Select raster/vector maps." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 -msgid "Copy statistics the clipboard (Ctrl+C)" +#: ../gui/wxpython/animation/dialogs.py:1825 +msgid "Please select maps or dataset first." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 -msgid "Statistics is not support for DBF tables." +#: ../gui/wxpython/animation/dialogs.py:1855 +msgid "Animation Tool settings" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 -msgid "Unable to calculte statistics." +#: ../gui/wxpython/animation/dialogs.py:1919 +msgid "Number of parallel processes:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 -#, python-format -msgid "" -"Unable to calculte statistics. Invalid number of lines %d (should be %d)." +#: ../gui/wxpython/animation/dialogs.py:1940 +msgid "Text foreground color:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 -msgid "Unable to calculte standard deviation." +#: ../gui/wxpython/animation/dialogs.py:1956 +msgid "Text background color:" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 -#, python-format -msgid "Field statistics <%s>" +#: ../gui/wxpython/animation/dialogs.py:1989 +msgid "Absolute time format:" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 -#, python-format +#: ../gui/wxpython/animation/dialogs.py:2007 msgid "" -"No attribute table found.\n" -"\n" -"Do you want to create a new attribute table and defined a link to vector map " -"<%s>?" +"Click and then press key up or down to preview different date and time " +"formats. Type custom format string." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 -msgid "Create table?" -msgstr "Δημιουργία πίνακα;" - -#: ../gui/wxpython/dbmgr/dialogs.py:106 -msgid "Close dialog on submit" +#: ../gui/wxpython/animation/dialogs.py:2025 +msgid "Learn more about formatting options" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 -msgid "No attributes found" +#: ../gui/wxpython/animation/dialogs.py:2039 +msgid "Display instances with no data" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 -msgid "Define attributes" +#: ../gui/wxpython/animation/dialogs.py:2042 +msgid "" +"When animating instant-based data which have irregular timestamps you can " +"display 'no data frame' (checked option) or keep last frame." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 -msgid "Display attributes" -msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/animation/dialogs.py:2073 +msgid "Invalid" +======= +#: ../gui/wxpython/gui_core/preferences.py:1721 +msgid "EPSG code:" +msgstr "Κωδικός EPSG" -#: ../gui/wxpython/dbmgr/dialogs.py:133 -msgid "&Reload" -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:1739 +msgid "PROJ string (required):" +msgstr "PROJ ορισμός (απαιτείται)" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 -msgid "&Submit" -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:1756 +msgid "EPSG file:" +msgstr "Αρχείο EPSG:" -#: ../gui/wxpython/dbmgr/dialogs.py:240 -#, python-format -msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:1773 +msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." +msgstr "Φόρτωση κωδικών EPSG (αναμείνατε), εισάγετε κωδικό EPSG ή απευθείας ορισμό PROJ " -#: ../gui/wxpython/dbmgr/dialogs.py:452 -msgid "Unknown" -msgstr "Άγνωστο" +#: ../gui/wxpython/gui_core/preferences.py:1781 +msgid "&Load EPSG codes" +msgstr "Φ&όρτωση κωδικών EPSG" -#: ../gui/wxpython/animation/temporal_manager.py:107 -msgid "" -"It is not allowed to display data with different temporal types (absolute " -"and relative)." -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:1801 +msgid "Coordinates format" +msgstr "Φορματ συντενταγμένων" -#: ../gui/wxpython/animation/temporal_manager.py:123 -#, python-format -msgid "It is not allowed to display data with different units (%s)." +#: ../gui/wxpython/gui_core/preferences.py:1809 +msgid "Lat/long projections" +<<<<<<< HEAD msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:136 -msgid "" -"You are going to display data with different temporal types of maps " -"(interval and point). It is recommended to use data of one temporal type to " -"avoid confusion." -msgstr "" +#: ../gui/wxpython/gui_core/preferences.py:1830 +msgid "Precision:" +msgstr "Ακρίβεια:" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/gui_core/preferences.py:1916 #, python-format -msgid "Topology of Space time dataset %s is invalid." -msgstr "" +msgid "Unable to read EPSG codes: %s" +msgstr "Αδυναμία ανάγνωσης κωδικών EPSG : %s" -#: ../gui/wxpython/animation/nviztask.py:53 +#: ../gui/wxpython/gui_core/preferences.py:1949 +#: ../gui/wxpython/gui_core/preferences.py:1961 +#: ../gui/wxpython/gui_core/preferences.py:1973 #, python-format -msgid "No 3d view information in workspace file <%s>." +msgid "EPSG code %s not found" +msgstr "Ο κωδικός EPSG %s δεν βρέθηκε" + +#: ../gui/wxpython/gui_core/preferences.py:1983 +msgid "Select default display font" msgstr "" -#: ../gui/wxpython/animation/nviztask.py:309 -msgid "Please add only one layer in the list." +#: ../gui/wxpython/gui_core/preferences.py:1997 +msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/animation/nviztask.py:315 -msgid "No map series nor space-time dataset is added." +#: ../gui/wxpython/gui_core/preferences.py:2016 +msgid "Select default output font" msgstr "" -#: ../gui/wxpython/animation/controller.py:243 -#: ../gui/wxpython/animation/dialogs.py:856 -#, python-format -msgid "Maximum number of animations is %d." +#: ../gui/wxpython/gui_core/preferences.py:2105 +msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/animation/controller.py:269 -#: ../gui/wxpython/animation/dialogs.py:909 +#: ../gui/wxpython/gui_core/preferences.py:2120 msgid "" -"More animations are using one window. Please select different window for " -"each animation." +"Check a mapset to make it accessible, uncheck it to hide it.\n" +" Notes:\n" +" - The current mapset is always accessible.\n" +" - You may only write to the current mapset.\n" +" - You may only write to mapsets which you own." msgstr "" -"Πολλά κινούμενα εικονίδια σε ένα παράθυρο. Παρακαλώ διαλέξτε διαφορετικό " -"παράθυρο για κάθε ένα." - -#: ../gui/wxpython/animation/controller.py:449 -msgid "Failed to display legend." -msgstr "Σφάλμα κατά την προβολή υπομνήματος" - -#: ../gui/wxpython/animation/controller.py:481 -msgid "Inconsistent number of maps, please check input data." -msgstr "Ο αριθμός των χαρτών δεν ταιριάζει, ελέγξτε τα δεδομένα." - -#: ../gui/wxpython/animation/controller.py:506 -msgid "No animation to export." -msgstr "Δεν υπάρχει κινούμενο σχέδιο για εξαγωγή" - -#: ../gui/wxpython/animation/controller.py:542 -msgid "Preparing export, please wait..." -msgstr "Προετοιμασία για εξαγωγή, παρακαλώ περιμένετε..." - -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 -#, python-format -msgid "%(from)s %(dash)s %(to)s" -msgstr "%(από) %(παύλα) %(σε) " - -#: ../gui/wxpython/animation/controller.py:604 -#, python-format -msgid "%(start)s %(unit)s" -msgstr "%(αρχή) %(μονάδα)ες " - -#: ../gui/wxpython/animation/controller.py:626 -msgid "Exporting animation, please wait..." -msgstr "Εξαγωγή κινούμενου σχεδίου, παρακαλώ περιμένετε..." -#: ../gui/wxpython/animation/data.py:66 -msgid "No animation name selected." -msgstr "Δεν έχει επιλεγεί κινούμενο σχέδιο" +#: ../gui/wxpython/gui_core/preferences.py:2197 +msgid "Owner" +msgstr "" -#: ../gui/wxpython/animation/data.py:133 -msgid "No workspace file selected." -msgstr "Δεν έχει επιλεγεί αρχείου χώρου εργασίας" +#: ../gui/wxpython/gui_core/dialogs.py:74 +msgid "Required item is not set." +msgstr "" -#: ../gui/wxpython/animation/data.py:136 -#, python-format -msgid "File %s not found" -msgstr "Το αρχείο %s δεν βρέθηκε" +#: ../gui/wxpython/gui_core/dialogs.py:105 +msgid "Select GRASS location and mapset" +msgstr "" -#: ../gui/wxpython/animation/data.py:145 -#, python-format -msgid "Animation %d" +#: ../gui/wxpython/gui_core/dialogs.py:125 +msgid "Location or mapset is not defined." msgstr "" -#: ../gui/wxpython/animation/utils.py:187 -msgid "The number of maps in space-time datasets has to be the same." +#: ../gui/wxpython/gui_core/dialogs.py:135 +msgid "Name of GRASS location:" msgstr "" -#: ../gui/wxpython/animation/utils.py:193 -msgid "" -"The temporal type (absolute/relative) of space-time datasets has to be the " -"same." +#: ../gui/wxpython/gui_core/dialogs.py:146 +#: ../gui/wxpython/gui_core/dialogs.py:203 +msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/animation/utils.py:201 -msgid "" -"The map type (point/interval) of space-time datasets has to be the same." +#: ../gui/wxpython/gui_core/dialogs.py:175 +msgid "Select mapset in GRASS location" msgstr "" -#: ../gui/wxpython/animation/utils.py:209 -msgid "" -"The temporal extents of maps in space-time datasets have to be the same." +#: ../gui/wxpython/gui_core/dialogs.py:195 +msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/animation/utils.py:221 -msgid "The number of maps to animate has to be the same for each map series." +#: ../gui/wxpython/gui_core/dialogs.py:216 +#: ../gui/wxpython/vdigit/toolbars.py:840 +#: ../gui/wxpython/vdigit/toolbars.py:997 +#: ../gui/wxpython/vdigit/toolbars.py:1095 +msgid "Select vector map" +msgstr "Επιλεξτε διανυσματικό χάρτη" + +#: ../gui/wxpython/gui_core/dialogs.py:230 +msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 -msgid "" -"The number of maps to animate has to be the same as the number of maps in " -"temporal dataset." +#: ../gui/wxpython/gui_core/dialogs.py:292 +msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 -msgid "Change animation speed" +#: ../gui/wxpython/gui_core/dialogs.py:326 +msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 -msgid "Play forward" +#: ../gui/wxpython/gui_core/dialogs.py:348 +msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 -msgid "Play back" +#: ../gui/wxpython/gui_core/dialogs.py:450 +#, python-format +msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 -msgid "Repeat" +#: ../gui/wxpython/gui_core/dialogs.py:455 +#, python-format +msgid "" +"Invalid or empty key column.\n" +"Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 -msgid "Play back and forward" +#: ../gui/wxpython/gui_core/dialogs.py:486 +#, python-format +msgid "Vector map <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 -#: ../gui/wxpython/animation/dialogs.py:347 -msgid "Add new animation" +#: ../gui/wxpython/gui_core/dialogs.py:576 +msgid "Load region:" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 -#: ../gui/wxpython/animation/toolbars.py:42 -msgid "Add, edit or remove animation" +#: ../gui/wxpython/gui_core/dialogs.py:582 +msgid "Save region:" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 -#: ../gui/wxpython/animation/dialogs.py:930 -msgid "Export animation" +#: ../gui/wxpython/gui_core/dialogs.py:634 +msgid "Name cannot begin with '.' and must not contain space, quotes, '/', ''', '@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 -msgid "Add space-time dataset or series of map layers" +#: ../gui/wxpython/gui_core/dialogs.py:650 +msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 -msgid "Add space-time dataset or series of map layers for animation" +#: ../gui/wxpython/gui_core/dialogs.py:684 +msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/animation/g.gui.animation.py:93 -#, python-format -msgid "%s=, %s=, %s= and %s= are mutually exclusive." +#: ../gui/wxpython/gui_core/dialogs.py:685 +msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/animation/g.gui.animation.py:137 -msgid "Animation Tool - GRASS GIS" +#: ../gui/wxpython/gui_core/dialogs.py:686 +msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:81 -msgid "Adjust speed of animation" +#: ../gui/wxpython/gui_core/dialogs.py:727 +#: ../gui/wxpython/gui_core/dialogs.py:1524 +msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:134 -msgid "Simple mode" +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:139 -msgid "Frame duration:" +#: ../gui/wxpython/gui_core/dialogs.py:745 +msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:140 -#: ../gui/wxpython/animation/dialogs.py:175 -msgid "ms" +#: ../gui/wxpython/gui_core/dialogs.py:758 +msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:166 -msgid "Temporal mode" +#: ../gui/wxpython/gui_core/dialogs.py:791 +#: ../gui/wxpython/gui_core/dialogs.py:859 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +msgid "Pattern:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:171 -msgid "Time unit:" +#: ../gui/wxpython/gui_core/dialogs.py:809 +#: ../gui/wxpython/gui_core/dialogs.py:877 +#: ../gui/wxpython/gui_core/dialogs.py:1533 +msgid "List of maps:" +msgstr "Λίστα χαρτών:" + +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:173 -msgid "Duration of time unit:" +#: ../gui/wxpython/gui_core/dialogs.py:830 +msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:239 -msgid "year" +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:240 -msgid "month" +#: ../gui/wxpython/gui_core/dialogs.py:1051 +msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:241 -msgid "day" +#: ../gui/wxpython/gui_core/dialogs.py:1188 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:242 -msgid "hour" +#: ../gui/wxpython/gui_core/dialogs.py:1191 +#: ../gui/wxpython/gui_core/dialogs.py:1207 +msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:243 -msgid "minute" +#: ../gui/wxpython/gui_core/dialogs.py:1204 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:244 -msgid "second" +#: ../gui/wxpython/gui_core/dialogs.py:1261 +msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:309 -msgid "Animation speed is too high." +#: ../gui/wxpython/gui_core/dialogs.py:1290 +#, python-format +msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:349 -msgid "Edit animation" +#: ../gui/wxpython/gui_core/dialogs.py:1293 +#, python-format +msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:361 -msgid "Advanced" -msgstr "Περίπλοκη" +#: ../gui/wxpython/gui_core/dialogs.py:1295 +#, python-format +msgid "Group <%s> was successfully changed." +msgstr "" -#: ../gui/wxpython/animation/dialogs.py:387 -msgid "top left" +#: ../gui/wxpython/gui_core/dialogs.py:1298 +#, python-format +msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:388 -msgid "top right" +#: ../gui/wxpython/gui_core/dialogs.py:1300 +#, python-format +msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:389 -msgid "bottom left" +#: ../gui/wxpython/gui_core/dialogs.py:1339 +msgid "No group selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:390 -msgid "bottom right" +#: ../gui/wxpython/gui_core/dialogs.py:1344 +msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:406 -msgid "Select 2D or 3D view" +#: ../gui/wxpython/gui_core/dialogs.py:1451 +msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:416 -msgid "Window position:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1477 +msgid "Map type:" +msgstr "Τύπος χάρτη:" -#: ../gui/wxpython/animation/dialogs.py:421 -msgid "View mode:" +#: ../gui/wxpython/gui_core/dialogs.py:1492 +msgid "Select toggle" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:429 -msgid "" -"For 3D animation, please select only one space-time dataset\n" -"or one series of map layers." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1499 +msgid "Mapset:" +msgstr "Συλλογή χαρτών:" -#: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 -msgid "Show raster legend" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1593 +msgid "Invert selection" +msgstr "Αντιστροφή επιλογής" -#: ../gui/wxpython/animation/dialogs.py:479 -msgid "3D view parameters" +#: ../gui/wxpython/gui_core/dialogs.py:1736 +#, python-format +msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:488 -msgid "Workspace file:" +#: ../gui/wxpython/gui_core/dialogs.py:1763 +msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:489 -msgid "Choose workspace file to import 3D view parameters" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1794 +#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 +#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 +msgid "transparent" +msgstr "διαφάνια" -#: ../gui/wxpython/animation/dialogs.py:498 -msgid "Parameter for animation:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1797 +msgid "opaque" +msgstr "αδιαφάνεια" -#: ../gui/wxpython/animation/dialogs.py:523 -msgid "Set spatial extent in 2D view" +#: ../gui/wxpython/gui_core/dialogs.py:1898 +msgid "Set image size" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:527 -msgid "Use saved region:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:1913 +msgid "Image size" +msgstr "Διαστασεις εικονας" -#: ../gui/wxpython/animation/dialogs.py:536 -msgid "Animate region change" +#: ../gui/wxpython/gui_core/dialogs.py:1960 +msgid "Template:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:545 -msgid "End region:" +#: ../gui/wxpython/gui_core/dialogs.py:2000 +msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:551 -msgid "Zoom value:" +#: ../gui/wxpython/gui_core/dialogs.py:2016 +msgid " SQL statement " msgstr "" -#: ../gui/wxpython/animation/dialogs.py:553 -msgid "N-S/E-W distances in map units used to gradually reduce region." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2064 +msgid "Symbols" +msgstr "Σύμβολα" -#: ../gui/wxpython/animation/dialogs.py:561 -msgid "N-S:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2099 +msgid "Symbol directory:" +msgstr "Φάκελος συμβόλων" -#: ../gui/wxpython/animation/dialogs.py:568 -msgid "E-W:" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2111 +msgid "Symbol name:" +msgstr "Όνομα συμβόλων" -#: ../gui/wxpython/animation/dialogs.py:681 -msgid "Only one series or space-time dataset is accepted for 3D mode." +#: ../gui/wxpython/gui_core/dialogs.py:2364 +msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:689 -msgid "No map series or space-time dataset added." +#: ../gui/wxpython/gui_core/dialogs.py:2369 +msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:731 -#: ../gui/wxpython/animation/dialogs.py:742 -msgid "Region information is not complete" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2448 +msgid "Select font:" +msgstr "Επιλογή γραμματοσειράς:" -#: ../gui/wxpython/animation/dialogs.py:763 -msgid "Add, edit or remove animations" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2479 +msgid "Character encoding:" +msgstr "Κωδικοποίηση χαρακτήρων:" -#: ../gui/wxpython/animation/dialogs.py:772 -msgid "List of animations" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:2497 +#: ../gui/wxpython/psmap/dialogs.py:397 ../gui/wxpython/psmap/dialogs.py:4980 +msgid "Font size:" +msgstr "Μέγεθος γραμματοσειράς:" -#: ../gui/wxpython/animation/dialogs.py:786 -msgid "Edit" +#: ../gui/wxpython/gui_core/dialogs.py:2549 +msgid "Example" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 -msgid "Format" +#: ../gui/wxpython/gui_core/wrap.py:208 +msgid "Clear" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1016 -msgid "Add time stamp" +#: ../gui/wxpython/gui_core/wrap.py:210 +msgid "&Clear" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1047 -msgid "Add time stamp, image or text decoration by one of the buttons above." +#: ../gui/wxpython/gui_core/wrap.py:223 +msgid "&Cancel" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1050 -msgid "Add image or text decoration by one of the buttons above." +#: ../gui/wxpython/gui_core/wrap.py:235 +msgid "&Close" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1064 -msgid "Font settings:" +#: ../gui/wxpython/gui_core/wrap.py:245 +msgid "Apply" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1069 -msgid "Sample text" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:564 +msgid "Enter parameters for '" +msgstr "Εισάγετε παραμέτρους για '" -#: ../gui/wxpython/animation/dialogs.py:1090 -msgid "Image file:" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:576 +msgid "Close this window without executing the command (Ctrl+Q)" +msgstr "Κλείσιμο αυτού του παραθύρου δίχως να εκτελεστεί η εντολή (Ctrl +Q)" -#: ../gui/wxpython/animation/dialogs.py:1091 -msgid "Choose image file" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:607 +msgid "Run the command (Ctrl+R)" +msgstr "Εκτέλεση της εντολής (Ctrl +R)" -#: ../gui/wxpython/animation/dialogs.py:1104 -msgid "Text:" +#: ../gui/wxpython/gui_core/forms.py:631 +msgid "Show manual page of the command (Ctrl+H)" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1124 -msgid "Placement as percentage of screen coordinates (X: 0, Y: 0 is top left):" +#: ../gui/wxpython/gui_core/forms.py:670 +msgid "Add created map(s) into layer tree" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1140 -#: ../gui/wxpython/psmap/dialogs.py:284 -msgid "X:" +#: ../gui/wxpython/gui_core/forms.py:700 +msgid "Close dialog when command is successfully finished. Change this settings in Preferences dialog ('Command' tab)." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1145 -#: ../gui/wxpython/psmap/dialogs.py:285 -msgid "Y:" +#: ../gui/wxpython/gui_core/forms.py:885 +#, python-format +msgid "'%s' copied to clipboard" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "image sequence" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:975 ../gui/wxpython/gui_core/forms.py:989 +msgid "Required" +msgstr "Απαιτούμενο" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "animated GIF" +#: ../gui/wxpython/gui_core/forms.py:978 ../gui/wxpython/gui_core/forms.py:990 +msgid "Optional" +msgstr "Προερετικό" + +#: ../gui/wxpython/gui_core/forms.py:1073 +#: ../gui/wxpython/gui_core/forms.py:2105 +msgid "Parameterized in model" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "SWF" +#: ../gui/wxpython/gui_core/forms.py:1163 +msgid "[multiple]" +msgstr "[πολλαπλό]" + +#: ../gui/wxpython/gui_core/forms.py:1221 +msgid "valid range" +msgstr "Εγκυρα όριο" + +#: ../gui/wxpython/gui_core/forms.py:1578 +msgid "Show graphical representation of temporal extent of dataset(s) ." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1159 -msgid "AVI" +#: ../gui/wxpython/gui_core/forms.py:1845 +#: ../gui/wxpython/gui_core/forms.py:1936 +#, python-format +msgid "Choose %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1166 -msgid "Export to:" +#: ../gui/wxpython/gui_core/forms.py:1890 +msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1184 -msgid "animation_" +#: ../gui/wxpython/gui_core/forms.py:1893 +msgid "&Save as" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1193 -msgid "Choose directory for export" +#: ../gui/wxpython/gui_core/forms.py:1895 +msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1220 -msgid "GIF file:" +#: ../gui/wxpython/gui_core/forms.py:1900 +msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1221 -#: ../gui/wxpython/animation/dialogs.py:1244 -#: ../gui/wxpython/animation/dialogs.py:1275 -msgid "Choose file to save animation" +#: ../gui/wxpython/gui_core/forms.py:1902 +msgid "Enter file content directly instead of specifying a file. Temporary file will be automatically created." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1243 -msgid "SWF file:" +#: ../gui/wxpython/gui_core/forms.py:2318 +msgid "Manual" +msgstr "Εγχειρίδιο" + +#: ../gui/wxpython/gui_core/forms.py:2362 +msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1265 +#: ../gui/wxpython/gui_core/forms.py:2370 +#, python-format msgid "" -"Program 'ffmpeg' was not found.\n" -"Please install it first and make sure\n" -"it's in the PATH variable." -msgstr "" - -#: ../gui/wxpython/animation/dialogs.py:1274 -msgid "AVI file:" +"Unable to load file.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1281 -msgid "Video codec:" +#: ../gui/wxpython/gui_core/forms.py:2400 +msgid "Save input as..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1284 -msgid "Additional options:" +#: ../gui/wxpython/gui_core/forms.py:2733 +msgid "No dataset given." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1288 -msgid "" -"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " -"Options depend on ffmpeg version." +#: ../gui/wxpython/gui_core/forms.py:2902 +#: ../gui/wxpython/gui_core/forms.py:2919 +#, python-format +msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1320 +#: ../gui/wxpython/gui_core/forms.py:2926 #, python-format -msgid "Current frame rate: %.2f fps" +msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1447 -#, python-format -msgid "File %s not found." +#: ../gui/wxpython/gui_core/forms.py:3008 +msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1451 -msgid "Decoration image file is missing." +#: ../gui/wxpython/gui_core/menu.py:155 +msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1459 +#: ../gui/wxpython/gui_core/menu.py:157 #, python-format -msgid "Directory %s not found." +msgid "Do advanced search using %s module" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1461 -msgid "Export directory is missing." +#: ../gui/wxpython/gui_core/menu.py:161 +msgid "Double-click to run selected module" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1520 -msgid "Time stamp" +#: ../gui/wxpython/gui_core/menu.py:164 +msgid "&Run..." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1544 -#, python-brace-format -msgid "Exported file directory '{base_dir}' does not exist." +#: ../gui/wxpython/gui_core/menu.py:165 +msgid "Run selected module from the tree" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1547 -msgid "Export file is missing." +#: ../gui/wxpython/gui_core/menu.py:166 +msgid "H&elp" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1568 -#, python-brace-format -msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" +#: ../gui/wxpython/gui_core/menu.py:168 +msgid "Show manual for selected module from the tree" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1654 -msgid "Add space-time dataset layer" +#: ../gui/wxpython/gui_core/menu.py:278 +#, python-format +msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1676 -msgid "Multiple raster maps" +#: ../gui/wxpython/gui_core/menu.py:356 +msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1677 -msgid "Multiple vector maps" +#: ../gui/wxpython/icons/icon.py:39 +#, python-format +msgid "Unknown iconset '%s', using default 'grass'...\n" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1678 -msgid "Multiple 3D raster maps" -msgstr "" +#: ../gui/wxpython/icons/icon.py:57 +#, python-format +msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..." +msgstr "Αδυναμία φόρτωσης του θέματος (εικονίδια). Αιτία: %s. Κλείσιμο του wxGUI.." -#: ../gui/wxpython/animation/dialogs.py:1679 -msgid "Space time raster dataset" +#: ../gui/wxpython/gcp/mapdisplay.py:48 ../gui/wxpython/gcp/manager.py:994 +#: ../gui/wxpython/image2target/ii2t_manager.py:952 +msgid "Manage Ground Control Points" +msgstr "Διαχείριση φωτοσταθερών σημείων" + +#: ../gui/wxpython/gcp/manager.py:150 +#: ../gui/wxpython/image2target/ii2t_manager.py:179 +msgid "Setup for georectification" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1680 -msgid "Space time vector dataset" +#: ../gui/wxpython/gcp/manager.py:183 ../gui/wxpython/gcp/manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:212 +#: ../gui/wxpython/image2target/ii2t_manager.py:216 +msgid "Georectifying setup canceled." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1681 -msgid "Space time 3D raster dataset" +#: ../gui/wxpython/gcp/manager.py:374 +#: ../gui/wxpython/image2target/ii2t_manager.py:381 +msgid "Select map type and location/mapset" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1720 -msgid "Input data type:" +#: ../gui/wxpython/gcp/manager.py:388 +#: ../gui/wxpython/image2target/ii2t_manager.py:395 +msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1797 -msgid "Select raster/vector maps." +#: ../gui/wxpython/gcp/manager.py:399 +#: ../gui/wxpython/image2target/ii2t_manager.py:406 +msgid "Select source location:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1825 -msgid "Please select maps or dataset first." +#: ../gui/wxpython/gcp/manager.py:420 +#: ../gui/wxpython/image2target/ii2t_manager.py:427 +msgid "Select source mapset:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1855 -msgid "Animation Tool settings" +#: ../gui/wxpython/gcp/manager.py:476 +#: ../gui/wxpython/image2target/ii2t_manager.py:483 +msgid "You must select a valid location before selecting a mapset" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1919 -msgid "Number of parallel processes:" +#: ../gui/wxpython/gcp/manager.py:489 +#: ../gui/wxpython/image2target/ii2t_manager.py:496 +msgid "You must select a valid location and mapset in order to continue" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1940 -msgid "Text foreground color:" +#: ../gui/wxpython/gcp/manager.py:511 +#: ../gui/wxpython/image2target/ii2t_manager.py:518 +msgid "Select image/map group to georectify" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1956 -msgid "Text background color:" +#: ../gui/wxpython/gcp/manager.py:533 +msgid "Select/create group:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1989 -msgid "Absolute time format:" +#: ../gui/wxpython/gcp/manager.py:550 +#: ../gui/wxpython/image2target/ii2t_manager.py:557 +msgid "Create group if none exists" +msgstr "Δημιουργία ομάδος αν δεν υπάρχει" + +#: ../gui/wxpython/gcp/manager.py:564 +#: ../gui/wxpython/image2target/ii2t_manager.py:571 +msgid "Add vector map to group..." +msgstr "Προσθήκη διανύσματικού χάρτη στην ομάδα" + +#: ../gui/wxpython/gcp/manager.py:655 +msgid "No vector maps." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2007 -msgid "" -"Click and then press key up or down to preview different date and time " -"formats. Type custom format string." +#: ../gui/wxpython/gcp/manager.py:662 +#: ../gui/wxpython/image2target/ii2t_manager.py:655 +msgid "You must select a valid image/map group in order to continue" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2025 -msgid "Learn more about formatting options" +#: ../gui/wxpython/gcp/manager.py:669 +#: ../gui/wxpython/image2target/ii2t_manager.py:662 +msgid "You must enter an map name extension in order to continue" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2039 -msgid "Display instances with no data" +#: ../gui/wxpython/gcp/manager.py:738 +#: ../gui/wxpython/image2target/ii2t_manager.py:731 +msgid "Select maps to display for ground control point (GCP) creation" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2042 -msgid "" -"When animating instant-based data which have irregular timestamps you can " -"display 'no data frame' (checked option) or keep last frame." +#: ../gui/wxpython/gcp/manager.py:743 +msgid "Map Display Web Service Layer(s)" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/animation/dialogs.py:2073 -msgid "Invalid" +#: ../gui/wxpython/gcp/manager.py:802 ../gui/wxpython/gcp/manager.py:3060 +#: ../gui/wxpython/image2target/ii2t_manager.py:792 +#: ../gui/wxpython/image2target/ii2t_manager.py:2982 +msgid "Select target vector map to display:" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= -#: ../gui/wxpython/gui_core/preferences.py:1721 -msgid "EPSG code:" -msgstr "Κωδικός EPSG" - -#: ../gui/wxpython/gui_core/preferences.py:1739 -msgid "PROJ string (required):" -msgstr "PROJ ορισμός (απαιτείται)" - -#: ../gui/wxpython/gui_core/preferences.py:1756 -msgid "EPSG file:" -msgstr "Αρχείο EPSG:" - -#: ../gui/wxpython/gui_core/preferences.py:1773 -msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." -msgstr "Φόρτωση κωδικών EPSG (αναμείνατε), εισάγετε κωδικό EPSG ή απευθείας ορισμό PROJ " - -#: ../gui/wxpython/gui_core/preferences.py:1781 -msgid "&Load EPSG codes" -msgstr "Φ&όρτωση κωδικών EPSG" - -#: ../gui/wxpython/gui_core/preferences.py:1801 -msgid "Coordinates format" -msgstr "Φορματ συντενταγμένων" - -#: ../gui/wxpython/gui_core/preferences.py:1809 -msgid "Lat/long projections" +>>>>>>> osgeo-main msgstr "" #: ../gui/wxpython/gui_core/preferences.py:1830 @@ -27296,37 +33523,37 @@ msgid "Select target vector map to display:" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/animation/provider.py:443 +#: ../gui/wxpython/animation/provider.py:444 msgid "Rendering map layers" msgstr "" -#: ../gui/wxpython/animation/provider.py:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "" -#: ../gui/wxpython/animation/provider.py:789 +#: ../gui/wxpython/animation/provider.py:792 #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -28243,17 +34470,17 @@ msgid "" msgstr "" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "" @@ -28279,26 +34506,26 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" "Unknown format %(for)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -28307,39 +34534,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "εκατοστό" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -28407,693 +34634,693 @@ msgid "" "edge of the paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "Επιλογή χρώματος:" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "Κέντρο:" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "'Ορια" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "Χρώμα ορίων:" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "Πλάτος ορίων (pts):" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "περιοχών" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "επιλογή χρώματος:" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "Επιλογή αρχείου" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "Εισαγωγή κειμένου:" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "Επιλογή φακέλου για για τις εικόνες" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -29120,135 +35347,135 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 msgid "Program {} is not available." msgstr "" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" @@ -29271,6 +35498,9 @@ msgid "Cartographic Composer - GRASS GIS" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -29384,14 +35614,11 @@ msgstr "" #~ msgid "Unable to display the map" #~ msgstr "Αδυναμία διαγραφής Τοποθεσίας" -#, fuzzy, python-format -#~ msgid "Unable to rename mapset: %s" -#~ msgstr "Αδυναμία ανάγνωσης της λίστας : %s" - #, fuzzy, python-format #~ msgid "Unable to rename location: %s" #~ msgstr "Αδυναμία διαγραφής επιλεγμένης Τοποθεσίας" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Volume" @@ -29433,6 +35660,8 @@ msgstr "(μονο για ανάγνωση)" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, fuzzy, python-format #~ msgid "Unable to delete location: %s" #~ msgstr "Αδυναμία διαγραφής επιλεγμένης Τοποθεσίας" @@ -29462,13 +35691,6 @@ msgstr "(μονο για ανάγνωση)" #~ msgid "Threshold" #~ msgstr "Όρια" -#, fuzzy -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "" -#~ "Η Τοποθεσία <%s> δημιουργήθηκε.\n" -#~ "\n" -#~ "Θέλετε να γίνει αλλαγή στην νέα Τοποθεσία;" - #~ msgid "Quit digitizer" #~ msgstr "Έξοδος απο τον ψηφιοποιητή" @@ -29669,6 +35891,9 @@ msgid " (readonly)" msgstr "(μονο για ανάγνωση)" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasswxpy_es.po b/locale/po/grasswxpy_es.po index 7b3e54b3d64..1aea6326cf2 100644 --- a/locale/po/grasswxpy_es.po +++ b/locale/po/grasswxpy_es.po @@ -11,11 +11,18 @@ msgstr "" "Project-Id-Version: grasswxpy_es\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD +======= +"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" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27,6 +34,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main "PO-Revision-Date: 2022-05-22 05:04+0000\n" "Last-Translator: Veronica \n" "Language-Team: Spanish no encontrado" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "Mapa vectorial <%s> no encontrado" @@ -1199,8 +1215,8 @@ msgid "" "The Temporal Plot Tool needs the \"matplotlib\" (python-matplotlib) package " "to be installed. {0}" msgstr "" -"La herramienta de gráfica temporal necesita que el paquete \"matplotlib" -"\" (mathplotlib-python) esté instalado. {0}" +"La herramienta de gráfica temporal necesita que el paquete \"matplotlib\" " +"(mathplotlib-python) esté instalado. {0}" #: ../gui/wxpython/tplot/frame.py:104 msgid "Temporal Plot Tool" @@ -1283,14 +1299,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "Desea el encabezado del CSV?" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "Exportar" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "Ayuda" @@ -1416,8 +1432,8 @@ msgid "Invalid input vector dataset" msgstr "Conjunto de datos vectoriales de entrada no válidos" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "Conjunto de datos espacio temporales <%s> no encontrado." @@ -1493,12 +1509,12 @@ msgstr "" msgid "Set opacity level" msgstr "Definir el nivel de opacidad" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "Administrador de clases" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "Seleccionar grupo de imágenes" @@ -1561,33 +1577,33 @@ msgstr "Añadir mapa ráster" msgid "Loading imagery lib failed" msgstr "No ha sido posible cargar la librería de imágenes" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Crear/editar grupo..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "Falta el nombre del grupo de imágenes." -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "Nombre del grupo de imágenes:" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "Nombre del subgrupo de imágenes:" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "Por favor seleccione un subgrupo." -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "El subgrupo <%s> no fue encontrado en el grupo <%s>" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" @@ -1596,7 +1612,7 @@ msgstr "" "No se encontraron datos en el subgrupo <%s> del grupo <%s>.\n" "." -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" @@ -1605,76 +1621,76 @@ msgstr "" "No se encontraron datos en el grupo <%s>.\n" "." -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "Grupo <%s> no encontrado" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "Falta el nombre del mapa." -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Mapa del mapa ráster:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Nombre del mapa vectorial:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "Clases" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "Nombre de la clase" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "Por favor use solo caracteres ASCII." -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "Acercar a las áreas de entrenamiento de la clase seleccionada" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "Guardar archivo de las firmas" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "Escriba el nombre de archivo de firmas:" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "Ruta del archivo de las firmas:" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "Exportar áreas de entrenamiento" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "Introduzca el nombre del nuevo mapa vectorial:" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "Exportar tabla de atributos" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" "Exporta tabla de atributos que contiene la información estadística calculada" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "Mapa vectorial <%s> ya existe. ¿Quiere sobrescribirlo?" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "Mapa vectorial <%s> existe" @@ -1722,7 +1738,7 @@ msgstr "" "\n" "Aún no hay clase, ¿quiere crear una?" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "No se ha seleccionado ninguna clase" @@ -1736,134 +1752,134 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Barra de herramientas de mapa." -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "Barra de herramientas de IClass" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "Barra de herramientas miscelanea de IClass" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "Barra de herramientas de digitalización" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "Gráficas" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "Pantalla de previsualización" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "Pantalla de áreas de entrenamiento" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" "Ajustar pantalla previsualización a la pantalla de áreas de entrenamiento" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" "Ajustar pantalla previsualización a la pantalla de áreas de entrenamiento" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "Sincronización de pantalla activada" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "Sincronización de pantalla desactivada" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "Se perderán todos los cambios. ¿Quiere continuar?" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "Importar mapa vectorial" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "No hay áreas en el mapa vectorial <%s>.\n" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" "El mapa vectorial <%s> contiene puntos o líneas, estos elementos son " "ignorados." -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "No se puede abrir mapa vectorial <%s>" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "No se pueden copiar elementos vectoriales desde <%s>" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "No se puede abrir el mapa vectorial temporal" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "No hay áreas de entrenamiento que exportar." -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" "%d áreas de entrenamiento (%d clases) exportadas a mapa vectorial <%s>." -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "No se pudo crear el mapa vectorial temporal." -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "Categoría %s sin área. Se saltará dicha categoría." -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "Falló el análisis." -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "resultados" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "No se ha seleccionado ningún grupo de imágenes." -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" @@ -1871,15 +1887,15 @@ msgstr "" "Debido a cambios recientes en las clases, las firmas pueden ser obsoletas y " "deben ser recalculadas. ¿Aún quiere continuar?" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "Firmas obsoletas" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" @@ -1888,15 +1904,15 @@ msgstr "" "Ya existe un archivo de firmas de nombre %s.\n" "¿Desea reemplazarlo?" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "El archivo ya existe" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "No se ha seleccionado ningún grupo de imágenes. Operación cancelada." -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " @@ -1905,11 +1921,11 @@ msgstr "" "El grupo <%(group)s> no tiene suficientes archivos (tiene %(files)d " "archivos). Operación cancelada." -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "No se ha dado ningún área. Operación cancelada." -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "Los elementos están fuera de las capas ráster. Operación cancelada." @@ -2020,13 +2036,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "Importar datos vectoriales" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Importar datos ráster" @@ -2097,56 +2113,58 @@ msgid "Data catalog" msgstr "Catálogo de datos" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "Seleccionar directorio de datos de GRASS:" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "¿Quiere crear un nuevo Directorio de mapas?" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Crear paquete" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "Enlazar datos externos" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2154,17 +2172,17 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 -#, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:96 +#, fuzzy, python-brace-format +msgid "Failed to read mapsets from project <{l}>." msgstr "Error al leer los directorios de mapas de la localización <{l}>." -#: ../gui/wxpython/datacatalog/tree.py:121 -#, python-brace-format -msgid "Failed to read maps from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:122 +#, fuzzy, python-brace-format +msgid "Failed to read maps from project <{l}>." msgstr "Error al leer los mapas de la localización <{l}>." -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " @@ -2173,303 +2191,312 @@ msgstr "" "Mapa de tipo {elem} <{name}> ya existe en el directorio de mapas <{mapset}" ">. Desea sobreescribirlo?" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "¿Sobreescribir?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "Mapa <{layer}> seleccionado para mover." -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "Mapa <{layer}> seleccionado para copiar." -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "Nombre nuevo" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "Renombrar mapa" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "Renombrando mapa <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "{cmd} -- ha finalizado" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "Ningún mapa seleccionado para copiar." -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "Ningún mapa seleccionado para mover." -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "Nuevo nombre para <{n}>" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "Seleccionar nombre nuevo" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "Copiando <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "Moviendo <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "g.copy ha finalizado" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "La reproyección no ha sido implementada aun para mapas ráster 3D" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "g.remove ha finalizado" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "Realmente desea remover el/los mapa(s) <{m}>?" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "Realmente desea remover {n} mapas?" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "Eliminar mapa" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "Eliminando {name}..." -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" "Para mover o copiar mapas a otros directorios de mapas, desbloquear la " "edición de dichos directorios" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 +#, fuzzy msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" +"Para mover o copiar mapas a otros directorios de mapas, desbloquear la " +"edición de dichos directorios" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "&Cortar" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "&Copiar" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "Copiar &nombre" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "&Pegar" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "&Borrar" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "&Renombrar" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "&Mostrar capas" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "&Mostrar capa" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "Mostrar &metadatos" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "&Cambiar Directorio de mapas" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "&Borrar mapset" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "&Renombrar mapset" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 #, fuzzy msgid "&Copy path to mapset" msgstr "&Crear mapset" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "&Crear mapset" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "&Borrar Localización" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "&Borrar mapset" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "&Renombrar localización" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "&Renombrar mapset" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" msgstr "&Crear nueva Localización" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +#, fuzzy +msgid "&Download sample project (location)" msgstr "&Descargar localización de muestra" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "&Borrar la base de datos de GRASS del catálogo de datos" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "&Borrar la base de datos de GRASS del disco" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" msgstr "&Borrar localizaciones" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "&Borrar mapsets" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 #, fuzzy msgid "&Copy paths to mapsets" msgstr "&Crear mapset" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "No hay opciones disponibles" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +#, fuzzy +msgid "Reload GRASS projects" msgstr "Recargar localizaciones de GRASS" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2489,59 +2516,63 @@ msgid "Add existing or create new database" msgstr "Añadir base de datos existente o crear una nueva" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "Crear un nuevo Directorio de mapas en la Localización seleccionada" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +#, fuzzy +msgid "Create new project (location) in current GRASS database" msgstr "" +"Crea nuevo Directorio de mapas en la Localización actual, cambia Directorio " +"de mapas actual." -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "Reproyección" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "Reproyectar" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "Reproyectar mapa ráster" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "Reproyectar mapa vectorial" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" @@ -2550,19 +2581,19 @@ msgstr "" "El mapa <{ml}> necesita ser reproyectado.\n" "Por favor revise y modifique los parámetros de reproyección:" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "Resolución estimada:" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "Método de remuestreo:" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "Longitud máxima del segmento:" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2575,9 +2606,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Herramientas" @@ -2638,7 +2669,7 @@ msgid "Switch to simple mode" msgstr "Cambiar a modo simple" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Cerrar" @@ -2662,27 +2693,27 @@ msgstr "Seguir cursor" msgid "Shape:" msgstr "Forma:" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "Grosor de línea:" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "Ventana de visualización móvil" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "Barra de herramientas principal" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "Barra de herramientas de Miselanea" @@ -2691,23 +2722,23 @@ msgstr "Barra de herramientas de Miselanea" msgid "Map <%s> not found. " msgstr "Mapa <%s> no encontrado." -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "Mapa <%s> no encontrado." #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "Nada a renderizar (mapa vacío). Operación cancelada." #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" @@ -2715,7 +2746,7 @@ msgstr "" "Seleccionar un nombre de archivo para guardar la imagen (no es necesario " "añadir la extensión)" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" "No se ha seleccionado ningún mapa ráster o vectorial para ser consultado." @@ -2731,88 +2762,204 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "No se puede cargar el tema de iconos. Razón: %s. Saliendo de wxGUI..." -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 #, fuzzy msgid "Double-click to open the tool" msgstr "Doble click para ejecutar el módulo seleccionado" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" msgstr "Remover" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 #, fuzzy msgid "Do you really want to remove <{}> command?" msgstr "Realmente desea remover {n} mapas?" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Remover leyenda" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 #, fuzzy msgid "Removing <{}>" msgstr "Moviendo <{name}>..." -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "Marca de tiempo" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Duración de cuadro:" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Mostrar barra de estado" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Máscara" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Máscara" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Norte" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "Sur" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Oeste" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Este" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "Resolución N-S" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Resolución estimada:" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Número de segmentos:" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Columna numérica:" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Número de segmentos:" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d segundos" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "General" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "Establecer región computacional desde región nombrada" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "Mostrar región actual" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "Coincidencia de proyecciones" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "Guardar región computacional a un archivo de región" + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "Explorador de datos" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "Exportar a:" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 #, fuzzy msgid "Export history of executed commands to a file" msgstr "Exporta un mapa vectorial a un archivo SVG." -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" -msgstr "" +#: ../gui/wxpython/history/browser.py:465 +#, fuzzy, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" +msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Guardar archivo como..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "Guardar archivo como" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "Archivos" + +#: ../gui/wxpython/history/browser.py:470 #, fuzzy, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "Archivos de texto" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "Archivos" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Guardar archivo como..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 #, fuzzy msgid "Command history saved to '{}'" msgstr "Registro de comandos guardado en '{}'." -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "Descarga en progreso, espere hasta que haya finalizado 0%" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " @@ -2821,116 +2968,125 @@ msgstr "" "Descarga en progreso, espere hasta que haya finalizado {0}%, {1} MB, {2} KB/" "s, {3:.0f} segundos transcurridos" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +#, fuzzy +msgid "Downloaded project is not valid" msgstr "La localización descargada no es válida" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "Cancelar" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" -msgstr "Cancelar descarga de Localización" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" +msgstr "Cancelar descarga" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" msgstr "Seleccione la localización de muestra para descargar:" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "Do&wnload" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" msgstr "Descargar la localización seleccionada" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "Descargar" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "Descarga en progreso, espere hasta que haya finalizado" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, fuzzy, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "Localización denominada <%s> ya existe, descarga cancelada" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "Ha fallado la descarga: %s" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 +#, fuzzy msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" "Descarga completa. Los datos de muestra descargados se listan en las " "pestañas localización/directorio de mapas al cerrar esta ventana" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, fuzzy, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "Localización denominada <%s> ya existe, renombrarla " -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Error: {text}" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:439 +#, fuzzy +msgid "Dataset Download" +msgstr "Descargar" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "Desea cancelar la descarga de la localización?" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Descargar la localización seleccionada" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "Cancelar descarga" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Desea cancelar la descarga de la localización?" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" msgstr "Nombre de la Localización no válido" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "Nombre para el nuevo Directorio de mapas:" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Crear nuevo Directorio de mapas" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "¿Quiere importar {} a la Localización recientemente creada?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "¿Importar datos?" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2940,82 +3096,86 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Renombrar el Directorio de mapas" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Error" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" +msgstr "No es posible renombrar el Directorio de mapas: %s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Renombrar Localización seleccionada" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Renombrar el Directorio de mapas" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" +"No es posible renombrar el Directorio de mapas.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -3025,11 +3185,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -3039,15 +3199,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -3057,50 +3217,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Eliminar objeto seleccionado" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Eliminar objeto seleccionado" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:497 +#, fuzzy +msgid "Error when deleting projects" +msgstr "Error leyendo el archivo '%s'." -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -3110,11 +3273,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3124,15 +3287,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3142,14 +3305,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "desconocido" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3161,15 +3325,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3177,8 +3341,8 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" @@ -3187,100 +3351,100 @@ msgstr "" "No ha sido posible realizar la importación de <%(name)s> .\n" "Razón: %(msg)s" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:662 +#, fuzzy, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" "Archivo de datos <%(name)s> importado exitosamente. La región predeterminada " "de la Localización fue definida a partir del mapa importado." -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"La Localización actual es <%(loc)s>.\n" +"El Directorio de mapas actual es <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "La Localización actual es <%(loc)s>.\n" "El Directorio de mapas actual es <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "El Directorio de mapas actual es <%s>." #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "Configuración para la georrectificación" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "Cancelada la configuración de la georrectificación." #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "Seleccionar tipo de mapa y Locación/Directorio de mapas" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "Tipo de mapa a georrectificar" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "ráster" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vector" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "Seleccionar Localización de origen:" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "Seleccionar Directorio de mapas de origen:" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" "Debe seleccionar una Localización válida antes que un Directorio de mapas" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" "Debe seleccionar una Localización y un Directorio de mapas válidos para " "poder continuar" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "Seleccionar un grupo de imágenes / mapas a georrectificar." @@ -3289,19 +3453,19 @@ msgid "Select/create group:" msgstr "Seleccionar/crear grupo:" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "Crear grupo si no existe ninguno" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "Añadir mapa vectorial al grupo..." -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "Extensión para los mapas de salida:" @@ -3310,17 +3474,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "Debe seleccionar un grupo de imágenes / mapas válido para continuar." #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "Debe introducir una extensión del nombre del mapa para continuar." #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" "Seleccionar mapas a visualizar para crear los puntos de control sobre el " @@ -3330,34 +3494,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "Seleccionar el mapa fuente a visualizar:" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "Seleccionar mapa ráster objetivo a visualizar:" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "Seleccionar mapa vectorial objetivo a visualizar:" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "Debe seleccionar mapa fuente para continuar" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3367,42 +3531,42 @@ msgstr "" "Por favor editar grupo o seleccionar otro grupo." #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "Administrar puntos de control sobre el terreno (GCP)" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "Se necesitan al menos %d puntos de control (GCP). Operación cancelada." #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "fuente" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "destino" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "Establecer coordenadas GCP" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3416,37 +3580,37 @@ msgstr "" "Norte: %(coor1)s" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "Falló la escritura del archivo de PUNTOS" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "Archivo de PUNTOS guardado para grupo <%s>" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "mapwin de entrada no definido" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "mapwin de salida no definido" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "Falló la lectura del archivo de PUNTOS" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3461,56 +3625,56 @@ msgstr "" "6+ puntos para 2o orden, y\n" "10+ puntos para 3er orden." -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "Rectificando imágenes, por favor espere..." -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "Transformando <%s>..." -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "Rectificando mapa vectorial <%s>, por favor espere..." -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "La Georrectificación del mapa vectorial <%s> ha fallado." -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" "Configuraciones del Administrador de puntos de control sobre el terreno" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "Salir del Administrador de puntos de control sobre el terreno GCP" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "Guardar puntos de control sobre el terreno?" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." @@ -3518,8 +3682,8 @@ msgstr "" "No se pudo calcular Error RMS.\n" "Posible error con m.transform." -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." @@ -3527,169 +3691,169 @@ msgstr "" "No se pudieron calcular nuevas extensiones.\n" "Posible error con m.transform." -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "Ajustar vista de entrada a vista de salida" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "Ajustar vista de salida a vista de entrada" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "utilizar" -#: ../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 +#: ../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 msgid "source E" msgstr "fuente E" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "Fuente N" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "objetivo E" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "objetivo N" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "Error siguiente" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "Error anterior" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "Valor de coordenada no válido. Operación cancelada." -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "Crear nuevo grupo de mapas vectoriales" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "Seleccionar mapa(s) vectorial(es) para añadir al grupo:" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "Editar puntos de control sobre el terreno (GCP)" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "No. Punto de control sobre el terreno" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "fuente E:" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "objetivo E:" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "fuente N:" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "objetivo N:" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "Aplicar cambios para la sesión actual" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" "Aplicar y guardar los cambios en el archivo de configuración del usuario " "(predeterminado para las próximas sesiones)." -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Cerrar cuadro de diálogo" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "Simbología" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "Sólo destacar error RMS más alto" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "Destacar error RMS > factor M + SD *:" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" @@ -3699,100 +3863,100 @@ msgstr "" "media + desviación estandard * factor facilitado. \n" "Los valores recomendados para este factor están entre 1 y 2." -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "Configuración de símbolos" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "Color para un error RMS elevado:" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "Color para el GCP seleccionado" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "Color para los GCPs no utilizados:" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "Mostrar GCPs no utilizados" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "Tamaño del símbolo:" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "Rectificación" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "Seleccionar orden de rectificación" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "Primer orden" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "Segundo orden" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "Tercer orden" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "Seleccionar método de interpolación:" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" "recorta la visualización a la región computacional en la Localización de " "destino" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "sobre-escribir mapa resultante" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "Factor RMS umbral debe ser> 0" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" @@ -3800,9 +3964,9 @@ msgstr "" "El factor RMS umbral es < 1\n" "Se tendrían que destacar demasiados puntos" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "Configuraciones del Administrador GCP guardadas en el archivo '%s'." @@ -3839,10 +4003,10 @@ msgstr "Visualización de origen" msgid "Target Display" msgstr "Visualización objetivo " -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3851,7 +4015,7 @@ msgstr "Configuración de página" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3860,7 +4024,7 @@ msgstr "Vista previa de impresión" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3874,14 +4038,14 @@ msgstr "Acercamiento a la región computacional (definida mediante g.region)." #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "Acercamiento a la región predeterminada" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "Acercamiento a una región guardada" @@ -3894,33 +4058,33 @@ msgstr "Establecer la región computacional desde la visualización" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "Guardar la geometría de la visualización a la región nombrada" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Número de categoría" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Intervalo válido:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "Error RMS" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "Adelante: %(forw)s, Hacia atrás:%(back)s" @@ -3950,7 +4114,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3986,300 +4150,310 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "Definir nueva Localización GRASS" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "Esta opción es requerida" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "(opcional)" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Nombre" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" msgstr "Nombre de directorio de Localización en el Directorio de datos SIG" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Descripción" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:251 +#, fuzzy +msgid "Description of project directory in GIS Data Directory" +msgstr "Nombre de directorio de Localización en el Directorio de datos SIG" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "No se ha podido crear una nueva base de datos de GRASS" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 +#, fuzzy msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" +"Nombre <%(name)s> no es válido para Localización o Directorio de mapas. Por " +"favor use solo caracteres ASCII excluyendo %(chars)s y espacio." -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "Nombre no válido" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 +#, fuzzy msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" "El título de la Localización está limitado a una línea y 256 caracteres. El " "resto del texto será ignorado." -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Código" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Código de la proyección:" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Buscar en la descripción:" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "No se puede leer la lista: %s" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "Seleccionar parámetros de proyección" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "Seleccionar datum o elipsoide (página siguiente)" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "Seleccionar datum con elipsoide asociado" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "Solamente Elipsoide" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "Tienes que entrar un valor para %s" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "Introduzca los parámetros para la proyección %s" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "No" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Sí" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "Especificar datum geodésico" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "Elipsoide" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Código del datum:" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "Especificar elipsoide:" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "Basado en la tierra." -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "Cuerpos planetarios" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "Código del elipsoide:" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "Archivo georreferenciado:" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "Seleccionar archivo georreferenciado" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Parámetros" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "Imposible leer los códigos EPGS: {0}" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "Escoger código IAU" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "Ruta al archivo de códigos IAU:" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "Código IAU:" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "Escoger archivo de códigos IAU" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "No ha sido posible leer códigos IAU: {0}" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "Introduzca la cadena de parámetros PROJ.4:" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "Se requiere una transformación del datum." -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Resumen" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "Base de datos de GRASS:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Nombre de la Localización:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Código de la proyección:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Descripción:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Proyección:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" @@ -4287,15 +4461,15 @@ msgstr "" "Definición PROJ.4:\n" "(no-definitiva)" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "personalizar" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" @@ -4304,152 +4478,208 @@ msgstr "" "\n" "Detalles: %(err)s" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" msgstr "No se puede crear la nueva Localización" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "La Localización ya existe en la base de datos de GRASS." -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "Falta el código EPSG." -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "Falta código IAU." -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "Archivo <%s> no encontrado." -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "Establecer la extensión y resolución de la región predeterminada" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "&Establecer región" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "Se ha seleccionado una Localización no válida." -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "Región no válida" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "Pulse aquí para mostrar la configuración 3D" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "Pulse aquí para ocultar la configuración 3D" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Filas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Columnas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Celdas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Profundidad: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "Celdas 3D: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "Superior" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "Inferior" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "Resolución del espacio entre los límites superior e inferior" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Norte" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Oeste" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Este" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Sur" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "Resolución N-S" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "Resolución E-O" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "Valor no válido: %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "Seleccionar transformación de datum" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "Seleccione de la lista de transformaciones de datum" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Remover" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Inhabilitar" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Habilitar" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "Definir etiqueta" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "Definir comentario" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "Añadir punto de control" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "Eliminar punto de control" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "Intermedio" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Propiedades" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "Etiqueta:" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "Comentario:" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "Configuraciones del modelador" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4466,7 +4696,6 @@ msgid "Disabled:" msgstr "Inhabilitado:" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "Editor de Python" @@ -4476,10 +4705,10 @@ msgid "GRASS API:" msgstr "Ayuda de GRASS" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Comando" @@ -4505,7 +4734,7 @@ msgid "Shape size" msgstr "Tamaño de la forma" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Tipo." @@ -4534,13 +4763,13 @@ msgid "Comment" msgstr "Comentario" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "Propiedades del modelo" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Metadatos" @@ -4549,7 +4778,7 @@ msgid "Commands" msgstr "Comandos" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4560,19 +4789,19 @@ msgid "Apply properties" msgstr "Aplicar propiedades" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "Cerrar el cuadro de diálogo e ignorar los cambios" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Nombre:" @@ -4581,64 +4810,452 @@ msgstr "Nombre:" msgid "Author(s):" msgstr "Autor(es):" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "Modelador Gráfico" + +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Modelo" + +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Ítems" + +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Variables" + +#: ../gui/wxpython/gmodeler/panels.py:189 +#, fuzzy +msgid "Script editor" +msgstr "&editor simple" + +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "Salida del comando" + +#: ../gui/wxpython/gmodeler/panels.py:273 +#, fuzzy +msgid "{} script contains local modifications" +msgstr "Script de python contiene modificaciones locales" + +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +#, fuzzy +msgid "{} script is up-to-date" +msgstr "Script de Python está actualizado" + +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d segundos" + +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" +msgstr "%(min)d minutos %(sec)d segundos" + +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "Comando finalizado" + +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" +msgstr "Finalizó el cómputo del modelo" + +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" +msgstr "%d mapas intermedios removidos del directorio de mapas actual" + +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" +msgstr "" +"La lectura del archivo del modelo <%s> ha fallado.\n" +"Archivo no válido, no es posible parsear el documento XML.\n" +"\n" +"%s" + +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "Por favor espere, cargando modelo..." + +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." +msgstr "" +"La escritura de las configuraciones actuales en el archivo del modelo ha " +"fallado." + +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." +msgstr "No es posible abrir el archivo <%s> para escribir." + +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" +msgstr "" +"El modelo actual no está vacío. Quiere almacenar las configuraciones " +"actuales en el archivo del modelo?" + +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "¿Crear nuevo modelo?" + +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "Escoger archivo del modelo" + +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "Archivo de Modelo GRASS (*.gxm)|*.gxm" + +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" +msgstr "%(items)d items (%(actions)d actions) cargados en el modelo" + +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "El archivo del modelo <%s> ya existe. Quiere sobrescribirlo?" + +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "Guardar modelo" + +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" +msgstr "Archivo <%s> guardado" + +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "Seleccione el archivo donde guardar el modelo actual" + +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "Modelo exportado a <%s>" + +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "Añadir comentario" + +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." +msgstr "Contenido vacío. Nada que añadir al modelo." + +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." +msgstr "Sin datos intermedios que eliminar." + +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "Desea eliminar los datos permanentemente?%s" + +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "Eliminar datos intermedios?" + +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "El modelo no es válido. Nada que validar." + +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Validando modelo..." + +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" +msgstr "" +"El modelo no es válido.\n" +"\n" +"%s" + +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "El modelo es válido." + +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "Modelador Gráfico wxGUI" + +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Redibujando modelo..." + +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Desea guardar los cambios en el modelo?" + +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "" +"Desea almacenar las actuales configuraciones del modelo en el archivo del " +"modelo?" + +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Salir del Modelador Gráfico" + +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "Lista de variables - derecha- clic para eliminar" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Tipo de dato" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "Valor predeterminado" + +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "Añadir nueva variable" + +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" +msgstr "entero" + +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "flotante" + +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "string" + +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "región" + +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "Directorio de mapas" + +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "archivo" + +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" +msgstr "dir" + +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "Añadir nueva variable al modelo" + +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "Lista deítems -derecha-click para eliminar" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "Etiqueta" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "En bucle (loop)" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" +msgstr "Parametrizado" + +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." +msgstr "No se ha seleccionado ningún elemento." + +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Script de Python" + +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" +msgstr "&Ejecutar" + +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "Lanzar script" + +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Guardar script de python en archivo" + +#: ../gui/wxpython/gmodeler/panels.py:1622 +#, fuzzy +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" +"Refrescar script de Python basado en el modelo.\n" +"Descartará todos los cambios locales." + +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" +msgstr "Python" + +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Script de Python" + +#: ../gui/wxpython/gmodeler/panels.py:1710 +#, fuzzy +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" +msgstr "" +"El script de Python fue modificado localmente. Al refrescar se descartarán " +"todos los cambios. ¿Realmente quiere continuar?" + +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" +msgstr "Actualizar" + +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Script Python (*.py)|*.py" + +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "Escoger archivo a guardar" + +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "El archivo <%s> ya existe. Quiere sobrescribir este archivo?" + +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "Guardar archivo" + +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" +msgstr "No se puede lanzar script de Python. %s" + +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "Crear nuevo modelo" + +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "Cargar modelo del archivo" + +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Guardar modelo al archivo" + +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 msgid "Export model to image" msgstr "Exportar modelo a imagen" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 msgid "Export model to Python script" msgstr "Exportar modelo a script Python" -#: ../gui/wxpython/gmodeler/toolbars.py:52 +#: ../gui/wxpython/gmodeler/toolbars.py:63 msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 +#: ../gui/wxpython/gmodeler/toolbars.py:66 msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 +#: ../gui/wxpython/gmodeler/toolbars.py:70 msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 +#: ../gui/wxpython/gmodeler/toolbars.py:73 msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 +#: ../gui/wxpython/gmodeler/toolbars.py:76 msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 msgid "Run model" msgstr "Ejecutar modelo" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 msgid "Validate model" msgstr "Validar modelo" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" -msgstr "" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "Propiedades del modelo" -#: ../gui/wxpython/gmodeler/toolbars.py:66 +#: ../gui/wxpython/gmodeler/toolbars.py:83 msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 +#: ../gui/wxpython/gmodeler/toolbars.py:85 msgid "Redraw model canvas" msgstr "" @@ -4663,16 +5280,6 @@ msgstr "Añadir comando GRASS al modelo" msgid "Label and comment" msgstr "Etiquetar y comentar" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "Etiqueta:" - -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "Comentario:" - #: ../gui/wxpython/gmodeler/dialogs.py:308 msgid "" "Command not defined.\n" @@ -4699,7 +5306,7 @@ msgstr "Propiedades de las relaciones" msgid "From" msgstr "Desde" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 msgid "To" msgstr "Hacia" @@ -4744,12 +5351,6 @@ msgstr "" msgid "Condition" msgstr "Condición" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "Etiqueta" - #: ../gui/wxpython/gmodeler/dialogs.py:564 msgid "Loop properties" msgstr "Propiedades del bucle" @@ -4796,50 +5397,46 @@ msgstr "Desea eliminar todas las variables del modelo?" msgid "Delete variables" msgstr "Eliminar variables" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 #: ../gui/wxpython/vdigit/dialogs.py:304 msgid "Delete selected" msgstr "Borrar lo seleccionado" -#: ../gui/wxpython/gmodeler/dialogs.py:914 +#: ../gui/wxpython/gmodeler/dialogs.py:913 #: ../gui/wxpython/vdigit/dialogs.py:308 msgid "Delete all" msgstr "Borrar todo" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 msgid "Reload" msgstr "Recargar" -#: ../gui/wxpython/gmodeler/model.py:74 +#: ../gui/wxpython/gmodeler/model.py:80 msgid "model" msgstr "modelo" -#: ../gui/wxpython/gmodeler/model.py:75 +#: ../gui/wxpython/gmodeler/model.py:81 msgid "Script generated by wxGUI Graphical Modeler." msgstr "Scrip generado por el Modelador Gráfico wxGUI." -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 #, python-format msgid "undefined variable '%s'" msgstr "Variable '%s' no definida" -#: ../gui/wxpython/gmodeler/model.py:612 +#: ../gui/wxpython/gmodeler/model.py:618 msgid "Running model..." msgstr "Ejecutando modelo..." -#: ../gui/wxpython/gmodeler/model.py:633 +#: ../gui/wxpython/gmodeler/model.py:639 msgid "Model is empty. Nothing to run." msgstr "El modelo está vacío. No hay nada que ejecutar." -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Validando modelo..." - -#: ../gui/wxpython/gmodeler/model.py:650 +#: ../gui/wxpython/gmodeler/model.py:656 #, python-format msgid "" "Model is not valid. Do you want to run the model anyway?\n" @@ -4850,454 +5447,71 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/gmodeler/model.py:653 +#: ../gui/wxpython/gmodeler/model.py:659 msgid "Run model?" msgstr "Ejecutar modelo?" -#: ../gui/wxpython/gmodeler/model.py:688 +#: ../gui/wxpython/gmodeler/model.py:696 msgid "Variables below not defined:" msgstr "Las siguientes variables no están definidas:" -#: ../gui/wxpython/gmodeler/model.py:801 +#: ../gui/wxpython/gmodeler/model.py:809 msgid "Raster maps" msgstr "Mapas ráster" -#: ../gui/wxpython/gmodeler/model.py:804 +#: ../gui/wxpython/gmodeler/model.py:812 msgid "3D raster maps" msgstr "Mapas ráster 3D" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 msgid "Vector maps" msgstr "Mapas vectoriales" -#: ../gui/wxpython/gmodeler/model.py:1556 +#: ../gui/wxpython/gmodeler/model.py:1564 msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 +#: ../gui/wxpython/gmodeler/model.py:1758 msgid "Condition: " msgstr "Condición:" -#: ../gui/wxpython/gmodeler/model.py:1752 +#: ../gui/wxpython/gmodeler/model.py:1760 msgid "Condition: not defined" msgstr "Condición: no definida" -#: ../gui/wxpython/gmodeler/model.py:1894 +#: ../gui/wxpython/gmodeler/model.py:1902 msgid "if-else" msgstr "if-else" -#: ../gui/wxpython/gmodeler/model.py:2000 +#: ../gui/wxpython/gmodeler/model.py:2008 msgid "empty" msgstr "vacío" -#: ../gui/wxpython/gmodeler/model.py:2001 +#: ../gui/wxpython/gmodeler/model.py:2009 #, python-brace-format msgid "Details: unsupported tag name '{0}'." msgstr "Detalles: nombre de etiqueta no soportado '{0}'." -#: ../gui/wxpython/gmodeler/model.py:3479 +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Aviso" + +#: ../gui/wxpython/gmodeler/model.py:3643 msgid "Model parameters" msgstr "Parámetros del modelo" -#: ../gui/wxpython/gmodeler/model.py:3500 +#: ../gui/wxpython/gmodeler/model.py:3665 msgid "Delete intermediate data when finish" msgstr "Eliminar datos intermedios cuando termine" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" -msgstr "&Ejecutar" - -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" -msgstr "Variables" - -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" -msgstr "Modelador Gráfico" - -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" -msgstr "Modelo" - -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" -msgstr "Ítems" - -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" -msgstr "Salida del comando" - -#: ../gui/wxpython/gmodeler/frame.py:251 -#, fuzzy -msgid "{} script contains local modifications" -msgstr "Script de python contiene modificaciones locales" - -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -#, fuzzy -msgid "{} script is up-to-date" -msgstr "Script de Python está actualizado" - -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." -msgstr "Redibujando modelo..." - -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" -msgstr "%d segundos" - -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" -msgstr "%(min)d minutos %(sec)d segundos" - -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" -msgstr "Comando finalizado" - -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" -msgstr "Finalizó el cómputo del modelo" - -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "Desea guardar los cambios en el modelo?" - -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" -msgstr "" -"Desea almacenar las actuales configuraciones del modelo en el archivo del " -"modelo?" - -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" -msgstr "Salir del Modelador Gráfico" - -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "%d mapas intermedios removidos del directorio de mapas actual" - -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." -msgstr "Sin datos intermedios que eliminar." - -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "Desea eliminar los datos permanentemente?%s" - -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "Eliminar datos intermedios?" - -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" -msgstr "" -"El modelo actual no está vacío. Quiere almacenar las configuraciones " -"actuales en el archivo del modelo?" - -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" -msgstr "¿Crear nuevo modelo?" - -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" -msgstr "Escoger archivo del modelo" - -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" -msgstr "Archivo de Modelo GRASS (*.gxm)|*.gxm" - -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" -msgstr "%(items)d items (%(actions)d actions) cargados en el modelo" - -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" -msgstr "El archivo del modelo <%s> ya existe. Quiere sobrescribirlo?" - -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" -msgstr "Guardar modelo" - -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" -msgstr "Archivo <%s> guardado" - -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" -msgstr "Seleccione el archivo donde guardar el modelo actual" - -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." -msgstr "El modelo no es válido. Nada que validar." - -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" -msgstr "" -"El modelo no es válido.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." -msgstr "El modelo es válido." - -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" -msgstr "Modelo exportado a <%s>" - -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" -msgstr "Añadir comentario" - -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." -msgstr "Contenido vacío. Nada que añadir al modelo." - -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" -msgstr "Modelador Gráfico wxGUI" - -#: ../gui/wxpython/gmodeler/frame.py:1116 -#, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" -msgstr "" -"La lectura del archivo del modelo <%s> ha fallado.\n" -"Archivo no válido, no es posible parsear el documento XML.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "Por favor espere, cargando modelo..." - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." -msgstr "" -"La escritura de las configuraciones actuales en el archivo del modelo ha " -"fallado." - -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "No es posible abrir el archivo <%s> para escribir." - -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "Remover" - -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" -msgstr "Inhabilitar" - -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" -msgstr "Habilitar" - -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" -msgstr "Definir etiqueta" - -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" -msgstr "Definir comentario" - -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" -msgstr "Añadir punto de control" - -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "Eliminar punto de control" - -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" -msgstr "Intermedio" - -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" -msgstr "Propiedades" - -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "Lista de variables - derecha- clic para eliminar" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" -msgstr "Tipo de dato" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "Valor predeterminado" - -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" -msgstr "Añadir nueva variable" - -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" -msgstr "entero" - -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "flotante" - -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "string" - -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "región" - -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" -msgstr "Directorio de mapas" - -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "archivo" - -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" -msgstr "dir" - -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" -msgstr "Añadir nueva variable al modelo" - -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "Lista deítems -derecha-click para eliminar" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" -msgstr "En bucle (loop)" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" -msgstr "Parametrizado" - -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." -msgstr "No se ha seleccionado ningún elemento." - -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" -msgstr "Script de Python" - -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -#, fuzzy -msgid "Run script" -msgstr "Lanzar script" - -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Guardar script de python en archivo" - -#: ../gui/wxpython/gmodeler/frame.py:2047 -#, fuzzy -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." -msgstr "" -"Refrescar script de Python basado en el modelo.\n" -"Descartará todos los cambios locales." - -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" -msgstr "Python" - -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:2078 -#, fuzzy -msgid "Python script type" -msgstr "Script de Python" - -#: ../gui/wxpython/gmodeler/frame.py:2110 -#, fuzzy -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" -msgstr "" -"El script de Python fue modificado localmente. Al refrescar se descartarán " -"todos los cambios. ¿Realmente quiere continuar?" - -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" -msgstr "Actualizar" - -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" -msgstr "Escoger archivo a guardar" - -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" -msgstr "Script Python (*.py)|*.py" - -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" -msgstr "El archivo <%s> ya existe. Quiere sobrescribir este archivo?" - -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" -msgstr "Guardar archivo" - -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" -msgstr "No se puede lanzar script de Python. %s" - -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" -msgstr "" - -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "&Archivo" @@ -5309,7 +5523,7 @@ msgstr "Entorno de trabajo" msgid "Create new workspace" msgstr "Crear nuevo archivo de Entorno de trabajo" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Abrir" @@ -5317,7 +5531,7 @@ msgstr "Abrir" msgid "Load workspace from file" msgstr "Cargar archivo de Entorno de trabajo desde archivo" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Guardar" @@ -5327,7 +5541,7 @@ msgstr "Guardar" msgid "Save workspace" msgstr "Guardar Entorno de trabajo" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Guardar cómo" @@ -5340,7 +5554,7 @@ msgid "Close workspace file" msgstr "Cerrar archivo del Entorno de trabajo" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "Vista del mapa" @@ -5377,7 +5591,7 @@ msgid "Add RGB raster map layer to current display" msgstr "Añadir capa de mapa ráster RGB al visualizador actual" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "Añadir capa de servicio web" @@ -5405,25 +5619,25 @@ msgstr "Cerrar ventana de visualización de mapas actual" msgid "Close all open map display windows" msgstr "Cerrar todas las ventanas de visualización de mapas" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "Importación simplificada de mapas raster con reproyección" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" "Importa datos ráster a un mapa ráster de GRASS utilizando la librería GDAL." -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "Importación de formatos ráster comunes" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "Importación y cuadriculado de puntos x,y,z ASCII" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." @@ -5431,78 +5645,78 @@ msgstr "" "Crea un mapa ráster a partir de un ensamblaje de muchas coordenadas usando " "estadísticas univariadas." -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "Importar matriz ASCII" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" "Convierte un archivo ráster GRASS ASCII en una capa de mapa ráster binaria." -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "Importar polígonos, líneas y puntos ASCII" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" "Crear mapas ráster a partir de archivos de datos de polígonos/líneas/puntos " "ASCII." -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "Importar arreglo binario crudo" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "Importar un archivo ráster binario a una capa de mapa ráster de GRASS." -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "Importar GRIDATB.FOR" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "Importa archivo de mapa GRIDTB.FOR (TOPMODEL) a mapa ráster de GRASS." -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "Importar Matlab 2D array" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importa un archivo binario MAT(v4) a un ráster de GRASS." -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "Importar PNG" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "Importa de formato de imagen PNG no georeferenciado." -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "Importar SPOT NDVI" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "Importa datos SPOT VGT NDVI a un mapa ráster." -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "Importar SRTM HGT" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "Importa archivo SRTM HGT a un mapa ráster." -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Importar Terra ASTER HDF" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." @@ -5511,34 +5725,42 @@ msgstr "" "relativos usando gdalwarp." #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "Importar puntos LAS LiDAR" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." -msgstr "" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +#, fuzzy +msgid "Module not installed" +msgstr "Estilo de diálogo de módulos:" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "Desempaquetar mapa ráster" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" @@ -5547,102 +5769,100 @@ msgstr "" "un mapa ráster" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +#, fuzzy +msgid "Reproject raster map from different GRASS project" msgstr "Reproyectar mapa ráster de una Localización GRASS diferente" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" "Reproyecta un mapa ráster de una Localización dada a la Localización actual." -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "Importación simplificada de mapas vectoriales con reproyección" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" "Importa datos vectriales a mapa vectorial de GRASS usando la librería OGR." -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "Importación de formatos vectoriales comunes" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "Formato ASCII de puntos o GRASS ASCII" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" "Crea un mapa vectorial a partir de archivo de puntos ASCII o ASCII vectorial." -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "Puntos ASCII como líneas vectoriales" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "Importa coordenadas x,y[,z] ASCII como series de líneas." -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "Importar DXF" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" "Convierte archivos en formato DXF a formato de mapa vectorial de GRASS." -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "Importa GetFeature de un servidor WFS." -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "Importar e00 de ESRI" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "Importa archivo E00 a mapa vectorial." -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "Importar GEOnet" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" "Importar archivos de paises de geonames.org a mapa vectorial de puntos." -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "Importar Matlab array o formato Mapgen" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "Importa mapas vectoriales Mapgen o Matlab-ASII a GRASS." -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "Desempaquetar mapa vectorial" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" @@ -5651,190 +5871,192 @@ msgstr "" "como un mapa vectorial" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" msgstr "Reproyectar mapa vectorial de una Localización GRASS diferente" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Reproyecta un mapa vectorial de una Localización a la Localización actual." -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "Importar datos ráster 3D" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "Importar ASCII 3D" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" "Convierte un archivo de texto ráster ASCII 3D en un mapa ráster 3D (binario)." -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "Importar arreglo binario 3D crudo" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "Importa un archivo ráster binario a un mapa ráster de GRASS 3D." -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Importar Vis5D" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "Importar archivos Vis5D tridimensionales." -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "Importar tabla de base de datos" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "Formatos de importación comunes" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "Importa tablas de atributos en varios formatos." -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "Exportar mapa ráster" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "Formatos de exportación comunes" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "Exporta mapas ráster de GRASS a formatos soportados por GDAL." -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "Exportación a cuadrícula ASCII" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "Convierte una capa de mapa ráster a un archivo de texto ASCII." -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "Exportar puntos x,y,z ASCII" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" "Exportar un mapa ráster a un archivo de texto como valores x,y,z basado en " "los centros de las celdas." -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "Exportación a GRIDATB.FOR" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "Exporta mapa ráster de GRASS a archivo de mapa GRIDATB.FOR (TOPMODEL)." -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "Exportación de Matlab 2D array" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "Exporta un ráster de GRASS a un archivo MAT binario." -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "Exportar arreglo binario crudo" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "Exporta un ráster de GRASS a un arreglo binario." -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "Exportar a MPEG-1" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "Convierte serie de mapas ráster a película MPEG." -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "Exportar a PNG" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" "Exportar mapa ráster de GRASS como formato de imagen PNG no georreferenciada." -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "Exportar a PPM" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "Convierte mapa ráster GRASS a archivo de imagen PPM." -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "Exportar a PPM a partir de RGB" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "Convierte 3 capas ráster de GRASS (R,G,B) a un archivo de imagen PPM." #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "Exportar a POV-Ray" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" "Convierte una capa de mapa ráster en un archivo de altura de campo POV-Ray." -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "Exportar a VRML" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" "Exporta un mapa ráster al Lenguaje de Modelado de Realidad Virtual (VRML)." #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "Exportar a VTK" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "Convierte mapas ráster al formato VTK-ASCII." -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "Empaquetar mapa ráster" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" "Exporta un mapa ráster como archivo de almacenamiento específico de GRASS GIS" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "Exportar mapa vectorial" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." @@ -5842,11 +6064,11 @@ msgstr "" "Exporta un mapa vectorial en cualquier formato soportado por OGR. Los mapas " "vectoriales se exportan por defecto en el formato GeoPackage." -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "Exportar puntos ASCII o ASCII de GRASS a vectorial" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." @@ -5855,112 +6077,112 @@ msgstr "" "predeterminado solo los elementos con categoría son exportados. Para " "exportar todos los elementos use 'layer=-1'." -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "Exportar a DXF" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "Exporta mapa vectorial a formato de archivo DXF." -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "Exportar a PostGIS" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "Exporta una capa de mapa vectorial a tabla de elemetos PostGIS." -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "Convierte puntos GRASS x,y,z al formato POV-Ray x,z,y." -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "Exportar a SVG" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "Exporta un mapa vectorial a un archivo SVG." -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "Convierte un mapa vectorial a salida ASCII VTK." -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "Empaquetar mapa vectorial" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "Exporta un mapa vectorial como un archivo específico de GRASS GIS" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "Exportar mapas ráster 3D" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "Exportar a ASCII 3D" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "Convierte una capa de mapa ráster 3D en un archivo de texto ASCII." -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "Exportar arreglo binario 3D crudo" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "Exporta un mapa ráster de GRASS a una matriz binaria." -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Exportar a Vis5D" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "Exportar mapa ráster 3D de GRASS a archivo tridimensional Vis5D." -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "Convierte mapas ráster al formato VTK-ASCII." -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "Exportar tabla de la base de datos" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "Exporta tablas de atributos a varios formatos." -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "Enlazar datos ráster externos" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" "Enlace GDAL soporta datos ráster como pseudo capas de mapa ráster GRASS." -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "Enlazar datos vectoriales externos" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" "Crea un nuevo mapa pseudo-vectorial como un enlace a una capa soportada por " "OGR." -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "Formato de salida para datos ráster" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." @@ -5968,36 +6190,36 @@ msgstr "" "Redirige el mapa ráster de salida a un archivo utilizando la librería GDAL " "en lugar de almacenarlo con el formato ráster de GRASS." -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "Formato de salida para datos vectoriales" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "Define el formato de salida del vectorial utilizando la librería OGR." -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "Administrar mapas" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "Copiar" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "Enlistar" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." @@ -6005,19 +6227,19 @@ msgstr "" "Enlista archivos de base de datos de GRASS del tipo de datos especificado " "por el usuario opcionalmente usando el patrón de búsqueda." -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "Renombrar" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" "Cambia el nombre archivos de elementos de base de datos en el Directorio de " "mapas actual del usuario." -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." @@ -6026,73 +6248,73 @@ msgstr "" "actual del usuario usando un patrón de búsqueda." #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "Conversiones de tipos de mapas" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "Ráster a vectorial" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "Convierte un mapa ráster en un mapa vectorial." #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "Series ráster a ráster 3D" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" "Convierte secciones de corte 2D de un mapa ráster a un mapa ráster de " "volumen 3D." #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "Ráster 2.5D a ráster 3D" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" "Crea un mapa de volumen 3D basado en mapas ráster de elevación y valor 2D." #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "Vectorial a ráster" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "Convierte (rasteriza) un mapa vectorial a un mapa ráster." #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "Vectorial a ráster 3D" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" "Convierte un mapa vectorial (solo puntos) en una capa de mapa ráster 3D." #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "vectorial 2D a vectorial 3D" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "Ejecuta la transformación de objetos espaciales vectoriales 2d a 3D." @@ -6100,21 +6322,21 @@ msgstr "Ejecuta la transformación de objetos espaciales vectoriales 2d a 3D." msgid "3D raster to raster series" msgstr "Ráster 3D a series ráster" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "Convierte mapas ráster 3D en mapas ráster 2D" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" "Administra los Puntos de Control sobre el Terreno para Georectificación" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "Modelador gráfico" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "Lanzar modelador gráfico" @@ -6134,13 +6356,13 @@ msgstr "" "Crear un renderizado 3D de datos SIG. Renderiza superficies (datos ráster). " "Datos vectoriales 2D/3D, y volúmenes (datos ráster 3D) en 3D." -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "Herramienta de animación" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "Lanzar herramienta de animación." @@ -6156,16 +6378,16 @@ msgstr "" "Una utilería simple para convertir medidas de rumbo y distancia a " "coordenadas y viceversa. Asume sistema de coordenadas cartesinas" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "Diseñador cartográfico" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "Lanzar diseñador cartográfico" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "Lanzar Ventana de visualización móvil" @@ -6185,7 +6407,7 @@ msgstr "Editor Simple para Python" msgid "Launches Simple Python Editor." msgstr "Inicia el Editor Simple para Python" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "Cerrar GUI" @@ -6193,8 +6415,8 @@ msgstr "Cerrar GUI" msgid "Close graphical user interface." msgstr "Cerrar la interfaz gráfica de usuario." -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "Salir de GRASS GIS" @@ -6202,42 +6424,42 @@ msgstr "Salir de GRASS GIS" msgid "Close GUI and exit GRASS GIS shell." msgstr "Cerrar GUI y salir de la consola de GRASS GIS." -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "&Configuraciones" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "Región computacional" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "Mostrar región actual" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "Muestra la extensión y resolución de la región computacional." -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "Mostrar la región usando latitud y longitud" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "Mostrar la extensión de la región actual en el Map Display" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "Muestra la extensión de la región computacional en el Map Display." -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "Establecer región" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" "Administra las definiciones de los contornos para la región geográfica." @@ -6251,7 +6473,8 @@ msgid "Mapset access" msgstr "Acceso a Directorio de mapas" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#, fuzzy +msgid "Set/unset access to other mapsets in current project" msgstr "" "Establecer/desestablecer el acceso a otros Directorios de mapas en la " "Localización actual" @@ -6282,11 +6505,13 @@ msgstr "" "Localización dada." #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "Cambiar Localización y Directorio de mapas" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "Cambiar Localización actual y Directorio de mapas." #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#, fuzzy +msgid "Change current project and mapset." msgstr "Cambiar Localización actual y Directorio de mapas." #: ../gui/wxpython/menustrings.py:240 @@ -6324,16 +6549,21 @@ msgstr "" "GRASS. Enlista todas las variables GRASS si no se da ninguna opción." #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +#, fuzzy +msgid "Create new project (location)" msgstr "Crear nueva Localización" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +#, fuzzy +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" "Lanza el asistente de Localizaciones para crear una nueva Localización GRASS." #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +#, fuzzy +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" "Crea nuevo Directorio de mapas en la Localización actual, cambia Directorio " "de mapas actual." @@ -6359,10 +6589,10 @@ msgid "Manage projections" msgstr "Administrar proyecciones" #: ../gui/wxpython/menustrings.py:256 +#, fuzzy msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" "Muestra o modifica el archivo de la información de proyección de GRASS (en " "varias descripciones de sistemas de coordenadas). Puede ser usado también " @@ -6397,7 +6627,7 @@ msgstr "Administrar extensiones instaladas" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "Actualiza o remueve Complemento(s) de extensión instalados." -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "Preferencias" @@ -6407,51 +6637,51 @@ msgstr "" "Preferencias del usuario para la interfaz gráfica de usuario (GUI) (tipo de " "letra, comandos, digitalizador, etc.)" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "&Ráster" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "Desarrollar mapa ráster" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "Comprimir/descomprimir" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "Comprime y descomprime mapas ráster." -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "Contornos de región" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "Establece las definiciones de los bordes para un mapa ráster." -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "Administrar los valores NULOS" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "Administra los valores nulos de un mapa ráster dado." -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "Cuantización" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "Produce el archivo de cuantización para un mapa de punto flotante." -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "Marca de tiempo" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." @@ -6459,37 +6689,37 @@ msgstr "" "Modifica una marca de tiempo para un mapa ráster. Imprimir/añadir/eliminar " "una marca de tiempo para un mapa ráster ." -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "Remuestrear utilizando estadística de conjuntos" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" "Remuestrea capas de mapa ráster en una malla más gruesa usando agregación." -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "Remuestrear utilizando varios métodos" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" "Remuestrea capas de mapas ráster en una red más fina usando interpolación." -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "Remuestrear utilizando el vecino más próximo" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "Capacidad de remuestreo de datos de una capa de mapa ráster de GRASS." -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "Remuestrar utilizando spline con tensión" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " @@ -6499,49 +6729,49 @@ msgstr "" "ráster de entrada a un nuevo mapa ráster (posiblemente con distinta " "resolución) usando splines regularizadas con tensión y suavizado." -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "Remuestrear usando bspline" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" "Realiza interpolación spline bicúbica o bilineal con regularización Tykhonov." -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "Remuestrear usando kernel analítico" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "Remuestrea mapa ráster usando un kernel analítico." #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "Mantenimiento de archivos de soporte" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" "Permite la creación y/o modificación de archivos de soporte de capas de " "mapas ráster." -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "Actualizar estadísticas de mapa" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "Actualizar estadísticas del mapa ráster" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "Realizar mosaico" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." @@ -6549,71 +6779,71 @@ msgstr "" "Produce mosaicos de la proyección de origen para su uso en la región y " "proyección de destino." -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "Administrar colores" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "Tablas de color" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "Crea/modifica la tabla de colores asociada a una capa de mapa ráster." -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "Tablas de color (stddev)" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" "Define las reglas de color basado en desviación estandar a partir del valor " "promedio de un mapa ráster." #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "Administrar de manera interactiva las reglas de colores" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "Administración interactiva de tablas de colores ráster." #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "Exportar tabla de colores" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "Exporta la tabla de colores asociada a un mapa ráster." -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "Mezclar 2 ráster de color" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" "Mezcla los componentes de color de dos mapas ráster en la proporción " "indicada." -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "Crear RGB" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" @@ -6621,11 +6851,11 @@ msgstr "" "compuesta." #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "Rojo, verde y azul (RGB) a Matiz, intensidad y saturación (HIS)" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " @@ -6635,36 +6865,36 @@ msgstr "" "matiz, intensidad y saturación (HIS) a partir de capas de mapa ráster de " "entrada especificadas por el usuario." -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "Consultar mapas ráster" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "Consultar valores por coordenadas" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" "Consulta capas de mapa ráster por sus valores y etiquetas de categoría." -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "Consultar colores por valor" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "Consulta los colores para una capa de mapa ráster." -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "Buffers ráster y distancia" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "Buffer ráster" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." @@ -6672,78 +6902,78 @@ msgstr "" "Crea una capa de mapa ráster que muestra zonas de buffer que rodean celdas " "que contienen valores de categoría no NULOS." -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "Círculos concéntricos" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" "Crea un mapa ráster que contiene anillos concéntricos alrededor de un punto " "dado." -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "Puntos más cercanos" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "Localiza los puntos más próximos entre objetos en dos mapas ráster." -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "Crecer por una celda" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" "Genera una capa de mapa ráster con áreas contiguas incrementadas en una " "celda." #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "Distancia a elementos más próximos" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "Crea una MÁSCARA para limitar operaciones ráster." #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "Calculadora de mapas ráster" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "Calculadora de mapas raster simplificada" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "Calculadora de mapas raster." -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "Análisis de vecindario" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "Ventana movil" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " @@ -6753,26 +6983,26 @@ msgstr "" "categoría asignados a las celdas a su alrededor y guarda los nuevos valores " "de celda en una capa de mapa ráster de salida." -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "Puntos de vecindario" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "Superponer rásters" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "Producto cruzado" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." @@ -6780,11 +7010,11 @@ msgstr "" "Crea un producto cruzado de los valores de categoría a partir de múltiples " "mapas ráster." -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "Parchar mapas ráster" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." @@ -6793,11 +7023,11 @@ msgstr "" "de una (o más) capa(s) de mapa para rellenar áreas \"sin datos\" en otra " "capa de mapa." -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "Agregación de series ráster" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." @@ -6806,11 +7036,11 @@ msgstr "" "asignados a las celdas correspondientes en las capas de mapa ráster de " "entrada." -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "Acumulación de series ráster" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." @@ -6819,11 +7049,11 @@ msgstr "" "valores asignados a las celdas correspondientes en las capas de mapa ráster " "de entrada." -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "Superposición estadística" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." @@ -6831,31 +7061,31 @@ msgstr "" "Calcula estadísticas orientadas a categorías u objetos (estadísticas basadas " "en acumulados)." -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "Superposición de cuantiles" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "Calcula categoría de cuantiles usando dos pasos." -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "Radiación solar y sombras" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "Mapa LatLong" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "Crea un mapa ráster latitud/longitud." -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "Irradiancia solar e irradiación" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6874,11 +7104,11 @@ msgstr "" "incidencia solar y/o mapas ráster de irradiancia. El efecto de sombreo de la " "topografía se puede incorporar de forma opcional." -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "Mapa de sombras" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " @@ -6889,11 +7119,11 @@ msgstr "" "exacta del sol o (B) fecha/hora para calcular la posición del sol mediante " "el mismo r.sunmask." -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "Horas de sol y ángulos solares" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6905,25 +7135,25 @@ msgstr "" "y el horizonte (idealizado). Azimut solar: el ángulo desde el norte en " "sentido de las manecillas del reloj," -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "Análisis del terreno" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "Genera líneas de contorno" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" "Produce una capa de mapa vectorial de contornos especificados a partir de " "una capa de mapa ráster." -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "Superficies de coste" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " @@ -6933,19 +7163,19 @@ msgstr "" "entre diferentes posiciones geográficas ubicadas en una capa de mapa ráster " "de entrada cuyos valores celdas son categorías que representan un coste." -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "Costo de movimientos acumulados" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " @@ -6956,41 +7186,41 @@ msgstr "" "mapa ráster de entrada cuyos valores de de celda son categorías que " "representan un coste." -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "Ruta o corriente de costes mínimos" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" "Traza un flujo a través de un modelo de elevación o una superficie de costo " "sobre una capa de mapa ráster." -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "Calcula sombreado de relieve" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" "Crea un mapa de sombreado de relieve a partir de uno de elevaciones (MDE)." -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "Aplicar sombreado a ráster" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" "Superpone un mapa ráster con color sobre un mapa de relieve con sombras o un " "mapa de orientación." -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "Pendiente y aspecto (orientación)" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " @@ -7000,11 +7230,11 @@ msgstr "" "y derivadas parciales a partir de una capa de mapa ráster de elevación. El " "aspecto se calcula en contra de las manecillas del reloj partiendo del Este." -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "Formas del terreno" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." @@ -7012,11 +7242,11 @@ msgstr "" "Calcula geomorfones (formas del terreno) y geometrías asociadas usando " "machine vision." -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "Parámetros del terreno" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." @@ -7025,20 +7255,20 @@ msgstr "" "escala tomando los parámetros de un ajuste cuadrático para cualquier tamaño " "de área (por medio de mínimos cuadrados)." -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "Objetos espaciales de textura" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" "Genera imágenes con objetos espaciales de textura a partir de un mapa ráster." -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "Visibilidad" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." @@ -7047,11 +7277,11 @@ msgstr "" "Formato predeterminado: NULL (no visible), ángulo vertical punto de vista " "wrt (visible)." -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "Ángulo del horizonte" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -7070,15 +7300,15 @@ msgstr "" "manecillas del reloj con este=0, norte=90 etc. La salida es la altura del " "horizonte en radianes." -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "Transformar elementos" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "Agrupar" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." @@ -7086,29 +7316,29 @@ msgstr "" "Recategoriza datos en una capa de mapa ráster agrupando celdas que forman " "áreas físicamente discretas en categorías únicas." -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "Incrementar" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "Adelgazar, afinar" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" "Adelgaza o afina en una capa de mapa ráster celdas que denotan elementos " "lineales." -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "Modelado hidrológico" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "Esculpir canales formados por corrientes." -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." @@ -7116,19 +7346,19 @@ msgstr "" "Genera canales de flujo. Toma los datos vectoriales que señalan una " "corriente, los transforma a ráster y resta la profundidad al MDE de salida." -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "Rellenar lago" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "Rellenar un lago en un punto dado a un nivel dado." -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "Mapa sin depresiones y líneas de flujo" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." @@ -7136,19 +7366,19 @@ msgstr "" "Filtra y genera un mapa de elevación sin depresiones y un mapa de dirección " "de flujo a partir de un mapa ráster de elevaciones." -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "Acumulación de flujo" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "Realiza cálculo de flujo para grillas de gran tamaño. " -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "Líneas de flujo" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." @@ -7157,53 +7387,53 @@ msgstr "" "acumulación de flujo (áreas contribuyentes) a partir de un mapa ráster de " "elevación." -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "Análisis de cuencas hidrográficas" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "Calcula parámetros hidrológicos y factores RUSLE." -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "Delimitación de sub-cuencas hidrográficas" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "Genera un mapa ráster de subcuencas hidrográficas." -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "Creación de cuencas hidrográficas" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "Crea cuencas hidrográficas a partir de mapa de dirección de drenaje." -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "Extracción de red de arrollos" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "Realiza extracción de red de arroyos." -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "Modelado de flujo superficial SIMWE" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" "Simulación de flujo hidrológico superficial utilizando un método de muestreo " "de ruta (SIMWE)." -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "Modelado de flujos de sedimento SIMWE" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." @@ -7211,11 +7441,11 @@ msgstr "" "Simulación de transporte de sedimento y erosión/deposición utilizando el " "método de muestreo de rutas (SIMWE)." -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "Mapa de índice topográfico" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." @@ -7223,40 +7453,40 @@ msgstr "" "Crea mapa ráster de índice topográfico (índice de humedad) a partir de un " "mapa ráster de elevación." -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "Simulación TOPMODEL." -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "Simula TOPMODEL que es un modelo hidrológico físicamente fundamentado." -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "Factor-K de USLE" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "Calcula Factor (K) de erosibilidad del suelo USLE." -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "Factor-R de USLE" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "Calcula factor R de USLE, Índice de erosividad de lluvia." -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "Modelado de aguas subterráneas" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "Flujo hídrico subterraneo" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -7264,11 +7494,11 @@ msgstr "" "Programa de cálculo numérico para flujo de aguas subterráneas temporales, " "confinadas i no confinadas en dos dimensiones" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "Tranporte de solutos de agua subterranea" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" @@ -7276,46 +7506,46 @@ msgstr "" "Programa de cálculo numérico para transporte en dos dimensiones de solutos " "transitorios, confinados y no confinados" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "Analizar parcelas del paisaje" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "Ajustar el marco de trabajo para muestreo y análisis" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "Editor de configuración para el 'indice' r.li." -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "Densidad de borde" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Calcula el índice de densidad de borde en un mapa ráster usando un algoritmo " "de 4 bordes vecinos" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "Contraste ponderado de densidad de borde" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" "Calcula el índice ponderado de contraste de densidad de bordes en un mapa " "ráster" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "Promedio de área de parcela" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" @@ -7323,102 +7553,102 @@ msgstr "" "Calcula el índice de tamaño medio de parcela en un mapa ráster usando un " "algoritmo de 4 parcelas vecinas" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "Rango de superficie de parcela." -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "Calcula el rango de tamaño de área de parcela en un mapa ráster" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "Desviación estándar de superficie de parcela." -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "Calcula la desviación estándar del área de parcela en un mapa ráster" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "Coeficiente de varianza de superficie de parcela." -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" "Calcula el coeficiente de varianción del área de parcela en un mapa ráster" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "Densidad de parcela" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Calcula el índice de densidad de parcela sobre un mapa ráster, usando un " "algoritmo de 4 parcelas vecinas" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "Número de parcelas" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" "Calcula el número de índice de parcela en un mapa ráster usando un algoritmo " "de 4 parcelas vecinas." -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "Dominancia de la diversidad" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "Calcula el dominio del índice de diversidad en un mapa ráster" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "Diversidad de Shannon" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "Calcula el índice de diversidad de Shannon en un mapa ráster" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "Diversidad de Simpson" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "Calcula el índice de diversidad de Simpson en un mapa ráster" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "Riqueza" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "Calcula índice de riqueza en un mapa ráster" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "Índice de forma" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "Calcula el índice de forma en un mapa ráster" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "Modelado de incendios forestales" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "Relación de propagación" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7431,11 +7661,11 @@ msgstr "" "la distancia potencial máxima de detección para simulaciones de dispersión " "de fuego." -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "Rutas de propagación de menor coste" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." @@ -7443,11 +7673,11 @@ msgstr "" "Traza de forma recursiva la ruta de menor coste de vuelta hacia las celdas " "desde las que se determinó el coste acumulado." -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "Simulación de propagación anisotrópica" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7462,17 +7692,17 @@ msgstr "" "coordenadas UTM vínculo de retroceso para seguir las rutas de dispersión. Es " "utilizado para simulaciones de dispersión de fuego. " -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "Cambiar valores de categorías y etiquetas" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "Administrar información de categoría" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." @@ -7480,19 +7710,19 @@ msgstr "" "Administra valores de categoría y etiquetas asociados con las capas de mapa " "ráster especificadas por el usuario." -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "Editar los valores de categoría en forma interactiva" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "Edita valores de celdas en mapa ráster." -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "Reclasificar por tamaño" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." @@ -7501,11 +7731,11 @@ msgstr "" "usuario (en hectáreas)." #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "Reclasificar" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " @@ -7515,28 +7745,28 @@ msgstr "" "ráster cuyos valores de categorías están basados en la reclasificación de " "las categorías de un mapa ráster existente." -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "Recodificar" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "Recodifica mapas ráster categóricos." -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "Rescalar" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" "Cambia escala del rango de valores de categoría en una capa de mapa ráster." -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "Cambia escala con histograma" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." @@ -7544,45 +7774,45 @@ msgstr "" "Al volver a escalar el histograma, se ha ecualizado el rango de valores de " "categoría en una capa de mapa ráster." -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "Generar celdas aleatorias" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "Celdas aleatorias" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "Genera valores de celda aleatorios con dependencia espacial." -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "Celdas aleatorias y puntos vectoriales" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "Generar superficies" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "Superficie fractal" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "Crea una superficie fractal de una dimensión fractal dada." -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "Superficie de densidad de núcleo gausiano" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " @@ -7592,11 +7822,11 @@ msgstr "" "La densidad es calculada usando un kernel móvil. Opcionalmente genera mapa " "de densidad vectorial en una red vectorial." -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "Superficie gaussiana derivada" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." @@ -7605,7 +7835,7 @@ msgstr "" "media y desviación estandar de las desviaciones gausianas pueden ser " "expresadas por el usuario." -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." @@ -7613,45 +7843,45 @@ msgstr "" "Crea un mapa ráster que representa un plano, dadas la pendiente " "(inclinación), aspecto (azimuth) y un punto." -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "Superficie derivada aleatoria" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" "Genera un mapa ráster de superficie de desviaciones aleatorias uniformes con " "rango definido." -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "Superficie aleatoria con dependencia espacial." -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "Genera superficie(s) aleatoria(s) con dependencia espacial." -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "Interpolar superficies" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "Bilineal y bicúbica a partir de puntos vectoriales" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" "Realiza interpolación spline bicúbica o bilineal con regularización Tykhonov." -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "IDW a partir de puntos raster" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." @@ -7659,11 +7889,11 @@ msgstr "" "Provee interpolación de superficies a partir puntos ráster mediante la " "ponderación inversa del cuadrado de la distancia." -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "IDW a partir de puntos vectoriales" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." @@ -7671,19 +7901,19 @@ msgstr "" "Provee interpolación de superficie a partir de datos de puntos vectoriales " "mediante la Ponderación del cuadrado del inverso de la distancia." -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "Contornos ráster" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "Genera mapas ráster de superficies a partir de contornos rasterizados." -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "Tensión spline regularizada." -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7695,11 +7925,11 @@ msgstr "" "puntos o isolíneas dados en formato vectorial a formato raster de punto " "flotante usando spline regularizada con tensión." -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "Interpolación de series ráster" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." @@ -7707,80 +7937,80 @@ msgstr "" "Interpola mapas ráster localizados (temporal o espacialmente) entre mapas " "ráster de entrada en posiciones muestrales específicas." -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "Rellenas celdas NULAS" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" "Rellenar áreas sin datos de mapas ráster, usando la interpolación de splines." -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "Informes y estadísticas" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "Metadatos básicos del ráster" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "Muestra información básica sobre un mapa ráster" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "Estadísticas generales" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "Genera estadísticas de área para mapa ráster." -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "Cuantiles para grandes conjuntos de datos" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "Calcula cuantiles utilizando dos pases." -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "Intervalo de valores de categoría" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" "Muestra lista concisa de los valores de categoría que se encuentran en una " "capa de un mapa ráster." -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "Suma área por mapa ráster y categoría" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "Reporta estadísticas para mapas ráster." -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "Estadísticas de celdas agrupadas" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." @@ -7789,20 +8019,20 @@ msgstr "" "un vectorial GRASS de puntos que contenga los centroides calculados para " "esos grupos." -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "Área total corregida" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "Muestra la estimación de la superficie de área de mapa ráster." -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "Estadísticas univariadas de ráster" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7815,32 +8045,32 @@ msgstr "" "coeficiente de variación y la suma." #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "Muestrear transectos" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" "Presenta los valores de una capa de mapa ráster que caen en una línea(s) " "definido(s) por el usuario." -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "Muestrear transectos (rumbo/distancia)" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" "Presenta valores de capa de mapa ráster situados caen a lo largo de línea(s) " "de transecto definidas." -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "Covarianza/correlación" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." @@ -7848,27 +8078,27 @@ msgstr "" "Produce una matriz de covarianza/correlación para las capas de mapa(s) " "ráster especificados por el usuario." -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "Regresión lineal" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "Calcula la regresión lineal de dos mapas ráster: y = a + b*x." -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "Regresión múltiple" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "Calcula la regresión lineal múltiple a partir de mapas ráster." -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "Acontecimientos mutuos de categoría" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." @@ -7876,29 +8106,29 @@ msgstr "" "Tabula la ocurrencia mutua (coincidencia) de categorías para dos capas de " "mapa ráster." -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "&Vector" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "Elaborar mapa vectorial" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "Crear nuevo mapa vectorial" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "Crear un nuevo mapa vectorial vacío" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "Editar un mapa vectorial (en forma no interactiva)" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." @@ -7906,48 +8136,49 @@ msgstr "" "Edita un mapa vectorial, permite añadir, eliminar y modificar " "características seleccionadas de un vector." -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "Convertir tipos de objetos" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "Cambia tipo de elementos vectoriales." -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "Líneas paralelas" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "Crear una línea paralela a las líneas vectoriales de entrada." -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "Disolver contornos" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Disuelve contornos entre áreas adyacentes que comparten un número de " "categoría o atributo común." -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "Crear vectorial 3D sobre ráster" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" "Convierte elementos vectorialiales 2D a 3D muestreando ráster de elevación." -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "Extruir mapa vectorial 3D" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." @@ -7957,32 +8188,32 @@ msgstr "" "altura definida. Opcionalmente, la altura se puede derivar del muestreo de " "un mapa ráster de elevación." -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "Crear etiquetas" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" "Crea etiquetas de pintura para un mapa vectorial a partir de atributos " "asociados." -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "Reposicionar mapa vectorial" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" "Realiza una transformación afín (dezplazamiento, escalado y rotación) sobre " "un mapa vectorial." -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "Rectificar mapa vectorial" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." @@ -7990,19 +8221,19 @@ msgstr "" "Rectifica un vectorial calculando una transformación de coordenadas para " "cada objeto en el vectorial basándose en los puntos de control." -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "Actualiza los metadatos del mapa vectorial." -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "Mantenimiento de topología" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "Crear o reconstruir topología" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." @@ -8010,115 +8241,115 @@ msgstr "" "Crea topología para mapa vectorial. Opcionalmente también revisa errores " "topológicos." -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "Reconstruir topología en todos los mapas vectoriales" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" "Reconstruye la topología en todos los mapas vectoriales del Directorio de " "mapas actual." -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "Construir polilíneas" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "Construye polilíneas a partir de líneas o contornos." -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "Dividir líneas" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "Dividir líneas vectoriales en segmentos más cortos." -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "Dividir polilíneas" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "Crea puntos / segmentos a partir de líneas y posiciones de entrada." -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "Limpiar mapa vectorial" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "Herramientas para limpiar la topología de mapas vectoriales." -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "Suavizar o simplificar" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "Realiza generalización basada en vectoriales." -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "Añadir centroides" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "Añade los centroides faltantes a contornos cerrados." -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "Crea/modifica la tabla de colores asociada a un mapa vectorial." -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "Gestión interactiva de tablas de color vectoriales." -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "Exporta la tabla de colores asociada con un mapa vectorial." -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "Consultar mapa vectorial" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "Consultar por coordenada(s)" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "Consulta una capa de mapa vectorial en las ubicaciones dadas." -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "Consultar datos de objetos espaciales vectoriales" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "Imprime atributos de mapa vectorial." -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "Selección de elementos" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "Seleccionar por atributos" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." @@ -8126,105 +8357,105 @@ msgstr "" "Selecciona objetos vectoriales de un mapa vectorial existente y crea un " "nuevo mapa vectorial que contiene sólo los objetos seleccionados." -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "Seleccionar por otro mapa" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" "Seleccionar elementos del mapa vectorial (A), mediante elementos de otro " "mapa vectorial (B)." -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "Buffer vectorial" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" "Crear un buffer alrededor de los elementos vectoriales de un tipo dado." -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "Análisis de puntos" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "Identificar y remover datos discrepantes (outliers)" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "Elimina los valores extremos de datos de vectores de puntos." -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "Identificar grupos de puntos" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "Realiza identificación de grupos." -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "Índices para recuentos de cuadrantes de listas de puntos vectoriales." #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "Índices de conteos de listas de puntos vectoriales en los cuadrantes." #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "Perturbar puntos" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "Perturbaciones aleatorias de la ubicación de puntos vectoriales." #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "Conjunto de puntos de prueba/entrenamiento" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "Divide al azar los puntos en conjuntos de prueba/entrenamiento." -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "Prueba de normalidad para vector de puntos" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "Prueba de normalidad para puntos vectoriales." -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "Análisis Lidar" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "Detectar bordes" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" "Detecta los bordes de un objeto a partir de un conjunto de datos LIDAR." -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "Detectar interiores" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" @@ -8232,11 +8463,11 @@ msgstr "" "Construcción de la determinación de curvas de nivel y algoritmo de " "crecimiento de región para determinar la construcción interior." -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "Corregir y reclasificar objetos" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." @@ -8244,33 +8475,33 @@ msgstr "" "Corrije la salida de v.lidar.growing. Es el último de los tres algoritmos " "para el filtrado de LIDAR." -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "Referencia lineal" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "Crear LRS" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "Crea un Sistema de referencia lineal." -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "Crear estaciones" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" "Crea estaciones a partir de las líneas de entrada, y de un sistema de " "referencia lineal." -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "Crear puntos/segmentos" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." @@ -8278,11 +8509,11 @@ msgstr "" "Crea puntos/segmentos a partir de las líneas de entrada, sistema de " "referencia lineal y posiciones leídas de la entrada estándar o un archivo." -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "Buscar ID de la línea y compensar" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." @@ -8290,11 +8521,11 @@ msgstr "" "Hallar una id de línea y km reales + compensación para puntos especificados " "en un mapa vectorial empleando un sistema de referencia lineal." -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "Elementos más próximos" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." @@ -8302,32 +8533,32 @@ msgstr "" "Encuentra el elemento más cercano en el mapa vectorial \"hacia\" para los " "elementos en el mapa vectorial \"desde\"." -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "Análisis de redes" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "Herramienta vectorial de análisis de redes" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "Herramienta para análisis interactivo de redes." -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "Preparación de red" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "Realiza el mantenimiento de la red." -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "Asignar subredes" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." @@ -8336,11 +8567,11 @@ msgstr "" "abierto (costes> = 0). Los costos del nodo central son utilizados para el " "cálculo." -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "Dividir red" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " @@ -8351,19 +8582,19 @@ msgstr "" "desde el centro). El nodo central debe estar abierto (costes> = 0). Los " "costos del nodo central se utilizarán en el cálculo." -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "Camino más corto" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "Encuentra la ruta más corta en una red vectorial." -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "Ruta más corta para conjuntos de elementos" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -8375,68 +8606,68 @@ msgstr "" "punto más cercano 'to' e información variada sobre esta relación es cargada " "en la tabla de atributos." -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "Ruta más corta utilizando horarios" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "Encuentra la ruta más corta utilizando horarios." -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "Ruta más corta para todos los pares" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "Calcula la ruta más corta entre todos los pares de nodos de la red." -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "Red de visibilidad" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "Realiza la construcción de una gráfica de visibilidad." -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "Puentes y puntos de articulación" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "Calcula los puentes y puntos de articulación en la red." -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "Flujo máximo" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "Calcula el flujo máximo entre dos conjuntos de nodos de la red." -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "Conectividad de vértices" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" "Calcula la conectividad de vértices entre dos conjuntos de nodos en la red." -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "Componentes" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "Calcula componentes conectados fuertemente y débilmente en la red." -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "Centralidad" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." @@ -8444,11 +8675,11 @@ msgstr "" "Cálcula grado, medidas de centralidad, intermediación, proximidad, y " "centralidad del eigenvector en la red." -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "Árbol de Steiner" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " @@ -8458,19 +8689,19 @@ msgstr "" "del 'Árbol mínimo de Steiner' es NP-hard y se usa un algoritmo heurístico en " "este módulo por lo que el resultado puede ser subóptimo." -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "Árbol de expansión mínima" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "Calcula el árbol de expansión mínima para la red." -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "Análisis del representante de comercio" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8481,21 +8712,21 @@ msgstr "" "este módulo y el círculo creado puede ser subóptimo" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "Superponer mapas vectoriales" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "Recortar mapas vectoriales" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" "Extrae características del mapa de entrada que se superponen con el mapa de " "corte." -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." @@ -8503,27 +8734,27 @@ msgstr "" "Superpone dos mapas vectoriales ofreciendo los siguientes operadores: " "recortar, diferencia, diferencia simétrica y unión." -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "Parchar mapas vectoriales" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "Crear un nuevo mapa vectorial combinando otros mapas vectoriales." -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "Administrar categorías" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "Cambia o reporta las categorías" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." @@ -8532,16 +8763,16 @@ msgstr "" "vectorial de acuerdo a los resultados de las consultas SQL o un valor en la " "columna atributo de la tabla." -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "Actualizar atributos" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "Actualizar atributos de área a partir de un ráster" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." @@ -8549,75 +8780,75 @@ msgstr "" "Calcular estadísticas univariadas a partir de un mapa ráster a partir de un " "mapa vectorial y carga estadísticas a nueva columna de atributos." -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "Actualizar atributos de área a partir de un vectorial" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" "Cuenta puntos en áreas, calcula estadísticas a partir de atributos de puntos." -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "Actualizar atributos de puntos a partir de áreas" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" "Carga valores vectoriales en las posiciones de puntos vectoriales a la tabla." -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "Actualiza valores de base de datos a partir de vectorial" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "Puebla los atributos de las características vectoriales." -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "Muestrea mapas ráster en ubicaciones puntuales" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" "Carga valores de ráster en las posiciones de puntos vectoriales a la tabla." -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "Muestrear 'vecindario' ráster alrededor de puntos" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "Muestrear un mapa ráster en ubicaciones de puntos vectoriales." -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "Generar área para la región actual" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" "Crear un polígono vectorial a partir de la extensión de la región actual." -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "Generar áreas a partir de puntos" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "Envolvente convexa mínima" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "Produce un envolvente convexo 2D/3D para un mapa vectorial dado." -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "Triángulos de Delaunay" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." @@ -8625,11 +8856,11 @@ msgstr "" "Crea una triangulación de Delaunay a partir de un mapa vectorial de entrada " "que contiene puntos o centroides." -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "Diagrama de Voronoi / polígonos de Thiessen" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." @@ -8637,80 +8868,80 @@ msgstr "" "Crea un diagrama Voronoi limitado a la extensión de la región actual a " "partir de un mapa vectorial de entrada que contiene puntos o centroides." -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "Generar cuadrícula" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "Crea un mapa vectorial de una cuadrícula definida por el usuario." -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "Generar puntos" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "Generar a partir de la base de datos" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" "Crea un nuevo mapa vectorial (de puntos) a partir de una tabla de la base de " "datos que contiene coordenadas." -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "Generar puntos a lo largo de líneas" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" "Crea puntos a lo largo de líneas de entrada en un nuevo vectorial con 2 " "capas." -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "Generar puntos aleatorios" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "Genera puntos vectoriales aleatorios 2D/3D." -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "Eliminar los valores extremos en los conjuntos de puntos" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "Metadatos básicos del vectorial" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "Muestra información básica sobre un mapa vectorial." -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "Clasifica los datos de atributo" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "Clasifica los datos de atributo, por ejemplo para cartografía temática" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "Informar topología por categoría" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "Reporta las estadísticas de geometría para mapas vectoriales." -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "Estadísticas univariantes de atributos para puntos" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." @@ -8718,11 +8949,11 @@ msgstr "" "Calcula estadísticas univariadas de elementos de mapa vectorial. La varianza " "y desviación estándar sólo se calculan para puntos si así se especifica." -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "Estadísticas univariantes para columnas de atributo" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." @@ -8730,68 +8961,68 @@ msgstr "" "Calcula estadísticas univariante de la columna de la tabla seleccionada para " "un mapa vectorial GRASS." -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "Herramienta de elaboración de perfiles de mapas vectoriales" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "Índices cuadráticos" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "Probar normalidad" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "&Imágenes" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "Crear imágenes y grupos" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "Crear/editar grupo" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "Crea, edita y enlista grupos y subgrupos de archivos de imágenes." -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "Grupo objetivo" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" "Destina un grupo de imagen a un Directorio de mapas y Localización GRASS." -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "Hacer mosaico de imágenes" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "Hace mosaicos de varias imágenes y extiender colormap." -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "Administrar colores de imágenes" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "Balance de color para RGB" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "Realiza un autobalanceo de colores para imágenes RGB." -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "Matiz, intensidad y saturación (HIS) a Rojo, verde y azul (RGB)" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." @@ -8799,7 +9030,7 @@ msgstr "" "Transforma mapas ráster a partir del espacio de color HIS (Tono-Saturación-" "Intensidad) al espacio de color RGB (Rojo-Verde-Azul)." -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." @@ -8807,11 +9038,11 @@ msgstr "" "Transforma mapas ráster a partir del espacio de color RGB (Rojo-Verde-Azul) " "al espacio de color HIS (Tono-Saturación-Intensidad)." -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "Rectificar imagen o ráster" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." @@ -8819,31 +9050,31 @@ msgstr "" "Rectifica una imagen calculando una transformación de coordenadas para cada " "pixel de la imagen basada en los puntos de control." -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "Histograma" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "Crear histograma de una imagen" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "Respuesta espectral" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" "Muestra la respuesta espectral en ubicaciones especificadas por el usuario " "en grupo o imágenes." -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "Pan sharpening" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" @@ -8851,15 +9082,15 @@ msgstr "" "Algoritmos de fusión de imágenes para mejorar multiespectral con canales " "pancromáticos de alta resolución" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "Clasificar imagen" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "Agrupaciones de entrada para clasificación no supervisada" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." @@ -8870,19 +9101,19 @@ msgstr "" "entrada para i.maxlik, para generar una clasificación no supervisada de " "imágenes." -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "Entrada para MLC supervisada" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "Genera estadísticas para i.maxlik a partir de mapa ráster." -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "Clasificación de máxima verosimilitud (MLC)" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." @@ -8892,32 +9123,32 @@ msgstr "" "La clasificación está basada en la información de la firma espectral " "generada por i.cluster, g.gui.iclass o i.gensig." -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "Entrada interactiva para clasificación supervisada" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" "Genera firmas espectrales permitiendo al usuario delimitar áreas de " "entrenamiento." -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "Entrada para SMAP supervisado" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "Genera estadísticas para i.smap a partir de mapa ráster." -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "Clasificación secuencial máxima a posteriori (SMAP)" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." @@ -8925,103 +9156,103 @@ msgstr "" "Realiza una clasificación contextual de imágenes utilizando una estimación " "secuencial máxima a posteriori (SMAP)." -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "Entrada para SMAP supervisado" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "Guardar archivo de las firmas" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "Segmentación de objeto" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "Identifica segmentos (objetos) de los datos de imágenes." -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "Filtrar imagen" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "Detección de bordes" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" "Función ráster \"detección de bordes\" sin traslapes (zero-crossing) para " "procesamiento de imágenes." -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "Filtro de matriz/convolución" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "Realiza un filtro de matrices de mapas ráster." -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "Transformar imagen" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "Correlación canónica" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" "Programa de Análisis de Componentes Canónicos (CCA) para procesamiento de " "imágenes." -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "Componentes principales" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" "Análisis de componentes principales (PCA) para procesamiento de imágenes." -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "Transformada rápida de Fourier" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "Transformación Rápida Fourier (FFT) para procesamiento de imágenes." -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "Transformación inversa rápida de Fourier (FFT)" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" "Transformación Inversa rápida de Fourier (ifft) para procesado de imágenes." -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "Herramientas de imágenes satelitales" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "Número Digital (DN) Aster a radiancia/reflectancia" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." @@ -9029,11 +9260,11 @@ msgstr "" "Calcula la temperatura de la radiancia/reflectancia/brillo en el tope de la " "atmósfera a partir del Número digital (DN) ASTER," -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "Número digital (DN) Landsat a radiancia/reflectancia" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" @@ -9041,28 +9272,28 @@ msgstr "" "Calcula radiancia o reflectancia en el tope de la atmósfera y temperatura " "para Landsat MSS/TM/ETM+/OLI" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "Evaluación de cobertura de nubes de Landsat" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" "Realiza evaluación automática de cobertura de nubes (ACCA) Landsat TM/ETM+" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "Control de calidad Modis" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "Extrae parámetros de control de calidad de las capas MODIS QC." -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "Corrección atmosférica" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." @@ -9070,47 +9301,47 @@ msgstr "" "Realiza corrección atmosférica utilizando el algoritmo 6S. - Second " "Simulation of Satellite Signal in the Solar Spectrum." -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "Corrección topográfica" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "Calcula la corrección topográfica de la reflectancia." -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "Herramientas para ortofotos" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" "Gestionar los puntos de control en el terreno (GCP's), para corrección 3D." -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "Geo-rectifica un mapa y permite gestionar los GCP para corrección 3D." -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "Corrige distorsiones de escaneo" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "Corrige distorsiones de escaneo en fotos aéreas escaneadas." -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "Productos de imágenes satelitales" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "Índices de vegetación" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." @@ -9119,94 +9350,94 @@ msgstr "" "rojo y cercano al infrarojo (NIR), y algunos índices adicionales requiere " "bandas adicionales." -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "Índice de cobertura de vegetación (Tasseled cap)" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "Realiza transformación Tasseled Cap (Kauth Thomas)" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "Albedo" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" "Calcula albedo de amplio espectro a partir de reflectancia superficial." -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "Emisividad" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" "Calcula emisividad a partir de NDVI, método genérico para tierra escasa " "(sparce)." -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "Crecimiento de biomasa" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" "Calcula crecimiento de biomasa, precursor del cálculo de rendimiento de " "cultivos." -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "Cálculo de evapotraspiración" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "Radiación neta instantánea" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "Aproximación de la radiación neta (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "Flujo de calor en suelo" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "Aproximación de flujo de calor en suelo (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "Flujo de calor sensible" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "Calcula el flujo de calor sensible por iteración SEBAL 01." -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "Fracción evapotranpirativa" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" "Calcula la fracción evapotranpirativa y zona de humedad del suelo en la zona " "de raices" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "Evapotraspiración actual" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "Evapotraspiración actual para el periodo diurno (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "Integración temporal de ETa" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." @@ -9214,11 +9445,11 @@ msgstr "" "Calcula integración de satélites ET actual (ETa) siguiedo el ET de " "referencia diario de las estacion(es) meteorológicas." -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "Métodos de evapotraspiración de Hargreaves" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." @@ -9226,22 +9457,22 @@ msgstr "" "Calcula evapotranspiración con la formulación original o modificada de " "Hargreaves,2001." -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "Evapotranspiración Penman-Monteith" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" "Calcula potencial de evapotraspiración con Penman-Monteith para cada hora." -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "Evapotraspiración Priestley-Taylor" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." @@ -9249,11 +9480,11 @@ msgstr "" "Calcula la evapotraspiración con la formulación de Priestley and Taylor, " "1972." -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "Análisis Kappa" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." @@ -9261,35 +9492,35 @@ msgstr "" "Calcular matriz de error y el parámetro kappa para evaluación de precisión " "del resultado de clasificación." -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "OIF para LandSat TM" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "Calcula tabla de Factor de Índice Óptimo para bandas espectrales" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "R&áster 3D" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "Desarrollar mapa ráster 3D" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "Administrar valores NULOS 3D" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "Crear explícitamente el archivo de mapa de bits de valor nulo 3D." -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "Administrar marca de tiempo" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." @@ -9297,45 +9528,45 @@ msgstr "" "Modifica una marca de tiempo para un mapa ráster 3D. Imprimir/añadir/" "eliminar una marca de tiempo para un mapa ráster 3D." -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "Rásters 3D a series ráster" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "Tablas de color 3D" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" "Crea/modifica la tabla de colores asociada a una capa de mapa ráster 3D." -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "Exportar tabla de colores 3D" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "Exporta la tabla de colores asociada con un mapa ráster 3D." -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "Máscara 3D" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "Establece la máscara ráster 3D para trabajo actual." -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "Calculadora de mapas ráster 3D" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "Sección transversal" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" @@ -9343,7 +9574,7 @@ msgstr "" "Crea un mapa raster 2D de sección transversal a partir de un mapa ráster 3D " "basado en mapa 2D de elevación." -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." @@ -9351,11 +9582,11 @@ msgstr "" "Programa de cálculo numérico para flujo de aguas subterráneas temporales, " "confinadas, en tres dimensiones." -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "Interpola ráster 3D a partir de puntos" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." @@ -9363,29 +9594,29 @@ msgstr "" "Interpola datos de puntos a mapa ráster 3D usando una spline regularizada " "con el algoritmo de tensión (RST)." -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "Metadatos básicos del ráster 3D" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" "Muestra información básica de una capa de mapa ráster 3D especificada por el " "usuario." -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "Estadísticas de ráster 3D" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "Genera estadísticas de volumen para mapas ráster 3D." -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "Estadísticas univariadas para ráster 3D" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -9397,106 +9628,106 @@ msgstr "" "máximo, rango, media aritmética, varianza poblacional, desviación estandar, " "coeficiente de variación, y suma." -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "&Base de datos" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "Información sobre la base de datos" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "Enlistar bases de datos" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" "Enlista todas las bases de datos para un controlador y Localización dados." -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "Enlistar controladores" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "Enlista todos los controladores de bases de datos." -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "Enlistar tablas" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "Enlista todas las tablas para una base de datos dada." -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "Describir tabla" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "Describe una tabla en forma detallada." -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "Enlistar columnas" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "Enlista todas las columnas de una tabla dada." -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "Administrar bases de datos" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "Conectar" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" "Muestra/establece la conexión general a la base de datos para el Directorio " "de mapas actual." -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "Iniciar sesión" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "Establece el usuario/contraseña para controlador/base de datos." -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "Crear base de datos" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "Crea una base de datos vacía." -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "Eliminar base de datos" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "Remueve una base de datos existente." -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "Eliminar tabla" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "Elimina una tabla de atributos (Drop table)." -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "Copiar tabla" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." @@ -9504,57 +9735,57 @@ msgstr "" "Copia una tabla. Se puede usar tanto la opción 'from_table' (opcionalmente " "con 'where') como 'select', pero no ambas al mismo tiempo." -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "Eliminar columna" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "Elimina una columna de la tabla de atributos seleccionada." -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "Prueba" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" "Probar el controlador de base de datos. La base de datos debe existir y " "estar conectada mediante db. connect." -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "Consulta" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "Consultar cualquier tabla" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" "Selecciona datos de una taula de atributos. Ejecuta sentencia(s) de consulta " "SQL." -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "Sentencia SQL" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "Ejecuta cualquier sentencia SQL. Para setencia SELECT use 'db.select'." -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "Conexiones a bases de datos de vectoriales" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "Tabla nueva" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." @@ -9562,27 +9793,27 @@ msgstr "" "Crea y conecta una nueva tabla de atributos a una capa dada de un mapa " "vectorial existente. " -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "Eliminar tabla" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "Elimina la tabla de atributos existente de un mapa vectorial." -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "Unir tabla" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "Une tabla de una base de datos a una tabla de un mapa vectorial." -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "Añadir columnas" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." @@ -9590,49 +9821,49 @@ msgstr "" "Añade una o más columnas a la tabla de atributos conectada a un mapa " "vectorial dado." -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" "Elimina una columna de la tabla de atributos conectada a un mapa vectorial " "dado." -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "Renombrar columna" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" "Cambia el nombre de una columna en la tabla de atributos conectada a un mapa " "vectorial dado." -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "Cambiar valores" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" "Actualiza una columna en la tabla de atributos conectada a un mapa vectorial." -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "Eliminar fila" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" "Remueve un elemento vectorial de un mapa vectorial a través de la selección " "de atributos." -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "Volver a conectar vectoriales a la a base de datos" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." @@ -9640,105 +9871,105 @@ msgstr "" "Reconecta tabla de atributos para todos los mapas vectoriales a partir del " "Directorio de mapas actual a una nueva base de datos." -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "Establecer conexión mapa vectorial - bases de datos" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" "Imprime / establece la conexión a la base de datos desde un mapa vectorial " "hacia la tabla de atributos." -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "&Temporal" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "Administrar conjunto de datos" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "Conectar base de datos temporal" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" "Imprime/establece la conexión de la base de datos GIS temporal para el " "Directorio de mapas actual." -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "Crear" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "Crea conjuntos de datos espacio temporales." -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "Renombra un conjunto de datos espacio temporales" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" "Remueve conjuntos de datos espacio temporales a partir de bases de datos " "temporales." -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "Actualizar metadatos" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "Modifica los metadatos de un conjunto de datos espacio temporales." -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "Unir" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" "Combina varios conjuntos de datos espacio temporales en un solo conjunto de " "datos espacio temporal." -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "Desplazamiento temporal" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" "Desplaza temporalmente los mapas de un conjunto de datos espacio temporales." -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "Ensamblar mapas de un conjunto de datos" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" "Autoensambla temporalmente los mapas de un conjuto de datos espacio temporal." -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" "Enlista conjuntos de datos espacio temporales y los mapas registrados en la " "base de datos temporal." -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "Administrar mapas en cojuntos de datos" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "Registrar mapas en conjunto de datos" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." @@ -9746,11 +9977,11 @@ msgstr "" "Asigna estampa temporal y registra mapas de tipo ráster, vectorial y ráster " "3D en un conjunto de datos espacio temporal." -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "Eliminar registro de mapas de conjunto de datos" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." @@ -9758,140 +9989,140 @@ msgstr "" "Quita el registro de mapas ráster, vectoriales y raster3d de una base de " "datos temporal o un conjunto de datos espacio temporales específico." -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "Lista de conjuntos de datos de mapas ráster" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" "Enlista mapas registrados de un conjunto de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "Lista de conjuntos de datos de mapas vectoriales" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" "Enlista mapas registrados de un conjunto de datos vectoriales espacio " "temporales." -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "Lista de conjuntos de datos de mapas ráster 3D" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" "Enlista mapas registrados de un conjunto de datos ráster3d espacio " "temporales." -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "Importar" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "Importar conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "Importa conjunto de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "Importa un conjunto de datos vectoriales" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" "Importa un conjunto de datos vectoriales espacio temporales de un fichero de " "archivos específico de GRASS GIS." -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "Exportar conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "Exporta conjunto de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "Exportar conjunto de datos ráster como serie de tiempo VTK" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" "Exporta un conjunto de datos ráster espacio temporales como serie de tiempo " "VTK." -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "Importar un conjunto de datos vectoriales" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" "Exporta un conjunto de datos vectoriales espacio temporales como un archivo " "de almacenamiento específico para GRASS GIS." -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "Convierte conjunto de datos ráster a ráster 3D" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "Convierte un conjunto de datos ráster en un mapa ráster 3D." -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "Extracción" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "Extraer subconjunto de conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "Extraer un subconjunto de conjunto de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "Extraer subconjunto de conjunto de datos vectoriales" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" "Extraer subconjunto de conjunto de datos espacio temporales vectoriales." -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "Extraer subconjunto de conjunto de datos raster 3D" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" "Extraer un subconjunto del conjunto de datos ráster 3D espacio temporales." -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "Consultar tabla de atributos de conjunto de datos vectoriales" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" "Muestra atributos de mapas vectoriales registrados en un conjunto de datos " "espacio temporales." -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "Tabla de colores de conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." @@ -9899,11 +10130,11 @@ msgstr "" "Crea/modifica la tabla de colores asociada con cada mapa ráster del conjunto " "de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "Cálculos ráster" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." @@ -9911,11 +10142,11 @@ msgstr "" "Ejecuta expresiones mapcalc espacio temporales en mapas temporales " "muestreados de conjunto de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "Cálculos ráster 3D" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." @@ -9923,37 +10154,37 @@ msgstr "" "Ejecuta expresiones de r3.mapcalc en mapas muestreados de conjunto de datos " "ráster 3D espacio temporales." -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "Interporlar vacíos en conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" "Reemplaza vacíos en un conjunto de datos ráster espacio temporales con mapas " "ráster interpolados." -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "Agregación" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "Análisis de vecindario para un conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" "Realiza análisis de vecindario para cada mapa en un conjunto de datos ráster " "espacio temporales" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "Agregación en conjunto de datos raster" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." @@ -9962,11 +10193,11 @@ msgstr "" "subconjuntos de mapas raster en un conjunto de datos ráster espacio " "temporales." -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "Agregación temporal" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." @@ -9974,11 +10205,11 @@ msgstr "" "Agrega temporalmente los mapas de un conjunto de datos ráster espacio " "temporales a partir de un tamaño de grano definido por el usuario." -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "Agregación temporal por conjunto de datos" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." @@ -9986,16 +10217,16 @@ msgstr "" "Agregar datos en un conjunto de datos ráster espacio temporales usando los " "intervalos de tiempo de un segundo conjunto de dato espacio temporales." -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "Muestreo" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" "Muestrear un conjunto de datos espacio temporales en un punto con coordenadas" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" @@ -10004,13 +10235,13 @@ msgstr "" "de un vector de puntos y escribe el resultado en pantalla utilizando " "diferentes diseños" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" "Consultar conjunto de datos ráster por conjunto de datos de puntos " "vectoriales" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." @@ -10018,11 +10249,11 @@ msgstr "" "Guarda los valores del mapa ráster en las posiciones espacio temporales de " "los puntos vectoriales como atributos vectoriales." -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "Observar ubicaciones específicas en un conjunto de datos ráster" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." @@ -10030,11 +10261,11 @@ msgstr "" "Observa ubicaciones específicas en un periodo de tiempo de un conjunto de " "datos raster espacio temporales usando puntos vectoriales." -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "Muestreo temporal" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." @@ -10043,21 +10274,21 @@ msgstr "" "conjunto de datos espacio temporales muestrales y muestra el resultado en la " "salida estandar." -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "Metadatos de conjunto de datos espacio temporales" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" "Enlista información acerca de un conjunto de datos y mapas espacio " "temporales." -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "Estadísticas univariadas de conjuntos de datos ráster" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." @@ -10065,11 +10296,11 @@ msgstr "" "Calcula estadísticas univariadas a partir de celdas no nulas para cada mapa " "ráster registrado en un conjunto de datos ráster espacio temporales." -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "Estadísticas univariadas de conjuntos de datos vectoriales" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" @@ -10077,11 +10308,11 @@ msgstr "" "Calcula estadísticas univariadas para cada atributo para cada mapa vectorial " "registrado en un conjunto de datos espacio temporal" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "Estadísticas univariadas de conjunto de datos ráster 3D" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." @@ -10089,398 +10320,390 @@ msgstr "" "Calcula estadísticas univariadas a partir de celdas no nulas para cada mapa " "ráster 3D registrado en un conjunto de datos ráster 3D espacio temporales." -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "Muestra topología temporal" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "Enlista topología temporal de un conjunto de datos espacio temporales." -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "Herramientas de GUI" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "Herramienta de linea de tiempo" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "Graficar extensión temporal." -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "Herramienta de gráfica temporal" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "Graficar valores temporales." -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "&Ayuda" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "Ayuda de GRASS" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "Mostrar las páginas HTML del manual de GRASS GIS" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "Ayuda de la GUI" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "Acerca del sistema" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "Mostrar información del sistema" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "Acerca de GRASS GIS" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "Importar, exportar y enlazar datos" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "Administrador de tabla de atributos" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "Digitalizador vectorial" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "Digitalizador ráster" -#: ../gui/wxpython/menustrings.py:2052 +#: ../gui/wxpython/menustrings.py:2057 msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "Crear nuevo modelo" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" -msgstr "Cargar modelo del archivo" - -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "Guardar modelo al archivo" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "Cerrar el archivo del modelo" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "Exportar a imagen" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "Exportar a Python" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "Salir del modelador" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "Cerrar la ventana del modelador" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "&Modelo" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "Añadir comando" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "Añadir acción (módulo GRASS) al modelo" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "Añadir datos" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "Añadir ítem de datos al modelo" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "Definir relación" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "Definir relación entre datos y elementos de acción" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "Añadir bucle / series" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "Añade bucle (series) al modelo" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "Añadir condición" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "Añade condición (if/else) para modelar" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "Añade comentario al modelo" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "Eliminar ítem" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "Eliminar acción/datos del modelo" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "Características del modelo (nombre, propósito, etc.)" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "Borrar datos intermedios" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "Eliminar datos intermedios definidos en el modelo" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "Ejecutar todo el modelo" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "Validar el modelo entero" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "Mostrar las páginas HTML de manuel del Modelador gráfico" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "Acerca del Modelador Gráfico" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "Mostrar información del Modelador gráfico" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "Especificar tamaño de papel, márgenes y orientación" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "Cargar archivo de instrucciones" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "Cargar archivo de texto con instrucciones de cartografía" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "Exportar archivo de instrucciones" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "Generar archivo de texto con las intrucciones de cartografía" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "Exportar a PostScript" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "Generar PostScript de salida" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "Exportar a PDF" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "Generar PDF de salida" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "Lanzar cuadro de díalogo de ps.map" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "Salir" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "Cerra el diseñador cartográfico" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "&Insertar" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "Marco del mapa" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "Añadir o editar marco del mapa" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "Añadir o editar mapa ráster" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "Añadir o editar mapa vectorial" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "Leyenda del mapa" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "Añadir o editar leyenda ráster o vectorial" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "información del mapa" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "Añadir o editar información del mapa" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "Añadir o editar barra de escala" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "Texto" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "Añadir texto" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "Imagen" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "Añadir imagen" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "Añadir flecha al norte" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "Eliminar objeto seleccionado" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "Mostrar las páginas del manual HTML del Diseñador cartográfico" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "Acerca del Diseñador Cartográfico" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "Mostrar información acerca del Diseñador cartográfico" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "Herramienta de gráfica de dispersión bivariada de GRASS" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "Gráfica de dispersión bivariada" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "Valores de las celdas ráster" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "Nada que graficar." -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "Al menos 2 mapas ráster deben ser especificados" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "Gráfica de dispersión bivariada de" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "Valores de las celdas ráster <%s>" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr ": %s" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "Regresión para gráfica(s) de dispersión" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -10517,7 +10740,7 @@ msgid "Text settings" msgstr "Configuración del texto" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "Configuración la gráfica" @@ -10578,60 +10801,60 @@ msgstr "Estadísticas para mapa(s) de los que se hicieron los histogramas" msgid "Statistics for raster map <%s>" msgstr "Estadísticas para mapa ráster <%s>" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "Herramienta GRASS para Análisis de Perfil" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "Perfil de" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "Distancia (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "Distancia a lo largo de un transecto" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "Valores de celda" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" "No todos los puntos del perfil están dentro de la región computacional." -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "Valores del ráster" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" "Para crear el perfil, debe dibujar un transecto en la ventana de " "presentación de los mapas ." -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "No hay algo que perfilar" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" "Escoger prefijo para archivo(s) donde se guardarán los valores del perfil..." -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "Valor separado por comas (*.csv)|*.csv" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "¿Sobreescribir archivo?" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" @@ -10640,7 +10863,7 @@ msgstr "" "No es posible abrir el archivo <%s> para escribir.\n" "Razones: %s" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" @@ -10649,11 +10872,11 @@ msgstr "" "%d archivos creados:\n" "%s" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "No se generaron archivos." -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "Estadísticas para perfil(es)" @@ -10678,7 +10901,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "Número de bins (para mapas de punto flotante)" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "Estadísticas" @@ -10724,11 +10947,11 @@ msgid "Selected group must be in current mapset" msgstr "El grupo seleccionado debe estar en el Directorio de mapas actual" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "Entrada no válida" @@ -10753,11 +10976,11 @@ msgid "Label font size (pts):" msgstr "Tamaño del tipo de letra de la etiqueta (puntos):" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "Configuración de tipo de letra" @@ -10773,191 +10996,185 @@ msgstr "Estilo:" msgid "Weight:" msgstr "Peso:" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "Aplicar cambios para la sesión actual y cerrar diálogo" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "Los tamaños de texto del grafico se guardaron en el archivo '%s'." -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "No se ha seleccionado ningún mapa o grupo de imágenes para graficar." -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Aviso" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "Mapa/imagen graficada" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "Configuración para el mapa seleccionado" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "Color de línea" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "Ancho de línea" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "Estilo de línea" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "Leyenda" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "Configuración de los marcadores del segmento de transecto." -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "Tamaño" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "Llenar" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "Estilo" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "Puntos de la gráfica de dispersión" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "Configuración de ejes" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "Eje X" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Eje Y" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "Escala" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" "Escalamiento automático de los ejes, cambiar máximo y mínimo, o que la " "escala sea igual al rango de los datos (min)" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "Mínimo personalizado" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "Máximo personalizado" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "Escala logarítmica" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "Configuración avanzada" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "Color de la rejilla." -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "Mostrar rejilla" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "Tamaño de fuente de la leyenda." -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "Mostrar la leyenda" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "Las configuraciones del gráfico se guardaron en el archivo '%s'." -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "Búsqueda avanzada..." -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "&Ejecutar..." -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "H&elp" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "Documentación de %s ha sido abierta en el explorador web" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "&Archivos recientes" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "Elemento no seleccionable" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "Directorio de mapas" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "Tipo:" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "GSelect: item no válido: %s" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" @@ -10966,7 +11183,7 @@ msgstr "" "Error del GIS Temporal:\n" "%s" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" @@ -10975,196 +11192,201 @@ msgstr "" "No se puede importar pyGRASS: %s\n" "Algunas funcionalidades no serán accesibles" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "No se ha ligado tabla alguna a la capa<{}>." -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "Seleccionar Dicrectorio de Datos SIG" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "Configuraciones de salida" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "Fuente de entrada." -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "Nativo" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "Archivo" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "Directorio" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "Base de datos" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "Protocolo" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "Tipo de salida" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "Tipo de fuente" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "todos los archivos" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "Archivos ZIP" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "Archivos GZIP" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "Archivos TAR" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "Archivos TARGZ" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "Archivo:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "Seleccionar archivo a importar" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "Directorio:" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "Seleccionar directorio de entrada de datos hacia GRASS:" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "Extensión:" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "Escoger archivo" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "Tipo de elemento:" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "elementos simples" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "topológico" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "Opciones de creación:" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "Formato:" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "Protocolo:" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "No hay configuraciones disponibles" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "Datos de origen no definidos, no se han guardado las configuraciones." -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "Punto" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "Cadena de caracteres." -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "Polígono" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" "No se ha seleccionado ningún mapa vectorial en el gestor de capas. Operación " "cancelada." -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "Mapa vectorial de entrada no ha sido seleccionado." -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " @@ -11173,12 +11395,12 @@ msgstr "" "Mapa vectorial de entrada <%s> y mapa seleccionado <%s> en el gestor de " "capas son diferentes. Operación cancelada." -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "No se ha seleccionado un mapa vectorial." @@ -11218,13 +11440,13 @@ msgstr "Traductores" msgid "Translation status" msgstr "Estatus de la traducción" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "No es posible obtener la versión de GRASS\n" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "versión desconocida" @@ -11240,18 +11462,18 @@ msgstr "Revisión de código" msgid "Build Date" msgstr "Construir fecha" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "Idioma" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "falta archivo %s" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " @@ -11260,89 +11482,89 @@ msgstr "" "Imposible proveer una sugerencia de referencia, vea el sitio web de GRASS " "GIS. El error fue: {0}" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "Error leyendo el archivo '%s'." -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "Líneas:" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "Correo electrónico" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "País" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "OSGeo_ID" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "Nación" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr " %d traducido" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr " %d fuzzy" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr " %d no traducido" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "%d traducido" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "Archivo <%s> no encontrado" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "&Siguiente" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "&Previo" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 #, fuzzy msgid "Clear prompt and output window" msgstr "Limpiar contenido de la ventana de salida" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Guardar modelo al archivo" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "Cancelar ejecución de comando" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -11353,7 +11575,7 @@ msgstr "" "\n" "Detalles: %(error)s" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "Salida del comando guardada en '%s'" @@ -11440,7 +11662,7 @@ msgstr "" msgid "category" msgstr "categoría" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "tipo" @@ -11463,8 +11685,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "No se ha seleccionado ninguna capa de mapa. Operación cancelada." @@ -11493,374 +11715,396 @@ msgstr "" "\n" "Razón: %s" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "Configuración del usuario" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "Establecer como predeterminado" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "Revertir la configuración la predeterminada" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "Aplicar cambios para la sesión actual y cerrar" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "Guardar solamente para esta sesión" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "Configuración aplicada a la actual sesión pero no guardada" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "La columna de clave no puede contener una cadena vacía." -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "Configuración de la GUI" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "Configuración del Administrador de capas" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "Preguntar cuando se elimine una capa de mapa del árbol de capas" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "" "Preguntar cuando se abandone la interfaz gráfica de usuario wx o se cierre " "la ventana." -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" +"Copiar automaticamente el texto seleccionado al portapapeles (en la pestaña " +"de Consola)" + +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "Configuración la gráfica" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "" +"Guardar parámetros de visualización de la ventana actual como predeterminados" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" +"Guardar la posición y tamaño actuales, tanto de la ventana del Administrador " +"de capas, como de la(s) de visualización de mapas abiertas y utilizar como " +"ajustes predeterminados para próximas sesiones." + +#: ../gui/wxpython/gui_core/preferences.py:379 +#, fuzzy +msgid "Save current single window panes layout as default" +msgstr "" +"Guardar parámetros de visualización de la ventana actual como predeterminados" + +#: ../gui/wxpython/gui_core/preferences.py:392 +#, fuzzy +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" +"Guardar la posición y tamaño actuales, tanto de la ventana del Administrador " +"de capas, como de la(s) de visualización de mapas abiertas y utilizar como " +"ajustes predeterminados para próximas sesiones." + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +#, fuzzy +msgid "Hide '{}' tab (requires GUI restart)" msgstr "Ocultar pestaña '%s' (requiere reiniciar la GUI)" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "Histograma" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" -"Copiar automaticamente el texto seleccionado al portapapeles (en la pestaña " -"de Consola)" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "Configuración del Entorno de trabajo" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" "Suprimir el posicionamiento de la(s) ventana(s) de visualización de mapas" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "Suprimir el posicionamiento de la ventana del administrador de capas" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "" -"Guardar parámetros de visualización de la ventana actual como predeterminados" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" -"Guardar la posición y tamaño actuales, tanto de la ventana del Administrador " -"de capas, como de la(s) de visualización de mapas abiertas y utilizar como " -"ajustes predeterminados para próximas sesiones." - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "Configuración de la región" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "Alinear la región a la resolución" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 #, fuzzy msgid "Window layout settings" msgstr "Configuración la gráfica" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 #, fuzzy msgid "Use single-window mode (requires GUI restart)" msgstr "Tema de íconos (requiere reiniciar la GUI):" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "Fuente para salida de comando:" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "Establecer tipo de letra" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "Mostrar página del manual" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "Configuración de lenguaje" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "Escoger idioma (es necesario guardar y reiniciar GRASS):" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "Configuración de la presentación" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "Lista de elementos:" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "Estilo del menú (requiere guardar y reiniciar la GUI):" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "Altura de la ventana emergente de la selección del mapa (en pixeles)" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "Tema de íconos (requiere reiniciar la GUI):" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "Visualización del Mapa" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "Tipo de letra predeterminado para las ventanas de GRASS:" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "Ajustes predeterminados de pantalla" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "Manejador de pantalla:" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "Modo de la barra de estado:" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "Alinear extensión de la región basado en el tamaño del visualizador" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "Restringir la resolución de pantalla a la configuración de cálculo" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "Habilitar auto renderizado" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "Permitir zoom automático a la capa de mapa seleccionada" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "Mostrar la extensión de la región computacional" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "Acción de la rueda del ratón:" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "Dirección de la rueda del ratón:" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "Configuraciones avanzada de visualización" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "Visualizar buffer de profundad 3D (valores posibles son 16, 24, 32):" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "Añadir el mapa creado al árbol de capas" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "Permite entrada interactiva" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "Nivel de detalle:" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "Capas" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "Configuraciones predeterminadas para ráster" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "Hacer opacas las celdas nulas" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "Tabla de colores predeterminada" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "Configuraciones predeterminadas para vectoriales" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "Visualizador:" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "Color del elemento:" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "Transparente" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "Color de relleno para el área:" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "Colores aleatorios según el número de categoría" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "Símbolo:" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "Atributos" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "Resaltar los elementos seleccionados" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "Ancho de línea (en pixeles):" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" "Resaltar automáticamente en el visualizador de mapas los elementos " "seleccionados" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "Explorador de datos" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "Doble click izquierdo del ratón:" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "Codificación (por ejemplo, UTF-8, ASCII, iso8859-1, KOI8-R):" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "Preguntar al eliminar registro(s) de datos de tabla" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "Crear tabla" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "Columna clave:" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "Proyección" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "Configuración de la barra de estado de las proyecciones" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 +#, fuzzy msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" "\n" @@ -11873,70 +12117,70 @@ msgstr "" "menú desplegable de la parte inferior de la ventana del visualizador de " "mapas.\n" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "Código EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "PROJ string (requerido):" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "archivo EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "Cargar códigos EPSG (sea paciente), entrar código EPSG o insertar PROJ " "string directamente." -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "&Cargar código EPSG" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "Formato de coordenadas" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "Proyecciones Lat/long" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "Precisión:" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "No se pueden leer los códigos EPSG: %s " -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "Código EPSG %s no encontrado" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "Seleccionar la fuente predeterminada para la pantalla." -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "No se pudo definir el tipo de letra para el monitor. Pruebe otro tipo." -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "Seleccionar la fuente predeterminada de salida" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "Administrar acceso a los Directorios de mapas" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11951,7 +12195,7 @@ msgstr "" " -Solo puede crear en el Directorio de mapas actual.\n" " -Solo puede crear en los Directorios de mapas que posee." -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "Propietario" @@ -11968,7 +12212,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "Copiar nombres de mapas al portapapeles (de abajo hacia arriba)" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "Definir opacidad de <%s>" @@ -12091,7 +12335,7 @@ msgstr "Guardar visualización en archivo" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "Seleccionar tipo de letra" @@ -12126,9 +12370,8 @@ msgid "Map Display Settings" msgstr "Configuraciones del mapa" #: ../gui/wxpython/gui_core/toolbars.py:86 -#, fuzzy -msgid "(Un)dock Map Display" -msgstr "Visualización del Mapa" +msgid "(Un)dock" +msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 msgid "Clear" @@ -12151,7 +12394,7 @@ msgid "Apply" msgstr "Aplicar" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "&Aplicar" @@ -12209,7 +12452,7 @@ msgid "Optional" msgstr "Opcional" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "Parametrizado en el modelo" @@ -12221,44 +12464,45 @@ msgstr "[múltiple]" msgid "valid range" msgstr "intervalo válido" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +#, fuzzy +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" "Mostrar representación gráfica de la extensión temporal del conjunto(s) de " "datos." -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "Seleccionar color" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "Seleccionar %s" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "&Cargar" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "Cargar y editar el contenido de un archivo" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "&Guardar cómo" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "Guardar contenido en un archivo para uso posterior" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "o introducir los valores directamente:" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." @@ -12266,38 +12510,38 @@ msgstr "" "Ingrese contenido de archivo directamente en vez de especificar un archivo. " "Se creará automáticamente un archivo temporal." -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "Id de capa" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "Nombre de capa" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "Tipo de elemento" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "Coincidencia de proyecciones" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "Manual" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "Nada que cargar." -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -12308,94 +12552,94 @@ msgstr "" "\n" "Razón: %s" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "Nada que guardar." -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "Guardar entrada como..." -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "No se dio ningún conjunto de datos." -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "Error en %s" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "No se puede parsear la comanda '%s'" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "%(cmd)s: parámetro '%(key)s' no disponible" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "Intente definir variables GRASS_ADDON_PATH o GRASS_ADDON_BASE." -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "Resultados de la consulta" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "Click derecho para copiar valores seleccionados al portapapeles." -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "Elemento" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "Valor" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "Copiar todo al portapapeles" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "Redireccionar a consola" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "Copiar desde la columna '%s'" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "Copiar líneas seleccionadas" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "Copiar '%s'" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "Copiar línea" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "Resultados de la consulta:" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "este, norte" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "No se ha encontrado nada" @@ -12403,60 +12647,64 @@ msgstr "No se ha encontrado nada" msgid "Required item is not set." msgstr "Elemento requerido no está definido." -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "Seleccionar Localización GRASS y Directorio de mapas" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." msgstr "No se ha definido la Localización o el Directorio de mapas." -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +#, fuzzy +msgid "Name of GRASS project:" msgstr "Nombre de la Localización GRASS:" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "Nombre del Directorio de mapas:" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "Seleccionar Directorio de mapas en Localización GRASS" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "Falta el nombre del nombre del Directorio de mapas." -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "Seleccionar mapa vectorial" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "Falta el nombre del mapa vectorial." -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "Crear tabla de atributos" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "Falta el nombre para el nuevo mapa vectorial." -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "Nombre para el nuevo mapa vectorial:" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "No se puede crear el mapa vectorial <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" @@ -12465,7 +12713,7 @@ msgstr "" "Columna llave vacía o inválida.\n" "No se puede crear el mapa vectorial <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " @@ -12474,15 +12722,15 @@ msgstr "" "El archivo vectorial <%s> ya existe en el Directorio de mapas actual ¿Quiere " "sobrescribirlo?" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "Cargar encuadre de región:" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "Guardar región:" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." @@ -12490,24 +12738,24 @@ msgstr "" "El nombre no puede iniciar con '.' y no debe contener espacios, comillas, " "'/', ''', '@', ',', '=', '*', o cualquier otro caracter no alfanumérico" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "Crear o editar grupos de imágenes" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "Aplicar cambios al grupo seleccionado y cerrar el cuadro de diálogo" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "Aplicar cambios a grupo seleccionado" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "Cerrar el cuadro de diálogo, cambios no aplicados" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." @@ -12515,211 +12763,211 @@ msgstr "" "Poner una expresión regular. Caracter '.*' significa cualquier cosa, " "caracter '^' significa inicio y '$' término." -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "Seleccionar grupo existente o ingresar nombre de nuevo grupo:" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "Editar/crear subgrupo" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "Seleccionar subgrupo existente o ingresar nombre de nuevo subgrupo:" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "Seleccionar todo" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "Patrón:" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "Lista de mapas:" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "Seleccionar capas de mapas y añadirlos a la lista." -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "Remover de la lista las capa(s) seleccionadas." -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "Revisar mapas de grupo a ser incluidas en subgrupo." -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "Añadir mapa seleccionado al grupo" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "El grupo <%s> no fue cambiado, ¿quiere aplicar los cambios?" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "Cambios no aplicados" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "El subgrupo <%s> no fue cambiado, ¿quiere aplicar los cambios?" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "No hay ningún mapa ráster seleccionado." -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "No hay cambios que aplicar al grupo <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "El grupo <%s> fue creado exitosamente." -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "El grupo <%s> fue cambiado exitosamente." -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "Crear grupo nuevo <%s> ha fallado." -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "Falló el cambio de grupo <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "No se ha seleccionado ningún grupo." -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "No se ha seleccionado ningún subgrupo." -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "Usar nombres completos de los mapas" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "Tipo de mapa:" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "Seleccionar palanca" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "Directorio de mapas:" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "Invertir selección" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "Deseleccionar todo" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "Series dinámicas (%s)" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "Establecer opacidad de la capa de mapa" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "transparente" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "opaco" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "Establecer tamaño de imagen" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "Tamaño de imagen" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "Plantilla:" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr " Sentencia SQL" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "Símbolos" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "Directorio del símbolo:" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "Nombre del símbolo:" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "Seleccione el tipo de letra:" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "Codificación de caracteres:" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "Tamaño de fuente:" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "Ejemplo" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr " (...)" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " @@ -12728,68 +12976,68 @@ msgstr "" "Nombre <%(name)s> no es válido para un mapa de GRASS. Por favor use " "solamente caracteres ASCII excluyendo %(chars)s y espacio." -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "Búsqueda de texto completo" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "Buscando, por favor ingrese más letras." -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 #, fuzzy msgid "{} tools matched" msgstr "%d módulos corresponden" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "Perfiles" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "Guardar configuración actual" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "Borrar configuraciones seleccionadas actualmente" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "Cargar:" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "Configuración <%s> no encontradas" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "Guardar configuraciones" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "Nombre no facilitado, no se han guardado las configuraciones." -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" "La configuración <%s> ya existe. ¿Quiere sobrescribir la configuración?" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "No hay configuraciones definidas. Operación cancelada." -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "No es posible guardar configuraciones" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12875,9 +13123,9 @@ msgid "Snap also to vertex" msgstr "Ajustar también al vértice" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "El umbral de ajuste es %(value).1f %(units)s." @@ -12903,141 +13151,141 @@ msgstr "" "De forma predeterminada, se han seleccionan todos los objetos espaciales que " "se superponen al cuadro delimitador de selección." -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "Revisar duplicados" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "Digitalizar nueva líneas/bordes" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "Dividir líneas en la intrersección" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "Digitalizar áreas" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "Cierre el contorno (cerrar en el nodo de inicio)" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "Guardar los cambios" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "Guardar cambios al salir" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "Herramienta de consultas" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "Seleccione la herramienta de consulta" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "Seleccionar mediante recuadro" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "longitud" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "Seleccionar líneas" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "más corto que" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "más largo que" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "dangle" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "Seleccionar dangles" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "Digitalizar nuevo elemento" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "Añadir nuevo registro a la tabla" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Capa" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Categoría" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "Modo" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "Siguiente a utilizar" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "Número de categoría" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "Modo de categoría" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "Entrada manual" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "Sin categoría" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "Borrar elemento(s) existente(s)" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "Borrar registro de la tabla" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "Atributos de geometría" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "área" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "perímetro" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." @@ -13045,88 +13293,88 @@ msgstr "" "Nota: Estas configuraciones se guardan en el Entorno de trabajo no en las " "preferencias del digitalizador vectorial." -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "Digitalizar nuevo segmento de línea" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "Digitalizar nueva línea/contorno" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "Resaltar" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "Resaltar (duplicados)" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "Línea" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "Contorno (no incluye el área)" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "Contorno (un área)" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "Contorno (dos áreas)" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "Centroide (dentro del área)" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "Centroide (fuera del área)" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "Centroide (duplicado en el área)" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "Nodo (una línea)" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "Nodo (dos líneas)" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "Vértice" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "Área (contorno cerrado + centroide)" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Dirección" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "Ajuste deshabilitado" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" "El umbral de ajuste es %(value).1f %(units)s (basado en la resolución comp.)." -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "" "Los ajustes del digitalizador de vectores se han guardado en el archivo <%s>." -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -13147,221 +13395,221 @@ msgstr "" msgid "Topology missing" msgstr "Topologia no encontrada" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "Herramienta de selección de área/contorno/centroide" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "Digitalizar nuevo punto" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "Izquierda: nuevo punto" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "Digitalizar nueva línea" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" "Izquierda: nuevo punto; Ctrl+Izquierda: deshacer último punto; Derecha: " "cerrar la línea" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 #, fuzzy msgid "Digitize new boundary (Ctrl+B)" msgstr "Digitalizar nuevo contorno" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 #, fuzzy msgid "Digitize new centroid (Ctrl+C)" msgstr "Digitalizar nuevo centroide" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 #, fuzzy msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "Digitalizar nueva área (cotorno sin categoría)" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 #, fuzzy msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "Añadir nuevo vértice a línea o contorno" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" "Izquierda: Seleccionar; Ctrl+Izquierda: Deseleccionar; Derecha: Confirmar" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 #, fuzzy msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "Borrar punto(s), línea(s), contorno(s) o centroide(s)" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Borrar áreas seleccionada(s)" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 #, fuzzy msgid "Display/update attributes (Ctrl+K)" msgstr "Visualizar/actualizar atributos" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "Izquierda: Seleccionar" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 #, fuzzy msgid "Display/update categories (Ctrl+J)" msgstr "Visualizar/actualizar categorías" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "Editar línea/contorno seleccionado" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 #, fuzzy msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "Mover punto(s), línea(s), contorno(s) o centroide(s) seleccionados" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 #, fuzzy msgid "Move selected vertex (Ctrl+G)" msgstr "Mover vértice seleccionado" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "Remover vértice seleccionado" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "Abrir (Ctrl+O)" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 #, fuzzy msgid "Quit (Ctrl+Q)" msgstr "Ejecutar (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "Salir del digitalizador y guardar cambios" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Mostrar manual" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "Mostrar el manual del digitalizador vectorial" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "Herramientas adicionales (copiar, invertir, conectar, etc.)" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 #, fuzzy msgid "Undo (Ctrl+Z)" msgstr "Ejecutar (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "Deshacer cambios anteriores" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 #, fuzzy msgid "Redo (Ctrl+Y)" msgstr "Ejecutar (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "Rehacer cambios anteriores" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "Separa las líneas/bordes en la intersección" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "Conectar las líneas / fronteras seleccionadas" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "Copiar categorías" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "Copiar elementos del mapa vectorial ubicado en segundo plano" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "Copiar atributos" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "Conversión del tipo de elemento" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "Invertir las líneas o fronteras seleccionadas" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "Combina las líneas o fronteras seleccionadas" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "Ajustar las líneas / fronteras seleccionadas (únicamente a los nodos)" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "Dividir línea/contorno" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "Consultar elementos" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "Etiquetado en bloque Z de líneas 3D" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "Seleccionar mapa vectorial de fondo" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "El mapa vectorial no es 3D. Operación cancelada." -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -13374,46 +13622,46 @@ msgstr "" "¿Quiere reconstruir la topología (tarda algún tiempo) y abrir el mapa " "vectorial para editar?" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "Error del digitalizador" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "Por favor, espere, abriendo el mapa vectorial <%s> para su edición ..." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -"Tipo de elemento '%(type)s' no soportado. No se puede editar capa OGR <" -"%(layer)s>." +"Tipo de elemento '%(type)s' no soportado. No se puede editar capa OGR " +"<%(layer)s>." -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "¿Desea guardar los cambios en el mapa vectorial <%s>?" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "¿Guardar los cambios?" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -"Por favor espere, cerrando y reconstruyendo la topología del mapa vectorial <" -"% s> ..." +"Por favor espere, cerrando y reconstruyendo la topología del mapa vectorial " +"<% s> ..." -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "La edición del mapa vectorial <%s> ha finalizado correctamente" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "Nuevo mapa vectorial" @@ -13426,8 +13674,8 @@ msgid "Add new category" msgstr "Añadir nueva categoría" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "Aplicar cambios" @@ -13436,11 +13684,11 @@ msgid "Ignore changes and close dialog" msgstr "Ignorar los cambios y cerrar el cuadro de diálogo" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "Aplicar los cambios y cerrar el cuadro de diálogo" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "Id del elemento:" @@ -13489,24 +13737,24 @@ msgstr "Identificador de elemento" msgid "Layer (Categories)" msgstr "Capa (Categorías)" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "Error de Digitalización" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "No se puede abrir el mapa vectorial <%s>." -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "No hay un mapa vectorial abierto para editar." -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "Operación cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -13517,24 +13765,24 @@ msgstr "" "\n" "Razón: %s" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "Falló la lectura del elemento de id %d. Operación cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "Enlace a la base de datos %d no disponible. Operación cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" "No es posible iniciar el controlador <%s> de la base de datos. Operación " "cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." @@ -13542,32 +13790,32 @@ msgstr "" "El driver <%(driver)s> no puede abrir la base de datos <%(db)s>. Operación " "cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "No es posible ejecutar la consulta SQL '%s'. Operación cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "El elemento id %d está marcado como fallecido. Operación cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "Tipo de elemento %d no soportado. Operación cancelada." -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "Tipo de elemento '%s' desconocido" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "No hay suficientes puntos para una línea" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." @@ -13575,45 +13823,45 @@ msgstr "" "Por favor instale Python Imaging Library (PIL)\n" "para un mejor control de leyendas y otras decoraciones." -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "Remover texto" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "Remover barra de escala" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "Remover símbolo Norte" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "Remover leyenda" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "La propiedad no existe: %s" @@ -13627,7 +13875,7 @@ msgstr "" "Se produjo un error durante la llamada al controlador: %s\n" "El manejador no fue registrado." -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -13636,12 +13884,12 @@ msgstr "" "Se produjo un error durante la cancelación del registro del manejador:\n" "%s El manejador no fue registrado." -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "El controlador: %s, no fue registrado." -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -13663,36 +13911,36 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "Por favor espere, exportando imagen..." -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" "No ha sido posible dibujar gráficas registradas. Se les quitó el registro a " "las gráficas." -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "Acercamiento a la extensión de la región guardada (zoom to saved...)" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "Definir región computacional desde la región nombrada" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "Región <%s> no encontrada. Operación cancelada." -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "" "Guardar la extensión de la visualización a un archivo de configuración de " "región." -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "Guardar región computacional a un archivo de región" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "El archivo de región <%s> ya existe. ¿Quiere sobrescribirlo?" @@ -13806,104 +14054,104 @@ msgstr "Contraseña:" msgid "Connecting to <%s>..." msgstr "Conectando a <%s>..." -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "Servicios web disponibles" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "Conectado a <%s>" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "No es posible connectar a <%s>" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "&Añadir capa" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" "Añadir servicio de capas wev seleccionado como una capa en el árbol de capas" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "Propiedades de capa de servicio web" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "&OK" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "Nombre para mapa ráster de salida:" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "Exportar región" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "Región nombrada" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" "La extensión y resolución están basadas en la geometría del visualizador de " "mapas." -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "Extensión y resolución están basadas en la región computacional." -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "Extensión y resolución están basadas en la región nombrada." -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "Sobreescribir mapa ráster existente" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "Escoger región nombrada:" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "&Guardar capa" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "Guardar capa de servicio web como mapa ráster" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "Falta ráster de salida." -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" "Mapa de salida puede ser añadido solamente al Directorio de mapas actual." -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "El mapa de salida <%s> ya existe" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "La región <%s> no existe." -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "Descargando datos..." -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "No se pueden recuperar los datos.\n" @@ -13932,12 +14180,12 @@ msgid "Order of layers in raster" msgstr "Orden de capas en ráster" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "Arriba" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "Abajo" @@ -14016,11 +14264,11 @@ msgstr "Seleccionar proyección fuente.\n" msgid "Choose output layer name.\n" msgstr "Escoger nombre de capa de salida.\n" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "Agregar predeterminado" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -14034,24 +14282,24 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "Administrador GRASS SIG de Puntos de control sobre el terreno" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "Seleccionar grupo:" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "Falló la escritura del archivo CONTROL_POINTS" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "Archivo CONTROL_POINTS guardado para grupo <%s>" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "Falló la lectura del archivo de CONTROL_POINTS" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." @@ -14059,7 +14307,7 @@ msgstr "" "No se pudo calcular el Error RMS.\n" "Posible error en i.ortho.transform." -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." @@ -14067,21 +14315,21 @@ msgstr "" "No se pudieron calcular las nuevas extensiones. Posible error de i.ortho." "transform." -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "origen Z" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "destino Z" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "origen Z:" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "destino Z:" @@ -14097,11 +14345,11 @@ msgstr "2. Seleccionar Localización GRASS" msgid "3. Select GRASS Mapset" msgstr "3. Seleccionar Directorio de mapas de GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "Directorio de bases de datos de GRASS GIS que contiene Localizaciones." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." @@ -14110,7 +14358,7 @@ msgstr "" "coordenadas de referencia. Una Locación puede ser un proyecto. La " "localización contiene Directorios de mapas." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." @@ -14118,29 +14366,29 @@ msgstr "" "El Directorio de mapas contiene los datos SIG relacionados con un proyecto, " "tarea dentro de un proyecto, subregión o usuario." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "Iniciar sesión de &GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "&Explorar" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "&Nuevo" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "Crear un nuevo Directorio de mapas en la Localización seleccionada" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "N&uevo" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." @@ -14150,65 +14398,79 @@ msgstr "" "sesión de GRASS." #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "Ren&ombrar" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Renombrar Localización seleccionada" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "Bo&rrar" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Borrar Localización seleccionada" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Borrar Directorio de mapas" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "GRASS GIS %s startup%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "Ingrese sesión de GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" "No se puede establecer la base de datos de GRASS. Revise la configuración " "local." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "ERROR: No se encuentra la Localización <%s>\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "ERROR: Directorio de mapas <%s> no encontrado\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "Línea no válida en archivo GISRC (%s):%s\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "¿Quiere importar <%(name)s> a la Localización recientemente creada?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "Nuevo Directorio de mapas:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" +"Archivo de datos <%(name)s> importado exitosamente. La región predeterminada " +"de la Localización fue definida a partir del mapa importado." + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -14219,8 +14481,8 @@ msgstr "" "\n" "Este Directorio de mapas no puede ser renombrado." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -14231,14 +14493,14 @@ msgstr "" "\n" "Introduzca un nombre nuevo:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Mensaje" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -14249,7 +14511,7 @@ msgstr "" "\n" "El Directorio de mapas <%s> ya existe en la Localización." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -14260,7 +14522,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -14271,7 +14533,7 @@ msgstr "" "\n" "La Localización <%s> ya existe in la base de datos de GRASS." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -14282,7 +14544,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -14293,11 +14555,11 @@ msgstr "" "\n" "Este Directorio de mapas no puede ser eliminado." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" @@ -14307,35 +14569,35 @@ msgstr "" "¡TODOS LOS MAPAS incluidos en este Directorio de mapas serán ELIMINADOS DE " "FORMA PERMENENTE!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "No es posible eliminar el Directorio de mapas" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" "\n" "ALL MAPS included in this location will be PERMANENTLY DELETED!" msgstr "" -"¿Está seguro que desea continuar con la eliminación de la Localización <" -"%s>?\n" +"¿Está seguro que desea continuar con la eliminación de la Localización " +"<%s>?\n" "\n" "¡TODOS LOS MAPAS incluidos en esta Localización serán SUPRIMIDOS DE MANERA " "PERMANENTE!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "No se puede eliminar la Localización" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" "Se detectó un error de Unicode. Corrobore la configuración de su locale. " "Detalles: {0}" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " @@ -14344,21 +14606,21 @@ msgstr "" "No se encontró ninguna Localización GRASS en '%s'. Crear nueva Localización " "o escoger un directorio diferente de bases de datos GRASS." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "Ruta '%s' no existe." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "Escriba el nombre para el nuevo Directorio de mapas:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "El Directo de mapas <%s> ya existe." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -14372,16 +14634,16 @@ msgstr "" "\n" "¿Está realmente seguro que quiere crear este Directorio de mapas?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "Nombre de Directorio de mapas reservado" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "No ha sido posible crear el nuevo Directorio de mapas: %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -14400,12 +14662,12 @@ msgstr "" "¿Quiere remover el .gislock (necesita permiso para esta operación) y " "continuar?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "Archivo de bloqueo (lock) encontrado" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -14418,7 +14680,7 @@ msgstr "" "GRASS. Revisa de nuevo en el administrador de tareas solo para estar " "seguro..." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -14429,7 +14691,7 @@ msgstr "" "\n" "Detalles: %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " @@ -14438,7 +14700,7 @@ msgstr "" "Nombre <%(name)s> no es válido para Localización o Directorio de mapas. Por " "favor use solo caracteres ASCII excluyendo %(chars)s y espacio." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " @@ -14449,47 +14711,47 @@ msgstr "" "es \"grassdata\", ubicado en su directorio home. Presione el botón Explorar " "para seleccionar el directorio." -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "Módulo <%s> no soporta costos de vueltas." -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "Mapa vectorial '%s' no existe." -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "No se escogió mapa vectorial." -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "capa arc" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "capa de nodos" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "capa de tabla de giros" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "capa de categorías únicas" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "%s '%s' escogido no existe en mapa vectorial '%s'.\n" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "Seleccionar %s existente.\n" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " @@ -14498,103 +14760,103 @@ msgstr "" "La columna '%s' seleccionada no existe en la tabla de atributos de la capa " "'%s' del mapa vectorial '%s'.\n" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "topología" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "Punto de inicio" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "Punto final" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "nuevo punto" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "Columna de costo para el arco hacia adelante /ambas direcciones:" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "Arco, hacia adelante / ambas:" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "Columna de costo del arco en dirección hacia atrás:" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "Arco hacia atrás." -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "Columna de costo de los arcos (Para ambas direcciones):" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "arco" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "Columna de costo de nodos:" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "nodo" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "Camino más corto %s" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "Punto final" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "Representante de comercio %s" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "Flujo máximo %s" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "Punto de origen" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "Punto de llegada" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "Subredes para centros más cercanos %s" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "Crea un árbol de Steiner para la red y terminales dadas %s" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "Distancia más corta vía la red %s" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "Isolíneas de costo %s" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "Sobreescribir capa de mapa" @@ -14602,7 +14864,7 @@ msgstr "Sobreescribir capa de mapa" msgid "Unable to perform analysis." msgstr "No se puede realizar el análisis." -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -14614,45 +14876,45 @@ msgstr "" "Es posible que el resultado mostrado no corresponda con el resultado " "original del análisis." -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "Resultados modificados fuera" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "El mapa puede ser creado solo en el Directorio de mapas actual" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "El mapa vectorial %s ya existe. ¿Quiere sobrescribirlo?" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "Sobreescribir mapa vectorial" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "Falló la creación de la tabla de giros." -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "Mapa vectorial con los resultados del análisis no existe." -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "Mapa puede ser guardado solo en el Directorio de mapas actual" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "Por favor escoja '%s' y '%s' puntos." -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "Por favor escoja al menos dos puntos." -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -14664,11 +14926,11 @@ msgstr "" "Es posible que La columna de topología no corresponda con la situación " "modificada." -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "Entrada modificada fuera" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" @@ -14677,20 +14939,20 @@ msgstr "" "Mapa temporal %s ya existe.\n" "¿Quiere continuar el análisis y sobrescribirlo?" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "No es posible usar ctypes. \n" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "No ha sido posible activar el modo de ajuste." -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "¿Realmente quiere activar el ajuste y sobrescribirlo?" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" @@ -14699,7 +14961,7 @@ msgstr "" "El mapa temporal '1%s' se modificó fuera de la herramienta de análisis de " "vectores. ¿Realmente desea activar el ajuste y sobrescribirlo?" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "Sobreescribir mapa" @@ -14798,117 +15060,117 @@ msgstr "Isolíneas:" msgid "Output" msgstr "Salida." -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "Añadir el mapa vectorial al árbol de capas" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "Tabla de entrada" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "Tablas resultantes" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "Cargando tablas..." -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "Creando tabla de giros..." -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "Mapa vectorial de entrada no existe." -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "Analizando..." -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "Calculando nodos..." -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "Otras configuraciones" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "Estilo de punto:" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "Estilo de los resultados del análisis:" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "Estilo de la tablas de color %s:" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "Invertir colores %s:" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "Color de línea:" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "Color para los puntos no utilizados:" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "Color para punto de inicio/desde/fuente/usado:" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "Color para puntos de término/a/destino:" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "Color para los puntos seleccionados:" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "Tamaño del punto:" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "Anchura del punto:" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "Umbral de ajuste en píxeles:" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "Cantidad máxima de resultados en la historia:" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "Nuevo mapa vectorial con tabla de giro" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "Guardar resultados del análisis" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "Editar costos de vueltas en intersecciones" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "Definir costo global de vuelta" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "Valor insertado no válido. Operación cancelada." -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "Editar punto" @@ -14924,41 +15186,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "Por favor, primero seleccione el mapa ráster" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "Click derecho para finalizar área" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "Click derecho para finalizar línea" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "¿Desea guardar los cambios?" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "Guardar cambios en el mapa ráster" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "Error al crear copia de respaldo del mapa ráster editado" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "Error al crear el nuevo mapa ráster" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "Rasterizando..." -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" "Error al definir la tabla de colores por defecto para el mapa ráster editado" @@ -15004,7 +15266,7 @@ msgstr "" "Ancho de línea digitalizada o diámetro de un punto digitalizado en unidades " "de mapa." -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "Nuevo mapa ráster" @@ -15037,19 +15299,19 @@ msgstr "" "El mapa ráster <%s> ya existe en el Directorio de mapas actual. ¿Desea " "sobreescribirlo?" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "metros" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "kilómetros" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "millas" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "pies" @@ -15073,21 +15335,21 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" "No se pudieron parsear los archivos XML con las cajas de herramientas del " "usuario. Se cargarán los archivos predeterminados." -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "No es posible crear el directorio de cajas de herramientas." -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "Cajas de herramientas personalizadas" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" @@ -15095,7 +15357,7 @@ msgstr "" "No se ha podido obtener la lista de complementos porque falló g.extension. " "Detalles: %s" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "Complementos" @@ -15107,8 +15369,8 @@ msgstr "Razón" msgid "Execution failed:" msgstr "Ejecución fallida:" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "Detalles:" @@ -15161,7 +15423,7 @@ msgstr "Llave duplicada: %s\n" msgid "Unable to create file '%s'\n" msgstr "No se ha creado el archivo '%s'\n" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -15175,23 +15437,23 @@ msgstr "" "Opción <%(opt)s>: lectura de la entrada estandar no está soportada por la " "wxGUI" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "Módulo <%s> no encontrado." -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" "Por favor note que los datos se han dejado en un estado inconsistente y " "podrían encontrarse corruptos" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "Comando abortado" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -15214,147 +15476,147 @@ msgstr "" "AVISO: Se está ignorando un nivel de depuración de wx que no está no " "soportado (Este debe ser >=0 y <=5). {0}\n" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "Ruptura de segmento." -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "Punto de datos" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "animación" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "Ocultar todos excepto los conjuntos de mapas PERMANENT y actual." -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "Ocultar todos excepto el conjunto de mapas PERMANENT" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "Ocultar todos excepto el actual" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "Ocultar todo" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "Expandir todo" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "Editar el registro seleccionado" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "Mostrar lo seleccionado" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "Clásico (sólo etiquetas)" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "Acercar y recentrar" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "Acercar al cursor del ratón" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "Nada" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "Mover hacia adelante para acercar" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "Mover hacia atrás para acercar" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "caja" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "esfera" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "cubo" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "diamante" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "asterisco" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "giroscópo" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "histograma" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "cruz" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "círculo" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "No es posible leer el archivo de configuración <%s>\n" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -15366,11 +15628,11 @@ msgstr "" "\t\tDetalles: %(detail)s\n" "\t\tLínea: '%(line)s'\n" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "No es posible crear directorio de configuración" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -15381,11 +15643,11 @@ msgstr "" "\n" "Detales: %(detail)s" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "Imposible de establecer" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "No es posible parsear configuración '%s '" @@ -15454,22 +15716,22 @@ msgstr "" "\n" "ERROR: No se puede leer archivo WIND: %s\n" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "No ha sido posible realizar acercamiento al mapa ráster <%s>." -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "No ha sido posible realizar acercamiento al mapa vectorial <%s>." -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "No ha sido posible realizar acercamiento al mapa ráster 3D <%s>." -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -15507,22 +15769,22 @@ msgstr " fila %d:" msgid "Unsupported command %s." msgstr "Comando %s no soportado." -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "No se puede leer cmdfile '%(cmd)s'. Detalles: %(det)s" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "Iniciar visualización de mapa <%s>..." -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "Imposible crear archivo <%s>" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "Detener visualización de mapa <%s>..." @@ -15531,36 +15793,36 @@ msgstr "Detener visualización de mapa <%s>..." msgid "Map window test frame" msgstr "Marco de prueba de la ventana de mapa." -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "Prueba de visualización del mapa." -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" "Marco de prueba de la API (Interfaz de Programación de la Aplicación) de la " "ventana de Mapa." -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "Marco de prueba de la medición de distancia de la ventana del mapa." -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" "Marco de prueba de la herramienta perfil, perteneciente a la ventana de mapa." -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "Marco de prueba e rlisetup de la ventana de mapa." -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "Valor desconocido %s de parámetro de prueba." #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "Activar/desactivar renderizado automático" @@ -15621,15 +15883,15 @@ msgstr "" msgid "Status bar" msgstr "Mostrar barra de estado" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "Renderizar" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "Escala de mapa" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." @@ -15638,33 +15900,33 @@ msgstr "" "estos valores no son verdaderas escales en el mapa, pero deben llevarte al " "vecindario correcto." -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "Establecer coordenadas GCP" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "Proyección no definida (comprobar la configuración)" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "Error en la proyección (comprobar configuraciones)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "Mostrar geometría" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "Coordenadas" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 #, fuzzy msgid "Display extent" msgstr "Mostrar geometría" @@ -15741,14 +16003,14 @@ msgid "Click mouse to unzoom" msgstr "Hacer click con el ratón para alejarse" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "Vista 2D" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "Vista 3D" @@ -15767,8 +16029,9 @@ msgid "Vector digitizer not available" msgstr "Digitalizador vectorial no disponible" #: ../gui/wxpython/mapdisp/toolbars.py:123 +#, fuzzy msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." @@ -15778,7 +16041,7 @@ msgstr "" "actualizadas de GRASS. Mientras tanto puede utilizar \"v.edit\" del menú " "Develop vector map para ediciones no interactivas." -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" @@ -15787,23 +16050,23 @@ msgstr "" "No se pudo ejecutar el comando '%(command)s'. Detalles:\n" "%(error)s" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "Ocultar barra de herramientas" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "Mostrar barra de herramientas" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "Ocultar barra de estado" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "Mostrar barra de estado" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" @@ -15812,11 +16075,11 @@ msgstr "" "No es posible iniciar el digitalizador vectorial wxGUI.\n" "Detalles: %s" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "Barra de herramientas del Digitalizador vectorial" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -15831,37 +16094,37 @@ msgstr "" "\n" "Detalles: %s" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "Iniciando modo de vista 3D..." -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "Por favor espere, cargando datos..." -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "Por favor espere, descargando datos..." -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "Volver al modo de vista 2D..." -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "No se pudo correr d.to.rast:\n" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "d.to.rast solo puede ser usado en el modo 2D." -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "Mapa vectorial <%s> abierto para edición -saltado." -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." @@ -15869,23 +16132,23 @@ msgstr "" "No se pudo consultar mapa(s) <{maps}>. Revise base la configuración de la " "base de datos y topología." -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "Definir región computacional a partir de la visualización" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "Definir extensión de la región computacional de manera interactiva" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "Establecer región computacional desde región nombrada" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "Guardar región computacional con nombre" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "Barra de herramientas del digitalizador ráster" @@ -16102,7 +16365,7 @@ msgstr "Ingresar valores de categoría ráster o porcentajes" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "intervalo" ======= @@ -19329,6 +19592,7 @@ msgid "Change" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19340,6 +19604,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -19537,6 +19806,9 @@ msgid "Find more information at:" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -19660,8 +19932,8 @@ msgstr "Guardar anchura en la columna:" msgid "Use color column instead of color table:" msgstr "Usar columna de color en lugar de tabla de colores:" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "Añadir columna" @@ -19693,8 +19965,8 @@ msgid "" "Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " "table cannot be edited." msgstr "" -"El mapa seleccionado <%(map)s> no está en el Directorio de mapas actual <" -"%(mapset)s>. La tabla de atributos no puede ser editada." +"El mapa seleccionado <%(map)s> no está en el Directorio de mapas actual " +"<%(mapset)s>. La tabla de atributos no puede ser editada." #: ../gui/wxpython/modules/colorrules.py:1536 #, python-format @@ -22347,7 +22619,7 @@ msgid "List of %s layers" msgstr "Lista de %s capas" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "click derecho para (des)seleccionar todo" @@ -22361,13 +22633,13 @@ msgstr "No comprobar proyección (usar la proyección de la localización actual #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "&Importar" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "Importar las capas seleccionadas" @@ -22385,6 +22657,7 @@ msgstr "Importar configuraciones" #: ../gui/wxpython/modules/import_export.py:240 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22396,6 +22669,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 "" @@ -22406,6 +22684,7 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:245 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22417,73 +22696,78 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "Añadir las capas enlazadas al árbol de capas" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "Añadir las capas importadas al árbol de capas" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "&Liga" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "Ligar las capas seleccionadas" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "No se han seleccionado capas. Operación cancelada." -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "No se puede determinar el número de bandas ráster" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "Definir formato de salida para datos vectoriales" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "Definir formato de salida para datos ráster" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "Definir formato externo y cerrar cuadro de diálogo" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "No se ha seleccionado ningún origen de datos" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "Importar capas de mapas DXF" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "Seleccionar archivo DXF a importar:" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "No hay capas seleccionadas." -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "Nombre para el mapa GRASS de salida" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " @@ -22491,15 +22775,15 @@ msgstr "" "La proyección de las siguientes capas no coincide con la proyección de la " "localización actual." -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "Capas a ser reproyectadas" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "&Importar && reproyectar" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "Reproyectar capas seleccionadas" @@ -22509,6 +22793,7 @@ msgstr "Reproyectar capas seleccionadas" #: ../gui/wxpython/modules/histogram.py:296 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22520,6 +22805,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 "" @@ -22890,6 +23180,7 @@ msgid "3D Raster Map Calculator" msgstr "Calculadora de mapas ráster 3D" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22901,6 +23192,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" @@ -23088,16 +23384,16 @@ msgstr "Seleccione un nombre de archivo para cargar la expresión" msgid "'{cmd}' copied to clipboard" msgstr "'{cmd}' copiado al portapapeles" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -"La herramienta de gráfica de dispersión necesita que el paquete \"matplotlib" -"\" (mathplotlib-python) esté instalado. {0}" +"La herramienta de gráfica de dispersión necesita que el paquete " +"\"matplotlib\" (mathplotlib-python) esté instalado. {0}" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "Acercamiento a la extensión del gráfico de dispersión" @@ -23105,15 +23401,15 @@ msgstr "Acercamiento a la extensión del gráfico de dispersión" msgid "Loading ctypes libs failed" msgstr "Ha fallado la carga librería ctypes" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "Cargando datos..." -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "No existe el conjunto de datos." -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -23129,7 +23425,7 @@ msgstr "" "Puede reducir el número de celdas en la región actual usando el comando ." -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -23149,7 +23445,7 @@ msgstr "" "¿Quiere continuar usando la herramienta interactiva de gráfica de dispersión " "con esta región?" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." @@ -23157,27 +23453,27 @@ msgstr "" "Ya hay una gráfica de dispersión con la misma combinación de bandas " "(independientemente del orden x y)." -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "Banda <%s> no es de tipo CELL (entero).\n" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "No se puede añadir gráfica de dispersión.\n" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" "La gráfica de dispersión no puede ser añadida.\n" "El rango del múltiplo de bandas <%s:%d * %s:%d = %d> es mayor al límite " "máximo <%d>.\n" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -23193,7 +23489,7 @@ msgstr "" "ej. usando r.rescale) por debajo del límite recomendado.\n" "¿Quiere realmente añadir esta gráfica de dispersión?" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" @@ -23204,7 +23500,7 @@ msgstr "" "\n" "Aún no hay ninguna clase, ¿quiere crear una?" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" @@ -23214,46 +23510,46 @@ msgstr "" "de dispersión:\n" "%s" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "Exportar gráfica de dispersión ráster de clases <%s>" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" "Gráfica de dispersión ráster de clases <%s> exportada a mapa ráster <%s>." -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -"Falló la exportación de gráfica de dispersión ráster de clases <%s> a mapa <" -"%s>.\n" +"Falló la exportación de gráfica de dispersión ráster de clases <%s> a mapa " +"<%s>.\n" "%s" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "Añadir gráfica de dispersión" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "Seleccionar área con polígono" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "Modo pan para gráficos de dispersión" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" "Modo de acercamiento para gráficas de dispersión (botón derecho del ratón, " "rueda)" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" @@ -23261,63 +23557,63 @@ msgstr "" "Encuadre (Zoom) al modo extendido del diagrama de dispersión de datos, (Haga " "click para hacer un encuadre o zooming a la extensión)." -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "Mostrar/ocultar administrador de clases" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "Incluir áreas seleccionadas a clase" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "Excluir áreas seleccionadas de la clase" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "Añadir nuevo vértice" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" "Agregue un nuevo vértice al diagrama de dispersión de límite de polígono." -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "Crear polígono de selección" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "Añadir nuevo vértice entre el último y el primer punto del contorno" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "Mover vértice" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "Mover vértice de contorno" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "Eliminar vértice" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "Eliminar vértice de contorno" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" "Remover polígono (click en la gráfica de dispersión para remover su polígono)" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "Añadir clase" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "Remover clase seleccionada" @@ -23387,28 +23683,28 @@ msgstr "Color de área seleccionada:" msgid "Selected area opacity:" msgstr "Seleccionar opacidad de área:" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "Seleccionar estilo:" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "Configuración de elipses:" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "Seleccione categoría para editar." -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "Falló el cálculo de la gráfica de dispersión." -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "Falló archivo de condiciones para parchar categoría ráster." -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" @@ -23417,7 +23713,7 @@ msgstr "" "Falló v.build:\n" "%s" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" @@ -23426,64 +23722,65 @@ msgstr "" "Falló v.to.rast:\n" "%s" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "gráfica de dispersión" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "Se ha alcanzado el número máximo de categorías." -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "Renombrar clase" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "Elegir color" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "Cambiar nivel de opacidad" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "Ocultar" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "Mostrar" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "Mover hasta arriba" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "Mover hasta abajo" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "Mover categoría arriba" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "Mover categoría abajo" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "Exportar ráster de clases" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "Cambiar opacidad de la clase <%s>" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "Nombre vacío insertado." @@ -23842,7 +24139,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "Seleccionada área muestral 1 de" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -23852,7 +24149,7 @@ msgstr "" "prefijo '%s' o seleccione la opción de sobreescribir mapas existentes" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "El polígono parece tener 0 áreas" @@ -24005,6 +24302,7 @@ msgstr "AVISO" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24016,6 +24314,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 "" @@ -24068,7 +24371,7 @@ msgstr "Definir el nuevo nombre para %s \" \"archivo de configuración" msgid "Rename configuration file" msgstr "Renombrar archivo de configuración" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -24076,47 +24379,47 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "Barra de herramientas del Entorno de trabajo" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "Barra de herramientas " -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "Barra de herramientas de la vista 3D" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "Consola" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 #, fuzzy msgid "Map Swipe Tool" msgstr "Ventana de visualización móvil" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "Seleccionar modelo a ejecutar" -#: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995 +#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003 #, python-format msgid "" "Command '%s' not yet implemented in the WxGUI. Try adding it as a command " @@ -24125,31 +24428,31 @@ msgstr "" "El comando '%s' no está implementado todavía en WxGUI. Intentar añadirlo " "como capa de comando." -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "La capa del mapa seleccionado no es vectorial." -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" "Solo se permiten editar mapas vectoriales del Directorio de mapas actual." -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "Seleccionar archivo script a ejecutar" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Script Python (*.py)|*.py|Script Bash (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "El script '%s' no existe. Operación cancelada." -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " @@ -24158,15 +24461,15 @@ msgstr "" "El script <%s> no es ejecutable. ¿Quieres establecer los permisos que te " "permitan correr este script (debes ser el propietario del archivo)?" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "¿Establecer permiso?" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "No ha sido posible definir permiso. Operación cancelada." -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " @@ -24175,25 +24478,25 @@ msgstr "" "Directorio '%s' no está definido en GRASS_ADDON_PATH. ¿Quiere añadir este " "directorio a GRASS_ADDON_PATH?" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "¿Actualizar ruta de Addons?" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "Lanzando script '%s'..." -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "" -"No se ha dado ninguna Localización/Directorio de mapas. Operación cancelada." +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "No se ha seleccionado ningún Directorio de mapas. Operación cancelada." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "No se ha seleccionado ningún Directorio de mapas. Operación cancelada." -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" @@ -24202,19 +24505,19 @@ msgstr "" "Directorio de trabajo cambiado a:\n" "\"%s\"" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "Cambiar directorio de trabajo actual para esta GUI." -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "Uso: cd [directory]" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "Sin parámetros abre un cuadro de diálogo." -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." @@ -24222,51 +24525,51 @@ msgstr "" "Si ~ (tilde) está presente como el primer directorio en la ruta, será " "reemplazada por el directorio home del usuario." -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "Más de un parámetro dado." -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "Seleccionar un directorio trabajo" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "Información del sistema" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "Versión de GRASS" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "Fecha de compilación" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "Construir plataforma" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "Plataforma" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "Escriba una nuevo nombre:" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "Renombrar visualizador de mapas" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -24277,26 +24580,26 @@ msgstr "" "\n" "Razón: %s" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "No ha sido posible iniciar Herramienta de línea de tiempo." -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "No es posible iniciar Herramienta de gráfica temporal." -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "Añadir capas de mapa seleccionadas al árbol de capas" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "Tipo de capa de mapa no soportada <%s>." -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." @@ -24304,12 +24607,18 @@ msgstr "" "Note que los valores de las celdas solo pueden ser visualizados para " "regiones con menos de 10,000 celdas." -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "opacidad:" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -24500,6 +24809,10 @@ msgstr "¿Sobreescribir archivo?" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -24510,20 +24823,20 @@ msgstr "" "%s\n" " del árbol de capas?" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "" "¿Desea remover la(s) capa(s) de mapa seleccionada(s) del árbol de capas?" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "Remover la capa de mapa" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "Cerrar la Interfaz gráfica de usuario GRASS" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " @@ -24533,7 +24846,7 @@ msgstr "" "computacional. Se sugiere constreñir el mapa a la región geométrica. ¿Quiere " "constreñir la resolución?" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "¿Constreñir mapa a la región geométrica?" @@ -24563,55 +24876,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "Gestionar la posición de marcas fiduciales en una foto escaneada" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "Un archivo POINTS ya existe, se lo renombrará como POINTS_BAK" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "Falló la apertura del archivo CAMERA" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "Escribiendo imagen de salida a grupo, por favor espere..." -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "origen X" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "origen Y" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "destino X" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "destino Y" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "origen X:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "destino X:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "origen Y:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "destino Y:" @@ -24686,7 +24999,7 @@ msgstr "Modo de edición" msgid "Background vector map" msgstr "Mapa vectorial de fondo" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "Capas de mapas" @@ -24719,124 +25032,137 @@ msgstr "" msgid "Align computational region to selected map" msgstr "Alinear la región computacional al mapa seleccionado" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "Formatos comunes de exportación" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "Exportar PostGIS" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "Crear paquete" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "Hacer una copia en el Directorio de mapas actual" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "Establecer la tabla de color" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "Establecer paleta de colores interactivamente" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "Muestra los datos del atributo" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "Comenzar edición" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "Terminar la edición" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "Reconstruir topología" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "Reportar estadísticas de ráster" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "Perfil" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "Guardar capa de servicio web" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "No se puede crear el perfil del mapa ráster." -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "Tipo de mapa no soportado <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "Escriba el nombre para el nuevo %s en el Directorio de mapas actual:" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "Hacer una copia de %s <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" "%s <%s> ya existe en el Directorio de mapas actual. ¿Quiere sobrescribirlo?" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "No fue posible hacer una copia de <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" "No fue posible hacer una copia de <%s>. El Directorio de mapas <%s> no es el " "Directorio de mapas actual." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/lmgr/layertree.py:1126 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../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." msgstr "" "No es posible mostrar el histograma del mapa ráster. No se definió ningún " "nombre de mapa." -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +#, fuzzy +msgid "Set opacity of <{}>" +msgstr "Definir opacidad de <%s>" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "Grupo de capas:" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "Pulse aquí para editar la configuración de la capa" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "(haga doble clic para establecer las propiedades)" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "Por favor espere, actualizando datos..." @@ -24936,6 +25262,9 @@ msgid "Add vector map" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -26214,6 +26543,7 @@ msgid "Creates copies of maps and other elements Copies available data files in msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26225,6 +26555,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -29572,6 +29907,7 @@ msgid "Interactive editing and digitization of vector maps." msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29583,6 +29919,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -29922,6 +30263,7 @@ msgid "Location Download" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29933,6 +30275,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -30039,6 +30386,15 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"La Localización actual es <%(loc)s>.\n" +"El Directorio de mapas actual es <%(mapset)s>." + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 ======= @@ -30282,24 +30638,33 @@ msgstr "" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" +"No se ha dado ninguna Localización/Directorio de mapas. Operación cancelada." + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/dbmgr/manager.py:114 +======= #: ../gui/wxpython/dbmgr/manager.py:113 ======= #: ../gui/wxpython/startup/guiutils.py:717 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30311,6 +30676,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " @@ -30318,11 +30692,14 @@ msgid "" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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\"." @@ -30331,41 +30708,44 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "Por favor espere, cargando datos del atributo." -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "Explorar datos" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "Administrar tablas" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "Administrar capas" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "Cerrar el administrador de tabla de atributos" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "Recargar tabla de atributos seleccionada actualmente" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "Recargar todos los datos de atributos (eliminar selección actual)" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "Cantida de registros cargados: %d" @@ -30379,71 +30759,78 @@ msgstr "Cargando datos de atributos para el mapa vectorial <%s>..." msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "Conexión a la base de datos" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "Establecer la sentencia SQL como predeterminada" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "Aplicar sentencia SQL" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "Cerrar el cuadro de diálogo" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "Columnas." -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "Inserción interactiva" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "Valores" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "Obtener todos los valores" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "Obtener una muestra" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "Obtener los primeros 256 valores únicos como muestra" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "Ir a:" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "Cerrar el cuadro de diálogo al aplicar" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "Constructor SQL GRASS (%(type)s): - <%(map)s>" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "Columna a mostrar (cláusula SELECT)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "Restricción para la búsqueda (claúsula WHERE)" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 #: ../gui/wxpython/dbmgr/base.py:1274 ======= @@ -30476,27 +30863,31 @@ msgstr "Aplicar la instrucción SELECT y recargar los registros de datos" #: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 #: ../gui/wxpython/dbmgr/sqlbuilder.py:498 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Example: %s" msgstr "Ejemplo: %s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "Verificar" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "Verificar la sentencia SQL" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "sentencia SQL no verificada" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "La sentencia SQL no es válida" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -30507,35 +30898,35 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "La sentencia SQL es válida" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "Columna a definir (cláusula SET)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "Calcular valor de la columna a definir" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "Funciones" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "La sentencia SQL no fue aplicada" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "La sentencia SQL fue aplicada" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "El controlador Dbf no soporta el uso de funciones de SQL." -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " @@ -30544,23 +30935,23 @@ msgstr "" "Tabla de atributos <% s> no ha sido encontrada. Para crear la tabla cambie a " "la pestaña \"Administrar capas\"." -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "No se ha encontrado la columna <%(column)s> en la tabla <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "Solo puede mostrar 256 columnas." -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -30569,21 +30960,21 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "Límite de visualización: 100000 registros." -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "Valor desconocido" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" "No se puede decodificar el valor. Determine la codificación en las " "preferencias ( 'Atributos') de la interfaz gráfica de usuario GUI." -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -30597,144 +30988,144 @@ msgstr "" "\n" "Detalles: %(detail)s" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "Ordenar de forma ascendente" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "Ordenar de forma descendente" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "Calcular (solo columnas numéricas)" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "Calculadora de campos" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "Tamaño de área" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "Longitud de línea" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "Compactación de un área" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "Dimensión fractal de los contornos que definen un polígono" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "Longitud del perímetro de un área" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "Cantidad de elementos para cada categoría" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "Pendiente de la línea 3D" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "Sinuosidad de línea" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "Línea de azimut" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "Añadir columna a la tabla <%s>" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" "No es posible añadir la columna a la tabla. No se ha definido el nombre de " "la columna." -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "La columna <%(column)s> ya existe en la tabla <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" "Datos del atributo - haga click derecho para editar/administrar los registros" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "Tabla" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr " (solo-lectura)" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "Consulta SQL" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "Simple" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "Aplicar la instrucción SELECT y recargar los registros de datos" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "Constructor" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "Constructor SQL" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "Insertar un nuevo registro" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "Borrar registro(s) seleccionado(s)" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "Borrar todos los registros" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "" "Resaltar el(los) objeto(s) espacial(es) seleccionados y acercar (zoom)." -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "Extraer elementos seleccionados" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "Borrar elementos seleccionados" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "Actualizar un registro existente" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "Los valores '%(value)s' necesitan ser capturados como %(type)s." -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" @@ -30743,17 +31134,17 @@ msgstr "" "No fue posible actualizar el registro existente.\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "En la tabla, ya existe un registro %d con ese número de categoría." -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "Falta el número de categoría (en la columna %s)." -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" @@ -30762,7 +31153,7 @@ msgstr "" "No fue posible insertar un nuevo registro.\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " @@ -30771,11 +31162,11 @@ msgstr "" "Los registros seleccionados (%d) serán borrados permanentemente de la tabla. " "¿Desea eliminarlos?" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "Borrar todos los registros" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " @@ -30784,15 +31175,15 @@ msgstr "" "Todos los registros (%d) serán borrados de la tabla permanentemente. ¿Desea " "eliminarlos?" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "No hay algo para extraer." -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "No hay nada para eliminar." -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -30803,7 +31194,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -30816,31 +31207,31 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "Tabla <%s> - haga clic derecho para eliminar la(s) columnas." -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "Columna" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "Longitud" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "Añadir" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" "No es posible renombrar la columna. No se ha definido un nombre de columna." -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " @@ -30849,24 +31240,24 @@ msgstr "" "No es posible renombrar la columna <%(column)s> como <%(columnTo)s>. por " "que la columna ya existe en la tabla <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" "No es posible renombrar la columna <%(column)s> , por que la columna no " "existe en la tabla <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "Eliminar las columnas seleccionadas" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "columnas" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " @@ -30875,11 +31266,11 @@ msgstr "" "Seleccionado %s será eliminado PERMANENTEMENTE de la tabla. ¿Quiere " "eliminarla la columna?" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "Eliminar columna(s)" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -30890,91 +31281,91 @@ msgstr "" "%s\n" "se eliminaran PERMANENTEMENTE de la tabla. Quiere eliminar las columnas?" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "Lista de capas." -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "Eliminar tambien la tabla ligada de atributos (%s)" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "Nombre de columna" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "Longitud de dato" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "Manejador" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "Llave" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "Añadir capa" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "Descripción de capa" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "Columna clave." -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "Inserte un registro para cada categoría en la tabla." -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "Necesita añadir categorías mediante el módulo v.category." -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "Descripción de la tabla" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "Nombre de la tabla" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "&Crear tabla" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "&Establecer predeterminado" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "Eliminar capa" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "Capa a eliminar" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "&Eliminar capa" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "Modificar capa" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "&Modificar capa" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." @@ -30983,20 +31374,20 @@ msgstr "" "Por favor utilice db.connect para establecer los parámetros de la conexión a " "la base de datos." -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" "No ha sido posible crear la nueva tabla. Faltan el nombre de la tabla o el " "nombre de la columna clave." -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" "No ha sido posible crear la nueva tabla <%s> por que esta ya existe en la " "base de datos." -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " @@ -31005,23 +31396,23 @@ msgstr "" "No ha sido posible añadir la nueva capa al mapa vectorial <%(vector)s>. la " "capa %(layer)d ya existe." -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "Calculadora de campos" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "Copiar estadísticas al portapapeles (Ctrl+C)" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "Las estadísticas no están soportadas para tablas DBF." -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "No es posible calcular estadísticas." -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." @@ -31029,16 +31420,22 @@ msgstr "" "No se pueden calcular las estadísticas. Número de líneas %d inválido (debe " "ser %d)." -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "No es posible calcular desviación estándar." -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "Calculadora de campos <%s>" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/dialogs.py:80 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/dialogs.py:79 ======= #: ../gui/wxpython/dbmgr/sqlbuilder.py:133 @@ -31200,6 +31597,10 @@ msgstr "Recargar todos los datos de atributos (eliminar selección actual)" #: ../gui/wxpython/dbmgr/dialogs.py:76 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "No attribute table found.\n" @@ -31211,41 +31612,41 @@ msgstr "" "\n" "¿Quiere crear una nueva tabla y definir un enlace al mapa vectorial <%s>?" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "¿Crear tabla?" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "Cerrar el cuadro de diálogo después de seleccionarlas opciones" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "No se han encontrado atributos" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "Definir atributos" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "Visualizar atributos" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "&Recargar" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "&Enviar" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" "Columna <%(col)s>: Valor '%(value)s' necesita ser capturado como %(type)s." -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "Desconocido" @@ -31361,7 +31762,7 @@ msgstr "" "Va a visualizar datos con diferentes tipos de mapas temporales (intervalo y " "punto). Se recomienda usar datos de un solo tipo para evitar confusiones." -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "Topología de conjunto de datos espacio temporales %s no es válida." @@ -31380,13 +31781,13 @@ msgid "No map series nor space-time dataset is added." msgstr "" "No se han añadido series de mapas ni conjuntos de datos espacio temporales." -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "La cantidad máxima de animaciones es %d." -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " @@ -31395,63 +31796,63 @@ msgstr "" "Más animaciones están usando una ventana. Por favor seleccione una ventana " "diferente para cada animación." -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "No se pudo mostrar la leyenda." -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" "La catidad de mapas es inconsistente, por favor revise el dato de entrada." -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "No hay animación que exportar." -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "Preparando exportación, por favor espere..." -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "%(from)s %(dash)s %(to)s" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "%(start)s %(unit)s" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "Exportando animación, por favor espere..." -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "Nombre de animación seleccionado." -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "No se seleccionó archivo de Entorno de trabajo." -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "Archivo %s no encontrado" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "Animación %d" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" "La cantidad de mapas en el conjunto de datos espacio temporales tiene que " "ser el mismo." -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." @@ -31459,7 +31860,7 @@ msgstr "" "El tipo temporal (absoluto/relativo) de conjutos de datos espacio temporales " "tiene que ser el mismo." -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" @@ -31467,6 +31868,12 @@ msgstr "" "tiene que ser el mismo." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/utils.py:209 ======= #: ../gui/wxpython/gui_core/gselect.py:886 @@ -31740,19 +32147,23 @@ msgstr "Archivos" #: ../gui/wxpython/gui_core/goutput.py:388 #, python-format >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 "" "La extensión temporal de los mapas en el conjunto de datos espacio " "temporales tiene que ser la misma." -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" "La cantidad de mapas a animar tiene que ser el mismo para cada serie de " "mapas." -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." @@ -31760,46 +32171,46 @@ msgstr "" "La cantidad de mapas a animar tiene que ser el miemos que el número de mapas " "en conjunto de datos espacio temporales." -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "Cambiar velocidad de la animación" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "Reproducir hacia adelante" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "Reproducir hacia atrás" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "Repetir" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "Reproducir hacia adelante y hacia atrás" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "Añadir nueva animación" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "Añadir, editar o remover animación" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "Exportar animación" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "Añadir conjunto de datos espacio temporales o series de capas de mapas" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" "Añadir conjunto de datos espacio temporales o series de capas de mapas para " @@ -31917,7 +32328,7 @@ msgstr "" "o una serie de capas de mapas." #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "Mostrar leyenda ráster" @@ -32001,7 +32412,7 @@ msgid "Edit" msgstr "Editar" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "Formato" @@ -32256,7 +32667,14 @@ msgid "Invalid" msgstr "No válido" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Renderizando capas de mapas" ======= @@ -32265,6 +32683,7 @@ msgid "PROJ string (required):" msgstr "PROJ string (requerido):" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32276,12 +32695,23 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "Superponer capas de mapas" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -32944,28 +33374,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Directory {t} not removed." msgstr "Directorio {t} no removido." -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "Herramienta de Animación" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "Barra de herramientas de animación" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "Cargando datos" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr " ({c} fuera de {p})" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "a %(to)s" @@ -33926,17 +34360,17 @@ msgstr "" "%s" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "No se pudo leer la instrucción %s" @@ -33969,7 +34403,7 @@ msgstr "" "%(old2)s\n" "value nuevo: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" @@ -33978,7 +34412,7 @@ msgstr "" "El tamaño del marco ha cambiado, valor antiguo: %(old1)s %(old2)s\n" "valor nuevo: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" @@ -33987,12 +34421,12 @@ msgstr "" "No se pudo leer instrucción %(file)s.\n" "Formato desconocido %(for)s" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "No se pudo leer la instrucción %s." -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "No se pudo leer instrucción %(inst)s: archivo %(file)s no encontrado." @@ -34001,39 +34435,39 @@ msgstr "No se pudo leer instrucción %(inst)s: archivo %(file)s no encontrado." msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "pulgada" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "punto" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "centímetro" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "milímetro" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "millas naúticas" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "pixel" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "metros" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "grados" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "No es posible ejecutar `ps.map -b`" @@ -34105,149 +34539,149 @@ msgstr "" "Posición desde el borde superior izquierdo\n" "del papel" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "Fuente:" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "Escoger color:" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "Cerrar cuadro de diálogo y aplicar los cambios" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "Unidades" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "Orientación" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "Anchura" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "Altura" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "Izquierda" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "Derecha" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "¡No se permite literal!" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "Tamaño de página" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "Márgenes" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "Vertical" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "Horizontal" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "Configuraciones del mapa" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "Configuraciones del marco del mapa" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "Opciones del marco del mapa:" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "ajustar marco para que coincida con el marco seleccionado " -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "ajustar marco para que coincida con la región guardada" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "ajustar el marco para que coincida con la región computacional actual" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "escala fija y centro del mapa" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "Selección de mapa" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "Mapa:" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "Región:" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "Escala de mapa y centro" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "Centro:" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "E:" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "N:" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "Escala:" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "Resolución máxima del mapa (dpi):" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "Borde" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "dibujar borde alrededor del marco del mapa" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "Color de borde:" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "Ancho de borde (pts):" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" @@ -34255,309 +34689,309 @@ msgstr "" "La región se establece para que coincida con este mapa,\n" "el mapa ráster o vectorial debe agregarse más tarde" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "Selección de la región" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "¡No se ha seleccionado ningún mapa!" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "¡No se ha seleccionado ninguna región!" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "¡Escala o centro del mapa incorrectos!" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "Escoger mapa ráster" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "no hay mapa ráster" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "ráster:" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "Por favor, crear primero el marco del mapa." -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "Añadir mapa" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "puntos" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "líneas" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "áreas" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "Tipo de datos" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "Administrar mapas vectoriales" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "El mapa vectorial superior se superpone a los otros" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "Propiedades..." -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "Configuraciones de mapa ráster" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "Configuraciones de mapa vectorial" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "%s propiedades" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "Selección de datos" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "centroides" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "contornos" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "Selección de capa" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" "La conexión a la base de datos no se encuentra definida en el archivo de BD." -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "Seleccionar capa:" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "lista de categorías (por ejemplo 1,3,5-7)" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "Utilizar máscara actual" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "Colores" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "Contorno" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "dibujar línea externa" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "Anchura (pts):" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "rellenar color" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "escoger color:" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "color de la columna de la tabla del mapa:" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "No hay efecto de color de relleno de la columna de la tabla" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "Color de las líneas:" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "Tamaño y estilo" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "archivo eps:" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "Escribir el nombre de archivo o clicar navegar para escoger archivo" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "Escoger un archivo" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "tamaño de la columna de la tabla del mapa:" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "escala:" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "Rotación" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "girar símbolos:" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "sentido antihorario en grados:" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "de la columna de la tabla del mapa:" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "Establecer anchura (pts):" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "multiplicar anchura por el valor de la categoría" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "Escoger estilo de línea:" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "Seleccionar extremo de línea:" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "Patrón:" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "utilizar patrón:" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "Selección archivo patrón:" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "patrón de ancho de línea (pts):" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "patrón de factor de escala:" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "Leyenda ráster" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "Ráster fuente" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "ráster actual" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "seleccionar ráster" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "%(rast)s: tipo %(type)s" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "Tipo de leyenda" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "leyenda discreta (mapas categóricos)" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "gradiente de color de la leyenda continuo (mapa de punto flotante)" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "Configuraciones avanzada de leyenda" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "dibujar caja \"sin datos\"" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "dibujar marcas a lo largo de la tabla de colores" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "Leyenda vectorial" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "Mostrar leyenda vectorial" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "Fuente de mapas vectoriales" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "Escoger mapas vectoriales y su orden en la leyenda" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "Editar etiqueta" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "dibujar borde alrededor de la leyenda" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "Tamaño y posición" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" "Dejar vacío el campo de edición, para utilizar los valores por defecto." -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" @@ -34565,15 +34999,15 @@ msgstr "" "Ancho del símbolo de color (para líneas)\n" "delante del texto de la leyenda" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "Columnas:" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "extensión de la columna:" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" @@ -34581,144 +35015,144 @@ msgstr "" "Distancia de separación de columna entre los bordes izquierdos\n" "de dos columnas en un leyenda multicolumna" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "Editar etiqueta de leyenda:" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "¡No hay ningún mapa ráster seleciconado!" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "No hay ráster" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "Configuraciones Mapinfo" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "Configuraciones de color" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "utilizar color de borde:" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "utilizar color de fondo:" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "Longitud:" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "La longitud de la barra de escala se facilita en las unidades del mapa" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "La altura de la barra de escala es la altura real en el papel" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "predeterminado" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "Tipo:" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "Número de segmentos:" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "Etiquetar cada" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "segmentos" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "fondo del texto transparente" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "La longitud de la barra de escala no está definida" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "Introducir texto:" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "Efectos del texto" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "texto de fondo" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "destacar" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "borde del texto" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "Offset" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "horizontal (pts):" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "vertical (pts):" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "Punto de referencia" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "Rotación del texto" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "girar texto (sentido antihorario)" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "No se ha entrado ningún texto!" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "Seleccionar un directorio con imágenes:" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "Nota: solo está soportado el formato EPS" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "Escala y rotación" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "Ángulo de rotación (grados):" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" "Rotación en el sentido contrario al de las manecillas del reloj en grados" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" @@ -34726,37 +35160,37 @@ msgstr "" "PIL\n" "faltante" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "No se puede leer el archivo %s" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "tamaño: %(width)s x %(height)s pts" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "No se ha seleccionado ninguna imagen." -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "Configuración de la flecha de Norte" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "Calcular convergencia" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "Símbolo" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "Símbolo seleccionado:" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" @@ -34764,48 +35198,48 @@ msgstr "" "Nota: símbolo seleccionado no se visualizará\n" "en el modo borrador (solo en el modo de vista previa)" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "Color de línea:" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "Color de relleno:" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "Tamaño y rotación" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "Tamaño (pt):" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "Tamaño del símbolo en puntos:" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "Configuración del rectángulo" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "Configuración de línea" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "Anchura de línea en puntos" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "Etiquetas de vectoriales" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" "Archivo de etiquetas debe ser creado anteriormente con el módulo v.label" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "Puede seleccionar múltiples archivos de leyenda." @@ -34840,29 +35274,29 @@ msgstr "" "El programa ps2pdf no está disponible. Por favor instálelo primero para " "crear PDF." -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "Generando PDF..." -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "Generando PostScript..." -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "Generando vista previa..." -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "Ps.map salió con código de retorno %s" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 #, fuzzy msgid "Program {} is not available." msgstr "Vista previa no disponible" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, fuzzy, python-brace-format msgid "" "{title} Please install it to create PDF.\n" @@ -34872,7 +35306,7 @@ msgstr "" "\n" " %s" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 #, fuzzy msgid "" "Program {} is not available. Please install it to create PDF.\n" @@ -34883,32 +35317,32 @@ msgstr "" "\n" " %s" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "%(prg)s salió con código de retorno %(code)s" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "PDF generado" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "Archivo PostScript generado" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "Generando vista previa, por favor espere" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "Vista previa no disponible" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." @@ -34916,75 +35350,100 @@ msgstr "" "Vista previa no disponible probablemente por que Ghostscript no esté " "instalado o no esté en RUTA." -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "Vista previa generada" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "Guardar archivo como" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "No se pudo leer el archivo %s." -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "La barra de escala no es adecuada para esta proyección" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" "Presione el botón con el icóno de triángulo verde para generar una vista " "previa." -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "Diseñador cartográfico wxGUI" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "MARCO DE MAPA" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "LEYENDA DE RÁSTER" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "LEYENDA DE VECTORIAL" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "INFORMACIÓN DEL MAPA" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "BARRA DE ESCALA" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "IMAGEN" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "FLECHA NORTE" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "Clicar y arrastrar para cambiar el tamaño del objeto" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "etiquetas:" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "&Delete location" +#~ msgstr "&Borrar Localización" + +#~ msgid "&Rename location" +#~ msgstr "&Renombrar localización" + +#~ msgid "Abort download location" +#~ msgstr "Cancelar descarga de Localización" + +#~ msgid "Location Name:" +#~ msgstr "Nombre de la Localización:" + +#~ msgid "Change location and mapset" +#~ msgstr "Cambiar Localización y Directorio de mapas" + +#, fuzzy +#~ msgid "(Un)dock Map Display" +#~ msgstr "Visualización del Mapa" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "Show comp. extent" #~ msgstr "Mostrar la región computacional" ======= @@ -34994,6 +35453,9 @@ msgid "Cartographic Composer - GRASS GIS" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -35184,10 +35646,6 @@ msgstr "" #~ msgid "GRASS GIS %s Startup%s" #~ msgstr "GRASS GIS %s inicio%s" -#, python-format -#~ msgid "Unable to rename mapset: %s" -#~ msgstr "No es posible renombrar el Directorio de mapas: %s" - #, python-format #~ msgid "Unable to rename location: %s" #~ msgstr "No es posible renombrar la Localización: %s" @@ -35244,9 +35702,6 @@ msgstr "La capa copiada necesita ser reproyectada:" #~ msgid "Run python script" #~ msgstr "Correr script de python" -#~ msgid "Unable to create new GRASS Database" -#~ msgstr "No se ha podido crear una nueva base de datos de GRASS" - #~ msgid "Go to GCP No." #~ msgstr "Ir a GCP número" @@ -35490,9 +35945,6 @@ msgstr "La capa copiada necesita ser reproyectada:" #~ msgid "Unknown format '{0}'." #~ msgstr "Formato desconocido '{0}'." -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "¿Quiere importar {} a la Localización recientemente creada?" - #~ msgid "Command prompt" #~ msgstr "Linea de comandos" @@ -35531,9 +35983,6 @@ msgstr "La capa copiada necesita ser reproyectada:" #~ "Escriba para buscar en todos los módulos. Presione Enter para la " #~ "siguiente opción encontrada." -#~ msgid "Module dialog style:" -#~ msgstr "Estilo de diálogo de módulos:" - #~ msgid "Module dialog settings" #~ msgstr "Configuración del cuadro de diálogo de módulos" @@ -35658,9 +36107,6 @@ msgstr "La capa copiada necesita ser reproyectada:" #~ msgstr "" #~ "Los mapas pueden ser copiados solamente al Directorio de mapas actual" -#~ msgid "Do you want to create new mapset?" -#~ msgstr "¿Quiere crear un nuevo Directorio de mapas?" - #~ msgid "No GRASS-python library found." #~ msgstr "No se ha encontrado librería GRASS-python." @@ -35670,9 +36116,6 @@ msgstr "La capa copiada necesita ser reproyectada:" #~ msgid "Point dataset:" #~ msgstr "Conjunto de datos de puntos:" -#~ msgid "Numeric column:" -#~ msgstr "Columna numérica:" - #~ msgid "Kriging" #~ msgstr "Kriging" @@ -36072,12 +36515,21 @@ msgstr "Título de la Localización:" #~ "will need to change the default GIS data directory in the GRASS startup " #~ "screen." #~ msgstr "" +<<<<<<< HEAD +#~ "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." +======= #~ "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." ======= msgid "Location wizard canceled. Location not created." msgstr "Se ha cancelado el asistente de Localizaciones. La Localización no ha sido creada." +<<<<<<< HEAD +======= +>>>>>>> 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." @@ -36518,6 +36970,7 @@ msgstr "" "Divide la red en bandas entre isolíneas de costo (Con dirección desde el centro). El nodo central debe estar abierto (costes> = 0). Los costos del nodo central se utilizan en el cálculo." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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." @@ -36722,6 +37175,8 @@ msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado" ======= ======= >>>>>>> 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." @@ -36950,6 +37405,13 @@ msgid "Resize legend" msgstr "Redimensionar la leyenda" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Unable to create location" +#~ msgstr "No se puede crear la Localización" +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #~ msgid "" #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII " #~ "characters excluding %(chars)s and space." @@ -36963,6 +37425,10 @@ msgstr "Nombre <%(name)s> no es válido para Localización o Directorio de mapas msgid "Unable to create location" msgstr "No se puede crear la Localización" +<<<<<<< HEAD +======= +>>>>>>> 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" @@ -37113,6 +37579,9 @@ msgid "Double-click or Ctrl-Enter to run selected module" msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasswxpy_fi.po b/locale/po/grasswxpy_fi.po index 17a043ad790..6717db30b6c 100644 --- a/locale/po/grasswxpy_fi.po +++ b/locale/po/grasswxpy_fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2015-08-17 22:18+0300\n" "Last-Translator: Kari Salovaara \n" "Language-Team: Finnish \n" @@ -25,12 +25,12 @@ msgstr "" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "" @@ -38,837 +38,837 @@ msgstr "" msgid "Analysis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Väri" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Uusi" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Arvo:" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "Läpinäkyvyys:" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "Näytä vektoriviivat" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "Vektoriviivat" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Viiva:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "leveys:" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "väri:" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "kuin 3D" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Ikoni:" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1063,8 +1063,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "" @@ -1108,7 +1108,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1216,14 +1216,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "" @@ -1333,8 +1333,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1405,12 +1405,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1472,115 +1472,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1621,7 +1621,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1632,169 +1632,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "tulokset" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1903,13 +1903,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "" @@ -1980,56 +1980,57 @@ msgid "Data catalog" msgstr "" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" +#: ../gui/wxpython/datacatalog/catalog.py:212 +msgid "Do you want to create a new project (also known as location)?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Luo uusi Paikka?" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2037,316 +2038,319 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "Poista valitut" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" +#: ../gui/wxpython/datacatalog/tree.py:2174 +msgid "&Rename project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" +msgstr "Luo uusi Paikka?" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "Poista valittu paikka" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2366,78 +2370,79 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "Luo uusi Karttajoukko valittuun Paikkaan" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2450,9 +2455,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Työkalut" @@ -2513,7 +2518,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Sulje" @@ -2537,27 +2542,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "" @@ -2566,29 +2571,29 @@ msgstr "" msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -2602,193 +2607,295 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 msgid "&Remove" msgstr "" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 msgid "Remove command" msgstr "" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +msgid "Timestamp:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:41 +msgid "Runtime duration:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:42 +msgid "Status:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:43 +msgid "Mask 2D:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:44 +msgid "Mask 3D:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Pohjoinen" + #: ../gui/wxpython/history/browser.py:46 +#, fuzzy +msgid "South:" +msgstr "Etelä" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Länsi" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Itä" + +#: ../gui/wxpython/history/browser.py:49 +msgid "North-south resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:50 +msgid "East-west resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:51 +msgid "Number of rows:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:52 +msgid "Number of columns:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:53 +msgid "Number of cells:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:63 +msgid "{} sec" +msgstr "" + +#: ../gui/wxpython/history/browser.py:117 +msgid "General info" +msgstr "" + +#: ../gui/wxpython/history/browser.py:138 +msgid "Computational region during command execution" +msgstr "" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +msgid "Update current region" +msgstr "" + +#: ../gui/wxpython/history/browser.py:271 +msgid "Region match" +msgstr "" + +#: ../gui/wxpython/history/browser.py:294 +msgid "Set current computational region to the region of executed command" +msgstr "" + +#: ../gui/wxpython/history/browser.py:359 msgid "History browser" msgstr "" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 msgid "&Export history" msgstr "" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "Kaikki tiedostot" + +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" msgstr "" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." msgstr "" -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample project to download:" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" +msgstr "Nimeä uudelleen valittu karttajoukko" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Virhe: {text}" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" +#: ../gui/wxpython/startup/locdownload.py:439 +msgid "Dataset Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Nimeä uudelleen valittu karttajoukko" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" +#: ../gui/wxpython/startup/locdownload.py:490 +msgid "Do you want to cancel dataset download?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +msgid "Invalid project name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Luo uusi karttajoukko" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" +#: ../gui/wxpython/startup/guiutils.py:173 +msgid "Do you want to import {} to the newly created project?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2798,82 +2905,82 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Nimeä uudelleen valittu karttajoukko" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Virhe" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" +msgstr "Nimeä uudelleen valittu karttajoukko" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Nimeä uudelleen valittu paikka" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Nimeä uudelleen valittu karttajoukko" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2883,11 +2990,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2897,15 +3004,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2915,50 +3022,52 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Poista valittu paikka" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Poista valittu karttajoukko" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" +#: ../gui/wxpython/startup/guiutils.py:497 +msgid "Error when deleting projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -2968,11 +3077,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -2982,15 +3091,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3000,14 +3109,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3019,15 +3129,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3035,101 +3145,99 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 +#: ../gui/wxpython/startup/guiutils.py:693 #, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 +#: ../gui/wxpython/startup/guiutils.py:711 #, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "" #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "rasteri" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vektori" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -3138,19 +3246,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "" @@ -3159,17 +3267,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -3177,34 +3285,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3212,42 +3320,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3257,37 +3365,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3297,334 +3405,334 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "käytä" -#: ../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 +#: ../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 msgid "source E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -3659,10 +3767,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3671,7 +3779,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3680,7 +3788,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3694,14 +3802,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "" @@ -3714,32 +3822,32 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 msgid "Pan to GCP by number" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -3769,7 +3877,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3805,462 +3913,520 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "Määrittele uusi GRASS Paikka" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +msgid "Name of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/location_wizard/wizard.py:271 +msgid "Project will be created in GRASS database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "GRASS Tietokanta:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Paikan Nimi:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Projektio:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Projektio:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2530 +#: ../gui/wxpython/location_wizard/wizard.py:2531 #, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" +msgstr "Vektorikarttaa ei voida päivittää." -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +msgid "Project already exists in GRASS Database." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Pohjoinen" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Länsi" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Itä" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Etelä" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4277,7 +4443,6 @@ msgid "Disabled:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "" @@ -4286,10 +4451,10 @@ msgid "GRASS API:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "" @@ -4315,7 +4480,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "" @@ -4344,13 +4509,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "" @@ -4359,7 +4524,7 @@ msgid "Commands" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4370,19 +4535,19 @@ msgid "Apply properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "" @@ -4391,687 +4556,670 @@ msgstr "" msgid "Author(s):" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" +#: ../gui/wxpython/gmodeler/panels.py:189 +msgid "Script editor" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:317 -#, python-format +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:431 +#: ../gui/wxpython/gmodeler/panels.py:861 #, python-format -msgid "Data: %s" -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:463 -msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" -msgstr "Poista valitut" - -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" -msgstr "Poista kaikki" - -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" -msgstr "Lataa uudelleen" - -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 #: ../gui/wxpython/modules/mcalc_builder.py:169 msgid "&Run" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +msgid "Run script" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Tallenna lauseke tiedostoon" + +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gmodeler/panels.py:1654 +msgid "Python script type" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Tallenna lauseke tiedostoon" + +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +msgid "Set model properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:308 +msgid "" +"Command not defined.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1116 +#: ../gui/wxpython/gmodeler/dialogs.py:317 #, python-format msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" +"'%s' is not a GRASS tool.\n" "\n" -"%s" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" +#: ../gui/wxpython/gmodeler/dialogs.py:431 +#, python-format +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" +#: ../gui/wxpython/gmodeler/dialogs.py:473 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" +msgstr "Poista valitut" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" +msgstr "Poista kaikki" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" +msgstr "Lataa uudelleen" + +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format +msgid "" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -msgid "Run script" +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Tallenna lauseke tiedostoon" +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -msgid "Python script type" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2110 -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Varoitus" + +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "&Tiedosto" @@ -5083,7 +5231,7 @@ msgstr "Työtila" msgid "Create new workspace" msgstr "Luo uusi työtila" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Avaa" @@ -5091,7 +5239,7 @@ msgstr "Avaa" msgid "Load workspace from file" msgstr "Lataa työtila tiedostosta" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Tallenna" @@ -5101,7 +5249,7 @@ msgstr "Tallenna" msgid "Save workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Tallenna nimellä" @@ -5114,7 +5262,7 @@ msgid "Close workspace file" msgstr "Sulje työtilan tiedosto" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "Karttanäyttö" @@ -5151,7 +5299,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -5179,649 +5327,652 @@ msgstr "" msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +msgid "Module not installed" msgstr "" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +msgid "Re-projects a raster map from given project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +msgid "Reproject vector map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +msgid "Re-projects a vector map from one project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "" @@ -5829,20 +5980,20 @@ msgstr "" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "" @@ -5860,13 +6011,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "" @@ -5880,16 +6031,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -5909,7 +6060,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "" @@ -5917,8 +6068,8 @@ msgstr "" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "" @@ -5926,42 +6077,42 @@ msgstr "" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" @@ -5974,7 +6125,7 @@ msgid "Mapset access" msgstr "" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +msgid "Set/unset access to other mapsets in current project" msgstr "" #: ../gui/wxpython/menustrings.py:234 @@ -5998,11 +6149,11 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" +msgid "Change project (location) and mapset" msgstr "" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +msgid "Change current project and mapset." msgstr "" #: ../gui/wxpython/menustrings.py:240 @@ -6036,15 +6187,18 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" -msgstr "" +#, fuzzy +msgid "Create new project (location)" +msgstr "Luo uusi Paikka?" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" #: ../gui/wxpython/menustrings.py:252 @@ -6068,8 +6222,7 @@ msgstr "" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6100,7 +6253,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "" @@ -6108,411 +6261,411 @@ msgstr "" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " "regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6523,22 +6676,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6546,127 +6699,127 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " "represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6677,323 +6830,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7001,21 +7154,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7024,203 +7177,203 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7228,106 +7381,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7336,503 +7489,503 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -7840,96 +7993,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -7937,818 +8090,818 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 msgid "Input for supervised SVM" msgstr "" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 msgid "Manage signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -8756,999 +8909,991 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 -msgid "Interactive editing and digitization of raster maps." -msgstr "" - #: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -9781,7 +9926,7 @@ msgid "Text settings" msgstr "" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -9842,74 +9987,74 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" "Reason: %s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -9933,7 +10078,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "" @@ -9979,11 +10124,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "" @@ -10008,11 +10153,11 @@ msgid "Label font size (pts):" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "" @@ -10028,402 +10173,401 @@ msgstr "" msgid "Weight:" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Varoitus" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "Tiedosto" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "Kaikki tiedostot" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "ZIP tiedostot" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "GZIP tiedostot" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "TAR tiedostot" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "TARGZ tiedostot" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "Tiedosto:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "Piste" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -10463,13 +10607,13 @@ msgstr "" msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "" @@ -10485,106 +10629,106 @@ msgstr "" msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Tallenna työtila tiedostoon" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -10592,7 +10736,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "" @@ -10675,7 +10819,7 @@ msgstr "" msgid "category" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "" @@ -10696,8 +10840,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -10723,426 +10867,439 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:348 +msgid "Layout settings" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:392 +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "Histogrammit" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 msgid "Window layout settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "Näytä käsikirjan sivu" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11151,7 +11308,7 @@ msgid "" " - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "" @@ -11168,7 +11325,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "" @@ -11290,7 +11447,7 @@ msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "" @@ -11325,9 +11482,8 @@ msgid "Map Display Settings" msgstr "Karttanäyttö" #: ../gui/wxpython/gui_core/toolbars.py:86 -#, fuzzy -msgid "(Un)dock Map Display" -msgstr "Karttanäyttö" +msgid "(Un)dock" +msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 msgid "Clear" @@ -11350,7 +11506,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -11406,7 +11562,7 @@ msgid "Optional" msgstr "" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "" @@ -11418,79 +11574,79 @@ msgstr "" msgid "valid range" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11498,94 +11654,94 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "" @@ -11593,381 +11749,383 @@ msgstr "" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" +msgstr "3. Valitse GRASS Karttajoukko" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +msgid "Project or mapset is not defined." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +msgid "Name of GRASS project:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" +msgstr "3. Valitse GRASS Karttajoukko" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " "overwrite it?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12047,9 +12205,9 @@ msgid "Snap also to vertex" msgstr "" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "" @@ -12071,226 +12229,226 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "Kyselyn työkalu" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "Valitse kyselyn työkalu" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "Valitse laatikolla" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "pituus" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "Valitse viivat" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Taso" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Luokka" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "Tila" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "alue" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "kehä" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "Viiva" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Suunta" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12308,200 +12466,200 @@ msgstr "" msgid "Topology missing" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 msgid "Digitize new point (Ctrl+P)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 msgid "Digitize new line (Ctrl+L)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 msgid "Digitize new boundary (Ctrl+B)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 msgid "Digitize new centroid (Ctrl+C)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Poista valittu karttajoukko" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 msgid "Display/update attributes (Ctrl+K)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 msgid "Display/update categories (Ctrl+J)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 msgid "Edit selected line/boundary (Ctrl+E)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "Nimeä uudelleen valittu karttajoukko" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 msgid "Settings (Ctrl+T)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Näytä käsikirjan sivu" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 msgid "Undo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 msgid "Redo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12510,42 +12668,42 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "" @@ -12558,8 +12716,8 @@ msgid "Add new category" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "" @@ -12568,11 +12726,11 @@ msgid "Ignore changes and close dialog" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "" @@ -12617,24 +12775,24 @@ msgstr "" msgid "Layer (Categories)" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "Toiminto peruutettiin." -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -12642,97 +12800,97 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -12744,19 +12902,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -12775,32 +12933,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "" @@ -12910,100 +13068,100 @@ msgstr "Salasana:" msgid "Connecting to <%s>..." msgstr "Yhdistetään <%s> ..." -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "Yhdistetty <%s>" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "&OK" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13032,12 +13190,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "" @@ -13111,11 +13269,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13126,50 +13284,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -13185,11 +13343,11 @@ msgstr "2. Valitse GRASS Paikka" msgid "3. Select GRASS Mapset" msgstr "3. Valitse GRASS Karttajoukko" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "GRASS GIS tietokanta hakemisto sisältää Paikat." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." @@ -13198,7 +13356,7 @@ msgstr "" "(projektiossa). Yksi Paikka voi olla yksi projekti. Paikka sisältää " "Karttajoukot." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." @@ -13206,100 +13364,112 @@ msgstr "" "Karttajoukko sisältää GIS tiedot jotka liittyvät yhteen projektiin. " "tehtävään yhdessä projektissa, seutuun tai käyttäjään." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "Käynnistä &GRASS istunto" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "Luo uusi Karttajoukko valittuun Paikkaan" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." msgstr "" #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Nimeä uudelleen valittu paikka" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Poista valittu paikka" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Poista valittu karttajoukko" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "Anna GRASS istunto" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "VIRHE: Paikkaa <%s> ei löydy\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "VIRHE: Karttajoukkoa <%s> ei löydy\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be renamed." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13310,14 +13480,14 @@ msgstr "" "\n" "Anna uusi nimi:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Viesti" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13325,7 +13495,7 @@ msgid "" "Mapset <%s> already exists in location." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13333,7 +13503,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13341,7 +13511,7 @@ msgid "" "Location <%s> already exists in GRASS database." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13349,27 +13519,27 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be deleted." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13377,37 +13547,37 @@ msgid "" "ALL MAPS included in this location will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13416,16 +13586,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13437,12 +13607,12 @@ msgid "" "this operation) and continue?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13450,7 +13620,7 @@ msgid "" "your data. Have another look in the processor manager just to be sure..." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13458,164 +13628,164 @@ msgid "" "Details: %(reason)s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " "ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " "located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -13623,7 +13793,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -13631,45 +13801,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -13677,38 +13847,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -13805,117 +13975,117 @@ msgstr "" msgid "Output" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "" @@ -13931,41 +14101,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -14007,7 +14177,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "" @@ -14038,19 +14208,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "" @@ -14074,25 +14244,25 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -14104,8 +14274,8 @@ msgstr "" msgid "Execution failed:" msgstr "" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "" @@ -14155,7 +14325,7 @@ msgstr "" msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14164,21 +14334,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14199,147 +14369,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14347,11 +14517,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14359,11 +14529,11 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "" @@ -14430,22 +14600,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14475,22 +14645,22 @@ msgstr "" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14499,33 +14669,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "" @@ -14571,46 +14741,46 @@ msgstr "" msgid "Status bar" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 msgid "Go to XY coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 msgid "Display extent" msgstr "" @@ -14684,14 +14854,14 @@ msgid "Click mouse to unzoom" msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "" @@ -14711,47 +14881,47 @@ msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -14761,59 +14931,59 @@ msgid "" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -21963,7 +22133,7 @@ msgstr "" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "" @@ -22030,8 +22200,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "" @@ -22122,7 +22292,7 @@ msgid "List of %s layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -22136,13 +22306,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "" @@ -22165,82 +22335,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -22538,14 +22708,14 @@ msgstr "" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -22553,15 +22723,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -22571,7 +22741,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -22583,30 +22753,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -22617,114 +22787,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -22792,99 +22962,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "Nimeä luokka uudelleen" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "Aseta väri" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "Piilota" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "Näytä" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -23238,7 +23409,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -23246,7 +23417,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -23397,7 +23568,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -23405,46 +23576,52 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 msgid "Map Swipe Tool" msgstr "" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -23615,144 +23792,149 @@ msgstr "" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " "layer instead." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "" +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "Toiminto peruutettiin." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -23760,37 +23942,37 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -23798,33 +23980,41 @@ msgid "" "from layer tree?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Quit GRASS GUI" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "" @@ -23852,55 +24042,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "" @@ -23973,7 +24163,7 @@ msgstr "" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "" @@ -24005,112 +24195,116 @@ msgstr "" msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +msgid "Set opacity of <{}>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "" @@ -24145,6 +24339,9 @@ msgid "New workspace" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -29236,6 +29433,13 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 ======= @@ -29470,57 +29674,61 @@ msgstr "" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " "define new connection in 'Manage layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "" @@ -29534,93 +29742,93 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -29628,58 +29836,58 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -29688,19 +29896,19 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -29709,190 +29917,190 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " "want to delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " "delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -29900,7 +30108,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -29909,63 +30117,63 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " "column?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -29973,144 +30181,144 @@ msgid "" "will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " "exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format msgid "" "No attribute table found.\n" @@ -30119,40 +30327,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "" @@ -30174,7 +30382,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "" @@ -30192,138 +30400,138 @@ msgstr "" msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " "each animation." msgstr "" -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "" -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:209 +#: ../gui/wxpython/animation/utils.py:210 msgid "" "The temporal extents of maps in space-time datasets have to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" @@ -30436,7 +30644,7 @@ msgid "" msgstr "" #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "" @@ -30514,7 +30722,7 @@ msgid "Edit" msgstr "" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "" @@ -30757,13 +30965,21 @@ msgid "Invalid" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" ======= #: ../gui/wxpython/gui_core/preferences.py:1739 msgid "PROJ string (required):" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30775,13 +30991,24 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -31432,28 +31659,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -31478,17 +31709,17 @@ msgid "" msgstr "" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "" @@ -31514,26 +31745,26 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" "Unknown format %(for)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -31542,39 +31773,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -31642,693 +31873,693 @@ msgid "" "edge of the paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -32355,146 +32586,149 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 msgid "Program {} is not available." msgstr "" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" +#~ msgid "Location Name:" +#~ msgstr "Paikan Nimi:" + +#, fuzzy +#~ msgid "(Un)dock Map Display" +#~ msgstr "Karttanäyttö" + #, fuzzy #~ msgid "Unable to display the map" #~ msgstr "Vektorikarttaa ei voida päivittää." -#, fuzzy, python-format -#~ msgid "Unable to delete location: %s" -#~ msgstr "Poista valittu paikka" - #~ msgid "layer" #~ msgstr "taso" @@ -32504,6 +32738,7 @@ msgstr "" #~ msgid "Ready." #~ msgstr "Valmis." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "Location Title:" @@ -32516,12 +32751,21 @@ msgstr "Paikka <%s> luotu" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Repository" #~ msgstr "Etäkirjasto" msgid "Location Title:" msgstr "Paikan Otsikko:" +<<<<<<< HEAD +======= +<<<<<<< HEAD +#~ msgid "Location <%s> created" +#~ msgstr "Paikka <%s> luotu" +======= +>>>>>>> osgeo-main msgid "Location <%s> created" msgstr "Paikka <%s> luotu" @@ -32534,8 +32778,14 @@ msgstr "Paikka <%s> luotu" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgid "Create new location?" msgstr "Luo uusi Paikka?" +======= +msgid "Create new location?" +msgstr "Luo uusi Paikka?" +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main diff --git a/locale/po/grasswxpy_fr.po b/locale/po/grasswxpy_fr.po index 933722c7aad..b9e497920a4 100644 --- a/locale/po/grasswxpy_fr.po +++ b/locale/po/grasswxpy_fr.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" -"PO-Revision-Date: 2023-04-15 15:08+0000\n" -"Last-Translator: Sylvain Maillard \n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" +"PO-Revision-Date: 2024-05-27 09:55+0000\n" +"Last-Translator: Edouard Choiniere \n" "Language-Team: French \n" "Language: fr\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.16.4\n" +"X-Generator: Weblate 5.4.3\n" "X-Poedit-SourceCharset: UTF-8\n" #: ../gui/wxpython/nviz/tools.py:109 ../gui/wxpython/nviz/preferences.py:65 @@ -29,12 +29,12 @@ msgstr "Vue" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "Données" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "Apparence" @@ -42,32 +42,32 @@ msgstr "Apparence" msgid "Analysis" msgstr "Analyses" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "Animation" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "Contrôles de la vue" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" "Ajuster la distance et l'angle de perspective de l'image au point de vue" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "Perspective :" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "Penche la surface par rapport à l'horizontale" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "Inclinaison :" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" @@ -75,35 +75,35 @@ msgstr "" "Ajuster la hauteur de vue (l'angle de vue s'ajuste automatiquement pour " "garder le même centre de la vue)" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "Ajuster la hauteur relative des entités au dessus de la surface" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "Hauteur :" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "Exagération verticale :" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "Orienter vers :" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "curseur" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." @@ -111,19 +111,19 @@ msgstr "" "Permet de sélectionner un point sur la surface qui deviendra le nouveau " "centre de la vue. Cliquer sur le bouton puis sur la surface." -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "centre" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "Rétablir le centre de la vue par défaut" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "nord" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." @@ -131,26 +131,26 @@ msgstr "" "Définir la vue directement au dessus du centre de la scène. Cette vue du " "haut est orientée approximativement nord-sud." -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "par défaut" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "Revenir à la vue par défaut" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "Apparence de l'image" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "Couleur d'arrière-plan :" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." @@ -159,312 +159,312 @@ msgstr "" "recommandé d'utiliser le mode survol (barre d'outils d'affichage) pour " "obtenir un déplacement fluide." -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "Enregistrer" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "Lecture" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "Pause" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "Stop" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "Nombre total d'images :" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "Taux de rafraichissement (FPS) :" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "Les images sont enregistrées à la fréquence donnée (FPS)." -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "Enregistrer la séquence d'image" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "Choisir un répertoire :" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "Choisir un répertoire pour les images" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "Parcourir" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "Préfix :" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" "Les noms de fichiers générés ressembleront à ceci : prefix_1.ppm, prefix_2." "ppm, ..." -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "Format de fichier :" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "Surface" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "Surface constante" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "Vecteur" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "Carte raster 3D" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "Éclairage" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "Frange" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "Décorations" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "Plans de coupe" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "Carte raster" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "Dessiner" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "Mode :" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "grossier" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "fin" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "les deux" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "Ombrage :" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "plat" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "gouraud" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "Définir pour tous" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "Utiliser les paramètres de rendu pour toutes les surfaces chargées" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "Mode grossier :" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "résolution :" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "style :" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "fil de fer" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "surface" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "Couleur du fil" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "Mode fin :" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "Attributs pour les surfaces" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Couleur" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "Masque" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "Transparence" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "Luminosité" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "carte" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "non défini" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "constante" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "Position" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "Modifier les positions x, y et z de la surface actuelle" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "Remise à zéro" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "Revenir à la position par défaut" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "Activer les plans de coupe :" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "effacer" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "couleur du dessus" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "couleur du fond" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "hachures" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "ombré" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "H horizontal :" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "Définir la coordonnée X du plan de coupe" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "Y horizontal :" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "Définir la coordonnée Y du plan de coupe" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "Rotation :" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "Effectue une rotation sur l'axe vertical du plan de coupe" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "Effectue une rotation sur l'axe horizontal du plan de coupe" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" @@ -472,423 +472,423 @@ msgstr "" "Définit la coordonnée Z du plan de coupe actuel (n'a de sens que si " "l'inclinaison n'est pas à 0)" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Nouveau" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "Supprimer" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "Résolution fine :" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Valeur :" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "Transparence :" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "Couleur :" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "Carte vectorielle" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "Montrer les lignes vectorielles" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "Lignes vectorielles" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Ligne :" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "largeur :" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "couleur :" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "utiliser la couleur pour la carte thématique" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "utiliser la largeur pour la carte thématique" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "Définir les options ..." -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "Affichage" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "sur la surface :" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "en 3D" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "Hauteur au-dessus de la surface :" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "Afficher les points vectoriels" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "Points vectoriels" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Icône :" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "taille :" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "symbole :" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "utiiser la taille pour la carte thématique" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "Carte raster 3D" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "iso-surfaces" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "tranche" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "Résolution :" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "Dessiner la boite en fil de fer" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "Liste des iso-surfaces" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "Montrer le modèle d'illumination" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "Position de la source de lumière" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "Ajuster la hauteur de la source de lumière" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "Couleur et intensité de la lumière" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "Luminosité :" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "Ajuster la luminosité de la lumière" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "Ambiante :" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "Ajuster la lumière ambiante" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "Bordures avec frange" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "N && O" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "N && E" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "S && O" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "S && E" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "Paramètres" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "Altitude de la frange depuis le fond :" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "Flèche du Nord" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "Longueur de la flèche (en unité de carte) :" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "Couleur de la flèche :" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "Positionner la flèche" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "Barre d'échelle" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "Longueur de la barre d'échelle (en unités de carte) : " -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "Couleur de la barre d'échelle :" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "Positionner une nouvelle barre d'échelle" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" "Voulez-vous enregistrer une nouvelle animation sans enregistrer la " "précédente ?" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." -msgstr "Pas de préfix de fichier." +msgstr "Pas de préfixe de fichier." -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "Le répertoire %s n'existe pas." -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "constante#" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "Attributs de l'iso-surface" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "Changer la direction normale" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "Valeur de l'iso-surface" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "Attributs des tranches" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "Tranches parallèles à l'axe :" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "O" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "N" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "S" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "E" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "NO" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "NE" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "SE" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "SO" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "Niveau" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "Liste des tranches" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "Niveau {level}" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "Tranche parallèle à {axis}" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "Tranches parallèles à" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "Barre d'échelle %d" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "Aucun" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "Plan" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "Carte vectorielle en 3D" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "Carte vectorielle en 2D" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "%(features)d entités (%(points)d points)" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "sur la surface" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "plage :" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "Limite nord :" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "Limite sud :" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "Limite ouest :" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "Limite est :" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "Ordonnée (Y) :" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "Hauteur (Z) :" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "Abscisse (X) :" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "Limite basse :" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "Limite haute :" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "Ajuster la distance et la direction au point de vue" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1094,8 +1094,8 @@ msgstr "couleur du fil :" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "Largeur :" @@ -1145,7 +1145,7 @@ msgstr "Carte raster <%s> non trouvée" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "Carte vectorielle <%s> non trouvée" @@ -1173,8 +1173,9 @@ msgstr "" "Avec un stvds vous devez utiliser une des options 'coordonées' ou 'cats'" #: ../gui/wxpython/tplot/g.gui.tplot.py:175 +#, fuzzy msgid "Temporal Plot Tool - GRASS GIS" -msgstr "" +msgstr "Outil d'affichage temporel - GRASS GIS" #: ../gui/wxpython/tplot/frame.py:46 #, python-brace-format @@ -1186,8 +1187,9 @@ msgstr "" "matplotlib) soit installé. {0}" #: ../gui/wxpython/tplot/frame.py:104 +#, fuzzy msgid "Temporal Plot Tool" -msgstr "" +msgstr "Outil d'affichage temporel" #: ../gui/wxpython/tplot/frame.py:189 msgid "" @@ -1266,14 +1268,14 @@ msgstr "chemin CSV" msgid "Do you want the CSV header?" msgstr "Voulez-vous les en-tête CSV ?" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "Exporter" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "Aide" @@ -1402,8 +1404,8 @@ msgid "Invalid input vector dataset" msgstr "Jeux de données vecteur en entrée non valide" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "Jeu de données temporel <%s> non trouvé." @@ -1479,12 +1481,12 @@ msgstr "" msgid "Set opacity level" msgstr "Définir le niveau d'opacité" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "Gestionnaire de classes" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "Sélectionner un groupe d'images :" @@ -1547,33 +1549,33 @@ msgstr "Ajouter une carte raster" msgid "Loading imagery lib failed" msgstr "Échec du chargement de la librairie d'imagerie" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Créer/éditer un groupe ..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "Le nom du groupe d'images est manquant." -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "Nom du groupe d'images :" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "Nom du sous-groupe :" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "Merci de choisir un sous-groupe." -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "Sous-groupe <%s> non trouvé dans le groupe <%s>" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" @@ -1582,7 +1584,7 @@ msgstr "" "Pas de données trouvées dans le sous-groupe <%s> du groupe <%s>.\n" "." -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" @@ -1591,75 +1593,75 @@ msgstr "" "Pas de données trouvées dans le groupe <%s>.\n" "." -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "Groupe <%s> non trouvé" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "Nom de la carte manquant." -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Nom de la carte raster :" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Nom de la carte vecteur :" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "Classes" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "Nom de la classe" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "Merci de n'utiliser que des caractères ASCII." -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "Zoomer sur les zones d'entrainement de la classe sélectionnée" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "Enregistrer le fichier de signatures" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "Entrer le nom du fichier de signatures :" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "Chemin du fichier de signatures :" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "Exporter les zones d'entrainement" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "Nom de la nouvelle carte vecteur :" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "Exporter la table d'attributs" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "Exporter la table d'attributs contenant les données de statistiques" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "Le fichier région <%s> existe déjà. Voulez-vous l'écraser ?" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "La carte vecteur <%s> existe" @@ -1674,8 +1676,9 @@ msgid "Subgroup <%s> not found" msgstr "Sous-groupe <%s> non trouvé" #: ../gui/wxpython/iclass/g.gui.iclass.py:111 +#, fuzzy msgid "Supervised Classification Tool - GRASS GIS" -msgstr "" +msgstr "Outil de classification dirigée - GRASS GIS" #: ../gui/wxpython/iclass/g.gui.iclass.py:122 #, python-format @@ -1707,7 +1710,7 @@ msgstr "" "\n" "Il n'y a pas encore de classes, voulez-vous en créer une ?" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "Pas de classe sélectionnée" @@ -1720,132 +1723,132 @@ msgstr "" "Échec du chargement de la librairie d'imagerie.\n" "%s" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" -msgstr "" +msgstr "Outil de classification dirigée" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Barre d'outils pour les cartes" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "Barre d'outils IClass" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "Barre d'outils IClass" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "Outil de numérisation" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "Graphiques" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "Fenêre d'aperçu" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "Affichage des zones d'entrainement" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "Ajuster la fenêtre de zones d'entrainement à la fenêtre d'aperçu" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "Ajuster la fenêtre d'aperçu à la fenêtre de zones d'entrainement" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "Synchronisation de l'affichage ON" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "Synchronisation de l'affichage OFF" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "Toutes les modifications seront perdues. Voulez-vous continuer ?" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "Importer une carte vecteur" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "Pas de surfaces dans la carte vecteur <%s>.\n" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" "La carte vecteur <%s> contient des points ou des lignes, ces entités seront " "ignorés." -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "Impossible d'ouvrir la carte vecteur <%s>" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "Impossible de copier l'entité vectorielle depuis <%s>" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "Impossible d'ouvrir la carte vecteur temporaire." -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "Pas de zones d'entrainement à exporter." -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" "%d zones d'entrainement (%d classes) exportées vers la carte vecteur <%s>." -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "Échec de création de la carte vecteurtemporaire." -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "Pas de zones dans la catégorie %s. Catégorie sautée." -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "Échec de l'analyse." -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "résultats" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "Pas de groupe d'images sélectionné." -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" @@ -1853,15 +1856,15 @@ msgstr "" "Suite à un changement récent dans les classes, les signatures peuvent être " "obsolètes et doivent être recalculées. Voulez-vous continuer ?" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "Signatures obsolètes" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" @@ -1870,15 +1873,15 @@ msgstr "" "Un fichier de signature appelé <%s> existe déjà.\n" "Voulez-vous l'écraser ?" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "Le fichier existe déjà" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "Pas de groupe d'images sélectionné. Opération annulée." -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " @@ -1887,11 +1890,11 @@ msgstr "" "Le groupe <%(group)s> ne contien pas suffisament de fichiers (il y a " "%(files)d fichiers). Opération annulée." -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "Pas de zones données. Opération annulée." -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" "Les entités vectorielles sont en dehors de la couche raster. Opération " @@ -2004,13 +2007,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "Importer des données vectorielles" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Importer une carte raster" @@ -2081,56 +2084,58 @@ msgid "Data catalog" msgstr "Catalogue de données" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "Choisir le répertoire des données de GRASS :" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "Voulez-vous créer un nouveau jeux de données ?" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Créer un pack" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "Lier des données externes" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2138,17 +2143,17 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 -#, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:96 +#, fuzzy, python-brace-format +msgid "Failed to read mapsets from project <{l}>." msgstr "Impossible de lire les jeux de cartes du secteur {l}." -#: ../gui/wxpython/datacatalog/tree.py:121 -#, python-brace-format -msgid "Failed to read maps from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:122 +#, fuzzy, python-brace-format +msgid "Failed to read maps from project <{l}>." msgstr "Impossible de lire les cartes du secteur {l}." -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " @@ -2157,302 +2162,308 @@ msgstr "" "La carte <{name}> de type <{elem}> existe déjà dans le jeu de cartes " "<{mapset}>. Voulez-vous l'écraser ?" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "Écraser ?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "Carte <{layer}> marquée pour suppression." -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "Carte <{layer}> marquée pour copie." -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "Nouveau nom" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "Renommer la carte" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "Renommage de {name} ..." -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "{cmd} -- terminé" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "Aucune carte sélectionnée pour la copie." -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." -msgstr "Pas de carte sélectionnée pour le déplacement." +msgstr "Aucune carte sélectionnée pour le déplacement." -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "Sélectionner un nouveau nom" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "Copie de <{name}> ..." -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "Déplacement de <{name}> ..." -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "g.copy terminé" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "La reprojection n'est pas implémentée pour les cartes raster 3D" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "g.remove terminé" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "Supprimer la carte" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "Suppression de {name} ..." -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" "Pour déplacer ou copier des cartes depuis d'autres jeux de cartes, débloquez " "l'édition d'autres jeux de cartes" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 +#, fuzzy msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" +"Pour déplacer ou copier des cartes depuis d'autres jeux de cartes, débloquez " +"l'édition d'autres jeux de cartes" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "&Couper" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "&Copier" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "Copier le &nom" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "&Coller" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "&Effacer" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "&Renommer" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" -msgstr "" +msgstr "Afficher les couches" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" -msgstr "Afficher la carte" +msgstr "Afficher la couche" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "Montrer les &métadonnées" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "Changer de jeux de cartes" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "Supprimer les enregistrements" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2174 +msgid "&Rename project" +msgstr "&Renommer le projet" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +msgid "&Create new project (location)" +msgstr "&Créer un nouveau projet (secteur)" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" +msgstr "Télécharger le projet (secteur) d'exemple" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "Effacer le secteur sélectionné" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 #, fuzzy msgid "&Copy paths to mapsets" msgstr "Gérer l'accès aux jeux de cartes" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +#, fuzzy +msgid "Reload GRASS projects" msgstr "Recharger les secteurs GRASS" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2472,59 +2483,63 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "Créer un nouveau jeu de cartes dans le secteur choisi" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +#, fuzzy +msgid "Create new project (location) in current GRASS database" msgstr "" +"Crée un nouveau jeux de cartes dans le secteur de travail courant, et change " +"le jeux de cartes courant." -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "Reprojection" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "Reprojeter" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "Reprojeter le raster" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "Reprojeter le vecteur" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" @@ -2533,19 +2548,19 @@ msgstr "" "La couche <{ml}> doit êre reprojetée.\n" "Merci de vérifier et modifier les paramètres de projection :" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "Résolution estimée :" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "Méthode de ré-échantillonnage : " -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "Longueur maximale d'un segment :" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2558,9 +2573,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Outils" @@ -2621,7 +2636,7 @@ msgid "Switch to simple mode" msgstr "Basculer vers le mode simple" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Fermer" @@ -2645,27 +2660,27 @@ msgstr "Curseur miroir" msgid "Shape:" msgstr "Forme :" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "Épaisseur de ligne :" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "Type de carte :" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "Barre d'outils principale" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "Barre d'outils divers" @@ -2674,23 +2689,23 @@ msgstr "Barre d'outils divers" msgid "Map <%s> not found. " msgstr "Carte <%s> non trouvée. " -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "Carte <%s> non trouvée." #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "Rien à afficher (carte vide). Opération annulée." #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" @@ -2698,10 +2713,10 @@ msgstr "" "Choisissez un nom de fichier pour enregistrer l'image (extension non " "nécessaire)" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" -"Pas de carte rater ou couche de carte vecteur sélectionnée pour " +"Pas de carte raster ou couche de carte vecteur sélectionnée pour " "interrogation." #: ../gui/wxpython/icons/icon.py:36 @@ -2716,204 +2731,329 @@ msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" "Impossible de charger les icône du thème. Raison : %s. Arrêt de wxGUI ..." -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 #, fuzzy msgid "Double-click to open the tool" msgstr "Double-clic pour exécuter le module sélectionné" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" -msgstr "Supprimer" +msgstr "Supp&rimer" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 #, fuzzy msgid "Do you really want to remove <{}> command?" msgstr "Voulez-vous enregistrer les modifications ?" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Supprimer la légende" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 #, fuzzy msgid "Removing <{}>" msgstr "Déplacement de <{name}> ..." -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "Date et heure" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Durée d'une frame :" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Afficher la barre de status" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Masque" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Masque" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Nord" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "Sud" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Ouest" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Est" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "Résolution Nord-Sud" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Résolution estimée :" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Nombre de segments :" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Colonne numérique : " + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Nombre de segments :" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d sec" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "Général" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "Définir la région calculée depuis un nom de région" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "Afficher la région courante" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "Concordance des projections" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "Enregistrer la région de calcul vers un fichier de région" + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "Navigateur de données" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "Exporter vers :" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 #, fuzzy msgid "Export history of executed commands to a file" msgstr "Exporter une carte vecteur vers un fichier SVG." -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" -msgstr "" +#: ../gui/wxpython/history/browser.py:465 +#, fuzzy, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" +msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Enregistrer le fichier sous ..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "Enregistrer le fichier sous" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "Fichiers" + +#: ../gui/wxpython/history/browser.py:470 #, fuzzy, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "Fichiers de texte" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "Fichiers" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Enregistrer le fichier sous ..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 #, fuzzy msgid "Command history saved to '{}'" msgstr "Log de la commande enregistrée dans '{}'" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +#, fuzzy +msgid "Downloaded project is not valid" msgstr "Le Secteur téléchargé n'est pas valide" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" +msgstr "Annuler le téléchargement" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" msgstr "Sélectionner le secteur d'exemple à télécharger : " -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "Télécharger" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" msgstr "Télécharger le Secteur sélectionné" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "Téléchargement en cours, attendez qu'il soit terminé" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, fuzzy, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "Le Secteur <%s> existe déjà, téléchargement annulé" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "Le téléchargement à échoué : %s" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 +#, fuzzy msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" "Téléchargement complet. Les données d'exemple téléchargées sont listées dans " "l'onglet Secteur/Jeu de cartes vers le bouton de fermeture de cette fenêtre" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, fuzzy, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "Le Secteur <%s> existe déjà, commencez par le renommer" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Erreur : {text}" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:439 +#, fuzzy +msgid "Dataset Download" +msgstr "Télécharger" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "Voulez-vous annuler le téléchargement de ce secteur ?" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Télécharger le Secteur sélectionné" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "Annuler le téléchargement" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Voulez-vous annuler le téléchargement de ce secteur ?" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" msgstr "Non de secteur invalide" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "Nom pour le nouveau jeu de cartes :" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Créer un nouveau jeu de cartes" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "Voulez-vous importer {} dans le nouveau secteur ?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "Importer les données ?" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2923,82 +3063,89 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Renommer le jeu de cartes sélectionné" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Erreur" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" msgstr "" +"Impossible de renommer le jeu de cartes.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Renommer le secteur sélectionné" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Renommer le jeu de cartes sélectionné" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" +"Impossible de renommer le jeu de cartes.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -3008,11 +3155,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -3022,15 +3169,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -3040,50 +3187,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Supprimer l'objet sélectionné" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Supprimer l'objet sélectionné" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:497 +#, fuzzy +msgid "Error when deleting projects" +msgstr "Erreur à la lecture du fichier '%s'." -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -3093,11 +3243,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3107,15 +3257,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3125,14 +3275,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "inconnu" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3144,15 +3295,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3160,8 +3311,8 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" @@ -3170,101 +3321,101 @@ msgstr "" "L'import de <%(name)s> a échoué.\n" "Raison : %(msg)s" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:662 +#, fuzzy, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" "Fichier de données <%(name)s> correctement importé. La région par défaut a " "été définie à partir de la carte importée." -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"Le secteur courant est <%(loc)s>.\n" +"Le jeu de cartes courant est <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "Le secteur courant est <%(loc)s>.\n" "Le jeu de cartes courant est <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "Le jeux de cartes actuel est <%s>." #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "Paramétrage de la géo-rectification" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "Paramétrage de la géo-rectification annulée." #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "Choisir le type de carte, le secteur et le jeu de cartes" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "Type de carte à géo-rectifier" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "raster" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vecteur" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "Choisir le secteur source :" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "Choisir le jeu de cartes source :" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" "Vous devez sélectionner un secteur valide avant de sélectionner un jeu de " "cartes" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" "Vous devez sélectionner un secteur et un jeu de cartes valides pour pouvoir " "continuer" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "Choisir un groupe d'images/cartes à géo-rectifier" @@ -3273,40 +3424,40 @@ msgid "Select/create group:" msgstr "Séletionner/créer un groupe :" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "Créer un groupe si aucun n'existe" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "Ajouter une carte vecteur au groupe ..." -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "Suffixe pour les cartes en sortie :" #: ../gui/wxpython/gcp/manager.py:690 msgid "No vector maps." -msgstr "" +msgstr "Aucune carte vectorielle." #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" "Vous devez sélectionner un groupe d'images ou de cartes valides pour pouvoir " "continuer" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "Vous devez entrer un suffixe au nom de la carte pour pouvoir continuer" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" "Sélectionner les cartes à afficher pour la création des points de contrôle" @@ -3315,34 +3466,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "Sélectionner la carte source à afficher :" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "Sélectionner la carte raster cible à afficher :" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "Sélectionner la carte vecteur cible à afficher :" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "Vous devez choisir une carte source pour pouvoir continuer" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3352,42 +3503,42 @@ msgstr "" "Merci d'éditer le groupe ou de sélectionner un autre groupe." #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "Gérer les points d'amer" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "Un minimum de %d PCS est requis. Opération annulée." #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "source" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "cible" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "Définir les coordonnées des points de contrôle" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3401,37 +3552,37 @@ msgstr "" "Nord: %(coor1)s" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "Échec de l'écriture du fichier POINTS" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "Fichier POINTS enregistré pour le groupe <%s>" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "fenêtre source non définie" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "fenêtre destination non définie" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "Lecture du fichier POINTS impossible" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3446,55 +3597,55 @@ msgstr "" "6 points ou + nécessaires pour le 2ème ordre, et\n" "10 points ou + nécessaires pour le 3ème ordre." -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "Rectification des images en cours, merci de patienter ..." -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "Transformation de <%s>..." -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "Rectification de la carte vectorielle <%s>, merci de patienter ..." -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "Échec du géoréférencement de la carte vecteur <%s>" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "Paramètres du gestionnaire de points de contrôle" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "Quitter le gestionnaire de points d'amer" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "Enregistrer les points de contrôle ?" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." @@ -3502,8 +3653,8 @@ msgstr "" "Impossible de calculer l'erreur RMS.\n" "Possible erreur avec m.transform." -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." @@ -3511,169 +3662,169 @@ msgstr "" "Impossible de calculer la nouvelle emprise.\n" "Possible erreur avec m.transform." -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "Ajuster l'affichage source à l'affichage cible" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "Ajuster l'affichage cible à l'affichage source" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "utiliser" -#: ../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 +#: ../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 msgid "source E" msgstr "E source" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "N source" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "E cible" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "N cible" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "Erreur suivante" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "Erreur précédente" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "Valeur de coordonnées non valide. Opération annulée." -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "Créer un nouveau groupe de cartes vectorielles" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "Sélectionner carte(s) vecteur à ajouter au groupe :" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "Modifier les points de contrôle" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "Point de contrôle no." -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "E source :" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "E cible :" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "N cible :" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "N cible :" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "Appliquer les changements pour la session courante" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" "Appliquer et enregistrer les modifications des paramètres utilisateur " "(valeurs par défaut pour la prochaine session)" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Fermer la boîte de dialogue" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "Symbologie" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "Surligner seulement la plus haute RMS" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "Surligner erreur RMS > M + V*facteur :" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" @@ -3683,98 +3834,98 @@ msgstr "" "moyenne + variance*facteur donné. \n" "Les valeurs recommandées pour ce facteur se situent entre 1 et 2." -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "Paramètres des symboles" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "Couleur pour erreur RMS élevée :" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "Couleur pour les points de contrôle sélectionnés :" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "Couleur pour les points de contrôle non utilisés :" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "Montrer les points de contrôle non utilisés" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "Taille de symbole :" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "Rectification" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "Sélectionner l'ordre de la rectification" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "1er ordre" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "2ème ordre" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "3ème ordre" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "Sélectionner la méthode d'interpolation :" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "circoncire à la région de calcul dans le secteur cible" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "Le seuil RMS doit être positif" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" @@ -3782,9 +3933,9 @@ msgstr "" "Le facteur de seuil RMS est < 1\n" "Trop de points doivent être surlignés" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -3821,10 +3972,10 @@ msgstr "Affichage source" msgid "Target Display" msgstr "Affichage cible" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3833,7 +3984,7 @@ msgstr "Mise en page" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3842,7 +3993,7 @@ msgstr "Aperçu avant impression" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3856,14 +4007,14 @@ msgstr "Zoomer sur la région de calcul (définie avec g.region)" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "Zoom sur la région par défaut" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "Zoom sur la région enregistrée" @@ -3876,33 +4027,33 @@ msgstr "Définir la région calculée à partir de celle de l'écran" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "Enregistrer la géométrie de l'écran dans un nom de région" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Numéro de catégorie" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Plage de validité :" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "Erreur RMS" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "Prograde : %(forw)s, Rétrograde: %(back)s" @@ -3932,7 +4083,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3968,300 +4119,310 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" -msgstr "Définir un nouveau secteur GRASS" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +msgid "Define new GRASS project" +msgstr "Définir un nouveau projet GRASS" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "Cette option est requise" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Nom" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" msgstr "Nom du répertoire du secteur dans le dossier GIS DATA" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Description" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:251 +#, fuzzy +msgid "Description of project directory in GIS Data Directory" +msgstr "Nom du répertoire du secteur dans le dossier GIS DATA" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "Impossible de créer la nouvelle base de données GRASS" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 +#, fuzzy msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} 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." -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "Nom invalide" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 +#, fuzzy msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" "Le titre du secteur est limité à une ligne et 256 caractères. Le reste du " "texte sera ignoré." -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Code" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Code de la projection " -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Rechercher dans la description :" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "Impossible de lire la liste : %s" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "Choisir les paramètres de projection" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "Sélectionner le datum ou l'ellipsoïde (page suivante)" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "Datum et ellipsoïde associé" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "Ellipsoïde uniquement" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "Vous devez entrer une valeur pour %s" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "Entrez les paramètres pour la projection %s" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "Non" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Oui" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "Spécifier les données géodésiques" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "Ellipsoïde" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Code des données :" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "Spécifier l'ellipsoïde" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "Coordonnées terrestres" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "Corps planétaire" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "Code de l'ellipsoïde : " -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "Fichier géo-référencé : " -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "Sélectionner un fichier géo-référencé" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Paramètres" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "Impossible de lire les codes EPSG : {0}" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "Choisir le code IAU" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "Chemin vers le fichier de codes IAU :" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "Code IAU :" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "Choisir un fichier de codes IAU" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "Impossible de lire les codes IAU : {0}" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "Entrer la chaîne de paramètres PROJ.4 :" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "Transformation par datum requise." -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Résumé" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "Base de données GRASS :" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Nom du secteur : " +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Code de la projection " -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Description :" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Projection :" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" @@ -4269,15 +4430,15 @@ msgstr "" "Définition PROJ.4 :\n" " (temporaire)" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "Personnalisé" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" @@ -4285,152 +4446,208 @@ msgstr "" "\n" "Détails: %(err)s" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" msgstr "Impossible de créer le nouveau secteur" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "Le secteur existe déjà dans la base de données GRASS." -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "Code EPSG manquant." -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "Code IAU manquant." -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "Fichier <%s> non trouvé." -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "Définir les limites et la résolution de la région par défaut" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "&Définir la région" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "Secteur sélectionné non valide." -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "Région non valide" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "Cliquer ici pour voir les paramètres 3D" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "Cliquer ici pour cacher les paramètres 3D" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Lignes : %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Colonnes : %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Cellules : %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Profondeur :%d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "Cellules 3D : %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "Sommet" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "Base" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "Résolution verticale " -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Nord" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Ouest" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Est" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Sud" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "Résolution Nord-Sud" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "Résolution Est-Ouest" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "Valeur non valide : %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "Sélectionner le datum de transformation" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "Sélectionner parmi une liste de datums de transformation" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Supprimer" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Désactiver" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Activer" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "Définir l'étiquette" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "Définir le commentaire" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "Ajouter un point de contrôle" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "Supprimer un point de contrôle" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "Intermédiaire" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Propriétés" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "Étiquette :" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "Commentaire :" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "Paramètres du modeleur" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4447,7 +4664,6 @@ msgid "Disabled:" msgstr "Désactivé :" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "Éditeur Python" @@ -4457,10 +4673,10 @@ msgid "GRASS API:" msgstr "Aide GRASS" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Commande" @@ -4486,7 +4702,7 @@ msgid "Shape size" msgstr "Taille de la forme" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Type" @@ -4515,13 +4731,13 @@ msgid "Comment" msgstr "Commentaire" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "Propriétés du modèle" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Métadonnée" @@ -4530,7 +4746,7 @@ msgid "Commands" msgstr "Commandes" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4541,19 +4757,19 @@ msgid "Apply properties" msgstr "Appliquer les propriétés" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "Fermer la boîte de dialogue et ignorer les changements" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Nom :" @@ -4562,64 +4778,450 @@ msgstr "Nom :" msgid "Author(s):" msgstr "Auteur(s) :" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "Modeleur graphique" + +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Modèle" + +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Objets" + +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Variables" + +#: ../gui/wxpython/gmodeler/panels.py:189 +#, fuzzy +msgid "Script editor" +msgstr "Mode simple" + +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "Messages de la commande" + +#: ../gui/wxpython/gmodeler/panels.py:273 +#, fuzzy +msgid "{} script contains local modifications" +msgstr "Le script Python contient des modifications locales" + +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +#, fuzzy +msgid "{} script is up-to-date" +msgstr "Le script Python est à jour" + +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d sec" + +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" +msgstr "%(min)d min %(sec)d sec" + +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "La commande s'est terminée" + +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" +msgstr "Calcul du modèle terminé" + +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" +msgstr "%d cartes intermédiaires supprimées du jeu de cartes courant" + +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" +"Échec de lecture du fichier de modèle <%s>.\n" +"Fichier non valide, impossible d'analyser le document XML.\n" +"\n" +"%s" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "Merci de patienter, modèle en cours de chargement ..." + +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." +msgstr "Échec de l'écriture des paramètres courant dans le fichier de modèle." + +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." +msgstr "Impossible d'ouvrir le fichier <%s> en écriture." + +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" +msgstr "" +"Le modèle courant n'est pas vide. Voulez-vous enregistrer les paramètres " +"courants dans un fichier ?" + +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "Créer un nouveau modèle ?" + +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "Choisir le fichier de modèle" + +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "Ficher modèle GRASS (*.gxm)|*.gxm" + +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" +msgstr "%(items)d objets (%(actions)d actions) chargés dans le modèle" + +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "" +"Le fichier de modèle <%s> existe déjà. Voulez-vous écraser ce fichier ?" + +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "Enregistrer le modèle" + +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" +msgstr "Fichier <%s> enregistré" + +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "Choisir le fichier où enregistrer le modèle courant" + +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "Modèle exporté vers <%s>" + +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "Ajouter un commentaire" + +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." +msgstr "Commentaire vide. Rien à ajouter au modèle." + +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." +msgstr "Pas de données intermédiaires à supprimer." + +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "Voulez vous supprimer les données définitivement ? %s" + +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "Supprimer les donnés inntermédiaires ?" + +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "Le modèle est vide. Rien à valider." + +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Validation du modèle ..." + +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" +msgstr "" +"Le modèle n'est pas valide.\n" +"\n" +"%s" + +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "Le modèle est valide." + +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "Modeleur graphique wxGUI" + +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Redessine le modèle ..." + +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Voulez-vous enregistrer les modifications du modèle ?" + +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "" +"Voulez-vous enregistrer les paramètres du modèle courants dans un fichier ?" + +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Quitter le Modeleur Graphique" + +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "Liste de variables - clic-droit pour supprimer" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Type de données" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "Valeur par défaut" + +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "Ajouter une nouvelle variable" + +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" +msgstr "entier" + +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "flottant" + +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "chaîne de caractères" + +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "région" + +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "jeu de cartes" + +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "fichier" + +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" +msgstr "dir" + +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "Ajouter une nouvelle variable au modèle" + +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "Liste d'objets - clic-droit pour supprimer" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "Étiquette" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "Dans la boucle" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" +msgstr "Paramétré" + +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." +msgstr "Pas d'objets sélectionnés." + +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Script Python" + +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" +msgstr "Exécute&r" + +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "Lancer un script" + +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Enregistrer le script python dans un fichier" + +#: ../gui/wxpython/gmodeler/panels.py:1622 +#, fuzzy +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" +"Actualiser le script Python basé sur le modèle.\n" +"Ceci écrasera toutes les modifications manuelles." + +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" +msgstr "Console Python" + +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Script Python" + +#: ../gui/wxpython/gmodeler/panels.py:1710 +#, fuzzy +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" +msgstr "" +"Le script Python a été modifié manuellement. La mise à jour écrasera toutes " +"les modifications. Voulez-vous vraiment continuer ?" + +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" +msgstr "Mettre à jour" + +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Script Python (*.py)|*.py" + +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "Choisir le fichier à enregistrer" + +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "Le fichier <%s> existe déjà. Voulez-vous écraser ce fichier ?" + +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "Enegistrer le fichier" + +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" +msgstr "Impossible d'exécuter le script Python. %s" + +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "Créer un nouveau modèle" + +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "Charger le modèle depuis un fichier" + +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Enregistrer le modèle dans un fichier" + +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 msgid "Export model to image" msgstr "Exporter le modèle vers une image" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 msgid "Export model to Python script" msgstr "Exporter le modèle dans un script Python" -#: ../gui/wxpython/gmodeler/toolbars.py:52 +#: ../gui/wxpython/gmodeler/toolbars.py:63 msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 +#: ../gui/wxpython/gmodeler/toolbars.py:66 msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 +#: ../gui/wxpython/gmodeler/toolbars.py:70 msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 +#: ../gui/wxpython/gmodeler/toolbars.py:73 msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 +#: ../gui/wxpython/gmodeler/toolbars.py:76 msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 msgid "Run model" msgstr "Exécuter un modèle" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 msgid "Validate model" msgstr "Valider le modèle" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" -msgstr "" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "Propriétés du modèle" -#: ../gui/wxpython/gmodeler/toolbars.py:66 +#: ../gui/wxpython/gmodeler/toolbars.py:83 msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 +#: ../gui/wxpython/gmodeler/toolbars.py:85 msgid "Redraw model canvas" msgstr "" @@ -4644,16 +5246,6 @@ msgstr "Ajouter une commande GRASS au modèle" msgid "Label and comment" msgstr "Étiquette et commentaire" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "Étiquette :" - -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "Commentaire :" - #: ../gui/wxpython/gmodeler/dialogs.py:308 msgid "" "Command not defined.\n" @@ -4680,7 +5272,7 @@ msgstr "Propriétés de la relation" msgid "From" msgstr "De" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 msgid "To" msgstr "Vers" @@ -4725,12 +5317,6 @@ msgstr "" msgid "Condition" msgstr "Contition" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "Étiquette" - #: ../gui/wxpython/gmodeler/dialogs.py:564 msgid "Loop properties" msgstr "Paramètres de la boucle" @@ -4776,50 +5362,46 @@ msgstr "Voulez-vous supprimer toutes les variables du modèle ?" msgid "Delete variables" msgstr "Supprimer les variables" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 #: ../gui/wxpython/vdigit/dialogs.py:304 msgid "Delete selected" msgstr "Supprimer la sélection" -#: ../gui/wxpython/gmodeler/dialogs.py:914 +#: ../gui/wxpython/gmodeler/dialogs.py:913 #: ../gui/wxpython/vdigit/dialogs.py:308 msgid "Delete all" msgstr "Supprimer tout" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 msgid "Reload" msgstr "Recharger" -#: ../gui/wxpython/gmodeler/model.py:74 +#: ../gui/wxpython/gmodeler/model.py:80 msgid "model" msgstr "modèle" -#: ../gui/wxpython/gmodeler/model.py:75 +#: ../gui/wxpython/gmodeler/model.py:81 msgid "Script generated by wxGUI Graphical Modeler." msgstr "Script généré par le Modeleur Graphique wxGUI." -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 #, python-format msgid "undefined variable '%s'" msgstr "variable '%s' non définie" -#: ../gui/wxpython/gmodeler/model.py:612 +#: ../gui/wxpython/gmodeler/model.py:618 msgid "Running model..." msgstr "Modèle en cours d'exécution ..." -#: ../gui/wxpython/gmodeler/model.py:633 +#: ../gui/wxpython/gmodeler/model.py:639 msgid "Model is empty. Nothing to run." msgstr "Le modèle est vide. Rien à exécuter." -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Validation du modèle ..." - -#: ../gui/wxpython/gmodeler/model.py:650 +#: ../gui/wxpython/gmodeler/model.py:656 #, python-format msgid "" "Model is not valid. Do you want to run the model anyway?\n" @@ -4830,452 +5412,71 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/gmodeler/model.py:653 +#: ../gui/wxpython/gmodeler/model.py:659 msgid "Run model?" msgstr "Exécuter le modèle ?" -#: ../gui/wxpython/gmodeler/model.py:688 +#: ../gui/wxpython/gmodeler/model.py:696 msgid "Variables below not defined:" msgstr "Les variables suivantes ne sont pas définies :" -#: ../gui/wxpython/gmodeler/model.py:801 +#: ../gui/wxpython/gmodeler/model.py:809 msgid "Raster maps" msgstr "Cartes raster" -#: ../gui/wxpython/gmodeler/model.py:804 +#: ../gui/wxpython/gmodeler/model.py:812 msgid "3D raster maps" msgstr "Cartes raster 3D" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 msgid "Vector maps" msgstr "Carte vectorielle" -#: ../gui/wxpython/gmodeler/model.py:1556 +#: ../gui/wxpython/gmodeler/model.py:1564 msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 +#: ../gui/wxpython/gmodeler/model.py:1758 msgid "Condition: " msgstr "Condition :" -#: ../gui/wxpython/gmodeler/model.py:1752 +#: ../gui/wxpython/gmodeler/model.py:1760 msgid "Condition: not defined" msgstr "Condition : non définie" -#: ../gui/wxpython/gmodeler/model.py:1894 +#: ../gui/wxpython/gmodeler/model.py:1902 msgid "if-else" msgstr "if-else" -#: ../gui/wxpython/gmodeler/model.py:2000 +#: ../gui/wxpython/gmodeler/model.py:2008 msgid "empty" msgstr "vide" -#: ../gui/wxpython/gmodeler/model.py:2001 +#: ../gui/wxpython/gmodeler/model.py:2009 #, python-brace-format msgid "Details: unsupported tag name '{0}'." msgstr "Détail : nom d'option non supportée '{0}'" -#: ../gui/wxpython/gmodeler/model.py:3479 +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Attention" + +#: ../gui/wxpython/gmodeler/model.py:3643 msgid "Model parameters" msgstr "Paramètres du modèle" -#: ../gui/wxpython/gmodeler/model.py:3500 +#: ../gui/wxpython/gmodeler/model.py:3665 msgid "Delete intermediate data when finish" msgstr "Supprimer les données intermédiaires" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" -msgstr "Exécute&r" - -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" -msgstr "Variables" - -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" -msgstr "Modeleur graphique" - -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" -msgstr "Modèle" - -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" -msgstr "Objets" - -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" -msgstr "Messages de la commande" - -#: ../gui/wxpython/gmodeler/frame.py:251 -#, fuzzy -msgid "{} script contains local modifications" -msgstr "Le script Python contient des modifications locales" - -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -#, fuzzy -msgid "{} script is up-to-date" -msgstr "Le script Python est à jour" - -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." -msgstr "Redessine le modèle ..." - -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" -msgstr "%d sec" - -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" -msgstr "%(min)d min %(sec)d sec" - -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" -msgstr "La commande s'est terminée" - -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" -msgstr "Calcul du modèle terminé" - -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "Voulez-vous enregistrer les modifications du modèle ?" - -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" -msgstr "" -"Voulez-vous enregistrer les paramètres du modèle courants dans un fichier ?" - -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" -msgstr "Quitter le Modeleur Graphique" - -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "%d cartes intermédiaires supprimées du jeu de cartes courant" - -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." -msgstr "Pas de données intermédiaires à supprimer." - -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "Voulez vous supprimer les données définitivement ? %s" - -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "Supprimer les donnés inntermédiaires ?" - -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" -msgstr "" -"Le modèle courant n'est pas vide. Voulez-vous enregistrer les paramètres " -"courants dans un fichier ?" - -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" -msgstr "Créer un nouveau modèle ?" - -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" -msgstr "Choisir le fichier de modèle" - -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" -msgstr "Ficher modèle GRASS (*.gxm)|*.gxm" - -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" -msgstr "%(items)d objets (%(actions)d actions) chargés dans le modèle" - -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" -msgstr "" -"Le fichier de modèle <%s> existe déjà. Voulez-vous écraser ce fichier ?" - -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" -msgstr "Enregistrer le modèle" - -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" -msgstr "Fichier <%s> enregistré" - -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" -msgstr "Choisir le fichier où enregistrer le modèle courant" - -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." -msgstr "Le modèle est vide. Rien à valider." - -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" -msgstr "" -"Le modèle n'est pas valide.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." -msgstr "Le modèle est valide." - -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" -msgstr "Modèle exporté vers <%s>" - -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" -msgstr "Ajouter un commentaire" - -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." -msgstr "Commentaire vide. Rien à ajouter au modèle." - -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" -msgstr "Modeleur graphique wxGUI" - -#: ../gui/wxpython/gmodeler/frame.py:1116 -#, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" -msgstr "" -"Échec de lecture du fichier de modèle <%s>.\n" -"Fichier non valide, impossible d'analyser le document XML.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "Merci de patienter, modèle en cours de chargement ..." - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." -msgstr "Échec de l'écriture des paramètres courant dans le fichier de modèle." - -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "Impossible d'ouvrir le fichier <%s> en écriture." - -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "Supprimer" - -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" -msgstr "Désactiver" - -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" -msgstr "Activer" - -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" -msgstr "Définir l'étiquette" - -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" -msgstr "Définir le commentaire" - -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" -msgstr "Ajouter un point de contrôle" - -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "Supprimer un point de contrôle" - -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" -msgstr "Intermédiaire" - -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" -msgstr "Propriétés" - -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "Liste de variables - clic-droit pour supprimer" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" -msgstr "Type de données" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "Valeur par défaut" - -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" -msgstr "Ajouter une nouvelle variable" - -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" -msgstr "entier" - -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "flottant" - -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "chaîne de caractères" - -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "région" - -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" -msgstr "jeu de cartes" - -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "fichier" - -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" -msgstr "dir" - -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" -msgstr "Ajouter une nouvelle variable au modèle" - -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "Liste d'objets - clic-droit pour supprimer" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" -msgstr "Dans la boucle" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" -msgstr "Paramétré" - -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." -msgstr "Pas d'objets sélectionnés." - -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" -msgstr "Script Python" - -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -#, fuzzy -msgid "Run script" -msgstr "Lancer un script" - -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Enregistrer le script python dans un fichier" - -#: ../gui/wxpython/gmodeler/frame.py:2047 -#, fuzzy -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." -msgstr "" -"Actualiser le script Python basé sur le modèle.\n" -"Ceci écrasera toutes les modifications manuelles." - -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" -msgstr "Console Python" - -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:2078 -#, fuzzy -msgid "Python script type" -msgstr "Script Python" - -#: ../gui/wxpython/gmodeler/frame.py:2110 -#, fuzzy -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" -msgstr "" -"Le script Python a été modifié manuellement. La mise à jour écrasera toutes " -"les modifications. Voulez-vous vraiment continuer ?" - -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" -msgstr "Mettre à jour" - -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" -msgstr "Choisir le fichier à enregistrer" - -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" -msgstr "Script Python (*.py)|*.py" - -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" -msgstr "Le fichier <%s> existe déjà. Voulez-vous écraser ce fichier ?" - -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" -msgstr "Enegistrer le fichier" - -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" -msgstr "Impossible d'exécuter le script Python. %s" - -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" -msgstr "" - -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "&Fichier" @@ -5287,7 +5488,7 @@ msgstr "Espace de travail" msgid "Create new workspace" msgstr "Créer un nouvel espace de travail" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Ouvrir" @@ -5295,7 +5496,7 @@ msgstr "Ouvrir" msgid "Load workspace from file" msgstr "Charger un espace de travail depuis un fichier" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Enregistrer" @@ -5305,7 +5506,7 @@ msgstr "Enregistrer" msgid "Save workspace" msgstr "Enregistrer l'espace de travail" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Enregistrer sous" @@ -5318,7 +5519,7 @@ msgid "Close workspace file" msgstr "Fermer le fichier de l'espace de travail" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "Affichage des cartes" @@ -5355,7 +5556,7 @@ msgid "Add RGB raster map layer to current display" msgstr "Ajouter une carte raster RGB à l'affichage actuel" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "Ajouter une couche web service" @@ -5385,24 +5586,24 @@ msgstr "Fermer la fenêtre d'affichage de carte actuelle" msgid "Close all open map display windows" msgstr "Fermer tous les fenêtres d'affichage de cartes" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "Importation raster simplifié avec reprojection" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "Importer des données raster en utilisant la librairie GDAL." -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "Importation de raster de formats communs" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "Importation et maillage de points ASCII x,y,z" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." @@ -5410,76 +5611,76 @@ msgstr "" "Créer une carte raster à partir de l'assemblage d'un lot de coordonnées en " "utilisant des statistiques univariées." -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "Importer une grille ASCII" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "Convertir un fichier raster ASCII en une carte raster binaire." -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "Import de polygones, lignes et points ASCII" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "Créer des cartes raster depuis des données ASCII point/ligne/polygone." -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "Import d'un tableau binaire brut" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "Importer un fichier 'raster' binaire dans une couche 'raster' GRASS." -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "Importer un GRIDATB.FOR" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" "Importer un fichier carte GRIDATB.FOR (TOPMODEL) vers une carte raster GRASS." -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "Importer un champ Matlab 2D" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importe un fichier binaire MAT-File (V.4) dans une carte raster GRASS." -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "Import PNG" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "Importer des images PNG non géo-référencées." -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "Importer un SPOT NDVI" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "Importer des données SPOT VGT NDVI vers une carte raster." -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "Importer un SRTM HGT" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "Importer un fichier SRTM HGT vers une carte raster." -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Importer un Terra ASTER HDF" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." @@ -5488,34 +5689,42 @@ msgstr "" "associés avec gdalwarp." #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "Importer des popints LiDAR LAS" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." -msgstr "" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +#, fuzzy +msgid "Module not installed" +msgstr "Style des boîtes de dialogue des modules" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "Dépaqueter une carte raster" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" @@ -5524,100 +5733,98 @@ msgstr "" "que carte raster" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +#, fuzzy +msgid "Reproject raster map from different GRASS project" msgstr "Reprojeter une carte raster depuis un secteur différent" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" "Reprojeter une carte raster depuis un secteur donné vers le secteur courant." -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "Importation vecteur simplifié avec reprojection" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "Importer des cartes vecteur en utilisant la librairie OGR." -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "Importation de vecteur de formats communs" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "Points ASCII ou format ASCII GRASS" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" "Créer une carte vecteur depuis un fichier de points ASCII ou un fichier " "vecteur ASCII." -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "Importer des points ASCII en tant que lignes vectorielles" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "Importer des coordonnées ASCII x,y[,z] en tant que séries de lignes." -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "Importer un DXF" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "Convertir des fichiers DXF en carte vecteur GRASS." -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "Télécharger GetFeature depuis un serveur WMS." -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "Importer un ESRII e00" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "Importer un fichier E00 vers une carte vecteur." -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "Importer depuis Geonames" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "Importe des fichiers de pays de geonames.org vers une carte de points." -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "Importer depuis le format Mapgen ou un champ Matlab" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "Importer des cartes vectorielles Mapgen ou Matlab-ASCII." -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "Dépaqueter une carte vecteur" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" @@ -5626,187 +5833,189 @@ msgstr "" "que carte vecteur" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" msgstr "Reprojeter une carte vecteur depuis un secteur différent" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Re-projette une carte vecteur depuis un secteur dans le secteur courant." -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "Importer des données raster 3D" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "Importer un ASCII 3D" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "Convertir un fichier raster ASCII 3D en une carte raster 3D binaire." -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "Importer un tableau binaire brut 3D" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "Importer un fichier raster binaire vers une carte raster 3D." -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Importer en Vis5D" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "Importer des fichiers Vis5D en 3-dimensions." -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "Importer une table d'une base de données" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "Importer des formats standards" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "Importe des tables attributaires de formats divers." -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "Exporter une carte raster" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "Formats standards d'export" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "Exporter une carte raster vers des formats pris en charge par GDAL." -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "Export en grille ASCII" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "Convertir une couche raster vers un fichier raster ASCII GRASS." -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "Export en points ASCII x,y,z" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" "Exporter une carte raster vers un fichier texte de valeurs x,y,z basées sur " "le centre des cellules." -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "Export en GRIDATB.FOR" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "Importer une carte raster vers un fichier GRIDATB.FOR (TOPMODEL)." -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "Export tableau 2D Matlab" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "Exporte un raster GRASS en fichier binaire MAT-file." -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "Export de tableau binaire brut" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "Exporter un raster vers un tableau binaire." -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "Export MPEG-1" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "Convertir une série de cartes raster vers une vidéo MPEG." -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "Export PNG" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "Exporter une carte raster vers une image PNG non géo-référencée." -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "Exporter en PPM" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "Convertir une carte raster vers un fichier image PPM." -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "Export PPM depuis RVB" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "Convertir 3 couches raster (R, V, B) vers un fichier image PPM." #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "Export POV-Ray" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "Convertir une couche raster vers un fichier de hauteurs pour POV-Ray." -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "Export VRML" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" "Exporter une carte raster vers le Langage de Modélisaiton de Réalité " "Virtuelle (VRML)." #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "Export VTK" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "Convertir des cartes raster vers le format VTK-ASCII." -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "Empaqueter des cartes raster" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "Exporter une carte raster vers un fichier d'archive GRASS GIS" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "Exporter une carte vecteur" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." @@ -5814,11 +6023,11 @@ msgstr "" "Exporter une carte vecteur vers un des formats vecteurs supportés par OGR. " "Par défaut une carte vecteur est exportée vers le format OGC GeoPackage." -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "Exporter des points ASCII ou vecteurs ASCII GRASS" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." @@ -5827,112 +6036,112 @@ msgstr "" "les entités avec une catégorie sont exportés. Utiliser 'layer=-1' pour " "exporter toutes les entités." -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "Exporter en DXF" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "Exporter une carte vecteur vers un fichier DXF." -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "Export PostGIS" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "Exporter une carte vecteur vers une table PostGIS." -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "Convertir des points GRASS x,y,z vers le format POV-Ray x,y,z." -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "Exporter en SVG" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "Exporter une carte vecteur vers un fichier SVG." -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "Convertir une carte vecteur vers un fichier VTK ASCII." -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "Empaqueter une carte vecteur" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "Exporter une carte vecteur vers un fichier d'archive GRASS GIS" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "Exporter des cartes raster 3D" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "Exporter en ASCII 3D" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "Convertir une couche raster 3D vers un fichier texte ASCII." -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "Exporter un tableau binaire brut 3D" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "Exporter une carte raster 3D vers tableau binaire." -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Export Vis5D" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "Exporter une carte raster 3D en fichier Vis5D à 3 dimensions." -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "Convertit des cartes raster 3D au format VTK-ASCII." -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "Exporter une table de la base de données" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "Exporte des tables attributaires vers divers formats." -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "Lier une carte raster externe" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" "Lier des données prises en charge par GDAL en tant que pseudocarte raster." -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "Lier des données vectorielles externes" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" "Crée une nouvelle pseudo carte vecteur comme lien vers une couche prise en " "charge par OGR." -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "Format de sortie pour les données raster" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." @@ -5940,36 +6149,36 @@ msgstr "" "Rediriger la sortie raster vers un fichier utilisant la librairie GDAL " "plutôt que de le stocker au format raster GRASS." -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "Format de sortie pour les données vecteur" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "Définir le format de sortie vecteur en utilisant la librairie OGR." -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "Gérer les cartes" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "Copier" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "Liste" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." @@ -5977,19 +6186,19 @@ msgstr "" "Lister les fichiers de base de données GRASS disponibles du type spécifié " "par l'utilisateur en utilisant un modèle de recherche." -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "Renommer" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" "Renommer les fichiers éléments de la base de données dans le jeu de données " "courant de l'utilisateur" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." @@ -5998,71 +6207,71 @@ msgstr "" "de l'utilisateur" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "Conversions de type de carte" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "Raster vers vecteur" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "Convertir une carte raster vers une carte vecteur." #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "Série de raster vers raster 3D" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" "Convertir des tranches de cartes raster 2D en une carte volumique raster 3D. " #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "Raster 2.5D vers raster 3D" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" "Crée un volume 3D à partir de cartes raster 2D d'altitude et de valeurs." #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "Vecteur vers raster" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "Convertir une carte vecteur en carte raster." #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "Vecteur vers raster 3D" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "Convertir une carte vecteur (que des points) vers une carte raster 3D." #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "vecteur 2D vers vecteur 3D" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "Transforme des entités vectorielles 2D en 3D." @@ -6070,20 +6279,20 @@ msgstr "Transforme des entités vectorielles 2D en 3D." msgid "3D raster to raster series" msgstr "Raster 3D vers série de raster" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "Convertir des cartes raster 3D en cartes raster 2D" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "Gérer les points de contrôle au sol pour la géorectification" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "Modeleur graphique" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "Lancer le modeleur graphique" @@ -6103,13 +6312,13 @@ msgstr "" "Crée un rendu 3D de données SIG. Rends les surfaces (données raster), les " "données vecteurs 2D/3D, et les volumes (données raster 3D), en 3D." -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "Outil d'animation" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "Lancer l'outil d'animation." @@ -6126,16 +6335,16 @@ msgstr "" "vers des coordonnées et vice-versa. Présume un système de coordonnées " "cartésien" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "Composeur de cartes" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "Lancer le Composeur de cartes" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "Lancer un script" @@ -6155,7 +6364,7 @@ msgstr "Editeur Python simple" msgid "Launches Simple Python Editor." msgstr "Lancer l'éditeur Python simple." -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "Fermer l'interface graphique" @@ -6163,8 +6372,8 @@ msgstr "Fermer l'interface graphique" msgid "Close graphical user interface." msgstr "Fermer l'interface graphique." -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "Quitter GRASS GIS" @@ -6172,42 +6381,42 @@ msgstr "Quitter GRASS GIS" msgid "Close GUI and exit GRASS GIS shell." msgstr "Fermer l'interface graphique et sortir du terminal GRASS." -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "&Paramètres" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "Région calculée" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "Afficher la région courante" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "Afficher l'emprise et la résolution de la région de calculs." -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "Afficher la région en latitude et longitude" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "Afficher l'emprise de la région courante dans l'affichage de cartes" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "Afficher l'emprise de la région de calcul dans l'affichage de cartes" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "Définir la région" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "Gère les définitions de contour pour la région géographique." @@ -6220,7 +6429,8 @@ msgid "Mapset access" msgstr "Accès au jeu de cartes" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#, fuzzy +msgid "Set/unset access to other mapsets in current project" msgstr "" "Active/désactive l'accès aux autres jeux de données dans le secteur courant" @@ -6249,11 +6459,13 @@ msgstr "" "cartes ou list les jeux de cartes disponibles dans le secteur choisi." #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "Choisir une secteur de travail et un jeu de cartes" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "Changer le secteur de travail courant et le jeux de cartes." #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#, fuzzy +msgid "Change current project and mapset." msgstr "Changer le secteur de travail courant et le jeux de cartes." #: ../gui/wxpython/menustrings.py:240 @@ -6292,15 +6504,20 @@ msgstr "" "définie." #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +#, fuzzy +msgid "Create new project (location)" msgstr "Créer un nouveau secteur" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +#, fuzzy +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "Lance l'assistant pour créer un nouveau secteur GRASS." #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +#, fuzzy +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" "Crée un nouveau jeux de cartes dans le secteur de travail courant, et change " "le jeux de cartes courant." @@ -6326,10 +6543,10 @@ msgid "Manage projections" msgstr "Gérer les projections" #: ../gui/wxpython/menustrings.py:256 +#, fuzzy msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" "Affiche ou modifie les fichiers de projection de GRASS (dans divers systèmes " "de coordonnées). Peut aussi être utilisé pour créer de nouveaux secteurs " @@ -6364,7 +6581,7 @@ msgstr "Gérer les extensions installées" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "Mettre à jour ou supprimer les extensions GRASS AddOns." -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "Préférences" @@ -6373,52 +6590,52 @@ msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" "Préférences utilisateur GUI (police d'affichage, commandes, numériseur, etc.)" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "&Raster" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "Travailler sur une carte raster" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "Compresser/décompresser" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "Compresser et décompresser des cartes raster." -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "Contours de région" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "Établir les définitions de contours pour une carte raster." -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "Gérer les valeurs NULL" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "Gère les valeurs NULL d'une carte raster donnée." -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "Quantification" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" "Produit le fichier de quantification pour une carte en virgule flottante." -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "Date et heure" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." @@ -6426,39 +6643,39 @@ msgstr "" "Modifier la date d'une carte raster. Afficher/ajouter/supprimer une date/" "heure d'une carte raster 3D" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "Ré-échantillonner par agrégats statistiques" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" "Ré-échantillonner une carte raster avec un maillage plus grossier en " "procédant par agrégation." -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "Ré-échantillonner par diverses méthodes" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" "Ré-échantillonner une carte raster vers un maillage plus fin par " "interpolation." -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "Ré-échantillonner par le plus proche voisin" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "Capacité de ré-échantillonage de cartes raster GRASS." -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "Ré-échantillonner par les splines avec tension" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " @@ -6468,49 +6685,49 @@ msgstr "" "raster (éventuellement à une résolution différente) en utilisant les splines " "régulées avec tension et lissage." -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "Rééchantillonner par les bsplines" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" "Interpolation spline bilinéaire ou bicubique avec régularisation de Tykhonov." -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "Ré-échantillonner par un noyau analytique" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "Ré-échantillonner une couche raster par un noyau analytique." #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "Administration du fichier de maintenance" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" "Permet la création et/ou la modification de fichiers de maintenance de " "cartes raster." -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "Mise à jour des statistiques de la carte" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "Mettre à jour les statistiques d'une carte raster" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "Mosaïquer" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." @@ -6518,70 +6735,74 @@ msgstr "" "Produit une mosaïque de la projection source pour utilisation dans la région " "et projection de destination." -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 +#, fuzzy msgid "Build a VRT (Virtual Raster)" -msgstr "" +msgstr "Construire un VRT (raster virtuel)" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 +#, fuzzy msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" +"Construire un VRT (raster virtuel) à partir de la liste de cartes raster " +"d'entrée." #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "Gérer les couleurs" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "Tables de couleurs" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "Créer/modifier la table de couleur associée à une carte raster." -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "Tables de couleurs (stddev)" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" "Définir les règles de couleurs basées sur l'écart-type depuis la moyenne des " "valeurs d'une carte raster." #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "Gérer les règles de couleur de manière interactive" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "Gestion interactive des tables de couleurs raster." #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "Exporter la table de couleurs" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "Exporter la table de couleur associée à une carte raster." -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "Mélange 2 cartes raster couleur" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" "Mélange les composantes de couleur de deux cartes raster d'un ratio donné." -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "Créer RVB" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" @@ -6589,11 +6810,11 @@ msgstr "" "composite." #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "RVB vers TSV" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " @@ -6603,36 +6824,36 @@ msgstr "" "de teinte, saturation, valeur (TSV) depuis des cartes raster indiquées par " "l'utilisateur." -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "Interroger des cartes raster" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "Interroger les valeurs à partir de coordonnées" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" "Interroger des cartes raster sur les valeurs et étiquettes de catégories." -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "Interroger les couleurs par une valeur" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "Interroger les couleurs d'une carte raster." -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "Zones tampon et distance raster" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "Zone tampon raster" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." @@ -6640,81 +6861,81 @@ msgstr "" "Créer une carte raster qui affiche des zones tampon autour des cellules qui " "contiennent des valeurs de catégorie non-NULL." -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "Cercles concentriques" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" "Crée une carte raster contenant des cercles concentriques autour d'un point " "donné." -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "Points les plus proches" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" "Localise les points de plus grande proximité entre objets de deux cartes " "raster." -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "Agrandir d'une cellule" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" "Produit une couche raster où les surfaces contiguës ont été agrandies d'une " "cellule." #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "Distance des entités" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "Créer un masque pour limiter les opérations raster." #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "Calculateur raster" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "Calculatrice raster simplifiée" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" "Calculer une nouvelle carte raster depuis une expression r.mapcalc simple." -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "Calculatrice raster." -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "Analyse de voisinage" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "Fenêtre mouvante" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " @@ -6724,37 +6945,37 @@ msgstr "" "cellules voisines, et enregistre la nouvelle valeur dans une carte raster de " "sortie." -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "Points voisins" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "Superposer des raster" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "Produit en croix" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" "Crée un produit croisé des valeurs de catégories de multiples cartes raster." -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "Combiner des cartes raster" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." @@ -6762,11 +6983,11 @@ msgstr "" "Crée une carte raster composite en utilisant les valeurs connues d'une (ou " "plusieurs) carte pour remplir les zones de \"no data\" d'une autre carte." -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "Aggrégation de séries raster" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." @@ -6774,11 +6995,11 @@ msgstr "" "Rend la valeur de sortie des cellules une foncton des valeurs des cellules " "correspondantes dans les cartes raster d'entrée." -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "Accumulation de séries raster" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." @@ -6786,11 +7007,11 @@ msgstr "" "Définie la valeur de sortie des cellules comme une foncton d'accumulation " "des valeurs des cellules correspondantes dans les cartes raster d'entrée." -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "Recouvrement statistique" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." @@ -6798,31 +7019,31 @@ msgstr "" "Calculer des statistiques par catégories ou orientées objets (statistiques " "d'accumulation)." -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "Recouvrement statistique" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "Calculer les quantiles des catégories en deux passes." -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "Rayonnement solaire et ombrage" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "Carte LatLong" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "Créer un carte raster latitude/longitude." -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "Rayonnement solaire et irradiation" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6841,11 +7062,11 @@ msgstr "" "cartes raster d'angle d'incidence et/ou d'irradiance solaire. La prise en " "compte de l'effet d'ombrage de la topographie est optionnelle." -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "Carte des ombres" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " @@ -6855,11 +7076,11 @@ msgstr "" "d'altitudes. Soit la position exacte du soleil (A) est spécifiée, soit la " "date/heure (B) pour que r.sunmask calcule tout seul la position du soleil." -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "Heure et angle solaire" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6871,24 +7092,24 @@ msgstr "" "solaire apparent et l'horizon (idéal). Azimuth solaire : l'angle dans le " "sens horaire à partir du nord." -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "Analyse de terrain" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "Générer des lignes de coutour" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" "Créer une couche vecteur GRASS avec les contours d'une couche raster GRASS." -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "Surface de coût" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " @@ -6898,19 +7119,19 @@ msgstr "" "différents points sur une carte raster d'altitude dont les valeurs de " "catégories représentent un coût." -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "Coûts de déplacement cumulés" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " @@ -6920,39 +7141,39 @@ msgstr "" "différentes positions géographique sur une carte raster dont les valeurs de " "catégories représentent le coût." -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "Plus court chemin ou flux" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" "Trace un écoulement à travers un modèle d'altitude ou une surface de coûts " "sur une carte raster." -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "Calculer le relief ombré" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "Créer une carte de relief ombré à partir d'une carte d'altitude (MNT)." -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "Appliquer l'ombrage au raster" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" "Drape un raster de couleur sur le relief ombré ou une carte d'exposition." -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "Pente et exposition" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " @@ -6962,11 +7183,11 @@ msgstr "" "partielles à partir d'une carte raster d'altitude. L'exposition est calculée " "dans le sens anti-horaire depuis l'est." -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "Relief" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." @@ -6974,11 +7195,11 @@ msgstr "" "Calculer la morphologie (forme du terrain) et les géométries associées à " "l'aide d'une approche de vision machine." -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "Paramètres de terrain" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." @@ -6987,20 +7208,20 @@ msgstr "" "échelle en prenant le paramètres quadratiques englobants pour n'import " "quelle taille de fenêtre (par les moindre carrés)." -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "Entités de texture" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" "Génère des images avec des entités de textures à partir d'une couche raster." -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "Visibilité" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." @@ -7008,11 +7229,11 @@ msgstr "" "Calculer la visibilité d'un point sur une carte raster d'altitudes. Format " "par défaut : NULL (invisible), angle vertical vers le point de vue (visible)." -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "Angle d'horizon" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -7030,15 +7251,15 @@ msgstr "" "d'entrée est l'angle (en degrés), qui est mesuré dans le sens anti-horaire " "avec est=0, nord=90 etc. La sortie est la hauteur de l'horizon en radians." -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "Transformer les entités" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "Agglomérer" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." @@ -7046,29 +7267,29 @@ msgstr "" "Reclasser les données dans une couche raster en regroupant les cellules qui " "forment des zones physiques discrètes." -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "Dilater" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "Affiner" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" "Réduit les cellules non vides qui définissent une entité linéaire dans une " "couche raster." -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "Modélisation hydrologique" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "Creuser des chenaux d'écoulement" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." @@ -7077,19 +7298,19 @@ msgstr "" "d'écoulement, les transforme en raster, et soustrait la profondeur au modèle " "de terrain en sortie." -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "Remplir un lac" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "Remplit le lac depuis un point d'origine jusqu'à un niveau donné." -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "Carte sans dépressions ni lignes de flux" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." @@ -7097,19 +7318,19 @@ msgstr "" "Filtrer et générer une couche d'altitude sans dépressions et une couche de " "direction d'écoulement depuis une couche d'altitude donnée." -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "Flux accumulé" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "Effectuer un calcul de flux sur une grille massive." -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "Lignes de flux" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." @@ -7118,53 +7339,53 @@ msgstr "" "chemins, et accumulations (surfaces amont) depuis une carte raster " "d'altitudes." -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "Analyse de bassin versant" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "Calcule les paramètres d'hydrologie et les facteurs RUSLE." -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "Sous-bassins versants" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "Générer les sous-bassins versants à partir d'une carte raster." -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "Création de bassin versant" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" "Générer les bassins versants à partir d'une carte de direction des " "écoulements." -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "Extraction du réseau de chenaux" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "Effectue l'extraction du réseau de chenaux." -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "Modélisation SIM&WE de l'écoulement de surface" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "Simulation d'innondation avec la méthode SIMWE." -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "Modélisation SIMWE des flux de sédiments" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." @@ -7172,11 +7393,11 @@ msgstr "" "Simulation de transport de sédiments et d'érosion/sédimentation avec la " "méthode SIMWE." -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "Carte d'index topographique" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." @@ -7184,40 +7405,40 @@ msgstr "" "Créer une carte d'index topographique à partir d'une carte raster " "d'altitudes." -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "Simulation TOPMODEL" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "Simule TOPMODEL, qui est un modèle hydrologique à base physique." -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "facteur K USLE" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "Calcule le Facteur d'Érosoin des Sols USLE (K)." -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "facteur R USLE" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "Calcule le facteur R USLE, index d'érosion des pluies." -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "Modélisation d'hydro-géologie" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "Flux souterrain" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -7225,11 +7446,11 @@ msgstr "" "Calcul numérique pour les eaux souterraines transitoires, confinées et non " "confinées, en deux dimensions." -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "Transport de soluté souterrain" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" @@ -7237,46 +7458,46 @@ msgstr "" "Calcul numérique pour le transport soluble transitoire, confiné et non " "confiné, en deux dimensions" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "Analyse des parcelles du paysage" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "Mise en place de l'échantillonage et de l'analyse" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "Editeur de configuration de \"l'index\" r.li " -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "Densité du bord" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Calcule l'index de densité de bords d'une carte raster, à l'aide d'un " "algorithme des 4 voisins les plus proches." -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "Contraste pondérée de la densité du bord" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" "Calculer l'index de densité de bords pondérée par le contraste sur une carte " "raster" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "Surface moyenne des patch" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" @@ -7284,102 +7505,102 @@ msgstr "" "Calculer l'index de taille moyenne de patch d'une carte raster, à l'aide " "d'un algorithme des 4 voisins les plus proches." -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "Plage de surface de patch" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "Calculer la plage des tailles de patch d'une carte raster." -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "Écart-type des tailles de patch" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "Calculer l'écart-type des tailles de patch d'une carte raster." -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "Coefficient de variation des tailles de patch" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" "Calculer le coefficient de variation des taille de patch d'une carte raster." -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "Module de densité" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Calculer l'index de densité de patch d'une carte raster, à l'aide d'un " "algorithme des 4 voisins les plus proches." -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "Module nombre" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" "Calculer l'index du nombre de patch d'une carte raster, à l'aide d'un " "algorithme des 4 voisins les plus proches." -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "Diversité de la Dominance" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "Calculer l'index de diversité de dominance d'une carte raster" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "Diversité de Shannon" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "Calcule l'indice de diversité de Shannon sur une carte raster" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "Diversité de Simpson" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "Calcule l'indice de diversité de Simpson sur une carte raster" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "Richesse" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "Calcule l'indice de richesse sur une carte raster" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "Indice de forme" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "Calcule l'indice de forme sur une carte raster" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "Modélisation des feux naturels" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "Taux de propagation" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7391,11 +7612,11 @@ msgstr "" "propagation maximale, et en option 4) la distance potentielle maximale de " "propagation." -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "Propagation par chemins de moindre coût " -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." @@ -7403,11 +7624,11 @@ msgstr "" "Trace de façon récursive le plus court chemin vers les cellules pour " "lequelles le coût cumulé est déterminé." -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "Simulation de diffusion anisotrope" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7422,17 +7643,17 @@ msgstr "" "chemins de propagation. Utilisable pour des simulations de propagation de " "feux." -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "Modifier des valeurs de catégories et des étiquettes" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "Gérer les informations de catégories" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." @@ -7440,19 +7661,19 @@ msgstr "" "Gérer les valeurs de catégories et les étiquettes associées aux cartes " "raster spécifiées." -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "Modifier les valeurs de catégories de manière interactive" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "Modifier les valeurs de cellules d'une carte raster." -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "Reclasser en fonction de la taille" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." @@ -7461,11 +7682,11 @@ msgstr "" "spécifiée par l'utilisateur (en hectares)." #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "Reclasser" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " @@ -7475,27 +7696,27 @@ msgstr "" "une nouvelle carte dont les valeurs de catégories sont basées sur une " "reclassification des catégories d'une carte raster existante." -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "Recoder" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "Recoder les catégories d'une carte raster." -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "Recalculer l'échelle des valeurs" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "Redéfinir la plage des valeurs de catégories d'une carte raster." -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "Recalculer l'échelle des valeurs par histogramme" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." @@ -7503,46 +7724,46 @@ msgstr "" "Rééchelonne l'histogramme sur la plage des valeurs de catégories de la " "couche raster." -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "Générer des cellules aléatoires" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "Cellules aléatoires" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" "Génère des valeurs de cellules aléatoires avec une dépendance spatiale." -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "Cellules aléatoires et points vectoriels" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "Générer des surfaces" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "Surface fractale" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "Créer une surface fractale à partir d'une dimension fractale donnée." -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "Surface avec un noyau de densité gaussienne" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " @@ -7552,11 +7773,11 @@ msgstr "" "utilisant un noyau mouvant et en option génère une carte de densité sur un " "réseau vectoriel." -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "Déviance gaussienne de surface" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." @@ -7565,7 +7786,7 @@ msgstr "" "gaussien. La moyenne et l'écart-type de la déviation gaussienne peut être " "indiqués par l'utilisateur." -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." @@ -7573,34 +7794,34 @@ msgstr "" "Crée une carte raster plane définie par un pendage (inclinaison), une " "orientation (azimuth) et un point." -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "Déviance aléatoire de surface" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" "Produit une couche raster de données aléatoires uniformément réparties dans " "une plage donnée par l'utilisateur." -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "Surface aléatoire avec dépendance spatiale" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "Génère une surface aléatoire avec une dépendance spatiale." -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "Interpoler des surfaces" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "Bilinéaire et bicubique de points vecteur" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." @@ -7608,11 +7829,11 @@ msgstr "" "Effectue une interpolation spline bicubique ou bilinéaire avec " "régularisation de Tykhonov." -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "IDW de points matriciels" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." @@ -7620,11 +7841,11 @@ msgstr "" "Interpolation de surface à partir de points raster par pondération de la " "distance inverse au carré (IDSW)." -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "IDW de points vecteur" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." @@ -7632,19 +7853,19 @@ msgstr "" "Interpolation de surface à partir de points vecteur par pondération de la " "distance inverse au carré (IDSW)." -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "Courbes de niveau raster" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "Générer une carte raster de surface depuis des contours raster." -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "Splines régulées avec tension" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7656,11 +7877,11 @@ msgstr "" "ou isolines au format vecteur vers un raster en nombre flottants, en " "utilisant des splines régulées avec tension." -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "Interpolation de série raster" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." @@ -7668,79 +7889,79 @@ msgstr "" "Interpoler des cartes raster situées (temporel ou spatial) entre des cartes " "rasters d'entrée à des points d'échantillonages spécifiques." -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "Remplir les cellules NULL" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" "Remplir les zones sans données de la carte raster par interpolation spline." -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "Comptes-rendus et statistiques" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "Métadonnées raster basiques" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "Afficher les informations élémentaires d'une carte raster." -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "Statistiques générales" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "Générer les statistiques de surface pour des cartes raster." -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "Quantiles pour les gros jeux de données." -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "Calculer les quantiles en deux passes." -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "Plage des valeurs de catégories" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" "Afficher la liste des valeurs de catégories trouvées dans une carte raster." -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "Somme des surfaces par carte raster et catégorie" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "Rend compte des statistique de cartes raster." -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "Statistiques pour des amas de cellules" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." @@ -7748,20 +7969,20 @@ msgstr "" "Calcul le volume de données en amas. En option, produit une couche de points " "contenant les centroïdes de ces amas." -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "Surface totale corrigée" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "Afficher les estimations de superficies d'une carte raster." -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "Statistiques raster univariées" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7774,59 +7995,59 @@ msgstr "" "l'écart-type, le coefficient de variation, et la somme." #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "Exemple de transects" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" "Affiche en sortie les valeurs de carte raster suivant une(des) ligne(s) " "définie(s) par l'utilisateur." -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "Exemple de transects (parcours/distance)" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" "Affiche en sortie les valeurs de carte raster suivant un(des) transect(s) " "défini(s) par l'utilisateur." -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "Covariance/corrélation" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "Sortir la matrice de covariance/corrélation pour des" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "Régression linéaire" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" "Calcule une régression linéaire depuis deux cartes raster : y = a + b*x." -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "Régression multiple" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "Calcule une régression linéaire multiple depuis des cartes raster." -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "Occurences mutelles de catégories" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." @@ -7834,29 +8055,29 @@ msgstr "" "Tabuler les occurrences mutuelles (coincidence) des catégories de deux " "rasters" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "&Vecteur" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "Travailler sur une carte vecteur" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "Créer un nouvelle carte vecteur" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "Créer un nouvelle carte vecteur vide" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "Éditer une carte vecteur (de façon non interactive)" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." @@ -7864,49 +8085,50 @@ msgstr "" "Édite une carte vecteur, permet d'ajouter, supprimer et modifier les objets " "vectoriels sélectionnés." -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "Convertir les types d'objets" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "Modifier le type des entités vectorielles." -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "Lignes parallèles" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "Crée des lignes parallèles aux lignes vectorielles d'entrée." -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "Fusionner des contours" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Fusionne des contours entre surfaces adjacentes partageant un attribut ou " "une catégorie commun(e)." -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "Créer une carte vecteur 3D par-dessus une carte raster" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" "Convertit des entités vecteurs de 2D vers 3D par échantillonage d'une carte " "raster d'altitudes." -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "Extruder une carte vecteur 3D" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." @@ -7915,30 +8137,30 @@ msgstr "" "définie. En Option, la hauteur peut être dérivée de l'échantillonage d'une " "carte raster d'altitudes." -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "Créer des étiquettes" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "Crée des étiquettes pour une carte vecteur à partir d'attributs liés." -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "Repositionner une carte vecteur" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" "Effectue la transformation affine (translation, échelle et rotation) d'une " "carte vecteur." -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "Rectifier une carte vecteur" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." @@ -7946,19 +8168,19 @@ msgstr "" "Rectifie un vecteur en calculant une transformation de coordonnées pour " "chaque objet du vecteur en se basant sur des points de contrôle." -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "Mettre à jour les métadonnées de la carte vecteur." -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "Outils de topologie" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "Créer ou reconstruire la topologie" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." @@ -7966,117 +8188,117 @@ msgstr "" "Créer la topologie pour la carte vecteur. En option, vérifie les erreurs de " "topologie." -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "Reconstruire la topologie de toutes les cartes vectorielles" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" "Reconstruire la topologie de toutes les cartes vectorielles dans le jeux de " "cartes courant." -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "Construire des polylignes" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "Construit des polylignes à partir de lignes ou de contours." -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "Diviser les lignes" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "Couper des lignes vecteurs en segments plus courts." -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "Scinder des polylignes" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" "Crée des points/segments à partir de lignes vectorielles et positions en " "entrée." -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "Nettoyer la carte vecteur" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "Jeu d'outils pour nettoyer la topologie d'une carte vecteur." -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "Lisser ou simplifier" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "Effectue une généralisation basée sur un vecteur." -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "Ajouter des centroïdes" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "Ajoute les centroïdes manquants aux contours fermés." -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "Créer/modifier la table de couleur associées à une carte vecteur." -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "Gestion interactive des tables de couleur vecteur." -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "Exporter la table de couleur associée une carte vecteur." -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "Interroger une carte vecteur" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "Requête sur coordonnée(s)" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "Interroge sune carte vecteur sur des positions données." -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "Interroger la carte vecteur depuis la table d'attributs" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "Afficher la table d'attributs de la carte vecteur." -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "Sélection d'entité" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "Sélectionner par attributs" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." @@ -8084,103 +8306,103 @@ msgstr "" "Sélectionne les entités vectorielles depuis une carte vecteur existante et " "créé une nouvelle carte vecteur contenant les entités sélectionnées." -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "Sélectionner par une autre carte" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" "Sélectionne des entités d'une carte vecteur (A) par des entités d'une autre " "carte vecteur (B)." -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "Vecteurs tampons" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "Créer un tampon autour d'entités d'un type donné." -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "Analyse de points" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "Identifier et supprimer les abérrations" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "Retire les points aberrants d'une carte vecteur de points." -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "Identifier les cluster de points" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "Effectue une identification des clusters." -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "Indices de quadrat pour la liste de points vecteurs." #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "Indice de quadrat pour la liste de points vecteurs." #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "Perturber des points" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "Perturbations aléatoires des positions des points du vecteur." #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "Jeux de points de tests/d'entraînement" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "Répartit aléatoirement les points dans des jeux de tests/entraînement." -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "Tests de normalité des points fecteurs" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "Test de normalité pour les points vecteur." -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "Analyse Lidar" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "Détecter les bordures" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "Détecte les bordures des objets d'un jeu de données LIDAR." -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "Détecter intérieurs" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" @@ -8188,11 +8410,11 @@ msgstr "" "Détermination des contours de bâtiments et algorithme d'agrandissement de la " "région pour déterminer les bâtiments à l'intérieur" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "Corriger et classifier les objets" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." @@ -8200,32 +8422,32 @@ msgstr "" "Correction de la sortie de v.lidar.growing. Il s'agit du dernier des trois " "algorithms pour le filtrage LIDAR." -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "Référencement linéaire" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "Créer LRS" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "Créer un système de référence linéaire" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "Créer des placements" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" "Créer des placement à partir de lignes, et d'un système de référence linéaire" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "Créer points/segments" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." @@ -8234,11 +8456,11 @@ msgstr "" "référence linéaire et des positions lues depuis l'entrée standard ou un " "fichier." -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "Trouver l'id de ligne et le décalage" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." @@ -8246,11 +8468,11 @@ msgstr "" "Trouvez l'id de ligne et le km réel pour les points donnés de la carte " "vectorielle en utilisant un système de référence linéaire" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "Entités les plus proches" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." @@ -8258,32 +8480,32 @@ msgstr "" "Trouve l'élément de la carte \"vers\" le plus proche des éléments de la " "carte \"depuis\"." -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "Analyse de réseau" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "Outil d'analyse de réseau vecteur" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "Outil d'analyse interactive de réseau vectoriel." -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "Préparation du réseau" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "Effectue la maintenance du réseau." -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "Allouer des sous-réseaux" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." @@ -8292,11 +8514,11 @@ msgstr "" "doit être ouvert (coûts >=0). Les coûts du noeud central sont utilisés dans " "les calculs." -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "Diviser le réseau" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " @@ -8307,19 +8529,19 @@ msgstr "" "(direction depuis le centre). Le noeud central doît être ouvert (coûts >=0). " "Les coûts du noeud central sont utilisés dans les calculs." -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "Plus court chemin" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "Détermines un plus court chemin sur un réseau vectoriel." -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "Plus court chemin pour des jeux d'entités" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -8331,69 +8553,69 @@ msgstr "" "'depuis' vers l'entité 'vers' la plus proche et enregistre les informations " "sur cette relation dans la table d'attributs." -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "Chemin le plus court avec des tables horaires" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "Trouve le chemin le plus court à l'aide de tables horaires." -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "Chemin le plus court pour toutes les paires" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" "Calcule le plus court chemin entre toutes les paires de nœuds du réseau." -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "Réseau visible" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "Construction du graphe de visibilité." -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "Ponts et points d'articulation" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "Calcule les ponts et points d'articulation dans le réseau." -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "Écoulement maximal" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "Calcule l'écoulement maximal entre deux jeux de points du réseau." -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "Connectivité des sommets" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" "Calcule la connectivité des sommets entre deux jeux de noeuds d'un réseau." -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "Composantes" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "Calcule les composants fortement et faiblement connectés d'un réseau." -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "Centralité" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." @@ -8401,11 +8623,11 @@ msgstr "" "Calcule les degré, centralité, intermédiarité, proximité et vecteur propre " "des mesures de centralité d'un réseau." -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "Arbre de Steiner" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " @@ -8416,19 +8638,19 @@ msgstr "" "qu'un algorithme heuristique est utilisé par ce module, le résultat peut " "être sous-optimal." -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "Arbre couvrant de poids minimal" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "Calcul l'arbre couvrant de poids minimum pour le réseau." -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "Analyse de type 'représentant commercial'" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8440,21 +8662,21 @@ msgstr "" "sous optimal." #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "Superposer des cartes vectorielles" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "Rogner les cartes vecteur" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" "Extraire les entités de la carte d'entrée qui chevauchent les entités de la " "carte de sélection." -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." @@ -8462,27 +8684,27 @@ msgstr "" "Superposer deux cartes vecteur avec un opérateur de découpe, intersection, " "différence, différence géométique, union." -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "Combiner des cartes vectorielles" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "Créer une nouvelle carte vecteur en combinant d'autres cartes vecteur." -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "Gérer les catégories" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "Modifier ou rendre compte des catégories" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." @@ -8491,16 +8713,16 @@ msgstr "" "des résultats de requêtes SQL ou d'un valeur dans une colonne de table " "attributaire." -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "Mettre à jour les attributs" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "Mise à jour des attributs surfaciques à partir d'une carte raster" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." @@ -8509,78 +8731,78 @@ msgstr "" "vecteur et ajouter les statistiques dans des nouvelles colonnes " "attributaires." -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "Mise à jour des attributs de surface depuis un vecteur" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" "Compter les points dans une surface, calculer les statistiques des attributs " "des points." -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "Mise à jour des attributs de points depuis des surfaces" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" "Ajouter dans la table les valeurs de vecteur à la position des points du " "vecteur." -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "Mise à jour des attributs de base de donnée depuis une carte vecteur" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "Rempli les valeurs d'attributs depuis les entités vectorielles." -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "Échantillonner une carte raster à partir de points" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" "Ajouter dans la table les valeurs de raster à la position des points du " "vecteur." -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "Échantillonner un voisinage raster autour de points" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "" "Échantillonne une carte raster au droit des points d'une carte vecteur." -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "Générer une surface pour la région courante" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "Créer un polygone couvrant l'étendue de la région courante." -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "Générer des surfaces à partir de points" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "Hull convexe" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "Produit l'enveloppe convexe 2D/3D d'une carte vecteur donnée." -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "Triangles de Delaunay" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." @@ -8588,11 +8810,11 @@ msgstr "" "Crée une triangulation de Delaunay à partir d'une carte vecteur contenant " "des points ou centroïdes." -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "Diagramme de Voronoï/polygones de Thiessen" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." @@ -8600,82 +8822,82 @@ msgstr "" "Créer un diagramme de Voronoi contraint dans l'emprise de la région courante " "depuis une carte vecteur d'entrée contenant des points ou centroïdes." -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "Générer une grille" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "Créer une carte vecteur d'une grille définie par l'utilisateur." -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "Générer des points" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "Générer à partir d'une base de données" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" "Crée une nouvelle carte vecteur (points) à partir d'une table de base de " "données contenant des coordonnées." -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "Générer des points le long des lignes" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" "Créer des points le long d'une ligne d'entrée dans une nouvelle carte " "vecteur avec 2 couches." -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "Générer des points aléatoires" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "Générer des points 2D/3D aléatoires." -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "Supprimer les points aberrants" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "Métadonnées élémentaires d'une carte vecteur" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "Affiche les métadonnées d'une carte vecteur." -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "Classer les données d'attributs" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" "Classifier les données attributaires, par exemple pour une cartographie " "thématique" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "Rendre compte de la topologie par catégorie" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "Compte-rendu des statistiques de géométrie pour les cartes vecteur." -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "Statistiques univariées pour des points" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." @@ -8683,77 +8905,77 @@ msgstr "" "Calcule les statistiques univariées pour les entités. La variance et l'écart-" "type sont calculés uniquement pour les points." -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "Statistiques univariées pour les colonnes d'attributs" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "Calcule les statistiques univariées sur la colonne sélectionnée." -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "Outil de profilage de la carte vecteur" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "Indices des quadrats" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "Test de normalité" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "&Imagerie" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "Travailler sur des images et groupes" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "Créer/éditer un groupe d'images" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "Crée, édite, et liste les groupes d'images." -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "Groupe cible" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "Cible un groupe d'imagerie sur un secteur et un jeu de données GRASS." -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "Mosaïquage d'images" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "Créer une mosaïque d'images et étendre la table de couleurs." -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "Gérer les couleurs d'image" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "Balance des couleurs pour RVB" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "Effectuer une balance automatique des couleurs pour les images RVB." -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "TSV vers RVB" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." @@ -8761,7 +8983,7 @@ msgstr "" "Transforme une carte raster de l'espace colorimétrique TSV (Teinte-" "Saturation-Valeur) vers l'espace colorimétrique RVB (Rouge-Vert-Bleu)." -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." @@ -8769,11 +8991,11 @@ msgstr "" "Transforme une carte raster de l'espace colorimétrique RVB (Rouge-Vert-Bleu) " "vers l'espace colorimétrique TSV (Teinte-Saturation-Valeur)." -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "Rectifier une image ou une carte raster" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." @@ -8781,31 +9003,31 @@ msgstr "" "Redresse une image en calculant une transformation de coordonnées pour " "chaque pixel de l'image basée sur des points de contrôle." -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "Histogramme" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "Générer l'histogramme d'une image" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "Réponse spectrale" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" "Affiche la réponse spectrale d'une position données pour un groupe ou une " "image." -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "Amélioration panchromatique" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" @@ -8813,15 +9035,15 @@ msgstr "" "Algorithme de fusion d'image pour améliorer la netteté des canaux " "multispectraux avec un canal panchromatique haute résolution." -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "Classification d'image" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" -msgstr "Regroupement pour classification non-supervisée" +msgstr "Regroupement pour classification non dirigée" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." @@ -8830,21 +9052,21 @@ msgstr "" "Générer les signatures spectrales pour les types d'occupation des sols dans " "une image avec un algorithme de regroupement. Le fichier de signature " "résultant est utilisé en entrée pour i.maxlik, pour générer une " -"classification non supervisée de l'image." +"classification non dirigée de l'image." -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" -msgstr "Entrée pour classification supervisée MLC" +msgstr "Entrée pour classification dirigée MLC" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "Générer les statistiques pour i.maxlik à partir d'une carte raster." -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "Classification par le maximum de vraissemblance (MLC)" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." @@ -8854,32 +9076,32 @@ msgstr "" "classification est basée sur les informations de signatures spectrales " "générées soit par i.cluster, g.gui.iclass, ou i.gensig." -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" -msgstr "Entrée interactive pour la classification supervisée" +msgstr "Entrée interactive pour la classification dirigée" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" "Générer les signatures spectrales en permettant à l'utilisateur à définir " "les zones d'entrainement." -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "Entrée pour classification supervisée SMAP" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "Générer les statistiques pour i.smap à partir d'une carte raster." -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "Classification par le maximum séquentiel à postériori (SMAP)" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." @@ -8887,99 +9109,99 @@ msgstr "" "Effectue une classification d'image contextuelle, en utilisant l'estimation " "du maximum séquentiel à postériori (SMAP)." -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "Entrée pour classification supervisée SMAP" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "Enregistrer le fichier de signatures" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "Segmentation orientée objet" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "Identifier des segments (objets) depuis les données d'imagerie." -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "Filtrage d'image" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "Détection des bordures" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" "Fonction raster de \"détection des bords\" sans croisement pour l'analyse " "d'images." -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "Matrice/filtre de convolution" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "Appliquer un filtre matriciel sur une carte raster." -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "Transformer une image" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "Corrélation canonique" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "Analyse d'image par composante canonique (CCA)." -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "Composantes principales" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "Analyse d'image par composante principale (pca)." -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "Fourier rapide" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "Analyse d'image par transformée de Fourier rapide (FFT)." -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "Inverse de Fourier rapide" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "Analyse d'image par inverse de transformée de Fourier rapide (IFFT)." -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "Outils d'images satellite" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "DN Aster vers radiance/réflectance" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." @@ -8987,11 +9209,11 @@ msgstr "" "Calcules les radiance/réflectance/température de luminosité au dessus de " "l'atmosphère pour les valeurs numériques ASTER." -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "Valeur numérique Landsat vers radiance/réflectance." -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" @@ -8999,29 +9221,29 @@ msgstr "" "Calculer la radiance ou la réflectance \"top-of-atmosphere\" et la " "température pour les images Landsat MSS/TM/ETM+/OLI" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "Évaluation de la couverture nuageuse Landsat." -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" "Effecture une évaluation automatique de la couverture nuageuse (ACCA) pour " "Landsat TM/ETM+." -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "Contrôle de qualité MODIS" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "Extraire les paramètres de contrôle de qualité d'une couche MODIS QC." -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "Corrections atmosphériques" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." @@ -9029,46 +9251,46 @@ msgstr "" "Effectue une correction atmosphérique avec l'algorithme 6S. 6S - Seconde " "Simulation du Signal d'un Satellite dans le Spectre Solaire." -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "Corrections topographiques" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "Calcule les corrections topologiques de la réflectance." -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "Outils d'orthophoto" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "Gérer les points de correction 3D" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "Géorectifie une carte et permet de gérder les points de correction 3D." -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "Corrige les distorsions de scan" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "Corrige les distortions de scan d'une photo aérienne scannée." -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "Produits d'imagerie satellitale" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "Indices de végétation" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." @@ -9077,91 +9299,91 @@ msgstr "" "bandes rouge et proche infra-rouge, certains indices nécessitent des bandes " "supplémentaires." -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "Index de végétation de Tessel" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "Transformation de Tasseled cap (Kauth Thomas)." -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "Albedo" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "Calculer l'albedo depuis la réflectance de surface." -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr " Emissivité" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" "Calcule l'émissivité depuis le NDVI, méthode générique pour les terres " "clairsemées." -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "Croissance de la biomasse" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" "Calcule la croissance de la biomasse, un des précurseur du calcul du " "rendement d'un champ." -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "Calcule de l'évapotranspiration" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "Radiation nette instantanéee" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "Approximation de la radiation nette (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "Flux de chaleur du sol" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "Approximation du flux de chaleur du sol (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "Flux de chaleur sensible" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "Calcule le flux de chaleur sensible par itération SEBAL 01." -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "Fraction évaporée" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "Calcule la fraction évaporée et l'humidité racinaire du sol." -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "Évapotranspiration réelle" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "Évapotranspiration réelle pour la période diurne (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "Intégration temporelle de ETa" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." @@ -9170,11 +9392,11 @@ msgstr "" "suivant l'ET journalier de référence (ETo) à partir de stations " "météorologiques." -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "Évapotranspiration selon la méthode Hargreaves" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." @@ -9182,11 +9404,11 @@ msgstr "" "Calcule l'évapotranspiration selon la formule de Hargreaves originale (2001) " "ou modifiée." -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "Évapotranspiration de Penman-Monteith" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." @@ -9194,22 +9416,22 @@ msgstr "" "Calcule l'évapotranspiration potentielle avec la méthode horaire Penman-" "Monteith." -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "Évapotranspiration de Priestley-Taylor" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" "Calcule l'évapotranspiration selon la formule de Priestley et Taylor, 1972." -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "Analyse Kappa" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." @@ -9217,35 +9439,35 @@ msgstr "" "Calcule la matrice de confusion et le paramètre kappa pour l'évaluation de " "l'exactitude des résultats de classification." -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "OIF pour LandSat TM" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "Calcule la table de facteur d'index optimal pour les bandes spectrales" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "Carte raster 3D" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "Développer la carte raster 3D" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "Gérer les valeurs 3D NULL" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "Créer explicitement un fichier 3D de valeurs NULL." -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "Gérer les dates et heures" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." @@ -9253,44 +9475,44 @@ msgstr "" "Modifier l'horodatage d'une carte raster 3D. Afficher/ajouter/supprimer " "l'horodatage d'une carte raster 3D." -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "Rasters 3D vers série de raster" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "Tables de couleurs 3D" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "Créé/modifie la table de couleur associées à une carte raster 3D." -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "Exporter une table de couleur 3D" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "Exporter la table de couleur associée à une carte raster 3D." -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "masque 3D" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "Définir le masque raster 3D courant." -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "Calculatrice raster 3D" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "Coupe transversale" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" @@ -9298,7 +9520,7 @@ msgstr "" "Créer une section de coupe 2D depuis une carte raster 3D et une carte " "d'altitude 2D" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." @@ -9306,11 +9528,11 @@ msgstr "" "Calcul numérique pour les eaux souterraines transitoires, confinées et non " "confinées, en trois dimensions." -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "Interpoler un raster 3D depuis des points" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." @@ -9318,27 +9540,27 @@ msgstr "" "Interpoler des données points vers une carte raster 3D, en utilisant " "l'algorithme des splines régulées avec tension (RST)." -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "Métadonnées raster 3D basiques" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "Affiche les informations basiques pour une carte raster 3D donnée." -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "Statistiques de raster 3D" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "Générer les statistiques de volumes pour les cartes raster 3D." -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "Statistiques univariées pour les raster 3D" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -9350,105 +9572,105 @@ msgstr "" "minimales et maximales, la plage, la moyenne arithmétique, la variance, " "l'écart type, le coefficient de variation, et la somme." -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "Base de &Données" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "Information sur la base de données" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "Lister les bases de données" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" "Lister toutes les bases de données pour un pilote et un secteur donnés." -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "Lister les pilotes" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "Lister tous les pilotes de bases de données." -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "Lister les tables" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "Lister toutes les tables d'une base de données" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "Décrire une table" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "Décrit une table en détail." -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "Lister les colonnes" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "Lister toutes les colonnes d'une table." -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "Gérer les bases de données" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "Se connecter" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" "Afficher/définir la connecion DB générale pour le jeu de cartes courant." -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "S'identifier" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "Définir utilisateur/mot de passe pour un pilote/base de données." -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "Créer une base de données" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "Créer une base de données vide." -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "Supprimer une base de données" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "Supprimer une base de données existante." -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "Supprimer une table" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "Supprimer une table d'attributs" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "Copier la table" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." @@ -9457,58 +9679,58 @@ msgstr "" "utilisé ou l'option 'select', mais pas 'depuis_table' et 'select' en même " "temps." -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "Supprimer une colonne" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "Supprimer une colonne de la table d'attributs sélectionnée." -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "Tester" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" "Tester un pilote de base de données ; la base doit exister et être connectée " "via db.connect" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "Requête" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "Interroger une table" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" "Sélectionne des données d'une table attributaire. Exécute des requêtes SQL." -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "Expression SQL" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" "Exécute n'importe qu'elle requête SQL. Pour une requête SELECT utiliser 'db." "select'." -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "Connections vecteur base de données" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "Nouvelle table" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." @@ -9516,27 +9738,27 @@ msgstr "" "Créée et connecte une table attributaire à une couche donnée d'une carte " "vecteur existante." -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "Supprimer une table" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "Retire une table attributaire existante d'une carte vecteur." -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "Joindre la table" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "Joint une table à la table attributaire d'une carte vecteur." -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "Ajouter des colonnes" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." @@ -9544,49 +9766,49 @@ msgstr "" "Ajoute une ou des colonnes à la table attributaire connectée à une carte " "vecteur donnée." -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" "Supprime une colonne d'une table attributaire connectée à une carte vecteur " "donnée." -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "Renommer une colonne" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" "Renomme une colonne dans une table attributaire connectée à une carte " "vecteur donnée." -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "Changer les valeurs" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" "Met à jour une colonne dans la table attributaire connectée à une carte " "vecteur." -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "Supprimer la ligne" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" "Supprime une entité d'une carte vecteur par sélection de ses attributs." -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "Reconnecter des cartes vecteur à une base de données" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." @@ -9594,101 +9816,101 @@ msgstr "" "Reconnecter les tables attributaires pour toutes les cartes vecteur du jeu " "de données actuel vers une nouvelle base de données." -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "Définir les connexions entre carte vecteur et base de données." -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" "Afficher/définir les connexions base de données pour la table d'attributs de " "la carte vecteur." -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "&Temporel" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "Gérer les jeux de données" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "Connexion à une base de données temporelle" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" "Afficher/définir la connecion DB générale pour le jeu de cartes courant." -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "Créer" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "Créer un nouveau jeu de données temporel" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "Renommer un jeu de données temporel" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" "Supprimer des jeux de données temporels de la base de donénes temporelle." -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "Mettre à jour les métadonnées" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "Modifier les métadonnées du jeu de données temporel." -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "Fusionner" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" "Fusionner plusieurs jeux de données temporels vers un seul jeu de données " "temporel." -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "Déplacement temporel" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "Déplacer temporellement les cartes d'un jeu de données temporel." -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "Accrocher les cartes du jeu de données" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "Accrocher temporellement les cartes du jeu de données temporel" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" "Lister les jeux de données temporels et cartes référencées dans la base de " "données temporelle." -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "Gérer les cartes du jeu de données" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "Référencer des cartes dans les jeux de données" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." @@ -9696,11 +9918,11 @@ msgstr "" "Assigner des horodatages et enregistrer des cartes raster, vecteur et " "raster3d dans un jeu de données temporel." -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "Déréférencer des cartes de jeux de données" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." @@ -9708,132 +9930,132 @@ msgstr "" "Déréférencer des cartes raster, vecteur et raster3d d'une base temporelle ou " "d'un jeu de données temporel spécifique." -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "Lister les rasters du jeu de données" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "Lister les cartes référencées dans le jeu de données raster temporel." -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "Lister les vecteurs du jeu de données" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" "Lister les cartes référencées dans le jeux de données vecteur temporel." -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "Lister les rasters 3D du jeu de données" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" "Lister les cartes référencées dans un jeux de données temporel raster3d." -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "Importer" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "Importer un jeu de données raster" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "Importer un jeu de données raster temporel." -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "Importer un jeu de données vecteur" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" "Importer un jeu de données vectoriel temporel depuis un fichier d'archive " "GRASS GIS." -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "Exporter un jeu de données raster" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "Exporter un jeux de données raster temporel." -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "Exporter un jeu de données raster en temps que série temporelle VTK" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "Exporter un jeu de données raster temporel vers une série VTK." -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "Exporter un jeu de données vecteur" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" "Exporter un jeu de données vecteur temporel vers un fichier d'archive GRASS." -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "Convertir un jeu de données raster vers un raster 3D" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "Convertir un jeu de données raster temporel en carte raster 3D." -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "Extraction" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "Extraire une partie d'un jeu de données raster" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "Extraire une partie d'un jeu de données raster temporel." -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "Extraire une partie d'un jeu de données vecteur" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "Extraire une partie d'un jeu de données vecteur temporel." -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "Extraire une partie du jeu de données raster 3D" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "Extraire une partie du jeu de données raster 3D temporel." -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "Interroger la table d'attributs de la carte vecteur" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" "Afficher les attributs des cartes vecteur référencées dans le jeu de données " "vecteur temporel." -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "Table de couleur du raster" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." @@ -9841,11 +10063,11 @@ msgstr "" "Crée/modifie la table de couleur associée à chaque carte raster d'un jeu de " "données temporel." -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "Calculatrice raster" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." @@ -9853,11 +10075,11 @@ msgstr "" "Applique les expressions mapcalc temporelles sur un échantillon temporel de " "cartes d'un jeu de données raster temporel." -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "Calculs raster 3D" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." @@ -9865,37 +10087,37 @@ msgstr "" "Applique des expressions r3.mapcalc sur les cartes d'échantillonnage d'un " "jeu de données raster3D temporel." -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "Interpoler les trous dans un jeu de données raster" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" "Remplir les trous dans un jeu de données raster temporel par des cartes " "raster interpolées." -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "Agrégation" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "Analyse de voisinage dans un jeu de donnée raster" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" "Effectuer une analyse de voisinage pour chaque carte d'un jeu de données " "temporel." -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "Agrégation dans un jeu de données raster" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." @@ -9903,11 +10125,11 @@ msgstr "" "Applique différents algorithmes d'aggrégation de r.series sur tout ou partie " "des cartes raster d'un jeu de données raster temporel." -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "Aggrégation temporelle" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." @@ -9915,11 +10137,11 @@ msgstr "" "Aggrégation temporelle des cartes d'un jeux de données raster temporel selon " "une granularité définie par l'utilisateur." -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "Aggrégation temporelle par jeu de données" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." @@ -9927,17 +10149,17 @@ msgstr "" "Aggrège les données d'un jeu de données raster temporel en utilisant le " "temps d'intervale d'un second jeu de données temporel." -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "Échantillonnage" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" "Échantillonner un jeu de données raster temporel à des coordonnées " "ponctuelles" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" @@ -9945,11 +10167,11 @@ msgstr "" "Échantilonner un jeu de données raster temporel aux coordonnées des points " "d'un vecteur et écrire le résultat sur stdout suivant différents formatages" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "Échantillonne une carte raster sur les points d'un vecteur" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." @@ -9957,11 +10179,11 @@ msgstr "" "Stocker les valeurs raster aux positions spatiales et temporelles de points " "vectoriels, en tant que données attributaire." -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "Observer un secteur spécifique dans le jeu de données raster" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." @@ -9969,11 +10191,11 @@ msgstr "" "Observer un jeu de données spécifique dans un jeu de données raster temporel " "sur une période de temps en utilisant un vecteur de points." -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "Échantillonnage temporel" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." @@ -9981,20 +10203,20 @@ msgstr "" "Échantillone un jeu de données temporel d'entrée avec un échantillon de jeu " "de données temporel et affiche le résultat dans la sortie standard." -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "Méta-données des jeux de données temporels" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" "Afficher les informations sur les jeux de données et cartes temporelles." -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "Statistiques raster univariées" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." @@ -10002,11 +10224,11 @@ msgstr "" "Calculer les statistiques univariées pour les cellules non nulles de chaque " "carte raster référencée dans un jeu de données temporel." -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "Statistiques univariées vectorielles" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" @@ -10014,11 +10236,11 @@ msgstr "" "Calcule les statistiques univariées des attributs de chaque carte " "vectorielle référencée dans un jeu de données vectorielles temporel" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "Statistiques raster 3D univariées" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." @@ -10026,398 +10248,390 @@ msgstr "" "Calculer les statistiques univariées pour les cellules non nulles de chaque " "carte raster 3D référencée dans un jeu de données raster 3D temporel." -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "Compte-rendu de topologie temporelle" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "Lister la topologie temporelle d'un jeu de données temporel." -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "Outils d'interface graphique" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "Barre d'outils temporelle" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "Afficher l'emprise temporelle." -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "Outil d'affichage temporel" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "Afficher les valeurs temporelles." -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "&Aide" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "Aide GRASS" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "Afficher les pages HTML du manuel GRASS" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "Aide GUI" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "À propos du système" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "Afficher les informations système" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" -msgstr "Au sujet du SIG GRASS" +msgstr "À propos du SIG GRASS" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "Importer, exporter et lier les données" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "Gestionnaire de table attributaire" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "Numérisation de vecteur" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "Numérisation de raster" -#: ../gui/wxpython/menustrings.py:2052 +#: ../gui/wxpython/menustrings.py:2057 msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "Créer un nouveau modèle" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" -msgstr "Charger le modèle depuis un fichier" - -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "Enregistrer le modèle dans un fichier" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "Fermer le fichier de modèle" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "Exporter en image" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "Exporter en Python" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "Quitter le Modeleur" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "Fermer la fenêtre du modeleur" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "&Modèle" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "Ajouter une commande" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "Ajouter une action (commande GRASS) au modèle" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "Ajouter des données" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "Ajouter un objet données au modèle" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "Définir une relation" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "Définir la relation entre les objets données et action" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "Ajouter une boucle / série" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "Ajouter une boucle (série) au modèle" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "Ajouter une condition" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "Ajouter une condition (if/else) au modèle" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "Ajouter un commentaire au modèle" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "Supprimer un objet" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "Supprimer une action/donnée du modèle" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "Propriétés du modèle (name, objectif, etc.)" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "Supprimer les données intermédiaires" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "Supprimer les données intermédiaires définies dans le modèle" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "Exécuter le modèle complet" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "Valider le modèle complet" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "Afficher les pages HTML du manuel du modeleur graphique" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "À propos du Modeleur Graphique" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "Afficher les informations concernant le Modeleur Graphique" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "Spécifier format du papier, marges et orientation" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "Charger un fichier d'instructions" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "Charger un fichier texte comportant des instructions de cartographie" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "Exporter un fichier d'instructions" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "Générer un fichier texte comportant des instructions de cartographie" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "Exporter en PostScript" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "Générer une sortie PostScript" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "Exporter en PDF" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "Générer une sortie PDF" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "Lancer la boite de dialogue ps.map" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "Quitter" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "Fermer le Composeur de cartes" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "&Insérer" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "Fenêtre de cartes" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "Ajouter ou modifier une trame de carte" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "Ajouter ou modifier une carte raster" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "Ajouter ou modifier une carte vecteur" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "Légende de la carte" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "Ajouter ou modifier la légende du raster ou vecteur" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "Informations sur la carte" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "Ajouter ou modifier les informations sur la carte" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "Ajouter ou modifier une barre d'échelle" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "Texte" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "Ajouter du texte" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "Image" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "Ajouter une image" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "Ajouter une flèche nord" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "Supprimer l'objet sélectionné" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "Afficher les pages HTML du manuel du Composeur de cartes" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "À propos du Composeur de cartes" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "Afficher les informations concernant le Composeur de cartes" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "Outil de nuage de points bivarié" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "Nuage de points bivarié" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "Valeurs de cellules raster" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "Rien à tracer." -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "Au moins 2 cartes raster doivent être spécifiées" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "Nuage de points bivarié de" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "Valeurs de cellules du raster <%s>" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr ": %s" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "Statistiques de régression pour le nuage de points" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -10452,7 +10666,7 @@ msgid "Text settings" msgstr "Paramètres de texte" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "Paramètres de graphique" @@ -10513,57 +10727,56 @@ msgstr "Statistiques pour la(les) carte(s) avec histogramme" msgid "Statistics for raster map <%s>" msgstr "Statistique pour la carte raster <%s>" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "Outil d'analyse de profil GRASS" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "Profil de" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "Distance (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "Distance le long du transect" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "Valeurs de cellule" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "Les points du profil ne sont pas tous dans la région de calcul." -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "Valeurs raster" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "Vous devez dessiner un transect dans la fenêtre d'affichage de cartes." -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "Rien à profiler" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." -msgstr "" -"Choisir le préfixe des fichiers où enregistrer les valeurs du profil ..." +msgstr "Choisir le préfixe des fichiers où enregistrer les valeurs du profil…" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "Valeurs séparées par des virgules (*.csv)|*.csv" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "Écraser le fichier ?" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" @@ -10572,7 +10785,7 @@ msgstr "" "Impossible d'ouvrir le fichier <%s> en écriture.\n" "Raison: %s" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" @@ -10581,11 +10794,11 @@ msgstr "" "%d fichiers crées : \n" "%s" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "Pas de fichier généré." -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "Statistiques du profil" @@ -10609,7 +10822,7 @@ msgstr "Sélectionner les cartes raster pour les nuages de points bivariés :" msgid "Number of bins (for FP maps)" msgstr "Nombre de cellules (pour les cartes en virgules flottantes)" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "Statistiques" @@ -10655,11 +10868,11 @@ msgid "Selected group must be in current mapset" msgstr "Le groupe sélectionné doit être dans le jeu de cartes courant" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "Entrée non valide" @@ -10684,11 +10897,11 @@ msgid "Label font size (pts):" msgstr "Taille de caractère d'étiquette (pts) :" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "Paramètres de police" @@ -10704,201 +10917,196 @@ msgstr "Style :" msgid "Weight:" msgstr "Graisse :" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" "Appliquer les changements pour la session courante et fermer la boite de " "dialogue" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "Tailles de texte du graphique enregistrées dans le fichier '%s'." -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "Pas de carte ou d'image sélectionné pour le graphique." -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Attention" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "Carte/image tracée" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "Paramètres pour la carte sélectionnée" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "Couleur de ligne" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "Épaisseur de ligne" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "Style de ligne" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "Légende" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "Paramètre de marqueur de segment du profil" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "Taille" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "Remplir" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "Style" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "Nuage de points" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "Paramètres des axes" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "Axe des abscisses" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Axe des ordonnées" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "Échelle" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" "Échelle de l'axe automatique, min et max personnalisés, ou échelle " "correspondant à la plage de données (min)" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "Minimum personnalisé" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "Maximum personnalisé" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "Échelle log" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "Paramètres de grille et de légende" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "Couleur de grille" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "Afficher la grille" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "Taille de caractère de la légende" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "Afficher la légende" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "Paramètres de graphique enregistrés dans le fichier '%s'." -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "Recherche ava&ncée ..." -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "Aid&e" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" "La documentation pour %s est maintenant disponible dans le navigateur web" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 +#, fuzzy msgid "&Recent Files" -msgstr "" +msgstr "Fichiers &récents" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "Pas d'élément sélectionnable" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "Jeu de cartes" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "Type : " -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "GSelect : objet %s invalide" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" @@ -10907,197 +11115,202 @@ msgstr "" "Impossible d'importer pyGRASS : %s\n" "Certaines fonctionnalités ne seront pas accessibles" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "Pas de table liée à la couche <{}>." -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "Choisir le répertoire de données SIG" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "Paramètres de sortie" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "Source d'entrée" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "Natif" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "Fichier" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "Répertoire" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "Base de données" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "Protocole" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "Type de la sortie" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "Type de la source" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "Tous les fichiers" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "Fichier ZIP" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "Fichiers GZIP" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "Fichiers TAR" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "Fichiers TARGZ" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "Fichier :" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "Choisir un fichier à importer" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "Répertoire :" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "Choisir le répertoire d'entrée" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "Extension :" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "Choisir un fichier" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "Type d'entité :" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "entités simples" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "topologiques" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "Options de création :" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "Format :" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "Protocole :" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "Pas de paramètres disponibles" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" "Pas de source de données définie, les paramètres ne sont pas enregistrés." -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "Point" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "Ligne" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "Polygone" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -"Pas de carte vecteur sélectionnée dans le gestionnaire de couches. Opération " +"Aucune carte vecteur sélectionnée dans le gestionnaire de couches. Opération " "annulée." -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "La couche vecteur en entrée n'est pas sélectionnée" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " @@ -11106,14 +11319,14 @@ msgstr "" "La carte vecteur <%s> en entrée et la carte <%s> sélectionnée dans le " "gestionnaire de couches sont différentes . Opération annulée." -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" -msgstr "Pas de carte vecteur sélectionnée" +msgstr "Aucune carte vecteur sélectionnée" #: ../gui/wxpython/gui_core/ghelp.py:76 msgid "Info" @@ -11151,13 +11364,13 @@ msgstr "Traducteurs" msgid "Translation status" msgstr "État de la traduction" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "Impossible de déterminer la version de GRASS\n" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "version inconnue" @@ -11173,109 +11386,109 @@ msgstr "Version du code" msgid "Build Date" msgstr "Date de compilation" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "Langue" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "fichier %s manquant" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -"Impossible de fournir une sugestion de citation, merci de consulter le site " +"Impossible de fournir une suggestion de citation, veuillez consulter le site " "internet de GRASS. L'erreur est : {0}" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "Erreur à la lecture du fichier '%s'." -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "Lignes :" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "Courriel" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "MPays" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "OSGeo_ID" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "Nationalité" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr " %d traduit" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr " %d flou" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr " %d non traduit" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "%d traduit" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "Fichier <%s> non trouvé" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "&Suivant" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "&Précédent" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 #, fuzzy msgid "Clear prompt and output window" msgstr "Effacer les messages de sortie" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Enregistrer le modèle dans un fichier" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "Annuler la commande en cours" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -11286,7 +11499,7 @@ msgstr "" "\n" "Détails: %(error)s" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "Sortie de la commande enregistrée dans '%s'" @@ -11373,7 +11586,7 @@ msgstr "" msgid "category" msgstr "catégorie" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "type" @@ -11393,12 +11606,12 @@ msgstr "" #: ../gui/wxpython/gui_core/vselect.py:281 msgid "No vector map layer selected. Operation canceled." -msgstr "" +msgstr "Aucune couche de carte vectorielle sélectionnée. Opération annulée." -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." -msgstr "Aucune ccouche sélectionnée. Opération annulée." +msgstr "Aucune couche sélectionnée. Opération annulée." #: ../gui/wxpython/gui_core/vselect.py:310 #, python-format @@ -11425,446 +11638,469 @@ msgstr "" "\n" "Raison: %s" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "Paramètres utilisateur" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "Définir par défaut" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "Revenir aux paramètres par défaut" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "Appliquer les changements pour la session courante et fermer" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "Appliquer pour cette session uniquement" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "Paramètres appliqués à la session courante mais non enregistrés" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "La colonne clé ne peut contenir de chaîne vide." -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "Paramètres de l'interface utilisateur" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "Paramètres du gestionnaire de couches" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "Demander lors de la suppression d'une couche de l'arborescence" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "En quittant wxGUI ou l'affichage des cartes, demander confirmation" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" +"Copier automatiquement le texte dans le presse-papier (dans la console de " +"commande)" + +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "Paramètres de graphique" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "Enregistrer la configuration de fenêtre actuelle comme défaut" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" +"Enregistrer les positions et tailles actuelles de la fenêtre de gestionnaire " +"de couches et de la (des) fenêtre(s) d'affichage de carte ; utiliser par " +"défaut pour les sessions suivantes." + +#: ../gui/wxpython/gui_core/preferences.py:379 +#, fuzzy +msgid "Save current single window panes layout as default" +msgstr "Enregistrer la configuration de fenêtre actuelle comme défaut" + +#: ../gui/wxpython/gui_core/preferences.py:392 +#, fuzzy +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" +"Enregistrer les positions et tailles actuelles de la fenêtre de gestionnaire " +"de couches et de la (des) fenêtre(s) d'affichage de carte ; utiliser par " +"défaut pour les sessions suivantes." + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +#, fuzzy +msgid "Hide '{}' tab (requires GUI restart)" msgstr "Cacher l'onglet '%s' (requiert le redémarrage du GUI)" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "Histogramme" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" -"Copier automatiquement le texte dans le presse-papier (dans la console de " -"commande)" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "Paramètres de l'espace de travail" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "Oublier le positionnement de la (des) fenêtre(s) d'affichage de carte" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "Oublier le positionnement de la fenêtre de gestionnaire de couches" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "Enregistrer la configuration de fenêtre actuelle comme défaut" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" -"Enregistrer les positions et tailles actuelles de la fenêtre de gestionnaire " -"de couches et de la (des) fenêtre(s) d'affichage de carte ; utiliser par " -"défaut pour les sessions suivantes." - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "Paramètres de région" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "Aligner la région sur la résolution" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 #, fuzzy msgid "Window layout settings" msgstr "Paramètres de graphique" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 #, fuzzy msgid "Use single-window mode (requires GUI restart)" msgstr "Thème d'icônes (requiert le redémarrage du GUI)" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "Police pour la sortie commandes :" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "Définir la police" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "Afficher le manuel" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "Paramètres de langue" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "Choisir une langue (validez et redémarrez GRASS) :" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "Paramètres d'apparence" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "Liste d'éléments :" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "Style de menu (requiert le redémarrage de l'interface graphique)" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "Hauteur de fenêtre popup de sélection de carte (en pixels) :" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "Thème d'icônes (requiert le redémarrage du GUI)" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "Fenêtre de carte" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "Police par défaut pour les affichages GRASS :" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "Paramètres d'affichage par défaut" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "Pilote d'affichage :" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "Mode de la barre de statut :" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "Aligner l'étendue de la région sur la taille de l'affichage" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "Contraindre la résolution d'affichage aux paramètres de calculs" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "Activer le rendu automatique" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "Activer le zoom automatique sur la carte sélectionnée" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "Afficher l'emprise de la région de calcul" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "Action de la molette de la souris :" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "Sens de défilement de la souris :" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "Paramètres avancés d'affichage" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "Taille du tampon d'affichage 3D (valeurs possibles 16, 24, 32) :" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "Ajouter la carte créée dans l'arborescence des couches" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "Autoriser les entrées interactives" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "Niveau de verbosité :" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" +"Nombre de threads pour le calcul parallèle (outils pris en charge uniquement)" +" :" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" +"Maximum de mémoire à utiliser en MB (outils pris en charge uniquement) :" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "Couches" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "Paramètres raster par défaut" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "Rendre les cellules vides opaque" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "Table de couleur par défaut" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "Paramètres vecteur par défaut" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "Afficher :" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "Couleur de l'entité :" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "Transparent" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "Couleur de remplissage :" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "Couleur aléatoire selon le numéro de catégorie" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "Symbole :" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "Attributs" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "Surligner les entités sélectionnées" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "Largeur de ligne (en pixels) :" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" "Surligner automatiquement les entités sélectionnées dans la fenêtre de cartes" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "Navigateur de données" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "Double clic gauche :" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "Encodage (p. ex. utf-8, ascii, iso 8859-1, koi8-r) :" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "Demander à la suppression d'enregistrement(s) d'une table" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "Créer une table" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "Colonne clé :" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "Projection" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "Paramètres de la barre de statut de projection" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" "\n" "Note : Ceci contrôle uniquement les coordonnées affichées dans le coin " "inférieur gauche\n" -"de la fenêtre de Carte. L'effet est purement cosméthique et n'affecte pas la " +"de la fenêtre de Carte. L'effet est purement cosmétique et n'affecte pas la " "projection\n" "du secteur d'aucune manière. Vous devrez cocher la case Projection dans le " "menu déroulant\n" " en bas de la fenêtre de carte.\n" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "Code EPSG : " -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "Chaîne PROJ (requise) :" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "Fichier EPSG :" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "Charger les codes EPSG (patience), entrer le code EPSG ou insérer la chaîne " "PROJ directement." -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "Charger les codes EPSG" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "Format des coordonnées" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "Projections lat/long" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "Précision :" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "Impossible de lire les codes EPSG : %s" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "Code EPSG %s non trouvé" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "Sélectionner la police d'affichage par défaut" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" "Impossible de définir la police de caractères par défaut. Essayez une police " "de caractère différente." -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "Sélectionner la police d'affichage par défaut" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "Gérer l'accès aux jeux de cartes" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11878,7 +12114,7 @@ msgstr "" " - Vous pouvez seulement écrire dans le jeu de cartes courant.\n" " - Vous pouvez seulement écrire dans le jeu de cartes qui vous appartient." -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "Propriétaire" @@ -11895,7 +12131,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "Copier les noms des cartes dans le presse-papier (de bas en haut)" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "Régler l'opacité de <%s>" @@ -12019,7 +12255,7 @@ msgstr "Enregistrer l'écran dans un fichier" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "Sélectionner une police" @@ -12054,9 +12290,8 @@ msgid "Map Display Settings" msgstr "Paramètres de carte" #: ../gui/wxpython/gui_core/toolbars.py:86 -#, fuzzy -msgid "(Un)dock Map Display" -msgstr "Fenêtre de carte" +msgid "(Un)dock" +msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 msgid "Clear" @@ -12067,19 +12302,21 @@ msgid "&Clear" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:273 +#, fuzzy msgid "&Cancel" -msgstr "" +msgstr "&Annuler" #: ../gui/wxpython/gui_core/wrap.py:286 +#, fuzzy msgid "&Close" -msgstr "" +msgstr "&Fermer" #: ../gui/wxpython/gui_core/wrap.py:297 msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "&Appliquer" @@ -12137,7 +12374,7 @@ msgid "Optional" msgstr "Optionnel" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "Paramètré dans le modèle" @@ -12149,44 +12386,45 @@ msgstr "[multiple]" msgid "valid range" msgstr "plage de validité" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +#, fuzzy +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" "Afficher une représentation graphique de l'emprise temporelle du jeu de " "données." -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "Choisir la couleur" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "Choisir %s" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "Charger" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "Charger et modifier un fichier" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "Enregi&strer sous" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "Enregistrer le contenue dans un fichier pour une utilisation future." -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "ou entrer les valeurs manuellement :" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." @@ -12194,38 +12432,38 @@ msgstr "" "Entrez le contenu directement au lieu de spécifier un fichier. Un fichier " "temporaire sera créé automatiquement." -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "Identifiant de couche" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "Nom de la couche" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "Type d'entité" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "Concordance des projections" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "Manuel" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "Rien à charger." -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -12236,95 +12474,95 @@ msgstr "" "\n" "Raison : %s" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "Rien à enregistrer." -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "Enregistrer le fichier sous ..." -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "Pas de jeu de données précisé" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "Erreur dans %s" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "Impossible d'interpréter la commande '%s'" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "%(cmd)s : paramètre '%(key)s' non disponible" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "Essayez de définir les variables GRASS_ADDON_PATH ou GRASS_ADDON_BASE." -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "Résultats de la requête" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" "Clic droit pour copier les valeurs sélectionnées vers le presse-papier." -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "Entité" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "Valeur" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "Tout copier dans le presse-papier" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "Rediriger vers la console" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "Copier depuis la colonne '%s'" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "Copier les lignes sélectionnées" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "Copier '%s'" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "Copier la ligne" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "Résuluats de la requête :" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr " " -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "est, nord" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "Aucun résultat" @@ -12332,60 +12570,64 @@ msgstr "Aucun résultat" msgid "Required item is not set." msgstr "L'objet requis n'est pas défini." -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "Choisir un secteur GRASS et un jeu de cartes" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." msgstr "Le secteur ou le jeux de donnée ne sont pas définis." -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +#, fuzzy +msgid "Name of GRASS project:" msgstr "Nom du secteur GRASS :" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "Nom du jeu de cartes :" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "Choisir le jeu de cartes dans le secteur GRASS" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "Nom du jeu de cartes manquant." -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "Sélectionner une carte vecteur" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "Nom de la carte vectorielle manquant." -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "Créer la table d'attributs" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "Nom de la nouvelle carte vectorielle manquant." -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "Nom pour la nouvelle carte vecteur :" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "Impossible de créer la carte vecteur <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" @@ -12394,7 +12636,7 @@ msgstr "" "Colonne clé non valide ou vide.\n" "Impossible de créer la carte vecteur <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " @@ -12403,15 +12645,15 @@ msgstr "" "La carte vecteur <%s> existe déjà dans le jeu de cartes courant. Voulez-vous " "l'écraser ?" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "Charger une région :" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "Enregistrer une région :" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." @@ -12420,25 +12662,25 @@ msgstr "" "guillemets, '/', ''', '@', ',', '=', '*', ou tout autre caractère non alpha-" "numérique." -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "Créer/éditer un groupe d'images" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "Appliquer les modifications et fermer la boîte de dialogue" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "Appliquer les modifications" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" "Fermer la boîte de dialogue, les modifications ne seront pas appliquées" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." @@ -12446,216 +12688,216 @@ msgstr "" "Mettez ici une expression régulière. Le caratère '.*' correspond à n'importe " "quoi, le caractère '^' correspond au début et '$' à la fin." -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "Sélectionner un groupe existant ou entrez le nom d'un nouveau groupe :" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "Modifier/créer un sous-groupe" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" "Sélectionner un sous-groupe existant ou entrez le nom d'un nouveau sous-" "groupe :" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "Tout sélectionner" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "Modèle :" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "Liste des cartes :" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "Sélectionner la couche et l'ajouter à la liste" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "Suprimer la(les) couche(s) sélectionnée(s) de la liste." -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "Vérifier les cartes du groupe à inclure dans le sous-groupe." -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "Ajouter les couches sélectionnées dans le groupe" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" "Le groupe <%s> a été modifié, voulez-vous enregistrer les modifications ?" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "Modifications non appliquées" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" "Le sous-groupe <%s> a été modifié, voulez-vous enregistrer les " "modifications ?" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "Pas de cartes raster sélectionnées." -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "Pas de modifications à appliquer au groupe <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "Le groupe <%s> a été créé." -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "Le groupe <%s> a été modifié." -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "La création du nouveau groupe <%s> a échoué." -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "La modification du groupe <%s> a échoué." -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "Pas de groupe sélectionné." -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "Pas de sous-groupe sélectionné." -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "Utilisez un nom de carte complet" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "Type de carte :" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "Interrupteur de sélection" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "Jeu de cartes :" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "Inverser la sélection" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "Tout dé-sélectionner" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "Série dynamique (%s)" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "Ajuster la transparence de la carte" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "transparent" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "opaque" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "Fixer la taille de l'image" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "Taille de l'image" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "Gabarit :" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr " Clause SQL " -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "Symboles" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "Répertoire des symboles :" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "Nom du symbole :" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "Sélectionner une police :" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "Encodage de caractère :" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "Taille du texte :" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "Exemple" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "(...)" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " @@ -12665,67 +12907,67 @@ msgstr "" "n'utiliser que des caractères ASCII à l'exclusion de %(chars)s et des " "espaces." -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "Recherche plein texte" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "Recherche, merci de taper plus de caractères." -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 #, fuzzy msgid "{} tools matched" msgstr "%d modules correspondent" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "Profil" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "Enregistrer les paramètres courants" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "Supprimer les paramètres actuellement sélectionnés" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "Charger :" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "Paramètres <%s> non trouvés" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "Enregistrer les paramètres" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "Pas de nom fourni, paramètres non enregistrés." -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "Les paramètres <%s> existent déjà. Voulez-vous les écraser ?" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "Pas de paramètres définis. Opération annulée." -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "Impossible d'enregistrer les paramètres" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12811,9 +13053,9 @@ msgid "Snap also to vertex" msgstr "Magnétiser aussi les vertex" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "Le seuil de magnétisme vaut %(value).1f %(units)s" @@ -12837,141 +13079,141 @@ msgstr "" "Par défaut sont sélectionnées toutes les entités chevauchent la boîte de " "sélection" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "Vérifier les doublons" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "Numériser des lignes/contours" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "Couper les lignes aux intersections" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "Numériser une nouvelle surface" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "Fermer le contour (accrocher au noeud de départ)." -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "Enregistrer les modifications" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "Enregistrer les modifications à la sortie" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "Outil de requête" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "Choisir l'outil de requête" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "Sélection par boîte" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "longueur" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "Sélectionner des lignes" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "Plus court que" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "plus long que" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "pendant" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "Sélection des pendants" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "Numériser une nouvelle entité" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "Ajouter un enregistrement à la table" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Couche" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Catégorie" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "Mode" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "Suivant à utiliser" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "Numéro de catégorie" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "Mode catégorie" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "Entrée manuelle" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "Pas de catégorie" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "Supprimer l'(les) entité(s) existante(s)" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "Supprimer l'enregistrement de la table" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "Attributs géométriques" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "surface" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "périmètre" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." @@ -12979,88 +13221,88 @@ msgstr "" "Note : ces paramètres sont stockés dans l'espace de travail, et non dans les " "préférences du module de numérisation." -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "Numériser une nouvelle ligne" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "Numériser un nouveau contour" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "Mise en surbrillance" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "Colorer (doublons)" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "Ligne" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "Contour (pas de surface)" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "Contour (une surface)" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "Contour (deux surfaces)" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "Centroïde (dans une surface)" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "Centroïde (hors d'une surface)" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "Centroïde (doublon dans une surface)" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "Nœud (une ligne)" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "Nœud (deux lignes)" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "Vertex" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "Surface (contour fermé + centroïde)" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Direction" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "Magnétisme désactivé" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" "Le seuil de magnétisme vaut %(value).1f %(units)s (fondé sur la résolution " "calculée)" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "Paramètres du module de numérisation enregistrés dans le fichier <%s>." -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -13081,223 +13323,223 @@ msgstr "" msgid "Topology missing" msgstr "Topologie absente" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "Sélectionner l'outil polygone/contour/centroïde" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "Numériser un nouveau point" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "Gauche : nouveau point" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "Numériser une nouvelle ligne" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" "Gauche : nouveau point ; Ctrl+gauche : annuler le dernier point ; Droite : " "fermer la ligne" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 #, fuzzy msgid "Digitize new boundary (Ctrl+B)" msgstr "Numériser un nouveau contour" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 #, fuzzy msgid "Digitize new centroid (Ctrl+C)" msgstr "Numériser un nouveau centroïde" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 #, fuzzy msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "Numériser une nouvelle surface (contour sans catégorie)" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 #, fuzzy msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "Ajouter un nouveau sommet à la ligne ou au contour" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" "Gauche : Sélectionner ; Ctrl+Gauche : Dé-sélectionner : Droite : Confirmer" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 #, fuzzy msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" "Supprimer le(s) point(s), ligne(s), contour(s) ou centroïde(s) sélectionné(s)" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Supprimer la surface sélectionné(s)" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 #, fuzzy msgid "Display/update attributes (Ctrl+K)" msgstr "Afficher/mettre à jour les attributs" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "Gauche : Sélectionner " -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 #, fuzzy msgid "Display/update categories (Ctrl+J)" msgstr "Afficher/mettre à jour les catégories" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "Modifier les lignes/contours sélectionné(e)s" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 #, fuzzy msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" "Déplacer le(s) point(s), ligne(s), contour(s) ou centroïde(s) sélectionné(s)" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 #, fuzzy msgid "Move selected vertex (Ctrl+G)" msgstr "Déplacer le sommet sélectionné" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "Supprimer le sommet sélectionné" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "Ouvrir (Ctrl+O)" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 #, fuzzy msgid "Quit (Ctrl+Q)" msgstr "Exécuter (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "Quitter le numériseur et enregistrer les modifications" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Afficher le manuel" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "Afficher le manuel de la numérisation vectorielle" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "Outils additionnels (copier, retourner, connecter, ...)" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 #, fuzzy msgid "Undo (Ctrl+Z)" msgstr "Exécuter (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "Annuler les changements précédents" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 #, fuzzy msgid "Redo (Ctrl+Y)" msgstr "Exécuter (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "Refaire les changements précédents" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "Couper les lignes/contours sélectionné(e)s aux intersections" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "Connecter les lignes/contours sélectionné(e)s" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "Copier les catégories" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "Copier les entités depuis une carte vecteur (d'arrière-plan)" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "Copier les attributs" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "Conversion de type d'entités" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "Retourner les lignes/contours sélectionné(e)s" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "Fusionner les lignes/contours sélectionné(e)s" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "Magnétiser les lignes/contours sélectionné(e)s (seulement aux nœuds)" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "Couper une ligne/limite" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "Interroger des entités" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "étiquetage d'altitude en masse de lignes 3D" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "Sélectionner la carte vectorielle de fond" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "La carte vecteur n'est pas 3D. Opération annulée." -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -13310,16 +13552,16 @@ msgstr "" "Voulez-vous reconstruire la topologie (peut prendre du temps) et ouvrir la " "carte vecteur pour édition ?" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "Erreur de numérisation" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "Merci d'attendre, ouverture de la carte vecteur <%s> pour édition..." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." @@ -13327,29 +13569,29 @@ msgstr "" "Type d'entité '%(type)s' non prise en charge. Impossible de modifier la " "couche OGR <%(layer)s>." -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "Souhaitez-vous enregistrer les modifications de carte vecteur <%s> ?" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "Enregistrer les modifications ?" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" "Merci de patienter, fermeture et reconstruction de la topologie de la carte " "vecteur <%s>..." -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "Édition de la carte vecteur <%s> terminée avec succès" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "Nouvelle carte vecteur" @@ -13362,8 +13604,8 @@ msgid "Add new category" msgstr "Ajouter une catégorie" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "Appliquer les changements" @@ -13372,11 +13614,11 @@ msgid "Ignore changes and close dialog" msgstr "Ignorer les modifications et fermer la boîte de dialogue" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "Appliquer les modifications et fermer la boîte de dialogue" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "Id de l'entité :" @@ -13424,24 +13666,24 @@ msgstr "Id de l'entité" msgid "Layer (Categories)" msgstr "Couche (Catégories)" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "Erreur de numérisation" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "Impossible d'ouvrir la carte vecteur <%s>." -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." -msgstr "Pas de carte vecteur sélectionnée pour édition." +msgstr "Aucune carte vecteur sélectionnée pour édition." -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -13452,56 +13694,56 @@ msgstr "" "\n" "Raison: %s" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "Échec de lecture de l'entité d'id %d. Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "Liaison avec la base de données %d non disponible. Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" "Impossible de démarrer le pilote de base de données <%s>. Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -"Impossible d'ouvrir la base de données <%(db)s> avec le pilote <" -"%(driver)s> . Opération annulée." +"Impossible d'ouvrir la base de données <%(db)s> avec le pilote " +"<%(driver)s> . Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "Impossible d'exécuter la requête SQL '%s'. Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "L'entité d'id %d est marquée comme morte. Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "Type d'entité %d non pris en charge. Opération annulée." -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "Type d'entité '%s' inconnu" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "Pas assez de points pour créer une ligne" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." @@ -13509,45 +13751,45 @@ msgstr "" "Merci d'installer la librairie Pyhton Imaging Library (PIL)\n" "pour un meilleur contrôle de la légende et des décorations." -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "Supprimer un texte" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "Supprimer la barre d'échelle" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "Supprimer la flèche nord" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "Supprimer la légende" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "La propriété n'existe pas : %s" @@ -13561,7 +13803,7 @@ msgstr "" "Une erreur est survenue lors de l'appel au gestionnaire : %s\n" "Le gestionnaire n'était pas référencé." -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -13570,12 +13812,12 @@ msgstr "" "Erreur lors du désenregistrement du gestionnaire : %s\n" "le gestionnaire n'était pas référencé." -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "Gestionnaire : %s n'était pas référencé" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -13596,34 +13838,34 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "Merci de patienter, export de l'image en cours ..." -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" "Impossible de dessiner le graphique référencé. Le graphique n'était pas " "référencé." -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "Zoomer sur les limites de la région enregistrée" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "Définir la région de calcul à partir d'une région enregistrée" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "Région <%s> non trouvée. Opération annulée." -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "Enregistrer les limites d'affichage dans un fichier de région" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "Enregistrer la région de calcul vers un fichier de région" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "Le fichier région <%s> existe déjà. Voulez-vous l'écraser ?" @@ -13737,103 +13979,103 @@ msgstr "Mot de passe:" msgid "Connecting to <%s>..." msgstr "Connexion à <%s> ..." -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "Services web disponibles" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "Connecté à <%s>" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "Impossible de se connecter à <%s>" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "&Ajouter une couche" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" "Ajouter les couches web service sélectionnées dans l'arborescence des couches" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr " Propriétés de la couche web service" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "&OK" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "Nom pour la carte raster en sortie : " -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "Exporter une région" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "Région nommée :" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -"L'emprise et la résolution sont basés sur la géométrie de l'écran " +"L'emprise et la résolution sont basées sur la géométrie de l'écran " "d'affichage." -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "L'emprise et la résolution sont basées sur la région de calcul." -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "L'emprise et la résolution sont basées sur la région enregistrée." -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "Écraser la carte raster existante" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "Choisir une région :" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "Enregi&strer la couche" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "Enregistrer la couche web service comme carte raster" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "Raster de sortie manquant." -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "La carte ne peut être ajoutée qu'au jeu de cartes courant." -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "La carte <%s> existe déjà." -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "La région <%s> n'existe pas." -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "Téléchargement des données ..." -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "Impossible de récupérer les données.\n" @@ -13862,12 +14104,12 @@ msgid "Order of layers in raster" msgstr "Ordre des couches dans le raster" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "Haut" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "Bas" @@ -13944,13 +14186,13 @@ msgstr "Sélectionner la projection source.\n" #: ../gui/wxpython/web_services/widgets.py:890 msgid "Choose output layer name.\n" -msgstr "Choisir le nom de la couche de sorte.\n" +msgstr "Choisir le nom de la couche de sortie.\n" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "Ajouter par défaut" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13964,24 +14206,24 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "Gestion des points de contrôle" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "Choisir un groupe :" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "L'écriture du fichier CONTROL_POINTS a échoué" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "Fichier CONTROL_POINTS enregistré pour le groupe <%s>" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "La lecture du fichier CONTROL_POINTS a échoué" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." @@ -13989,7 +14231,7 @@ msgstr "" "Impossible de calculer l'erreur RMS.\n" "Potentiellement une erreur avec i.ortho.transform." -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." @@ -13997,21 +14239,21 @@ msgstr "" "Impossible de calculer la nouvelle emprise.\n" "Potentiellement une erreur avec i.ortho.transform." -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "Z source" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "Z cible" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "Z source :" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "Z cible :" @@ -14027,11 +14269,11 @@ msgstr "2. Choisir un Secteur" msgid "3. Select GRASS Mapset" msgstr "3. Choisir un jeu de cartes" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "La base de donnée GRASS contient les secteurs." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." @@ -14040,7 +14282,7 @@ msgstr "" "coordonnées (projection). Un Secteur peut être un projet. Le Secteur " "contient des Jeux de données." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." @@ -14048,29 +14290,29 @@ msgstr "" "Les jeux de cartescontiennent les données SIG relatives au projet, tâche " "dans un projet, sous-région ou utilisateur." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "Démarrer GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "&Parcourir" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "&Nouveau" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "Créer un nouveau jeu de cartes dans le secteur choisi" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "N&ouveau" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." @@ -14079,65 +14321,79 @@ msgstr "" "créé, la session GRASS sera lancée." #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "Ren&ommer" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Renommer le secteur sélectionné" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "Effacer" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Effacer le secteur sélectionné" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Effacer le jeu de cartes sélectionné" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "SIG GRASS %s démarrage %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "Démarrer une session GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" "Impossible de définir la base de données GRASS. Vérifiez vos paramètres de " "langue." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "ERREUR : Secteur <%s> non trouvé\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "ERREUR : Jeu de cartes <%s> non trouvé\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "Ligne invalide dans le fichier GISRC (%s) : %s\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "Voulez-vous importer <%(name)s> dans le nouveau secteur ?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "Nouveau jeu de cartes :" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" +"Fichier de données <%(name)s> correctement importé. La région par défaut a " +"été définie à partir de la carte importée." + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -14148,8 +14404,8 @@ msgstr "" "\n" "Ce jeu de cartes ne peut être renommé." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -14160,14 +14416,14 @@ msgstr "" "\n" "Entrer le nouveau nom :" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Message" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -14178,7 +14434,7 @@ msgstr "" "\n" "Le jeu de cartes <%s> existe déjà dans ce secteur." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -14189,7 +14445,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -14200,7 +14456,7 @@ msgstr "" "\n" "Le secteur <%s> existe déjà dans la base de données GRASS." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -14211,7 +14467,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -14222,25 +14478,25 @@ msgstr "" "\n" "Ce jeu de cartes ne peut être supprimé." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -"Voulez-vous vraiment supprimer le jeu de cartes <%(mapset)s> du secteur <" -"%(location)s>?\n" +"Voulez-vous vraiment supprimer le jeu de cartes <%(mapset)s> du secteur " +"<%(location)s>?\n" "\n" "TOUTES LES CARTES incluses dans ce jeu de cartes seront DÉFINITIVEMENT " "SUPPRIMÉES !" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "Impossible d'effacer le jeu de cartes" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -14251,17 +14507,17 @@ msgstr "" "\n" "TOUTES LES CARTES incluses dans ce secteur seront DÉFINITIVEMENT SUPPRIMÉES !" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "Impossible d'effacer le secteur" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" "Erreur d'unicode détectée. Vérifiez vos paramètres de langue. Détails : {0}" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " @@ -14270,21 +14526,21 @@ msgstr "" "Pas de Secteur GRASS trouvé dans '%s'. Créez un nouveau Secteur ou " "choisissez un autre dossier de base de données GRASS." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "Le chemin %s n'existe pas." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "Entrer le nom du nouveau jeu de cartes :" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "Le jeux de cartes <%s> existe déjà." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -14297,16 +14553,16 @@ msgstr "" "\n" "Êtes-vous sûr de vouloir créer ce jeu de cartes ?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "Nom de jeu de cartes réservé" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "Impossible de créer le nouveau jeu de cartes : %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -14325,12 +14581,12 @@ msgstr "" "Souhaitez-vous essayer de supprimer .gislock (notez qu'il vous faut disposer " "de droits pour cette opération) et continuer ?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "Ficher de verrouillage détecté" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -14342,7 +14598,7 @@ msgstr "" "Si vous avez une autre session GRASS en cours, vous risquez de corrompre vos " "données. Vérifiez dans votre gestionnaire de tâches pour en être sûr ..." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -14353,7 +14609,7 @@ msgstr "" "\n" "Détails : %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " @@ -14363,7 +14619,7 @@ msgstr "" "cartes. Merci de n'utiliser que des caractères ASCII sans %(chars)s ni " "espaces." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " @@ -14374,47 +14630,47 @@ msgstr "" "votre dossier personnel. Cliquez sur le bouton Parcourir pour sélectionner " "le dossier." -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "Le module <%s> ne supporte pas les coûts de virages." -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "La carte vectorielle '%s' n'existe pas." -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "Carte vectorielle non sélectionnée." -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "couche d'arc" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "couche de noeud" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "couche des coûts de virages" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "couche de catégories uniques" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "La %s '%s' choisie n'existe pas dans la carte vecteur '%s'.\n" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "Choisir %s. \n" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " @@ -14423,103 +14679,103 @@ msgstr "" "La colonne choisie '%s' n'existe pas dans la table d'attributs de la couche " "'%s' de la carte vectorielle '%s'.\n" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "topologie" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "Point de départ" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "Point d'arrivée" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "nouveau point" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "Colonne de coût des arcs en avant / deux directions :" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "arc en avant / les deux" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "Colonne de coût de direction arrière pour les arcs :" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "arc en arrière" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "Colonne de coûts des arcs (pour les deux directions) :" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "arc" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "Colonne de coût des noeuds : " -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "noeud" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "Plus court chemin %s" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "Point de fin" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "Analyse de type \"représentant commercial\" %s" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "Écoulement maximal %s" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "Point de source" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "Point de perte" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "Sous-réseau pour le centre le plus proche %s" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "Créer l'arbre de Steiner pour le réseau et les points terminaux %s" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "Plus courte distance via le réseau %s" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "Isoligne de coût %s" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "Écraser la carte" @@ -14527,7 +14783,7 @@ msgstr "Écraser la carte" msgid "Unable to perform analysis." msgstr "Impossible d'effectuer l'analyse." -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -14538,45 +14794,45 @@ msgstr "" "l'outil d'analyse de réseau vectoriel.\n" "Les résultats affichés peuvent ne pas correspondre aux résultats d'origine." -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "Résultat modifié manuellement" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "Une carte ne peut être crée que dans le jeu de cartes courant" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "Le carte vectorielle <%s> existe déjà. Voulez-vous l'écraser ?" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "Écraser la carte vecteur" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "Échec à la création de la table de virages." -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "La carte vecteur avec le résultat d'analyse n'existe pas." -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "La carte ne peut être enregistrée que dans le jeux de cartes courant" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "Merci de choisir les points '%s' et '%s'." -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "Merci de choisir au moins deux points." -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -14587,11 +14843,11 @@ msgstr "" "d'analyse de réseau vectoriel.\n" "La colonne de topologie peut ne pas correspondre à la situation modifiée." -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "Entrée modifiée manuellement" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" @@ -14600,20 +14856,20 @@ msgstr "" "La carte temporaire %s existe déja.\n" "Voulez-vous continuer l'analyse et l'écraser ?" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "Impossible d'utiliser ctypes. \n" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "Le magnétisme ne peut pas être activé." -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "Voulez-vous vraiment activer le magnétisme et l'écraser ?" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" @@ -14623,7 +14879,7 @@ msgstr "" "vectorielle.\n" "Voulez-vous vraiment activer le magnétisme et l'écraser ?" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "Écraser la carte ?" @@ -14722,117 +14978,117 @@ msgstr "Isolignes :" msgid "Output" msgstr "Sortie" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "Ajouter la carte dans l'arborescence des couches" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "Tables en entrée" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "Tables de résultats" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "Tables en cours de chargement ..." -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "Création de la table de virages ..." -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "La couche vecteur entrée n'existe pas." -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "Analyse en cours ..." -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "Analyse des noeuds en cours ..." -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "Autres paramètres" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "Style de point :" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "Style du résultat de l'analyse :" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "Style de table de couleurs %s :" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "Inverser les couleurs %s :" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "Couleur de ligne :" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "Couleur pour les points non utilisés :" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "Couleur des points de Départ/De/Source/Utilisés :" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "Couleurs des points de Fin/Vers/Destination :" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "Couleur pour les points sélectionnés :" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "Taille du texte :" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "Épaisseur du point :" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "Seuil d'accroche en pixels :" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "Nombre maximal de résulats dans l'historique :" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "Nouvelle couche vecteur avec une table de virages" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "Enregistrer le résultat de l'analyse" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "Modifier les coûts de virages aux intersections" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "Définir les coûts globaux de virages" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "Valeur insérée non valide. Opération annulée." -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "Modifier le point" @@ -14848,43 +15104,43 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "Merci de commencer par sélectionner la carte raster" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "Clic droit pour terminer la surface" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "Clic droit pour terminer la ligne" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "Voulez-vous enregistrer les modifications ?" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "Enregistrer les modifications de la carte raster" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" "Échec de création de la copie de sauvegarde de la carte raster en " "modification." -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "Échec de création de la nouvelle carte raster." -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "Rasterisation ..." -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" "Échec de définition de la table de couleur par défaut pour la carte raster " @@ -14930,7 +15186,7 @@ msgstr "" "Largeur de la ligne en cours de numérisation ou diamètre d'un point en " "unités de carte." -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "Nouvelle carte raster" @@ -14963,19 +15219,19 @@ msgstr "" "La carte raster <%s> existe déjà dans le jeu de cartes courant. Voulez-vous " "l'écraser ?" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "mètres" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "kilomètre" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "mile" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "pied" @@ -14999,21 +15255,21 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" "Impossible d'analyser le fichier XML des barres d'outils utilisateur. " "Chargement du fichier par défaut." -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "Impossible de créer le dossier des boites à outils." -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "Boites à outils personnalisées" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" @@ -15021,7 +15277,7 @@ msgstr "" "Liste ds extentions qui n'ont pas put être obtenues à cause d'une ereur de g." "extension. Détails : %s" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "Extensions" @@ -15033,8 +15289,8 @@ msgstr "Raison" msgid "Execution failed:" msgstr "L'exécution a échoué :" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "Détails :" @@ -15086,7 +15342,7 @@ msgstr "Paramètre en double : %s\n" msgid "Unable to create file '%s'\n" msgstr "Impossible de créer le fichier '%s'\n" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -15100,23 +15356,23 @@ msgstr "" "Option <%(opt)s> : la lecture depuis l'entrée standard n'est pas prise en " "charge par wxGUI" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "Module <%s> non trouvé." -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" "Veuillez noter que les données sont laissées dans un état inconsitant et " "peuvent être corrompues" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "La commande s'est interrompue" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -15137,147 +15393,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "ALERTE : niveau de debug wx non supporté (doit être >=0 et <=5). {0}\n" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "Fin de segment" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "point" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "animation" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "Réduire tout sauf PERMANENT et actuel" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "Réduire tout sauf PERMANENT" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "Réduire tout sauf actuel" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "Réduire tout" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "Étendre tout" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "Éditer les enregistrements sélectionnés" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "Afficher sélection" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "Classique (étiquettes uniquement)" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "Haut" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "Gauche" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "Lister à gauche" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "Zoom et recentre" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "Zoom sur la souris" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "Aucune action" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "Molette avant pour zoomer" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "Molette arrière pour zoomer" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "boite" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "sphère" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "cube" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "diamant" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "étoile" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "roue" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "histogramme" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "croix" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "cercle" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "Impossible de lire le fichier de paramètres <%s>\n" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -15288,11 +15544,11 @@ msgstr "" "\t\tDétails: %(detail)s\n" "\t\tLigne: '%(line)s'\n" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "Impossible de créer le dossier de paramètres" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -15303,11 +15559,11 @@ msgstr "" "\n" "Détails : %(detail)s" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "Impossible de définir " -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "Impossible de lire la configuration '%s'" @@ -15377,22 +15633,22 @@ msgstr "" "\n" "ERREUR : Impossible de lire le fichier WIND : %s\n" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "Impossible de zoomer sur la carte raster : %s" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "Impossible de zoomer sur la carte vecteur <%s>." -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "Impossible de zoomer sur la carte raster 3d <%s>." -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -15429,23 +15685,23 @@ msgstr "ligne %d:" msgid "Unsupported command %s." msgstr "Commande %s non prise en charge." -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" "Impossible de lire le fichier de commandes '%(cmd)s'. Détails : %(det)s" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "Lancement d'un nouvel affichage <%s>..." -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "Impossible de créer le fichier <%s>" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "Arrêt de l'affichage <%s>..." @@ -15454,33 +15710,33 @@ msgstr "Arrêt de l'affichage <%s>..." msgid "Map window test frame" msgstr "Test du cadre de la fenêtre de cartes" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "Test de l'affichage des cartes" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "Cadre test pour la fenêtre de carte de l'API" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "Cadre test pour la fenêtre de carte de mesure de distance" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "Cadre test pour la fenêtre de carte de l'outil de profile" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "Cadre test pour la fenêtre de carte rlisetup" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "Valeur %s inconnue pour le paramètre test." #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "Activer/désactiver le rendu automatique" @@ -15541,15 +15797,15 @@ msgstr "" msgid "Status bar" msgstr "Afficher la barre de status" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "Afficher" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "Échelle de la carte" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." @@ -15558,33 +15814,33 @@ msgstr "" "différemment, ces valeurs ne sont pas des échelles réelles mais restent " "proches de la réalité." -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "Définir les coordonnées des points de contrôle" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "Projection non définie (vérifiez les paramètres)" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "Erreur dans la projection (vérifiez les paramètres)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "Afficher la géométrie" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "Coordonnées" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 #, fuzzy msgid "Display extent" msgstr "Afficher la géométrie" @@ -15661,14 +15917,14 @@ msgid "Click mouse to unzoom" msgstr "Cliquez pour dé-zoomer" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "Vue 2D" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "Vue 3D" @@ -15687,8 +15943,9 @@ msgid "Vector digitizer not available" msgstr "La numérisation de vector n'est pas disponible" #: ../gui/wxpython/mapdisp/toolbars.py:123 +#, fuzzy msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." @@ -15698,7 +15955,7 @@ msgstr "" "pouvez toujours utiliser \"v.edit\" depuis le menu Vecteur pour des " "modifications non interactives." -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" @@ -15707,23 +15964,23 @@ msgstr "" "Échec au lanceément de la commande '%(command)s'. Détails :\n" "%(error)s" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "Cacher les barres d'outils" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "Afficher les barres d'outils" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "Cacher la barre de status" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "Afficher la barre de status" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" @@ -15732,11 +15989,11 @@ msgstr "" "Impossible de démarrer l'outil wxGUI de numérisation de vecteur.\n" "Détails: %s" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "Barre d'outils de numérisation de vecteur" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -15751,37 +16008,37 @@ msgstr "" "\n" "Détails : %s" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "Démarrage du mode vue 3D..." -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "Patientez, chargement des données ..." -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "Patientez, dé-chargement des données ..." -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "Retour à la vue 2D ..." -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "La lancement de d.to.rast a échoué :\n" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "d.to.rast ne peut être utilisé qu'en mode 2D." -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "Carte vectorielle <%s> ouverte pour édition - sautée." -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." @@ -15789,23 +16046,23 @@ msgstr "" "L'interrogation de la carte vecteur <{maps}> a échoué. Vérifier les " "paramètres de base de données et de topologie." -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "Définir la région calculée à partir de celle de l'écran" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "Définir l'emprise de la région de calcul de manière interactive" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "Définir la région calculée depuis un nom de région" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "Enregistrer la région calculée vers un nom de région" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "Barre d'outils de numérisation de raster" @@ -19239,6 +19496,7 @@ msgstr "Créer une nouvelle table de couleur pour une carte raster" msgid "Enter raster category values or percents" msgstr "Entrer les valeurs de catégories ou les pourcentages" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/location_wizard/wizard.py:186 @@ -19249,10 +19507,12 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "plage" ======= @@ -19266,6 +19526,9 @@ msgid "Change" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -19466,6 +19729,9 @@ msgid "Find more information at:" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -19589,8 +19855,8 @@ msgstr "Enregistrer l'épaisseur dans la colonne :" msgid "Use color column instead of color table:" msgstr "Utiliser la colonne de couleur à la place de la table de couleur :" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "Ajouter une colonne" @@ -19623,8 +19889,8 @@ msgid "" "Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " "table cannot be edited." msgstr "" -"La carte sélectionnée <%(map)s> n'est pas dans le jeux de cartes courant <" -"%(mapset)s>. La table d'attributs ne peut pas être modifiée." +"La carte sélectionnée <%(map)s> n'est pas dans le jeux de cartes courant " +"<%(mapset)s>. La table d'attributs ne peut pas être modifiée." #: ../gui/wxpython/modules/colorrules.py:1536 #, python-format @@ -22279,7 +22545,7 @@ msgid "List of %s layers" msgstr "Liste des couches %s" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "ckic droit pour (dé)sélectionenr tout" @@ -22295,13 +22561,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "&Importer" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "Importer les couches sélectionnées" @@ -22319,6 +22585,7 @@ msgstr "Paramètres d'import" #: ../gui/wxpython/modules/import_export.py:240 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22330,6 +22597,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 "" @@ -22340,6 +22612,7 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:245 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22351,73 +22624,78 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "Ajouter les couches liées dans l'arborescence des couches" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "Ajouter les couches importées dans l'arborescence des couches" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "&Lien" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "Lier les couches sélectionnées" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "Aucune couche sélectionnée. Opération annulée." -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "Impossible de déterminer le nombre de bandes du raster" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "Définir le format de sortie pour la carte vectorielle" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "Définir le format de sortie pour les données raster" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "Définir un format externe et fermer la boite de dialogue" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "Pas de source de données sélectionnée." -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "Importer des couches DXF" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "Choisir le fichier DXF à importer" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "Pas de couches sélectionnées." -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "Nom de la carte GRASS" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " @@ -22425,15 +22703,15 @@ msgstr "" "La projection des couches suivante n'est pas cohérente avec la projection du " "secteur courant." -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "Couche à reprojeter" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" -msgstr "&Importe && reprojecte" +msgstr "&Importer && reprojeter" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "Reprojeter les couches sélectionnées" @@ -22443,6 +22721,7 @@ msgstr "Reprojeter les couches sélectionnées" #: ../gui/wxpython/modules/histogram.py:296 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22454,6 +22733,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 "" @@ -22824,6 +23108,7 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22835,6 +23120,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -23022,7 +23312,7 @@ msgstr "Choisir un fichier pour charger une formule" msgid "'{cmd}' copied to clipboard" msgstr "'{cmd}' copiée dans le presse-papier" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " @@ -23031,7 +23321,7 @@ msgstr "" "L'outil Scatterplot nécessite que le paquet \"matplotlib\" (python-" "matplotlib) soit installé. {0}" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "Zoomer sur l'étendue du nuage de points" @@ -23039,15 +23329,15 @@ msgstr "Zoomer sur l'étendue du nuage de points" msgid "Loading ctypes libs failed" msgstr "Échec du chargement de la librairie ctypes" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "Chargement des données ..." -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "Pas de données définies." -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -23063,7 +23353,7 @@ msgstr "" "Vous pouvez diminuer le nombre de cellules de la région avec la commande ." -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -23083,7 +23373,7 @@ msgstr "" "Voulez-vous continuer à utiliser l'outil interactif de nuages de points avec " "cette région ?" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." @@ -23091,27 +23381,27 @@ msgstr "" "Un nuage de points avec la même combinaison de bandes (indépendament de " "l'ordre x y) est déjà affiché." -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "La bande <%s> n'est pas de type CELL (entier).\n" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "Le nuage de point ne peut pas être ajouté.\n" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" "Le nuage de point ne peut pas être ajouté.\n" "La multiplication des plages de bandes <%s:%d * %s:%d = %d> est supérieure à " "la limite maximale <%d>.\n" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -23128,7 +23418,7 @@ msgstr "" "\n" "Voulez-vous vraiment ajouter ce nuage de poitns ?" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" @@ -23139,7 +23429,7 @@ msgstr "" "\n" "Il n'y a pas encore de classe, voulez-vous en créer une ?" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" @@ -23148,17 +23438,17 @@ msgstr "" "Une erreur est survenue lors du calcul de la catégorie du nuage de points :\n" "%s" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "Export du nuage de points des classes de raster <%s>" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "Nuage de points de la classe <%s> exporté vers la carte raster <%s>." -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" @@ -23167,23 +23457,23 @@ msgstr "" "l'export du nuage de points de la classe <%s> vers la carte <%s> a échoué.\n" "%s" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "Ajouter un nuage de points" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "Sélectionner une zone par un polygone" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "Mode déplacer" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "Mode zoom pour les nuages de points (bouton de souris gauche, molette)" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" @@ -23191,64 +23481,64 @@ msgstr "" "Mode de zoom sur l'emprise des données du nuage de points (cliquer sur le " "nuage de points pour zoomer sur l'emprise)" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "Afficher/cacher le gestionnaire de classes" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "Inclure la zone sélectionnée à la classe" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "Exclure la zone sélectionnée de la classe" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "Ajouter un nouveau sommet" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "Ajouter un nouveau sommet au polygone de contours du nuage de points" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "Créer un polygone de sélection" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" "Ajouter un nouveau sommet entre le dernier et le premier point du contour" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "Déplacer un sommet" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "Déplacer un sommet du contour" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "Supprimer un sommet" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "Supprimer un sommet du contour" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" "Supprimer le polygone (cliquer sur le nuage de points pour supprimer son " "polygone)" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "Ajouter une classe" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "Supprimer la classe sélectionnée" @@ -23270,7 +23560,7 @@ msgstr "Bandes à ajouter au nuage de points (x y) :" #: ../gui/wxpython/iscatt/dialogs.py:156 msgid "No scatter plots selected." -msgstr "Pas de nuage de points sélectionné." +msgstr "Aucun nuage de points sélectionné." #: ../gui/wxpython/iscatt/dialogs.py:196 msgid "Select both x and y bands." @@ -23318,28 +23608,28 @@ msgstr "Couleur de la surface :" msgid "Selected area opacity:" msgstr "Opacité des surfaces sélectionnées :" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "Style de la sélection :" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "Paramètres des ellipses :" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "Sélectionner la catégorie à modifier." -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "Le calcul du nuage de points a échoué." -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "La corection des catégories raster du fichier de conditions a échoué." -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" @@ -23348,7 +23638,7 @@ msgstr "" "v.build a échoué :\n" "%s" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" @@ -23357,64 +23647,65 @@ msgstr "" "v.to.rast a échoué :\n" "%s" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "nuage de points" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "La limite maximale du nombre de catégories a été atteinte." -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "Renommer une classe" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "Définir une couleur" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "Changer le niveau d'opacité" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "Cacher" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "Afficher" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "Déplacer en haut" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "Déplacer en bas" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "Faire monter la catégorie" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "Faire descendre la catégorie" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "Exporter la class raster" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "Modifier l'opacité de la classe <%s>" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "Un nom vide a été inséré." @@ -23777,7 +24068,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "Sélectionner la zone d'échantillon 1 de " #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -23788,7 +24079,7 @@ msgstr "" "cartes existantes." #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "Le polygone semble avoir 0 surface" @@ -23941,6 +24232,7 @@ msgstr "ATTENTION" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23952,6 +24244,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 "" @@ -24006,7 +24303,7 @@ msgstr "" msgid "Rename configuration file" msgstr "Renommer le fichier de configuration" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -24014,47 +24311,47 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "Barre d'outils de l'espace de travail" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "Barre d'outils des outils" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "Barre d'outils de vue 3D" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "Console de commande" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 #, fuzzy msgid "Map Swipe Tool" msgstr "Type de carte :" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "Choisir un modèle à exécuter" -#: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995 +#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003 #, python-format msgid "" "Command '%s' not yet implemented in the WxGUI. Try adding it as a command " @@ -24063,32 +24360,32 @@ msgstr "" "La commande '%s' n'est pas encore implantée dans wxGUI. Essayez plutôt de " "l'ajouter en tant que couche de commande." -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "La couche sélectionnée n'est pas un vecteur." -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" "L'édition n'est permise que pour des cartes vectorielles du jeux de cartes " "actuel." -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "Choisir un script à exécuter" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Script Python (*.py)|*.py|Bash script (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "Le fichier de script '%s' n'existe pas. Opération annulée." -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " @@ -24097,15 +24394,15 @@ msgstr "" "Le script <%s> n'est pas exécutable. Voulez-vous définir les permissions " "d'exécution du script (vous devez être l'utilisateur propriétaire) ?" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "Définir les permissions ?" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "Impossible de définir les permissions. Opération annulée." -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " @@ -24114,24 +24411,24 @@ msgstr "" "Le dossier '%s' n'est pas définit dans GRASS_ADDON_PATH. Voulez-vous ajouter " "ce dossier à GRASS_ADDON_PATH ?" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "Mettre à jour le chemin des extentions ?" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "Lancement du script '%s'..." -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "Aucun secteur/jeux de carte sélectionné. Opération annulée." +#: ../gui/wxpython/main_window/frame.py:1456 +msgid "No project provided. Operation canceled." +msgstr "Aucun projet sélectionné. Opération annulée." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "Aucun jeux de carte sélectionné. Opération annulée." -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" @@ -24140,19 +24437,19 @@ msgstr "" "Dossier de travail modifié pour :\n" "\"%s\"" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "Modifier le dossier de travail pour cette Interface Graphique." -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "Utilisation : cd [dossier]" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "Sans paramètre, ouvre une boiite de dialogue." -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." @@ -24160,81 +24457,81 @@ msgstr "" "Si ~ (tilde) est présent comme premier dossier du chemin, il sera remplacé " "par le dossier utilisateur." -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "PLus d'un paramètre fourni." -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "Choisir un dossier de travail" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "Information système" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "Version de GRASS" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "Révision du code" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "Date de compilation" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "Plateforme de compilation" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "Plateforme" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "Entrer le nouveau nom :" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "Renommer la fenêtre de carte" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" "\n" "Reason: %s" msgstr "" -"Impossible de lancer l' « Outil de classification supervisée ».\n" +"Impossible de lancer l' « Outil de classification dirigée ».\n" "\n" "Raison : %s" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "Impossible de démarrer l'outil Temporel" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "Impossible de démarrer l'outil d'affichage temporel" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "Ajouter les cartes sélectionnées dans l'arborescence des couches" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "Type de couche <%s> non pris en charge" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." @@ -24242,12 +24539,18 @@ msgstr "" "A noter que les valeurs des cellules ne peuvent être affichées que pour les " "régions de moins de 10 000 cellules." -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "opacité :" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -24438,6 +24741,10 @@ msgstr "Écraser le fichier ?" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -24448,21 +24755,21 @@ msgstr "" "%s\n" "de l'arborescence des couches ?" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "" "Voulez-vous retirer la(les) carte(s) sélectionnée(s) de l'arborescence des " "couches ?" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "Enlever la carte" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "Quitter l'interface graphique GRASS" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " @@ -24472,7 +24779,7 @@ msgstr "" "la région de calculs. Il est suggéré de contraindre les cartes aux limites " "de la région. Voulez-vous contraindre la résolution ?" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "Restreindre la carte aux limites de la région ?" @@ -24500,55 +24807,55 @@ msgstr "Merci de fournie une extention de fichier (utilisé par i.rectify)" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "Gestion de l'emplacement des points d'accroche sur une photo scannée" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "Gestion de la position des points fiduciaux sur une photo scannée" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "Un fichier POINTS existe, renommage en POINTS_BAK" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "L'ouverture du fichier CAMERA a échoué" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "Écriture de l'image de sortie vers la groupe, merci de patienter ..." -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "X source" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "Y source" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "X cible" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "Y cible" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "X source : " -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "X cible : " -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "Y source : " -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "Y cible : " @@ -24621,7 +24928,7 @@ msgstr "Mode édition" msgid "Background vector map" msgstr "Carte vecteur d'arrière-plan" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "Couches de cartes" @@ -24654,97 +24961,98 @@ msgstr "" msgid "Align computational region to selected map" msgstr "Aligner la région de calcul sur la carte sélectionnée" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "Exporter vers des formats standards" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "Exporter vers PostGIS" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "Créer un pack" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "Faire une copie dans le jeu de cartes courant" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "Définir une table de couleur" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "Définir les règles de couleur de manière interactive" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "Montrer les attributs" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "Commencer l'édition" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "Arrêter l'édition" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "Reconstruire la topologie" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "Compte-rendu de statistiques raster" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "Profil" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "Enregistrer la couche web service" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "Impossible de créer le profil de carte raster." -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "Type de couche <%s> non pris en charge" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "Entrer le nom pour le nouveau %s dans le jeux de cartes courant :" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "Faire une copie de %s <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" "%s <%s> existe déjà dans le jeu de cartes courant. Voulez-vous l'écraser ?" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "Impossible de faire une copie de <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" "Impossible de faire une copie de <%s>. Le jeu de cartes <%s> n'est pas le " "jeu de cartes courant." +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/wxplot/histogram.py:43 @@ -24753,27 +25061,39 @@ msgid "Histogram Tool" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/lmgr/layertree.py:1126 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../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." msgstr "" "Impossible d'afficher l'histogramme de carte raster. Pas de nom de carte " "définit." -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +#, fuzzy +msgid "Set opacity of <{}>" +msgstr "Régler l'opacité de <%s>" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "Groupe de couches :" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "Cliquer pour modifier les paramètres de couche" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "(double clic pour régler les propriétés)" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "Merci d'attendre, mise à jour des données..." @@ -24796,6 +25116,9 @@ msgid "Histogram Tool" #: ../gui/wxpython/wxplot/histogram.py:43 msgid "Histogram Tool" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -25867,6 +26190,7 @@ msgid "Creates copies of maps and other elements Copies available data files in msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25878,6 +26202,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -29088,6 +29417,9 @@ msgid "Interactive editing and digitization of vector maps." ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -29388,6 +29720,7 @@ msgid "Location Download" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29399,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/lmgr/pyshell.py:78 msgid "Simple &editor" @@ -29442,6 +29780,7 @@ msgid "Unable to create new mapset: {}" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29453,6 +29792,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -29493,6 +29837,15 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"Le secteur courant est <%(loc)s>.\n" +"Le jeu de cartes courant est <%(mapset)s>." + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 ======= @@ -29731,24 +30084,32 @@ msgstr "Voulez-vous enregistrer les paramètres actuels dans un fichier ?" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "Aucun secteur/jeux de carte sélectionné. Opération annulée." + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/dbmgr/manager.py:114 +======= #: ../gui/wxpython/dbmgr/manager.py:113 ======= #: ../gui/wxpython/startup/guiutils.py:717 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -29760,6 +30121,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " @@ -29767,11 +30137,14 @@ msgid "" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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'." @@ -29780,42 +30153,45 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "Patientez, chargement des données attributaires .." -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "Parcourir les données" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "Gérer les tables" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "Gérer les couches" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "Fermer le gestionnaire de table attributaire" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "Recharger les données attributaires actuellement sélectionnées" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "" "Recharger toutes les données attributaires (annule la sélection actuelle) " -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "Nombre d’enregistrements chargés : %d" @@ -29829,71 +30205,78 @@ msgstr "chargement des données attributaires <%s> ..." msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "Connexion base de données" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "Régler l'expre" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "Exécuter la requête SQL" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "Fermer la boîte de dialogue" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "Colonnes" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "Insertion interactive" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "Valeurs" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "Toutes les valeurs" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "Échantillon" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "Obtenir les 256 premières valeurs unique comme échantillon" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "Aller à :" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "Fermer la boîte de dialogue après validation" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "Constructeur SQL (%(type)s) - <%(map)s>" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "Colonne à afficher (clause SELECT)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "Contrainte pour la requête (clause WHERE)" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 #: ../gui/wxpython/dbmgr/base.py:1274 ======= @@ -29926,27 +30309,31 @@ msgstr "Appliquer l'expression SELECT et recharger les enregistrements" #: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 #: ../gui/wxpython/dbmgr/sqlbuilder.py:498 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Example: %s" msgstr "Exemple : %s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "Vérifier" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "Vérifier l'expression SQL" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "Expression SQL non vérifiée" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "L'expression SQL n'est pas valide" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -29957,35 +30344,35 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "L'expression SQL est valide" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "Colonne à définir (clause SET)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "Calculer la valeur de colonne à définir" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "Fonctions" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "L'expression SQL n'a pas été appliquée" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "L'expression SQL a été appliquée" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "Le driver Dbf ne supporte pas l'usage de fonctions SQL." -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " @@ -29994,23 +30381,23 @@ msgstr "" "Table d'attributs <%s> non trouvée. Pour créer la table passer à l'onglet " "'Gérer les couches'." -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "Colonne <%(column)s> non trouvée dans la table <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "Ne peut afficher que 256 colonnes." -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -30019,21 +30406,21 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "Limite d'affichage : 100000 enregistrements." -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "Valeur inconnue" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" "Valeur impossible à décoder. Fixer l'encodage dans les préférences du GUI " "('Attributs')" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -30047,141 +30434,142 @@ msgstr "" "\n" "Détails: %(detail)s" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "Tri ascendant" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "Tri descendant" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "Calculer (seulement les colonnes numériques)" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "Calculatrice de champs" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "Aire de la surface" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "Longueur de ligne" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "Compacité d'une surface" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "Dimension fractale d'un contour définissant un polygone" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "Périmètre d'une surface" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "Nombre d'entités pour chaque catégorie" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "Raideur de pente d'une ligne 3D" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "Sinuosité d'une ligne" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "Azimuth de la ligne" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "Ajouter la colonne à la table <%s>" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "Impossible d'ajouter la colonne à la table. Nom de colonne non défini." -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "La colonne <%(column)s> existe déjà dans la table <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" "Données attributaires - clic droit pour éditer/gérer les enregistrements" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "Table" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 +#, fuzzy msgid " (read-only)" -msgstr "" +msgstr " (lecture-seule)" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "Requête SQL" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "Simple" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "Appliquer l'expression SELECT et recharger les enregistrements" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "Constructeur" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "Constructeur SQL" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "Insérer un nouvel enregistrement" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "Supprimer l'(les) enregistrement(s) sélectionné(s)" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "Supprimer tous les enregistrements" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "Surligner et zoomer sur les entités sélectionnées" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "Extraire les entités sélectionnées" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "Supprimer les entités sélectionnées" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "Mettre à jour un enregistrement existant" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "La valeur '%(value)s' demande à être entrée comme %(type)s." -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" @@ -30190,18 +30578,18 @@ msgstr "" "Impossible de mettre à jour l'enregistrement existant.\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" "L'enregistrement portant la catégorie numéro %d existe déjà dans la table." -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "Le numéro de catégorie (colonne %s) est manquant." -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" @@ -30210,7 +30598,7 @@ msgstr "" "Impossible d'insérer le nouvel enregistrement.\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " @@ -30219,11 +30607,11 @@ msgstr "" "Les enregistrements sélectionnés (%d) vont être définitivement supprimés de " "la table. Souhaitez-vous les supprimer ?" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "Supprimer les enregistrements" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " @@ -30232,15 +30620,15 @@ msgstr "" "Tous les enregistrements (%d) seront définitivement supprimés de la table. " "Souhaitez-vous les supprimer ?" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "Rien à extraire" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "Rien à supprimer." -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -30251,7 +30639,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -30264,30 +30652,30 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "Table<%s> - clic droit pour supprimer la(les) colonne(s)" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "Colonne" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "Longueur" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "Ajouter" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "Impossible de renommer la colonne. Pas de nom de colonne défini." -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " @@ -30296,24 +30684,24 @@ msgstr "" "Impossible de renommer la colonne <%(column)s> en <%(columnTo)s>. La colonne " "existe déjà dans la table <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" "Impossible de renommer la colonne. La colonnes<%(column)s> n'existe pas dans " "la table <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "Supprimer les colonnes sélectionnées" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "Supprimer toutes les colonnes" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " @@ -30322,11 +30710,11 @@ msgstr "" "La colonne sélectionnée %s sera DÉFINITIVEMENT supprimée de la table. " "Souhaitez-vous supprimer cette colonne ?" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "Supprimer la(les) colonne(s)" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -30338,91 +30726,91 @@ msgstr "" "seront DÉFINITIVEMENT supprimées de la table. Souhaitez-vous supprimer ces " "colonnes ?" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "Liste de couches" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "Supprimer également la table attributaire liée (%s)" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "Nom de colonne" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "Taille de la donnée" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "Pilote" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "Clé" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "Ajouter une couche" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "Description de couche" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "Colonne clé" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "Insérer un enregistrement pour chaque catégorie dans la table" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "Il vous faut ajouter des catégories via le module v.category." -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "Description de table" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "Nom de la table" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "&Créer une table" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "Fixer par défaut" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "Enlever une couche" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "Couche à supprimer" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "Enlever la couche" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "Modifier une couche" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "&Modifier la couche" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." @@ -30430,20 +30818,20 @@ msgstr "" "Impossible d'obtenir la liste des tables.\n" "Merci d'utiliser db.connect pour fixer les paramètres de base de donnée." -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" "Impossible de créer la nouvelle table. Il manque le nom de la table ou de la " "colonne clé." -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" "Impossible de créer la nouvelle table. La table <%s> existe déjà dans la " "base." -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " @@ -30452,23 +30840,23 @@ msgstr "" "Impossible d'ajouter la nouvelle couche à la carte vecteur <%(vector)s>. La " "couche %(layer)d existe déjà." -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "Statistiques de champs" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "Copier les statistiques dans le presse-papier (Ctrl+C)" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "Les statistiques ne sont pas suportées pour les tables DBF." -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "Impossible de calculer les statistiques" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." @@ -30476,16 +30864,22 @@ msgstr "" "Impossible de calculer les statistiques. Nombre de lignes %d invalides " "(devrait être %d)." -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "Impossible de calculer l'écart-type." -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "Statistiques de champs <%s>" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/dialogs.py:80 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/dialogs.py:79 ======= #: ../gui/wxpython/dbmgr/sqlbuilder.py:133 @@ -30647,6 +31041,10 @@ msgstr "Recharger toutes les données attributaires (annule la sélection actuel #: ../gui/wxpython/dbmgr/dialogs.py:76 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "No attribute table found.\n" @@ -30656,44 +31054,44 @@ msgid "" msgstr "" "Pas de table attributaire trouvée.\n" "\n" -"Voulez-vous créer une nouvelle table attributaire et la lier au vecteur <" -"%s> ?" +"Voulez-vous créer une nouvelle table attributaire et la lier au vecteur " +"<%s> ?" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "Créer la table ?" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "Fermer la boîte de dialogue après validation" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "Aucun attribut trouvé" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "Définir les attributs" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "Afficher les attributs" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "&Recharger" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "&Soumettre" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" "Colonne<%(col)s> : La valeur '%(value)s' doit être entrée comme %(type)s." -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "Inconnu" @@ -30811,7 +31209,7 @@ msgstr "" "temporelles différents (intervalle et ponctuel). Il est recommandé " "d'utiliser un seul tye temporel pour éviter la confusion." -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "La topologie du jeux de données temporel %s est invalide." @@ -30829,13 +31227,13 @@ msgstr "Merci de n'ajouter qu'une seule couche dans la liste." msgid "No map series nor space-time dataset is added." msgstr "Pas de séries de carte ou de jeux de données temporels ajoutés." -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "Le nombre maximum d'animations est %d." -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " @@ -30844,60 +31242,60 @@ msgstr "" "Plusieurs animations utilisent la même fenêtre. Merci de sélectionner une " "fenêtre différente pour chaque animation." -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "L'affichage de la légende à échoué." -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "Nombre de cartes inconsistent, vérifiez les données d'entrée." -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "Pas d'animation à exporter." -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "Préparation de l'export, merci de patienter ..." -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "%(from)s %(dash)s %(to)s" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "%(start)s %(unit)s" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "Export de l'animation, merci de patienter ..." -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "Pas de nom défini pour l'animation." -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." -msgstr "Pas de fichier d'espace de travail sélectionné." +msgstr "Aucun fichier d'espace de travail sélectionné." -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "Fichier %s non trouvé" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "Animation %d" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "Le nombre de cartes des jeux de données temporels doiit être le même." -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." @@ -30905,7 +31303,7 @@ msgstr "" "Le type temporel (absolut/relatif) des jeux de données temporels doit être " "le même." -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" @@ -30913,6 +31311,12 @@ msgstr "" "être le même." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/utils.py:209 ======= #: ../gui/wxpython/gui_core/gselect.py:886 @@ -31186,18 +31590,22 @@ msgstr "Fichiers" #: ../gui/wxpython/gui_core/goutput.py:388 #, python-format >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 "" "L'étendue temporelle des cartes des jeux de données temporels doit être la " "même." -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" "Le nombre de cartes à animer doit être le même pour chaque série de cartes." -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." @@ -31205,46 +31613,46 @@ msgstr "" "Le nombre de cartes à animer doit être le même que le nombre de cartes dans " "le jeu de données temporel." -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "Modifier la vitesse de l'animation" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "Avancer" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "Lecture" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "Répéter" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "Lire en avant et en arrière" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "Ajouter une nouvelle animation" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "Ajouter, modifier et supprimer l'animation" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "Exporter l'animation" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "Ajouter un jeu de données temporel ou une série de cartes" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" "Ajouter un jeu de données temporel ou une série de cartes pour l'animation" @@ -31361,7 +31769,7 @@ msgstr "" "ou une série de cartes." #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "Afficher la légende de la carte raster" @@ -31442,7 +31850,7 @@ msgid "Edit" msgstr "Modifier" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "Format" @@ -31697,7 +32105,14 @@ msgid "Invalid" msgstr "Invalide" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Rendu des couches" ======= @@ -31706,6 +32121,7 @@ msgid "PROJ string (required):" msgstr "Chaîne PROJ (requise) :" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31717,12 +32133,23 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "Superposition des couches" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -32386,28 +32813,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Directory {t} not removed." msgstr "Répertoire {t} non supprimé." -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "Barre d'outils d'animation" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "Chargement des données" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr " ({c} en dehors de {p})" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "vers %(to)s" @@ -33370,17 +33801,17 @@ msgstr "" "%s" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "Impossible de lire les instructions %s" @@ -33412,7 +33843,7 @@ msgstr "" "La position du cadre de carte a changé, ancienne valeur : %(old1)s %(old2)s\n" "nouvelle valeur : %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" @@ -33421,7 +33852,7 @@ msgstr "" "La taille du cadre de carte a changé, ancienne valeur : %(old1)s %(old2)s\n" "nouvelle valeur : %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" @@ -33430,12 +33861,12 @@ msgstr "" "Impossible de lire les instructions %(file)s.\n" "Format %(for)s inconnu" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "Impossible de lire les instructions %s." -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -33445,39 +33876,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "Pouce" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "point" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "centimètre" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "milliimètre" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "miles nautiques" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "pixel" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "mètre" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "degré" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "Impossible d'exécuter `ps.map -b`" @@ -33549,149 +33980,149 @@ msgstr "" "Position par rapport à la bordure\n" "supérieure gauche du papier" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "Police :" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "Choisir la couleur :" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "Appliquer les changements et fermer la boite de dialogue" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "Unités" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "Orientation" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "Largeur" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "Hauteur" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "Gauche" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "Droit" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "Textuel non permis !" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "Taille de la page" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "Marges" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "Portrait" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "Paysage" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "Paramètres de carte" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "Paramètres du cadre de carte" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "Options de cadre de carte :" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "Ajuster le cadre sur la carte sélectionnée" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "Ajuster le cadre sur la région enregistrée" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "Ajuster le cadre sur la région de calcul" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "échelle fixe et center de la carte" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "Sélection de la carte" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "Carte :" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "Région :" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "Échelle de la carte et centre" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "Centre :" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "E :" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "N :" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "Échelle" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "Résolution max de carte (dpi)" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "Bordure" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "dessiner une limite autour de la trame de carte" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "couleur de bordure :" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "largeur de limite (pts) :" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" @@ -33699,310 +34130,310 @@ msgstr "" "La région est définie pour correspondre à cette carte,\n" "la carte raster ou vecteur doit être ajouter plus tard" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "Sélection de la région" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" -msgstr "Pas de carte sélectionnée !" +msgstr "Aucune carte sélectionnée !" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "Pas de région sélectionnée !" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "Échelle ou centre de carte non valide !" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "Choisir une carte raster" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "pas de carte raster" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "carte raster :" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "Merci de créer d'abord le cadre de carte." -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "Ajouter une carte" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "points" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "lignes" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "surfaces" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "Type de données" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "Gérer les cartes vecteur" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "La carte la plus haute recouvre les autres" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr " Propriétés ..." -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "Paramètres de carte raster" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "Paramètres de carte vecteur" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "Propriétés de %s" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "Sélection des données" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "centroïdes" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "contours" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "Sélectionner la couche" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" "La connexion à la base de données n'est pas définie dans le fichier DB." -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "Sélectionner la couche :" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "liste de catégories (par ex. 1,3,5-7)" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "Utiliser le masque courant" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "Couleurs" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "Contour" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "dessiner le contour" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "Largeur (pts) :" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "remplir par la couleur" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "choisir la couleur :" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "couleur depuis la colonne :" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "Pas d'effet de remplissage de couleur depuis la colonne" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "Couleur des lignes :" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "Taille et style" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "fichier eps :" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" "Taper un nom de fichier ou cliquer sur Parcourir pour choisir un fichier" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "Choisir un fichier" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "taille depuis la colonne :" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "échelle :" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "Rotation" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "rotation des symboles :" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "sens anti-horaire en degrés :" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "depuis un champ attributaire de la carte :" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "Définir la largeur (pts) :" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "modifier la largeur depuis une valeur de catégorie" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "Choisir le style de ligne :" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "Choisir les chapeaux de ligne :" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "Modèle" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "utiliser le motif :" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "Choisir un fichier de motif :" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "épaisseur de ligne du motif (pts) :" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "facteur d'échelle du motif :" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "Légende de la carte raster" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "Carte raster source" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "carte raster actuelle" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "sélectionner la carte raster" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "%(rast)s : type %(type)s" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "Type de légende" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "légende discrète (carte avec catégories)" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "légende en gradient de couleurs continues (carte en nombre flottants)" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "Paramètres avancés de légende" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "afficher la boite \"pas de données\"" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "afficher l'échelle de la table de couleur" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "Légende du vecteur" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "Afficher la légende des vecteurs" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "Carte vectorielle source" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "Choisir les cartes vecteur et leur ordre dans la légende" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "Modifier les étiquettes" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "dessiner une bordure autour de la légende" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "Taille et position" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" "Laisser vide le champ d'édition afin d'utiliser les valeurs par défaut." -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" @@ -34010,157 +34441,157 @@ msgstr "" "Largeur du symbole de couleur (pour les lignes)\n" "en face du texte de la légende" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "Colonnes :" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "largeur de colonne :" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "Espacement de colonne entre le limite" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "Éditer l'étiquette de légende :" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "Pas de carte raster sélectionnée !" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "pas de carte raster" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "Paramètres Mapinfo" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "Paramètres de couleur" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "utiliser la couleur de bordure :" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "utiliser la couleur d'arrière-plan :" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "Longueur :" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "La longueur de barre d'échelle est donnée en unités de cartes" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "La hauteur de barre d'échelle est la hauteur réelle sur le papier" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "défaut" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "Type :" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "Nombre de segments :" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "Étiqueter tout" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "segments" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "arrière-plan de texte transparent" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "La longueur de barre d'échelle n'est pas définie" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "Entrez le texte :" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "Effets de texte" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "arrière-plan de texte" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "surligner" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "bordure du texte" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "Offset" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "horizontal (pts) :" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "vertical (pts) :" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr " Point de référence" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "Rotation du texte" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "pivoter le texte (sens anti-horaire)" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" -msgstr "Pas de texte saisi !" +msgstr "Aucun texte saisi !" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "Choisir un répertoire avec des images" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "Note : seul le format EPS est supporté" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "Échelle et rotation" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "Angle de rotation (deg) :" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "Rotation anti-horaire en degrés" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" @@ -34168,37 +34599,37 @@ msgstr "" "PIL\n" "manquant" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "Impossible de lire le fichier %s" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "taille : %(width)s x %(height)s pts" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "Pas d'image sélectionnée." -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "Paramètres de la flèche nord" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "Calculer la convergence" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "symbole" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "Sélectionner le symbole :" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" @@ -34206,47 +34637,47 @@ msgstr "" "Note : le symbol sélectionné n'est pas affiché\n" "en mode brouillon (seulement en mode aperçu" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "Couleur de mise en valeur:" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "Remplir par la couleur" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "Taille et rotation" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "Taille (pt) :" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "Taille de symbole en points" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "Paramètres du rectangle" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "Paramètres de ligne" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "Épaisseur de ligne en points :" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "Étiquettes vecteur" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "Fichier d'étiquettes créé auparavant par le module v.label" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "Vous pouvez sélectionner plusieurs fichiers d'étiquettes." @@ -34281,29 +34712,29 @@ msgstr "" "Le programme ps2pdf n'est pas disponible. Merci de l'installer pour " "permettre la création de fichiers PDF." -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "Génération du PDF en cours ..." -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "Génération du fichier PostScript..." -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "Génération de l'aperçu en cours ..." -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "La commande ps.map a retourné le code de sortie %s" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 #, fuzzy msgid "Program {} is not available." msgstr "Aperçu non disponible" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, fuzzy, python-brace-format msgid "" "{title} Please install it to create PDF.\n" @@ -34314,7 +34745,7 @@ msgstr "" "\n" " %s" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 #, fuzzy msgid "" "Program {} is not available. Please install it to create PDF.\n" @@ -34326,32 +34757,32 @@ msgstr "" "\n" " %s" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "%(prg)s s'est terminé avec le code de sortie %(code)s" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "PDF généré" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "Fichier PostScript généré" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "Génération de l'aperçu en cours ..." -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "Aperçu non disponible" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." @@ -34359,73 +34790,89 @@ msgstr "" "L'aperçu n'est pas disponible, probablement parce que Ghostscript n'ets pas " "installé ou pas dans le PATH." -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "Aperçu généré" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "Enregistrer le fichier sous" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "Impossible de lire le fichier %s." -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "La barre d'échelle n'est pas adaptée à cette projection" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "Cliquer sur le bouton avec un triangle vert pour générer l'aperçu." -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "Composeur de cartes wxGUI" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "CADRE DE CARTE" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "LÉGENDE RASTER" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "LÉGENDE VECTEUR" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "INFO DE CARTE" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "BARRE ÉCHELLE" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "IMAGE" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "FLÈCHE NORD" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "Cliquez-déposez pour redimensionner l'objet" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "étiquettes :" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Location Name:" +#~ msgstr "Nom du secteur : " + +#~ msgid "Change location and mapset" +#~ msgstr "Choisir une secteur de travail et un jeu de cartes" + +#, fuzzy +#~ msgid "(Un)dock Map Display" +#~ msgstr "Fenêtre de carte" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "Show comp. extent" #~ msgstr "Afficher l'étendue" ======= @@ -34435,6 +34882,9 @@ msgid "Cartographic Composer - GRASS GIS" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -34520,20 +34970,10 @@ msgstr "" #~ msgid "Unable to display the map" #~ msgstr "Impossible d'effacer le jeu de cartes" -#~ msgid "Download sample location" -#~ msgstr "Télécharger le Secteur d'exemple" - #, python-format #~ msgid "GRASS GIS %s Startup%s" #~ msgstr "Lancement du SIG GRASS %s - %s" -#, fuzzy, python-format -#~ msgid "Unable to rename mapset: %s" -#~ msgstr "" -#~ "Impossible de renommer le jeu de cartes.\n" -#~ "\n" -#~ "%s" - #, fuzzy, python-format #~ msgid "Unable to rename location: %s" #~ msgstr "" @@ -34588,9 +35028,6 @@ msgstr "" #~ msgid "Run python script" #~ msgstr "Exécuter le script python" -#~ msgid "Unable to create new GRASS Database" -#~ msgstr "Impossible de créer la nouvelle base de données GRASS" - #~ msgid "Go to GCP No." #~ msgstr "Aller au point d'amer no." @@ -34827,9 +35264,6 @@ msgstr "" #~ msgid "Unknown format '{0}'." #~ msgstr "Format '{0}' inconnu." -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "Voulez-vous importer {} dans le nouveau secteur ?" - #~ msgid "Command prompt" #~ msgstr "Messages de la commande" @@ -34867,9 +35301,6 @@ msgstr "" #~ "Taper pour rechercher dans tous les modules. Appuyer sur Entrer pour la " #~ "prochaine concordance." -#~ msgid "Module dialog style:" -#~ msgstr "Style des boîtes de dialogue des modules" - #~ msgid "Module dialog settings" #~ msgstr "Paramètres des fenêtres de modules" @@ -35013,9 +35444,6 @@ msgstr "" #~ msgid "Maps can be copied only to current mapset" #~ msgstr "Une carte ne peut être copiée que dans le jeu de cartes courant" -#~ msgid "Do you want to create new mapset?" -#~ msgstr "Voulez-vous créer un nouveau jeux de données ?" - #, fuzzy #~ msgid "Unicode error detected. Check your locale settings. Details: {}" #~ msgstr "Erreur d'unicode. Vérifiez vos paramètres de langue. Détails : {}" @@ -35031,8 +35459,8 @@ msgstr "" #~ msgid "" #~ "GRASS GIS %(version)s Map Display: %(id)s - Location: %(loc)s@%(mapset)s" #~ msgstr "" -#~ "SIG GRASS %(version)s - Fenêtre de cartes : %(id)s - Secteur : %(loc)s@" -#~ "%(mapset)s" +#~ "SIG GRASS %(version)s - Fenêtre de cartes : %(id)s - Secteur : " +#~ "%(loc)s@%(mapset)s" #~ msgid "" #~ "Note that the wxGUI's vector digitizer is currently disabled (hopefully " @@ -35100,9 +35528,6 @@ msgstr "" #~ msgid "Point dataset:" #~ msgstr "Jeux de points :" -#~ msgid "Numeric column:" -#~ msgstr "Colonne numérique : " - #~ msgid "Kriging" #~ msgstr "Krigeage" @@ -36458,6 +36883,7 @@ msgid "GRASS GIS %s Layer Manager" msgstr "GRASS GIS %s - Gestionnaire des couches" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "" "Location <%s> created.\n" @@ -36614,6 +37040,8 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné" ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main msgid "" "Location <%s> created.\n" @@ -36832,6 +37260,15 @@ msgstr "Redimensionner la légende" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Unable to create location" +#~ msgstr "Impossible de créer le secteur" +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main #~ msgid "" #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII " #~ "characters excluding %(chars)s and space." @@ -36850,6 +37287,10 @@ msgstr "Le nom <%(name)s> n'est pas un nom valide pour un secteur. Merci de n'ut msgid "Unable to create location" msgstr "Impossible de créer le secteur" +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Select EPSG code of spatial reference system" msgstr "Sélectionner le code EPSG" @@ -36908,6 +37349,14 @@ msgstr "Utilitaire de requêtes SQL" #~ msgstr "" #~ "Impossible d'obtenir l’extension géographique courante. Sortie forcée de " #~ "wxGUI. Merci d'exécuter manuellement g.region pour résoudre ce problème." +<<<<<<< HEAD +======= +<<<<<<< HEAD + +msgid "supported tools only" +msgstr "outils pris en charge uniquement" +======= +>>>>>>> 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 ?" @@ -36915,6 +37364,12 @@ msgstr "Voulez-vous quitter GRASS y compris le terminal ou juste fermer l'interf msgid "Double-click or Ctrl-Enter to run selected module" msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 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 ?" @@ -36923,6 +37378,10 @@ msgid "Double-click or Ctrl-Enter to run selected module" msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> 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 9ef670e3364..8e32d90ba99 100644 --- a/locale/po/grasswxpy_hu.po +++ b/locale/po/grasswxpy_hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2018-03-10 17:22+0100\n" "Last-Translator: Zoltan Siki , 2018\n" "Language-Team: Hungarian (https://www.transifex.com/grass-gis/teams/45198/" @@ -25,12 +25,12 @@ msgstr "Nézet" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "Adat" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "Megjelenés" @@ -38,837 +38,837 @@ msgstr "Megjelenés" msgid "Analysis" msgstr "Elemzés" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "Animáció" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "Perspektíva:" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "Döntés:" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "Magasság:" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "itt" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "visszaállít" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "Alapértelmezett nézet visszaállítása" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "Háttér szín:" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "Felvétel" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "Lejátszás" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "Szünet" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "Állj" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "Képkockák teljes száma:" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "Képkocka szám (FPS):" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "A képkockákat az adott frekvenciával rögzítjük (FPS)." -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "Képsorozat mentése" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "Válasszon egy könyvtárat:" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "Válasszon könyvtárat a képekhez" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "Tallózás" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "Fájl előtag:" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "Fájl formátum:" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "Vektor" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "3D raszter" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "Dekorációk" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "Raszter térkép" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "Mód:" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "durva" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "finom" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "mindkettő" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "Durva mód:" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "felbontás:" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "stílus:" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "drót" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "Finom mód:" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Szín" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "Maszk" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "Átlátszóság:" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "Fényesség" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "térkép" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "konstans" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "Pozíció" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "Visszaállít" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "Alapértelmezett pozíció visszaállítása" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "Forgatás:" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Új" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "Törlés" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Érték:" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "Átlátszóság:" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "Szín:" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "Vektor térkép" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "Vektor vonalak" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Vonal:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "szín:" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "használd a színt a tematikus térképezéshez" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "használd a vastagságot a tematikus térképezéshez" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "mint 3D" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "Magasság a felszín felett:" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "Vektor pontok" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Ikon:" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "méret:" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "szimbólum:" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "használd a méretet a tematikus térképezéshez" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "3D raszter térkép" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "Felbontás:" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "Fényforrás pozíció" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "Fényesség:" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "É && Ny" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "É && K" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "D && Ny" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "D && K" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "Beállítások" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "Észak nyíl" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "Nyíl hossz (térképi egységekben):" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "Nyíl szín:" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "Léptékvonalzó" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "Ny" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "É" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "D" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "K" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "ÉNy" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "ÉK" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "DK" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "DNy" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "Szint" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "Szint {level}" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "Lépték vonalzó %d" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "Sík" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "A vektor térkép 3D-s" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "A vektor térkép 2D-s" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "tartomány:" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "Északi él:" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "Déli él:" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "Nyugati él:" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "Keleti él:" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "Észak (Y):" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "Magasság (Z):" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "Kelet (X):" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "Alsó él:" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "Felső él:" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1070,8 +1070,8 @@ msgstr "drót szín:" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "Szélesség:" @@ -1119,7 +1119,7 @@ msgstr "<%s> rasztertérképet nem találom" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "Vektor térképet <%s> nem találom" @@ -1228,14 +1228,14 @@ msgstr "CVS útvonal" msgid "Do you want the CSV header?" msgstr "Akar CVS fejlécet?" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "Export" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "Súgó" @@ -1346,8 +1346,8 @@ msgid "Invalid input vector dataset" msgstr "Hibás input vektor adathalmaz" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "<%s> tér-adat adathalmazt nem találom" @@ -1418,12 +1418,12 @@ msgstr "" msgid "Set opacity level" msgstr "Átlátszóság színt beállítás" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "Osztály kezelő" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1485,115 +1485,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Csoport létrehozás/szerkesztés..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "Képcsoport neve:" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "Kép alcsoport neve:" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "Kérjük válasszon egy alcsoportot" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Rasztertérkép neve:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Vektortérkép neve:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "Osztályok" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "Attribútum tábla export" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "<%s> vektor létezik" @@ -1634,7 +1634,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1645,169 +1645,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Térkép eszközsor" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "eredmények" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "A fájl már létezik" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1916,13 +1916,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "Vektor adat import" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Raszter adat import" @@ -1993,56 +1993,58 @@ msgid "Data catalog" msgstr "Adat katalógus" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "GRASS adat könyvtár:" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "Meg akarja szakítani a hely letöltést?" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Átvetítés" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2050,317 +2052,323 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 -#, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:96 +#, fuzzy, python-brace-format +msgid "Failed to read mapsets from project <{l}>." msgstr "Térképcsoportok olvasása sikertelen a helyről <{l}>." -#: ../gui/wxpython/datacatalog/tree.py:121 -#, python-brace-format -msgid "Failed to read maps from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:122 +#, fuzzy, python-brace-format +msgid "Failed to read maps from project <{l}>." msgstr "Térképek olvasása sikertelen a helyről <{l}>." -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "Felülírhatom?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "Új név" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "Térkép átnevezés" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "g.copy-t befejeztem" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "g.remove-t befejeztem" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "Térkép törlés" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "Kivágás" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "Másolás" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "Beillesztés" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "Törlés" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "Átnevezés" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "&Metaadat megjelenítés" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "Térképcsoport váltás" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "Rekordok törlése" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "Átvetítés" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" +msgstr "Új hely létrehozása" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2197 +#, fuzzy +msgid "&Download sample project (location)" +msgstr "Minta hely letöltése" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "Kiválasztott hely törlése" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 #, fuzzy msgid "&Copy paths to mapsets" msgstr "Hozzáférés kezelése a térképcsoportokhoz" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +#, fuzzy +msgid "Reload GRASS projects" msgstr "GRASS hely újra betöltése" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2380,78 +2388,82 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "Új térképcsoport létrehozása a kiválasztott helyen" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +#, fuzzy +msgid "Create new project (location) in current GRASS database" msgstr "" +"Az aktuális helyen létrehoz egy új térképcsoportot, módosítja az aktuális " +"térképcsoportot." -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "Átvetítés" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "Átvetítés" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "Raszter átvetítés" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "Vektor átvetítés" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "Becsült felbontás:" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "Újramintavételezési módszer:" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "Maximum szegmens hossz:" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2464,9 +2476,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Eszközök" @@ -2527,7 +2539,7 @@ msgid "Switch to simple mode" msgstr "Váltás egyszerű módra" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Lezárás" @@ -2551,27 +2563,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "Vonalvastagság:" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "Fő eszközsor" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "Vegyes eszközsor" @@ -2580,30 +2592,30 @@ msgstr "Vegyes eszközsor" msgid "Map <%s> not found. " msgstr "<%s> térképet nem találom." -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "<%s> térképet nem találom" #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" "Válasszon fájlnevet a mentendő képhez (nem szükséges kiterjesztést megadni)" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -2617,85 +2629,201 @@ msgstr "Ismeretlen ikonkészlet '%s', alapértelmezett 'grass'-t használom...\n msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "Nem tudom betölteni az ikon témát. Ok: %s. Kilépés a wxGUI-ból..." -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" msgstr "Eltávolítás" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Jelmagyarázat eltávolítás" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "Időbélyeg" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Képkocka időtartama:" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Állapotsor megjelenítés" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Maszk" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Maszk" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Észak" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "Dél" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Nyugat" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Kelet" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "É-D felbontás" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Becsült felbontás:" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Szegmensek száma:" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Szegmensek száma:" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Szegmensek száma:" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d mp" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "Általános" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "Számítási régió beállítása névvel bíró régióval" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "Aktuális régió megjelenítése" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "Vetület egyezik" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "Számítási régió mentése régió fájlba" + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "Adat tallózó" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "Exportálás ebbe:" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 #, fuzzy msgid "Export history of executed commands to a file" msgstr "Vektor térkép konvertálása SVG fájlba." -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" -msgstr "" +#: ../gui/wxpython/history/browser.py:465 +#, fuzzy, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" +msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Fájl mentés másként..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "File mentés másként" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "Fájlok" + +#: ../gui/wxpython/history/browser.py:470 #, fuzzy, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "Szöveg fájlok" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "Fájlok" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Fájl mentés másként..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 #, fuzzy msgid "Command history saved to '{}'" msgstr "A parancs naplót ide mentettem '[]'" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "A letöltés folyamatban, várjon amíg befejeződik 0%" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " @@ -2704,116 +2832,125 @@ msgstr "" "A letöltés folyamatban, várjon amíg befejeződik {0}%, {1} MB, {2} KB/s, " "{3:.0f} másodperc" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +#, fuzzy +msgid "Downloaded project is not valid" msgstr "Letöltött hely hibás" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "Megszakít" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" -msgstr "Hely letöltés megszakítása" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" +msgstr "Letöltés megszakítás" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" msgstr "Válasszon minta helyet a letöltéshez:" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "Letöltés" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" msgstr "Kiválasztott hely letöltése" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "Letöltés" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "A letöltés folyamatban, várjon amíg befejeződik" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, fuzzy, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "<%s> nevű hely már létezik, a letöltés megszakadt" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "Sikertelen letöltés: %s" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 +#, fuzzy msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" "A letöltés befejeződött. a Letöltött minta adatok a hely/térképcsoport " "füleken láthatók ez az ablak lezárása után" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, fuzzy, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "<%s> nevű hely már létezik, előbb nevezze át" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Hiba: {text}" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:439 +#, fuzzy +msgid "Dataset Download" +msgstr "Letöltés" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "Meg akarja szakítani a hely letöltést?" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Kiválasztott hely letöltése" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "Letöltés megszakítás" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Meg akarja szakítani a hely letöltést?" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" msgstr "Hibás hely név" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "Név az új térképcsoporthoz:" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Új térképcsoport létrehozás" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "Létre akar hozni egy GRASS helyet <%s>?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "Adat import?" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2823,82 +2960,89 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Kiválasztott térképcsoport átnevezése" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Hiba" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" msgstr "" +"Nem tudom átnevezni a térképcsoportot.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Kiválasztott hely átnevezése" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Kiválasztott térképcsoport átnevezése" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" +"Nem tudom átnevezni a térképcsoportot.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2908,11 +3052,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2922,15 +3066,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2940,50 +3084,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Szelektált objektum törlése" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Szelektált objektum törlése" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:497 +#, fuzzy +msgid "Error when deleting projects" +msgstr "Hiba a '%s' fájl olvasása közben." -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -2993,11 +3140,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3007,15 +3154,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3025,14 +3172,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "ismeretlen" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3044,15 +3192,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3060,8 +3208,8 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" @@ -3070,98 +3218,98 @@ msgstr "" "<%(name)s> sikertelen import.\n" "Ok: %(msg)s" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:662 +#, fuzzy, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" "<%(name)s> adatfájlt sikeresen importáltam. A hely alapértelmezett régióját " "ebből az importált térképből állítottam be." -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"Az aktuális hely <%(loc)s>.\n" +"Az aktuális térképcsoport <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "Az aktuális hely <%(loc)s>.\n" "Az aktuális térképcsoport <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "Az aktuális térképcsoport <%s>." #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "Válasszon térkép típus és helyet/térképcsoportot" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "raszter" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vektor" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "Válasszon forrás helyet:" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "Válasszon forrás térképcsoportot" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "A térképcsoport kiválasztás előtt ki kell választania egy helyet" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" "A folytatás érdekében egy helyet és egy térképcsoportot kell választania" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -3170,19 +3318,19 @@ msgid "Select/create group:" msgstr "Csoport kiválasztás/létrehozás:" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "Csoport létrehozása, ha nem létezik" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "Vektor térkép hozzáadás a csoporthoz..." -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "Terjedelem az output térképhez:" @@ -3191,17 +3339,17 @@ msgid "No vector maps." msgstr "Nincsenek vektortérképek." #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "A folytat érdekében kép/térkép csoportot kell választania" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -3209,34 +3357,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "Megjelenítendő forrás térkép:" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "Megjelenítendő cél raszter térkép:" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "Megjelenítendő cél vektor térkép:" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "A folytatás érdekében egy forrás térképet kell kiválasztania" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3244,42 +3392,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "Illesztőpontok (GCP) kezelése" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "Legalább %dGCP szükséges. A művelet megszakadt." #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "forrás" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "cél" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "GCP koordináták beállítása" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3289,37 +3437,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "Sikertelen pont fájl olvasás" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3329,55 +3477,55 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "Transzformálás <%s>..." -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "GCP kezelő beállítások" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "Kilépés a GCP kezelőből" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "Illesztőpontok mentése?" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." @@ -3385,8 +3533,8 @@ msgstr "" "Az RMS hibát nem tudom kiszámítani.\n" "Valószínűleg m.transform hiba." -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." @@ -3394,167 +3542,167 @@ msgstr "" "Nem tudom az új terjedelmet kiszámítani.\n" "Valószínűleg m.transform hiba." -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "" -#: ../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 +#: ../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 msgid "source E" msgstr "forrás K" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "forrás É" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "cél K" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "cél É" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "Hibás koordináta érték. A művelet megszakadt." -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "Vektor térkép csoport létrehozás" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "Csoporthoz adandó vektor térkép(ek):" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "GCP szerkesztés" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "Illesztőpont szám" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "forrás K:" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "cél K" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "forrás É:" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "cél É:" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Párbeszédablak lezárás" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "Csak a legnagyobb RMS hiba kiemelése" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" @@ -3564,106 +3712,106 @@ msgstr "" "átlag + szórás * szorzó.\n" "A szorzóra ajánlott érték 1 és 2 között van." -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "Szimbólum beállítások" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "Szín nagy RMS hibához:" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "Szín a kiválasztott GCP-hez:" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "Szín a nem használt GCP-khez:" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "Nem használ GCP-k mutatása" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "Szimbólum méret:" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "Rektifikáció" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "1. rendű" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "2. rendű" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "3. rendű" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "Válasszon interpoláció módszert:" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "eredmény térkép felülírása" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "GCP kezelő beállításokat mentettem a(z) '%s' fájlba." @@ -3698,10 +3846,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3710,7 +3858,7 @@ msgstr "Oldal beállítás" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3719,7 +3867,7 @@ msgstr "Nyomtatási kép" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3733,14 +3881,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "Nagyítás az alapértelmezett régióra" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "Nagyítás a mentett régióra" @@ -3753,33 +3901,33 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Kategória szám" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Helyes tartomány:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "RMS hiba" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -3809,7 +3957,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3845,300 +3993,310 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "Új GRASS hely definiálása" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Név" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" msgstr "A hely könyvtár neve a GRASS adatkönyvtárban" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Leírás" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:251 +#, fuzzy +msgid "Description of project directory in GIS Data Directory" +msgstr "A hely könyvtár neve a GRASS adatkönyvtárban" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "Nem tudok új GRASS adatbázist létrehozni" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 +#, fuzzy msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" +"<%(name)s> név nem megfelelő név egy helyhez. Csak az ASCII karaktereket " +"használja kivéve %(chars)s és a szóközt." -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "Hibás név" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 +#, fuzzy msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" "Hely címét egy sorra és 256 karakterre korlátozzuk. A szöveg többi részét " "figyelmen kívül hagyjuk." -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Kód" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Vetület kód:" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Keresés a leírásban:" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "Nem tudom beolvasni a listát: %s" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "Válasszon vetület paramétereket" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "Válasszon dátumot vagy ellipszoidot (következő lap)" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "Dátum a kapcsolt ellipszissel" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "Csak ellipszoid" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "Meg kell adnia egy értéket ehhez %s" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "Adja meg a paramétereket a %s vetülethez" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "Nem" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Igen" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "Adja meg a geodéziai dátumot" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "Ellipszoid" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Dátum kód:" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "Adja meg az ellipszoidot" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "Ellipszoid kód:" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "Georeferált fájl:" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "Válaszon georeferált fájlt" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Paraméterek" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "Válasszon IAU kódot" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "Elérési út az IAU kódok fájlhoz:" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "IAU kód:" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "Válasszon IAU kódok fájlt" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "Nem tudom beolvasni az IAU kódokat: {0}" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "Adja meg a PROJ.! paraméter szövegláncot:" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "Dátum transzformáció szükséges." -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Összegzés" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "GRASS adatbázis:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Hely név:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Vetület kód:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Leírás:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Vetület:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" @@ -4146,15 +4304,15 @@ msgstr "" "PROJ.4 definció:\n" " (non-definitive)" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "egyéni" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" @@ -4162,152 +4320,208 @@ msgstr "" "\n" "Részletek: %(err)s" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" msgstr "Nem tudok új helyet létrehozni" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "A hely már létezik a GRASS adatbázisban" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "EPSG kód hiányzik." -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "IAU kód hiányzik." -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "<%s> fájlt nem találom." -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "Alapértelmezett tartomány és felbontás beállítása" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "Régió beállítá&s" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "Hibás helyet választott" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "Hibás régió" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "Kattintson ide a 3D beállítások megjelenítéséhez" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "Kattintson ide a 3D beállítások elrejtéséhez" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Sorok: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Oszlopok: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Cellák: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Mélység: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "3D cellák: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "Felső" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "Alsó" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Észak" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Nyugat" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Kelet" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Dél" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "É-D felbontás" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "K-Ny felbontás" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "Hibás érték: %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "Válasszon dátum transzformációt" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "Válasszon dátum transzformációk listájából" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Eltávolítás" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Tilt" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Engedélyez" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "Címke beállítás" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "Megjegyzés beállítása" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Tulajdonságok" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "Címke:" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "Megjegyzés:" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "Modellező beállítások" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4324,7 +4538,6 @@ msgid "Disabled:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "Python szerkesztő" @@ -4334,10 +4547,10 @@ msgid "GRASS API:" msgstr "GRASS súgó" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Parancs" @@ -4363,7 +4576,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Típus" @@ -4392,13 +4605,13 @@ msgid "Comment" msgstr "Megjegyzés" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "Modell tulajdonságok" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Meta adat" @@ -4407,7 +4620,7 @@ msgid "Commands" msgstr "Parancsok" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4418,19 +4631,19 @@ msgid "Apply properties" msgstr "Tulajdonságok alkalmazása" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "Párbeszédablak lezárása és a módosítások eldobása" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Név:" @@ -4439,97 +4652,458 @@ msgstr "Név:" msgid "Author(s):" msgstr "Szerző(k):" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "Grfikus modellező" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Modell" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Elemek" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" -msgstr "Modell export képbe" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Változók" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" -msgstr "Modell export Python szkriptbe" +#: ../gui/wxpython/gmodeler/panels.py:189 +#, fuzzy +msgid "Script editor" +msgstr "&Egyszerű szerkesztő" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "Parancs output" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +#, fuzzy +msgid "{} script is up-to-date" +msgstr "Python szkript naprakész" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d mp" + +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" +msgstr "%(min)d perc %(sec)d mp" + +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "Parancs befejezve" + +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" -msgstr "Modell futtatás" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" +msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" -msgstr "Modell ellenőrzés" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "Kérem várjon, modell betöltése..." -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" -msgstr "Adat tulajdonságok" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "Új modell létrehozása?" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" -msgstr "Elem neve:" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "Válasszon modell fájlt" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" -msgstr "Elem típus:" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "GRASS Model fájl (*.gxm)|*.gxm" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" -msgstr "GRASS megjegyzés hozzáadása a modellhez" +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" -msgstr "Címke és komment" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "<%s> modell fájl már létezik. Felül akarja írni ezt a fájlt?" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "Címke:" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "Modell mentés" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "Megjegyzés:" +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" +msgstr "<%s> fájlt mentettem" + +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "Válasszon fájlt az aktuális modell mentéséhez" + +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "A modellt exportáltam <%s>" + +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "Megjegyzés hozzáadás" + +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." +msgstr "Üres megjegyzés. Nincs mit hozzáadni a modellhez." + +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." +msgstr "Nincsenek törlendő közbenső adatok." + +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "Véglegesen törölni akarja az adatokat? %s" + +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "Közbenső adatok törlése?" + +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "A modell üres. Nincs mit ellenőrizni." + +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Modell ellenőrzése..." + +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" +msgstr "" +"A modell hibás.\n" +"\n" +"%s" + +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "A modell hibátlan." + +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "wxGUI grafikus modellező" + +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Modell újrarajzolása" + +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Akarja menteni a modell változásokat?" + +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "A modell beállításokat szeretné a modell fájlban tárolni?" + +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Kilépés a grafikus modellezőből" + +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Adattípus" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "Alapértelmezett érték" + +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "Új változó hozzáadás" + +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" +msgstr "egész" + +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "valós" + +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "szöveglánc" + +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "régió" + +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "térképcsoport" + +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "fájl" + +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "Címke" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." +msgstr "Nincsenek szelektált elemek." + +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Python szkript" + +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" +msgstr "Futtatás" + +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "Python szkript futtatása" + +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Python szkript mentése fájlba" + +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Python szkript" + +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" +msgstr "Aktualizál" + +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Python szkript (*.py)|*.py" + +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "<%s> fájl már létezik. Felül akarja írni ezt a fájlt?" + +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "Fájl mentés" + +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" +msgstr "" + +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "Új modell létrehozás" + +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "Modell betöltés fájlból" + +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Modell mentés fájlba" + +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" +msgstr "Modell export képbe" + +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" +msgstr "Modell export Python szkriptbe" + +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" +msgstr "Modell futtatás" + +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" +msgstr "Modell ellenőrzés" + +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "Modell tulajdonságok" + +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" +msgstr "" + +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" +msgstr "Adat tulajdonságok" + +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" +msgstr "Elem neve:" + +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" +msgstr "Elem típus:" + +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" +msgstr "GRASS megjegyzés hozzáadása a modellhez" + +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" +msgstr "Címke és komment" #: ../gui/wxpython/gmodeler/dialogs.py:308 msgid "" @@ -4554,7 +5128,7 @@ msgstr "" msgid "From" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 msgid "To" msgstr "" @@ -4593,12 +5167,6 @@ msgstr "" msgid "Condition" msgstr "Feltétel" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "Címke" - #: ../gui/wxpython/gmodeler/dialogs.py:564 msgid "Loop properties" msgstr "" @@ -4644,50 +5212,46 @@ msgstr "" msgid "Delete variables" msgstr "Változók törlése" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 #: ../gui/wxpython/vdigit/dialogs.py:304 msgid "Delete selected" msgstr "Szelektáltakat töröl" -#: ../gui/wxpython/gmodeler/dialogs.py:914 +#: ../gui/wxpython/gmodeler/dialogs.py:913 #: ../gui/wxpython/vdigit/dialogs.py:308 msgid "Delete all" msgstr "Mindent töröl" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 msgid "Reload" msgstr "Újratöltés" -#: ../gui/wxpython/gmodeler/model.py:74 +#: ../gui/wxpython/gmodeler/model.py:80 msgid "model" msgstr "modell" -#: ../gui/wxpython/gmodeler/model.py:75 +#: ../gui/wxpython/gmodeler/model.py:81 msgid "Script generated by wxGUI Graphical Modeler." msgstr "wxGUI grafikus modellerrel generált szkript." -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 #, python-format msgid "undefined variable '%s'" msgstr "'%s'definiálatlan változó" -#: ../gui/wxpython/gmodeler/model.py:612 +#: ../gui/wxpython/gmodeler/model.py:618 msgid "Running model..." msgstr "Modell futtatás..." -#: ../gui/wxpython/gmodeler/model.py:633 +#: ../gui/wxpython/gmodeler/model.py:639 msgid "Model is empty. Nothing to run." msgstr "A modell üres. Nincs mit futtatni." -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Modell ellenőrzése..." - -#: ../gui/wxpython/gmodeler/model.py:650 +#: ../gui/wxpython/gmodeler/model.py:656 #, python-format msgid "" "Model is not valid. Do you want to run the model anyway?\n" @@ -4698,437 +5262,71 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/gmodeler/model.py:653 +#: ../gui/wxpython/gmodeler/model.py:659 msgid "Run model?" msgstr "Modell futtatás?" -#: ../gui/wxpython/gmodeler/model.py:688 +#: ../gui/wxpython/gmodeler/model.py:696 msgid "Variables below not defined:" msgstr "Alábbi változók definiálatlanok:" -#: ../gui/wxpython/gmodeler/model.py:801 +#: ../gui/wxpython/gmodeler/model.py:809 msgid "Raster maps" msgstr "Raszter térképek" -#: ../gui/wxpython/gmodeler/model.py:804 +#: ../gui/wxpython/gmodeler/model.py:812 msgid "3D raster maps" -msgstr "3D raszter térképek" - -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" -msgstr "Vektor térképek" - -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" -msgstr "" - -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " -msgstr "Feltétel:" - -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" -msgstr "Feltétel: nem definiált" - -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" -msgstr "" - -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" -msgstr "üres" - -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." -msgstr "" - -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" -msgstr "Modell paraméterek" - -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" -msgstr "" - -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" -msgstr "Futtatás" - -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" -msgstr "Változók" - -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" -msgstr "Grfikus modellező" - -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" -msgstr "Modell" - -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" -msgstr "Elemek" - -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" -msgstr "Parancs output" - -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -#, fuzzy -msgid "{} script is up-to-date" -msgstr "Python szkript naprakész" - -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." -msgstr "Modell újrarajzolása" - -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" -msgstr "%d mp" - -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" -msgstr "%(min)d perc %(sec)d mp" - -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" -msgstr "Parancs befejezve" - -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "Akarja menteni a modell változásokat?" - -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" -msgstr "A modell beállításokat szeretné a modell fájlban tárolni?" - -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" -msgstr "Kilépés a grafikus modellezőből" - -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." -msgstr "Nincsenek törlendő közbenső adatok." - -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "Véglegesen törölni akarja az adatokat? %s" - -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "Közbenső adatok törlése?" - -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" -msgstr "Új modell létrehozása?" - -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" -msgstr "Válasszon modell fájlt" - -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" -msgstr "GRASS Model fájl (*.gxm)|*.gxm" - -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" -msgstr "<%s> modell fájl már létezik. Felül akarja írni ezt a fájlt?" - -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" -msgstr "Modell mentés" - -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" -msgstr "<%s> fájlt mentettem" - -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" -msgstr "Válasszon fájlt az aktuális modell mentéséhez" - -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." -msgstr "A modell üres. Nincs mit ellenőrizni." - -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" -msgstr "" -"A modell hibás.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." -msgstr "A modell hibátlan." - -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" -msgstr "A modellt exportáltam <%s>" - -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" -msgstr "Megjegyzés hozzáadás" - -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." -msgstr "Üres megjegyzés. Nincs mit hozzáadni a modellhez." - -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" -msgstr "wxGUI grafikus modellező" - -#: ../gui/wxpython/gmodeler/frame.py:1116 -#, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "Kérem várjon, modell betöltése..." - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "Eltávolítás" - -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" -msgstr "Tilt" - -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" -msgstr "Engedélyez" - -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" -msgstr "Címke beállítás" - -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" -msgstr "Megjegyzés beállítása" - -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" -msgstr "Tulajdonságok" - -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" -msgstr "Adattípus" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "Alapértelmezett érték" - -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" -msgstr "Új változó hozzáadás" - -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" -msgstr "egész" - -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "valós" - -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "szöveglánc" - -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "régió" - -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" -msgstr "térképcsoport" - -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "fájl" - -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." -msgstr "Nincsenek szelektált elemek." - -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" -msgstr "Python szkript" - -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -#, fuzzy -msgid "Run script" -msgstr "Python szkript futtatása" - -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Python szkript mentése fájlba" - -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." -msgstr "" +msgstr "3D raszter térképek" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" +msgstr "Vektor térképek" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -#, fuzzy -msgid "Python script type" -msgstr "Python szkript" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " +msgstr "Feltétel:" -#: ../gui/wxpython/gmodeler/frame.py:2110 -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" +msgstr "Feltétel: nem definiált" + +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" -msgstr "Aktualizál" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" +msgstr "üres" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" -msgstr "Python szkript (*.py)|*.py" - -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" -msgstr "<%s> fájl már létezik. Felül akarja írni ezt a fájlt?" +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" -msgstr "Fájl mentés" +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Figyelmeztetés" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" +msgstr "Modell paraméterek" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "&Fájl" @@ -5140,7 +5338,7 @@ msgstr "Munkaterület" msgid "Create new workspace" msgstr "Új munkaterület létrehozás" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Megnyitás" @@ -5148,7 +5346,7 @@ msgstr "Megnyitás" msgid "Load workspace from file" msgstr "Munkaterület betöltése fájlból" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Mentés" @@ -5158,7 +5356,7 @@ msgstr "Mentés" msgid "Save workspace" msgstr "Munkaterület mentés" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Mentés másként" @@ -5171,7 +5369,7 @@ msgid "Close workspace file" msgstr "Munkaterület fájl lezárás" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "" @@ -5208,7 +5406,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -5236,652 +5434,660 @@ msgstr "" msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "ASCII rács import" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "GRASS ASCII raszter fájl konvertálás bináris raszter térképbe." -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "GRIDATB.FOR import" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "Matlab 2D tömb import" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "PNG import" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "SPOT NDVI import" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "SRTM HGT import" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Terra ASTER HDF import" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "LAS LiDAR pont import" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." -msgstr "" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +#, fuzzy +msgid "Module not installed" +msgstr "<%s> modult nem találom." #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +#, fuzzy +msgid "Reproject raster map from different GRASS project" msgstr "Egy rasztertérkép vetületi transzformációja egy másik helyről" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "" "Egy rasztertérkép vetületi transzformációja egy adott helyről az aktuális " "helyre." -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "ASCII pontok mint vektor vonalak" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "DXF import" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "ESRI e00 import" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "Vektor térkép kicsomagolás" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" msgstr "Egy vektortérkép vetületi transzformációja egy másik helyről" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "" "Egy rasztertérkép vetületi transzformációja egy helyről az aktuális helyre." -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "3D raszter adat import" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "ASCII 3D import" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "Bináris raszter fájl import GRASS 3D raszter térképbe." -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Vis5D import" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "3-dimenziós Vis5D fájlok importálása." -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "Adatbázistábla import" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "Attribútumtábla import változatos formátumokból." -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "Raszter térkép export" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "GRASS raszter térképek exportálása GDAL támogatott formátumokba." -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "ASCII rács export" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "Raszter térkép réteg konvertálása GRASS ASCII szövegfájlba." -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "ASCII x,y,z pont export" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "GRIDATB.FOR export" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "GRASS raszter export GRIDATB.FOR térkép fájlba (TOPMODEL)." -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "Matlab 2D tömb export" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "GRASS raszter export bináris MAT-fájlba" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "Nyers bináris tömb export" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "GRASS raszter exportálás bináris tömbbe." -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "MPEG-1 export" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "Raszter térkép sorozat konvertálása MPEG filmbe." -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "PNG export" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "GRASS raszter térkép export nem georeferált PNG képbe." -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "PPM export" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "GRASS raszter térkép konvertálás PPM kép fájlba." -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "POV-Ray export" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "VRML export" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "Raszter térkép export virtuális valóság modellező nyelvbe (VRML)." #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "VTK export" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "Raszter térkép konvertálás VTK-ASCII formátumba." -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "Raszter térkép becsomagolás" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "Raszter térkép export GRASS GIS specifikus archive fájlba" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "Vektor térkép export" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "ASCII pontok vagy GRASS ASCII vektor export" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "DXF export" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "Vektor térkép exportálása DXF fájl formátumba." -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "PostGIS export" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "GRASS x,y,z pontok konvertálása POV-Ray x,y,z formátumba." -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "SVG export" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "Vektor térkép konvertálása SVG fájlba." -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "Vektor térkép konvertálása VTK ASCII outputba." -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "3D raszter térkép export" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "ASCII 3D export" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "3D raszter térkép konvertálása ASCII szövegfájlba." -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Vis5D export" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "Adatbázistábla export" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "Attribútum táblák exportálása különböző formátumokba." -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "Külső raszter adat kapcsolás" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "Külső vektor adtok kapcsolása" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "Output formátum a raszter adatokhoz" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "Output formátum vektor adatokhoz" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "Térképek kezelése" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "Másolás" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "Lista" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "Átnevezés" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "Térkép típus konverziók" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "Raszter vektorrá" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "Raszter térkép konvertálása vektor térképpé." #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "Raszter sorozatok 3D raszterbe" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "2.5D raszter 3D raszterbe" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "Vektor 3D raszterbe" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "2D vektor 3D vektorba" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "" @@ -5889,20 +6095,20 @@ msgstr "" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "Grafikus modellező" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "Grafikus modellező indítása" @@ -5920,13 +6126,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "" @@ -5940,16 +6146,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -5969,7 +6175,7 @@ msgstr "Egyszerű Python szerkesztő" msgid "Launches Simple Python Editor." msgstr "Egyszerű Python szerkesztő indítása." -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "GUI bezárás" @@ -5977,8 +6183,8 @@ msgstr "GUI bezárás" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "Kilépés GRASS GIS-ből" @@ -5986,42 +6192,42 @@ msgstr "Kilépés GRASS GIS-ből" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "Beállítások" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "Aktuális régió megjelenítése" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "Régió beállítás" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" @@ -6034,7 +6240,8 @@ msgid "Mapset access" msgstr "Térképcsoport hozzáférés" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#, fuzzy +msgid "Set/unset access to other mapsets in current project" msgstr "" "Hozzáférés beállítása/törlése egy másik térképcsoporthoz az aktuális helyen" @@ -6059,11 +6266,13 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "Hely és térképcsoport váltás" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "Aktuális hely és térképcsoport módosítása" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#, fuzzy +msgid "Change current project and mapset." msgstr "Aktuális hely és térképcsoport módosítása" #: ../gui/wxpython/menustrings.py:240 @@ -6097,15 +6306,20 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +#, fuzzy +msgid "Create new project (location)" msgstr "Új hely létrehozása" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +#, fuzzy +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "Elindítja a hely varázslót egy új GRASS hely létrehozásához." #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +#, fuzzy +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" "Az aktuális helyen létrehoz egy új térképcsoportot, módosítja az aktuális " "térképcsoportot." @@ -6131,8 +6345,7 @@ msgstr "Vetületek kezelése" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6163,7 +6376,7 @@ msgstr "Telepített bővítmények kezelése" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "" @@ -6171,411 +6384,411 @@ msgstr "" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "&Raszter" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "Időbélyeg" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " "regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "Színek kezelése" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "Koncentrikus körök" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "Legközelebbi pontok" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "Növelés egy cellával" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "Távolság az elemekhez" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "Raszter térkép kalkulátor" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "Rasztertérkép kalkulátor" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "Szomszédsági elemzés" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "Mozgó ablak" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6586,22 +6799,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6609,127 +6822,127 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "Szintvonalak generálása" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " "represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "Lejtő és kitettség" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "Láthatóság" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "Vízszintes szög" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6740,323 +6953,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "Növel" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "Vékonyít" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "Hidrológiai modellezés" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "Vízgyűjtő elemzés" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "USLE K-faktor" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "USLE talajerózió faktor (K) számítás." -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "USLE R-faktor" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "Talajvíz modellezés" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "Talajvíz áramlás" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7064,21 +7277,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7087,203 +7300,203 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "Véletlen cellák" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "Véletlen cellák és raszter pontok" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7291,106 +7504,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "Általános statisztika" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "Egyváltozós raszter statisztika" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7399,504 +7612,504 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "&Vektor" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "Új vektor térkép létrehozás" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "Új üres vektor térkép létrehozás" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "Párhuzamos vonalak" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" "Topológia újraépítése az összes vektortérképhez az aktuális térképcsoportban." -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "Egy vektortérkép lekérdezése adott helyeken." -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "Pont elemzés" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "Lidar elemzés" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "Legközelebbi elemek" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "Hálózat elemzés" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "Vektor hálózat elemző eszköz" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "Hálózat előkészítés" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "Legrövidebb útvonal" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "Legrövidebb útvonal megtalálása a vektor hálózaton." -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -7904,96 +8117,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "Legrövidebb útvonal minden párra" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "Steiner fa" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "Minimális feszítő fa" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "Minimális feszítő fa számítás a hálózatra." -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "Utazó ügynök elemzés" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8001,819 +8214,819 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "Vektor térkép vágás" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "Kategória kezelés" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "Rasztertérkép mintavételezése adott pont helyeken" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "Rasztertérkép mintavételezése adott vektor pont helyeken." -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "Delaunay háromszögek" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "Rács generálás" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "Pont generálás" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "Generálás adatbázisból" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "Pontok generálása vonalak mentén" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "Hisztogram" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 msgid "Input for supervised SVM" msgstr "" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "Kategória kezelés" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "Ortofotó eszközök" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "Szkennelési torzítás korrekciója" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "3D színtáblák" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "3D maszk" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "3D raszter térkép kalkulátor" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "Metszet" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "Alap 3D raszter meta adat" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "3D raszter statisztika" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "Térfogat statisztika generálás 3Draszter térképekhez." -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -8821,999 +9034,991 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "A&datbázis" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "Adatbázis információ" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "Adatbázisok lista" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "Táblák listája" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "Tábla leírás" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "Egy adott tábla összes oszlopának listája" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "Adatbázisok kezelése" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "Csatlakozás" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "Adatbázis létrehozás" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "Tábla törlés" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "Egy attribútum tábla törlése." -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "Tábla másolás" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "Oszlop törlés" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "Oszlop törlés a kiválasztott attribútum táblából." -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "Teszt" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "SQL mondat" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "Vektor adatbázis kapcsolatok" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "Új tábla" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "Tábla eltávolítás" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "Egy vektor térkép attribútum táblájának eltávolítása." -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "Tábla kapcsolás" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "Adatbázis tábla kapcsolása egy vektor térkép táblához." -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "Oszlopok hozzáadása" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "Oszlop átnevezés" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "Értékek módosítása" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "Sor eldobása" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "Létrehozás" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "Raszter térkép lista" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "Vektor térkép lista" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "3D raszter térkép lista" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "Import" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "Raszter adathalmaz import" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "Vektor adathalmaz import" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "Raszter adathalmaz export" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "Vektor adathalmaz export" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "Raszter adathalmaz konvertálás 3D rétegbe" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "3D raszter számítások" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "GUI eszközök" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "Idővonal eszközök" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "Súgó" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "GRASS súgó" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "GRASS GIS HTML kézikönyv oldalainak megjelenítése" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "GUI súgó" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "Rendszer névjegy" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "GRASS GIS névjegy" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "Attribútum tábla kezelő" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "Vektor digitalizáló" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "Raszter digitalizáló" -#: ../gui/wxpython/menustrings.py:2052 +#: ../gui/wxpython/menustrings.py:2057 msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "Új modell létrehozás" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" -msgstr "Modell betöltés fájlból" - -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "Modell mentés fájlba" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "Modell fájl lezárás" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "Exportálás képbe" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "Export Pythonba" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "Kilépés a modellezőből" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "Modellező ablak lezárás" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "&Modell" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "Parancs hozzáadás" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "Feltétel hozzáadás" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "Elem eltávoilítás" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "Művelet/adat eltávolítása a modellből" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "A teljes modell ellenőrzése" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "Grafikus modellező névjegy" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "Papír méret, margók és tájolás megadása" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "Térképi utasításokat tartalmazó szövegfájl betöltése " -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "Térképi utasításokat tartalmazó szövegfájl generálása" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "Export PostScriptbe" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "PostScript output generálás" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "Export PDF-be" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "PDF output generálás" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "Térképkeret" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "Térkép jelmagarázat" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "Térkép info" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "Szöveg" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "Szöveg hozzáadás" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "Kép" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "Kép hozzáadás" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "Észak nyíl hozzáadás" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "Szelektált objektum törlése" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "Raszter cella értékek" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr ": %s" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -9846,7 +10051,7 @@ msgid "Text settings" msgstr "Szöveg beállítások" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "Rajz beállítások" @@ -9907,56 +10112,56 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "Raszter térkép statisztika <%s>" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "Távolság (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "Cella értékek" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "Raszter értékek" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "Vesszővel elválasztott értékek (*.csv)|*.csv" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "Fájl felülírása?" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" @@ -9965,7 +10170,7 @@ msgstr "" "<%s> fájlt nem tudom megnyitni írásra.\n" "Ok: %s" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" @@ -9974,11 +10179,11 @@ msgstr "" "%d fájlt létrehoztam:\n" "%s" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -10002,7 +10207,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "Statisztika" @@ -10048,11 +10253,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "Hibás input" @@ -10077,11 +10282,11 @@ msgid "Label font size (pts):" msgstr "Címke betűméret (pt):" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "Betűkészlet beállítások" @@ -10097,402 +10302,401 @@ msgstr "Stílus:" msgid "Weight:" msgstr "Súly:" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Figyelmeztetés" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "Vonalszín" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "Vonalszélesség" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "Vonalstílus" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "Jelmagyarázat" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "Méret" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "Kitöltés" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "Stílus" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "Tengely beállítások" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "X tengely" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Y tengely" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "Méretarány" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "Rács szín" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "Rács megjelenítés" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "Jelmagyarázat betűméret" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "Jelmagyarázat megjelenítés" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "Nem szelektálható elem" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "Térképcsoport" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "Típus:" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "Nincs kapcsolt tábla a <{}> réteghez." -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "Válasszon GIS adatkönyvtárat" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "Output beállítások" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "Fájl" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "Könyvtár" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "Adatbázis" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "Protokol" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "Output típus" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "Forrás típus" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "Minden fájl" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "ZIP fájlok" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "GZIP fájlok" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "TAR fájlok" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "TARGZ fájlok" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "Fájl:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "Válasszon importálandó fájlt" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "Könyvtár:" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "Válasszon input könyvtárat" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "Kiterjesztés:" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "Fájl választás" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "Elemtípus:" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "egyszerű elemek" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "topológiai" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "Létrehozási beállítások:" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "Formátum:" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "Pont" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "Törtvonal" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "Nincs szelektált vektortérkép" @@ -10532,13 +10736,13 @@ msgstr "Fordítók" msgid "Translation status" msgstr "Fordítás státusz" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "ismeretlen verzió" @@ -10554,107 +10758,107 @@ msgstr "" msgid "Build Date" msgstr "Készítés dátum" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "Nyelv" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "%s fájl hiányzik" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "Hiba a '%s' fájl olvasása közben." -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "Vonalak:" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "E-mail" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "Ország" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "%d lefordítva" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "%d nincs lefordítva" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "%d lefordítva" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "<%s> fájlt nem találom" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "Következő" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "Előző" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 #, fuzzy msgid "Clear prompt and output window" msgstr "Output ablak tartalmának törlése" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Modell mentés fájlba" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "Futó parancs megszakítása" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -10665,7 +10869,7 @@ msgstr "" "\n" "Részletek: %(error)s" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "Parancs outputot mentettem ide: '%s'" @@ -10748,7 +10952,7 @@ msgstr "" msgid "category" msgstr "kategória" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "" @@ -10769,8 +10973,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "Nincs szelektált térkép réteg. A művelet megszakadt." -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "Nincs kiválasztott térkép réteg. A művelet megszakadt." @@ -10799,429 +11003,443 @@ msgstr "" "\n" "Ok: %s" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "Felhasználói beállítások" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "Beállítás alapértelmezettnek" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "Csak erre a munkamenetre mentés" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "A kulcs oszlop nem lehet üres szöveg." -#: ../gui/wxpython/gui_core/preferences.py:250 -msgid "GUI Settings" +#: ../gui/wxpython/gui_core/preferences.py:252 +msgid "GUI Settings" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:280 +msgid "Layer Manager settings" +msgstr "Rétegkezelő beállítások" + +#: ../gui/wxpython/gui_core/preferences.py:293 +msgid "Ask when removing map layer from layer tree" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:307 +msgid "Ask when quitting wxGUI or closing display" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "Rajz beállítások" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:278 -msgid "Layer Manager settings" -msgstr "Rétegkezelő beállítások" +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:291 -msgid "Ask when removing map layer from layer tree" +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 -msgid "Ask when quitting wxGUI or closing display" +#: ../gui/wxpython/gui_core/preferences.py:392 +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "Hisztogram" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "Munkaterület beállítások" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 #, fuzzy msgid "Window layout settings" msgstr "Rajz beállítások" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "Betűkészlet beállítás" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "Kézikönyv oldal megjelenítése" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "Nyelvi beállítások" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "Elem lista:" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "Egérgörgő művelet:" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "A létrehozott térkép hozzáadás a réteg fához" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "Interaktív input engedélyezése" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "Alapértelmezett raszter beállítások" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "Alapértelmezett szín tábla" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "Alapértelmezett vektor beállítások" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "Elem szín:" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "Átlátszó" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "Terület kitöltő szín:" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "Véletlen színek a kategória számnak megfelelően" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "Szimbólum:" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "Attribútumok" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "Szelektált elemek kiemelése" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "Vonalvastagság (pixelekben):" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "Adat tallózó" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "Tábla létrehozás" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "Kulcs oszlop" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "Vetület" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "PROJ szöveg (kötelező):" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "EPSG fájl:" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "EPSG kódok betöltése (legyen türelmes), vigye be az EPSG kódot vagy írja be " "közvetlenül a PROJ szöveget." -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "EPSG kódok betöltése" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "Koordináta formátum" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "Élesség:" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "Hozzáférés kezelése a térképcsoportokhoz" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11230,7 +11448,7 @@ msgid "" " - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "Tulajdonos" @@ -11247,7 +11465,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "Térkép nevek másolása a vágólapra (alulról felfelé)" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "" @@ -11371,7 +11589,7 @@ msgstr "Képernyő mentése fájlba" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "Betűkészlet" @@ -11406,7 +11624,7 @@ msgid "Map Display Settings" msgstr "Térkép beálítások" #: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +msgid "(Un)dock" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 @@ -11430,7 +11648,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -11486,7 +11704,7 @@ msgid "Optional" msgstr "Opcionális" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "" @@ -11498,79 +11716,79 @@ msgstr "" msgid "valid range" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "Betö<és" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "Fájl tartalmának betöltése és módosítása" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "Mentés másként" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "Fájl tartalmának mentése későbbi felhasználásra" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "vagy adja meg az értéket közvetlenül" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "Réteg id" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "Rétegnév" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "Elemtípus" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "Vetület egyezik" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "Kézikönyv" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "Nincs mit betölteni." -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11581,95 +11799,95 @@ msgstr "" "\n" "Ok: %s" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "Nincs mit menteni." -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "Input mentése másként..." -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "Nem adott adathalmazt." -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "Hiba ebben %s" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "Nem tudom értelmezni a parancsot '%s'" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" "Próbálja meg beállítani a GRASS_ADDON_PATH vagy GRASS_ADDON_BASE változót." -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "Lekérdezés eredmények" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "Jobb gomb kattintás a szelektált értékeke vágólapra másolásához." -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "Elem" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "Érték" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "Minden másolása a vágólapra" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "Átirányítás a konzolba" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "Másolás a '%s' oszlopból" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "Szelektált sorok másolása" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "Másolás '%s'" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "Sor másolás" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "Lekérdezés eredmények:" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "kelet, észak" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "Semmit sem találtam" @@ -11677,60 +11895,64 @@ msgstr "Semmit sem találtam" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "Válasszon GRASS helyet és térképcsoportot" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." msgstr "Nem adott meg helyet vagy térkép csoportot." -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +#, fuzzy +msgid "Name of GRASS project:" msgstr "GRASS hely neve" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "Térképcsoport neve" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "Válasszon térképcsoportot a helyen" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "Térképcsoport neve hiányzik" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "Válasszon vektor térképet" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "A vektor térkép neve hiányzik." -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "Attribútum tábla létrehozás" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "Az új vektor térkép neve hiányzik." -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "Új vektor térkép neve:" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "Nem tudom a vektor térképet létrehozni <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" @@ -11739,7 +11961,7 @@ msgstr "" "Hibás vagy üres kulcs oszlop.\n" "Nem tudom a vektor térképet létrehozni <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " @@ -11747,15 +11969,15 @@ msgid "" msgstr "" "A <%s> térkép már létezik az aktuális térképcsoportban. Felül akarja írni?" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "Régió betöltés:" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "Régió mentés:" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." @@ -11763,300 +11985,300 @@ msgstr "" "A névnem kezdődhet '.'-tal és nem tartalmazhat szóközt, idézőjelet, '/', " "''', '@', ',', '=', '*', és minden más nem alfanumerikus karaktert." -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "Képcsoport létrehozás vagy szerkesztés" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "Módosítások alkalmazása a szelektált csoportra" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "Alcsoport létrehozás, szerkesztés" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "Mindent szelektál" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "Minta:" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "Térképek listája:" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "Szelektált réteg(ek) eltávolítása a listából." -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "Szelektált térkép rétegek hozzáadása a csoporthoz" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "Nincs szelektált rasztertérkép." -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "Nincs szelektált csoport." -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "Térkép típus:" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "Térképcsoport:" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "Kiválasztás megfordítása" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "Semmit sem szelektál" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "Térkép réteg átlátszóság" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "átlátszó" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "Képméret beállítás" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "Képméret" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "Sablon:" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "SQL mondat" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "Szimbólumok" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "Szimbólum könyvtár:" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "Szimbólum név:" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "Betűkészlet:" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "Karakter kódolás:" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "Betűméret:" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "Példa" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr " (...)" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "Teljes szöveg keresés" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "Metszetek" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "Aktuális beállítások mentése" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "Beállítások mentése" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "Nem adott nevet, beállításokat nem mentettem." -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12141,9 +12363,9 @@ msgid "Snap also to vertex" msgstr "Illesztés a töréspontokhoz is" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "Illesztési küszöbérték %(value).1f%(units)s" @@ -12165,226 +12387,226 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "Duplikáltak ellenőrzése" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "Vonalak, határok digitalizálása" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "Vonalak megszakítása metszéseknél" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "Területek digitalizálása" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "Határ bezárása (illesztés a kezdő csomópontba)" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "Változások mentése" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "Változások mentése a kilépéskor" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "Lekérdezés eszköz" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "Kiválasztás téglalappal" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "hossz" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "Vonalak szelektálása" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "rövidebb mint" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "hosszabb mint" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "lógó vonal" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "Lógó vonalak szlektálása" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "Új elem digitalizálás" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "Új rekord hozzáadása a táblához" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Réteg" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Kategória" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "Mód" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "Kategória szám" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "Kategória mód" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "Manuális bevitel" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "Nincs kategória" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "Létező elem(ek) törlése" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "Rekord törlés a táblából" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "terület" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "kerület" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "Új vonalszakasz digitalizálás" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "Új vonal, határ digitalizálás" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "Kiemel" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "Kiemelés (duplikáltak)" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "Vonal" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "Határvonal (nincs terület)" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "Határvonal (egy terület)" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "Határvonal (két terület)" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "Centrális (területben)" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "Centrális (területen kívül)" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "Centrális (duplán a területben)" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "Csomópont (egy vonal)" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "Csomópont (két vonal)" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "Töréspont" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "Terület (zárt határvonal + centrális)" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Irány" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "Illesztés kikapcsolva" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "Vektor digitalizálás beállításokat a <%s> fájlba mentettem." -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12405,220 +12627,220 @@ msgstr "" msgid "Topology missing" msgstr "Topológia hiányzik" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "Válassza a terület/határ/centrális eszközt" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "Új pont digitalizálás" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "Bal: új pont" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "Új vonal digitalizálás" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "Bal: új pont; Ctrl+bal: utolsó pont visszavonás; jobb: vonal lezárás" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 #, fuzzy msgid "Digitize new boundary (Ctrl+B)" msgstr "Új határ digitalizálás" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 #, fuzzy msgid "Digitize new centroid (Ctrl+C)" msgstr "Új centrális digitalizálás" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 #, fuzzy msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "Új terület digitalizálás (határvonal kategória nélkül)" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 #, fuzzy msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "Új töréspont hozzáadása vonalhoz vagy határvonalhoz" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 #, fuzzy msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" "Szelektált pont(ok), vonal(ak), határvonal(ak) vagy centrális(ok) törlése" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Szelektált terület(ek) törlése" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 #, fuzzy msgid "Display/update attributes (Ctrl+K)" msgstr "Attribútumok megjelenítése/aktualizálása" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "Bal: kiválaszt" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 #, fuzzy msgid "Display/update categories (Ctrl+J)" msgstr "Kategóriák megjelenítése/frissítése" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "Kiválasztott vonal/határvonal szerkesztése" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 #, fuzzy msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" "Kiválasztott pont(ok), vonal(ak), határvonal(ak) vagy centrális(ok) mozgatása" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 #, fuzzy msgid "Move selected vertex (Ctrl+G)" msgstr "Kiválasztott töréspont mozgatás" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "Kiválasztott töréspont eltávolítás" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "Megnyitás (Ctrl+O)" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 #, fuzzy msgid "Quit (Ctrl+Q)" msgstr "Futtatás (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "Kilépés a digitalizálóból ésa módosítások mentése" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Parancs kézikönyv oldal megjelenítése (Ctrl+H)" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "Vektor digitalizálás kézikönyv megjelenítése" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "További eszközök (másol, tükröz, összekapcsol, stb.)" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 #, fuzzy msgid "Undo (Ctrl+Z)" msgstr "Futtatás (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "Előző módosítások visszavonása" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 #, fuzzy msgid "Redo (Ctrl+Y)" msgstr "Futtatás (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "Előző változások ismétlése" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "Kiválasztott vonalak/határok megtörése a metszéseknél" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "Szelektált vonalak/határok összekapcsolása" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "Kategóriák másolása" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "Elemek másolása a (háttér) vektor térképből" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "Attribútumok másolása" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "Elem típus konverzió" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "Szelektált vonalak/határok tükrözése" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "Szelektált vonalak/határok összevonása" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "Szelektált vonalak/határok illesztése (csak csomópontokhoz)" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "vona/határ vágása" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "Elemek lekérdezése" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "Válaszon háttér vektortérképet" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "A vektor térkép nem 3D-s. A művelet megszakadt." -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12631,16 +12853,16 @@ msgstr "" "Újraépíti a topológiát (némi időt vehet igénybe) és megnyitja a " "vektortérképet szerkesztésre?" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "Digitalizálási hiba" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "Kérem várjon, megnyitom a <%s> vektortéképet szerkesztésre..." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." @@ -12648,28 +12870,28 @@ msgstr "" "Nem támogatott elemtípus '%(type)s'. Nem tudom szerkeszteni a <%(layer)s> " "OGR réteget." -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "El akarja menteni a változásokat a <%s> vektortérképbe?" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "Változások mentése?" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" "Kérem várjon a <%s> vektortérkép lezárására és a topológia újraépítésére..." -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "<%s>vektortérkép szerkesztését sikeresen befejeződött" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "Új vektor térkép" @@ -12682,8 +12904,8 @@ msgid "Add new category" msgstr "Új kategória hozzáadás" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "Módosítások elfogadása" @@ -12692,11 +12914,11 @@ msgid "Ignore changes and close dialog" msgstr "Változások eldobása és ablak bezárása" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "" @@ -12741,24 +12963,24 @@ msgstr "Elem id" msgid "Layer (Categories)" msgstr "Réteg (Kategóriák)" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "Digitalizálási hiba" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "Nem tudom a vektor térképet megnyitni <%s>." -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "Nincs szerkesztésre megnyitott vektortérkép." -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "Művelet megszakítva." -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -12766,53 +12988,53 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "%delem id olvasása sikertelen. A művelet megszakadt." -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "%d adatbázis kapcsolat nem érhető el. A művelet megszakadt." -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "Nem tudom elindítani a <%s> adatbázis meghajtót. Művelet megszakadt." -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "Nem támogatott elem típus %d. művelet megszakadt." -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "Ismeretlen elem típus '%s'" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "Nincs elég pont avonalhoz" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." @@ -12820,45 +13042,45 @@ msgstr "" "Kérjük telepítse a Python Kép Könyvtárat (PIL)\n" "a jelmagyarázat és más dekorációk jobb felügyeletére." -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "Szöveg eltávolítás" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "Léptékvonalzó eltávolítás" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "Észak nyíl eltávolítás" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "Jelmagyarázat eltávolítás" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "A tulajdonság nem létezik: %s" @@ -12870,19 +13092,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -12901,32 +13123,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "Kérem várjon, kép exportálás..." -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "Nagyítás a mentett régió terjedelmére" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "Számítási régió beállítása névvel bíró régióval" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "Képernyő terjedelem mentése régió fájlba" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "Számítási régió mentése régió fájlba" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "<%s> régió fájl már létezik. Felül akarja írni?" @@ -13038,100 +13260,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "Réteg hozzá&adás" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13160,12 +13382,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "Fel" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "Le" @@ -13239,11 +13461,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13254,50 +13476,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "GRASS GIS illesztőpont kezelés" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "Válasszon csoportot:" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "forrás Z" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "cél Z" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "forrás Z:" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "Cél Z:" @@ -13313,45 +13535,45 @@ msgstr "2. Válasszon GRASS helyet" msgid "3. Select GRASS Mapset" msgstr "3. Válasszon GRASS térképcsoportot" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "A GRASS GIS adatbázis könyvtár tartalmaz helyeket." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "&GRASS indítása" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "Tallózás" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "Új" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "Új térképcsoport létrehozása a kiválasztott helyen" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "Új" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." @@ -13360,64 +13582,78 @@ msgstr "" "után egy GRASS munkamenet indul." #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "Átnevezés" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Kiválasztott hely átnevezése" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "Törlés" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Kiválasztott hely törlése" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Kiválasztott térképcsoport törlése" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "GRASS GIS %sindítás%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" "Nem tudom a GRASS adatbázist beállítani. Ellenőrizze a helyi beállításait." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "HIBA: <%s> helyet nem találom\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "HIBA: <%s> térképcsoportot nem találom\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "Hibás sor a GISRC fájlban (%s): %s\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "Importálni akarja <%(name)s>-t az újonnan létrehozott helyre?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "Új térképcsoport" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" +"<%(name)s> adatfájlt sikeresen importáltam. A hely alapértelmezett régióját " +"ebből az importált térképből állítottam be." + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13427,8 +13663,8 @@ msgstr "" "\n" "Ez a térképcsoport nem nevezhető át." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13439,14 +13675,14 @@ msgstr "" "\n" "Új név:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Üzenet" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13457,7 +13693,7 @@ msgstr "" "\n" "<%s> térképcsoport már létezik a helyen." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13468,7 +13704,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13479,7 +13715,7 @@ msgstr "" "\n" "<%s> hely már létezik a GRASS adatbázisban." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13490,7 +13726,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13500,11 +13736,11 @@ msgstr "" "\n" "Ez a térképcsoport nem törölhető." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" @@ -13513,11 +13749,11 @@ msgstr "" "\n" "Minden a térképcsoporthoz tartozó térképet véglegesen törlök!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "Nem tudom törölni a térképcsoportot" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13528,17 +13764,17 @@ msgstr "" "\n" "Minden a helyhez tartozó térképet véglegesen törlök!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "Nem tudom törölni a helyet" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" "Unicode hibát találtam. Ellenőrizze a helyi beállításait. Részletek: {0}" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " @@ -13547,21 +13783,21 @@ msgstr "" "Nem találtam GRASS helyet itt '%s'. Hozzon létre egy új helyet vagy " "válasszon egy másik GRASS adatbázis könyvtárat." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "'%s' útvonal nem létezik." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "Az új térképcsoport neve:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "<%s>térképcsoport már létezik." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13574,16 +13810,16 @@ msgstr "" "\n" "Biztos benne, hogy létre akarja hozni ezt a térképcsoportot?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "Fenntartott térképcsoport név" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "Nem tudok új térképcsoportot létrehozni: %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13595,12 +13831,12 @@ msgid "" "this operation) and continue?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13608,7 +13844,7 @@ msgid "" "your data. Have another look in the processor manager just to be sure..." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13619,7 +13855,7 @@ msgstr "" "\n" "Részletek: %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " @@ -13628,7 +13864,7 @@ msgstr "" "<%(name)s> név nem megfelelő egy helyhez vagy egy térképcsoporthoz. Csak az " "ASCII karaktereket használja kivéve %(chars)s és szóköz." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " @@ -13639,150 +13875,150 @@ msgstr "" "választás a \"grassdata\", a kezdőkönyvtárában. Nyomja meg a Tallóz gombot " "egy könyvtár kiválasztásához." -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "'%s' vektor térkép nem létezik." -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "Nem választott vektor térképet." -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "csomópont réteg" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "fordulási tábla réteg" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "egyedi kategóriák réteg" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "topológia" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "Kezdőpont" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "Végpont" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "új pont" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "Él költség oszlop (mindkét irányhoz)" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "él" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "Csomópont költség oszlop:" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "csomópont" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "Legrövidebb útvonal %s" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "Végpont" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "Utazó ügynök %s" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "Forráspont" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "Nyelő pont" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "Legrövidebb távolság a hálózaton %s" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "Költség izovonalak %s" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "Térkép réteg felülírása" @@ -13790,7 +14026,7 @@ msgstr "Térkép réteg felülírása" msgid "Unable to perform analysis." msgstr "Nem tudom az elemzést végrehajtani." -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -13798,45 +14034,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "Térkép csak az aktuális térkép csoportba hozható létre" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "<%s> vektortérkép már létezik. Felül akarja írni?" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "Vektor térkép felülírása" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "Nem sikerült a fordulási tábla létrehozása." -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "Nem található a vektor térkép az elemzési eredményekkel." -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "Térkép csak az aktuális térképcsoportba menthető" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "Kérem válasszon legalább két pontot." -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -13844,38 +14080,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "Térkép felülírása" @@ -13974,117 +14210,117 @@ msgstr "Izovonalak:" msgid "Output" msgstr "Output" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "Vektor térkép hozzáadása a réteg fához" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "Input táblák" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "Eredmény táblák" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "Táblák betöltése..." -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "Fordulási tábla készítés..." -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "Az input vektor térkép nem létezik." -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "Elemzés..." -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "Csomópontok számítása..." -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "További beállítások" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "Pont stílus:" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "Elemzés eredmény stílus:" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "Szín tábla stílus %s:" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "Szinek invertálása %s:" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "Vonalszín:" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "Szín a nem használt ponthoz:" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "Szín a kezdő/forrás/használt ponthoz:" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "Szín a vég/cél/nyelő ponthoz:" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "Szín a kiválasztott ponthoz:" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "Pont méret:" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "Pont szélesség:" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "Új vektor térkép fordulási táblával" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "Elemzés eredmény mentése" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "Végpont" @@ -14100,41 +14336,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "Raszterizálás..." -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -14176,7 +14412,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "Új raszter térkép" @@ -14209,19 +14445,19 @@ msgstr "" "<%s> rasztertérkép már létezik az aktuális térképcsoportban. Felül akarja " "írni?" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "méter" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "kilométer" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "mérföld" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "láb" @@ -14245,25 +14481,25 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -14275,8 +14511,8 @@ msgstr "" msgid "Execution failed:" msgstr "Végrehajtási hiba:" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "Részletek:" @@ -14326,7 +14562,7 @@ msgstr "" msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14335,21 +14571,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "<%s> modult nem találom." -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "Parancs megszakítva" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14370,147 +14606,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "Kiválasztott rekord szerkesztése" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14518,11 +14754,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14530,11 +14766,11 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "" @@ -14601,22 +14837,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14646,22 +14882,22 @@ msgstr "" msgid "Unsupported command %s." msgstr "Nem támogatott parancs %s." -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "Nem tudom létrehozni a fájlt <%s>" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14670,33 +14906,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "" @@ -14743,47 +14979,47 @@ msgstr "" msgid "Status bar" msgstr "Állapotsor megjelenítés" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "Rajzolás" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "Térkép méretarány" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "GCP koordináták beállítása" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "Hiba a vetületben (ellenőrizze a beállításokat)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "Koordináták" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 #, fuzzy msgid "Display extent" msgstr "Képernyő felbontás" @@ -14858,14 +15094,14 @@ msgid "Click mouse to unzoom" msgstr "Kattintson az egérrel a kicsinyítéshez" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "2D nézet" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "3D nézet" @@ -14885,47 +15121,47 @@ msgstr "Vektor digitalizáló nem érhető el" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "Eszközsorok elrejtése" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "Eszközsorok megjelenítése" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "Állapotsor elrejtés" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "Állapotsor megjelenítés" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "Vektor digitalizáló eszköztár" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -14940,59 +15176,59 @@ msgstr "" "\n" "Részletek: %s" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "3D megjelenítési mód indítása..." -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "Kérem várjon, adatbetöltés..." -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "Kérem várjon, adatok eltávolítása..." -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "Visszatérés a 2D megjelenítési módra..." -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "Sikertelen d.to.rast futtatás:\n" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "d.to.rast csak 2D módban használható." -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "Számítási régió interaktív beállítása" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "Számítási régió beállítása névvel bíró régióval" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "Számítási régió mentése névvel bíró régióba" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "Raszter digitalizáló eszköztár" @@ -17913,6 +18149,7 @@ msgid "Graphical Modeler - GRASS GIS" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17924,6 +18161,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -18000,7 +18242,7 @@ msgstr "Adja meg a raszter kategória értékeket vagy százalékokat" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "tartomány" ======= @@ -18298,6 +18540,7 @@ msgid "Change" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18309,6 +18552,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -18495,8 +18743,8 @@ msgstr "Szélesség mentése oszlopba:" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "Oszlop hozzáadás" @@ -18526,8 +18774,8 @@ msgid "" "Selected map <%(map)s> is not in current mapset <%(mapset)s>. Attribute " "table cannot be edited." msgstr "" -"A kiválasztott térkép <%(map)s> nincs az aktuális térképcsoportban <" -"%(mapset)s>. Az attribútum tábla nem szerkeszthető." +"A kiválasztott térkép <%(map)s> nincs az aktuális térképcsoportban " +"<%(mapset)s>. Az attribútum tábla nem szerkeszthető." #: ../gui/wxpython/modules/colorrules.py:1536 #, python-format @@ -21157,7 +21405,7 @@ msgid "List of %s layers" msgstr "%sréteg listája" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -21171,13 +21419,13 @@ msgstr "Vetület felülbírálása (az aktuális hely vetületét használja)" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "&Import" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "Szelektált rétegek importálása" @@ -21200,82 +21448,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "Kapcsolt réteg hozzáadása rétegfához" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "Importált rétegek hozzáadása a rétegfához" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "Kapcsolás" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "Kiválasztott rétegek kapcsolása" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "Nem szelektált réteget. A művelet megszakadt." -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "Nem tudom meghatározni a raszter sávok számát" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "Adja meg a vektor adatokhoz az output formátumot" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "Adja meg a raszter adatokhoz az output formátumot" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "Külső formátum beállítása és a párbeszédablak lezárása" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "Nem választott adatforrást." -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "DXF rétegek import" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "Válasszon importálandó DXF fájlt" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "Nem szelektált réteget." -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "Output GRASS térkép neve" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "A következő rétegek vetülete nem egyezik az aktuális hely vetületével." -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "Átvetítendő rétegek" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "&Import && átvetítés" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "Kiválasztott rétegek átvetítése" @@ -21285,6 +21533,7 @@ msgstr "Kiválasztott rétegek átvetítése" #: ../gui/wxpython/modules/histogram.py:296 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21296,6 +21545,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 "" @@ -21613,8 +21867,14 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= -<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -21811,14 +22071,14 @@ msgstr "Válasszon egy fájlnevet a kifejezés betöltéséhez" msgid "'{cmd}' copied to clipboard" msgstr "'{cmd}'-t a vágólapra másoltam" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -21826,15 +22086,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "Adatok betöltése..." -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -21844,7 +22104,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -21856,30 +22116,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -21890,114 +22150,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "Töréspont mozgatás" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "Töréspont eltávolítás" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "Határvonal töréspont eltávolítás" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -22065,99 +22325,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "Kiválasztás stílus:" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "Válasszon kategóriát a szerkesztéshez." -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "Osztály átnevezés" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "Szín beállítás" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "Átlátszósági szint módosítás" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "Elrejt" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "Mutat" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "Felülre mozgat" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "Alulra mozgat" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "Kategória mozgatás fel" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "Kategória mozgatás le" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -22513,7 +22774,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -22521,7 +22782,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -22671,6 +22932,7 @@ msgstr "FIGYELMEZTETÉS" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22682,6 +22944,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 "" @@ -22734,7 +23001,7 @@ msgstr "" msgid "Rename configuration file" msgstr "Konfiguráció fájl átnevezés" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -22742,39 +23009,46 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Munkaterület eszközsor" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "Eszközök eszközsor" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "3D nézet eszközsor" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "Konzol" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 #, fuzzy msgid "Map Swipe Tool" msgstr "Térkép eszközsor" @@ -22784,6 +23058,7 @@ msgid "Text properties" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22795,12 +23070,23 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "Válassza ki a futtatandó modelt" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -22983,76 +23269,81 @@ msgstr "Fájl felülírása?" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " "layer instead." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "A kiválasztott térkép réteg nem vektor." -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" "A szerkesztés csak az aktuális térképcsoport vektor térképeire engedélyezett." -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "Válassza ki a futtatandó szkript ffájlt" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Python szkript (*.py)|*.py|Bash szkript (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "'%s' szkript fájl nem létezik. A művelet megszakadt." -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "Engedély beállítás?" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "Nem tudom az engedélyt beállítani. A művelet megszakadt." -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "Nem kaptam helyet/térképcsoportot. A művelet megszakadt." +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "Nem kaptam térképcsoportot. A művelet megszakadt." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "Nem kaptam térképcsoportot. A művelet megszakadt." -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" @@ -23061,69 +23352,69 @@ msgstr "" "A munka könyvtár erre módosult:\n" "\"%s\"" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "Használat: cd [könyvtár]" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "Paraméterek nélkül egy párbeszédablakot nyit." -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "Válasszon munka könyvtárat" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "Rendszer info" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "GRASS version" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "Platform" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "Új név:" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -23131,26 +23422,26 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "Kiválasztott térkép rétegek hozzáadás a réteg fához" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "Nem támogatott térkép réteg típus <%s>" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." @@ -23158,12 +23449,12 @@ msgstr "" "A cella értékek megjelenítése csak a 10,000 cellánál kisebb régiókra " "lehetséges." -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "átlátszóság:" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -23174,16 +23465,23 @@ msgstr "" "%s\n" "a réteg fából?" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "El akarja távolítani a kiválasztott térkép réteg(ek)et a réteg fából?" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "Térkép réteg eltávolítás" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Kilépés a GRASS GUI-ból" ======= @@ -23193,26 +23491,36 @@ msgid "Histogram Tool" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" +#: ../gui/wxpython/wxplot/histogram.py:51 +msgid "Histogram of" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +msgstr "" +>>>>>>> osgeo-main + #: ../gui/wxpython/wxplot/histogram.py:51 msgid "Histogram of" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "" @@ -23240,55 +23548,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "Output kép írása a csoportba, kérem várjon..." -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "forrás X" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "forrás Y" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "cél X" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "cél Y" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "forrás X:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "cél X:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "forrás Y:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "cél Y:" @@ -23361,7 +23669,7 @@ msgstr "Szerkesztő mód" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "Térkép rétegek" @@ -23393,64 +23701,70 @@ msgstr "" msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "PostGIS export" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "Másolat készítés az aktuális térképcsoportban" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "Szín tábla beállítás" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "Színtábla interaktív beállítása" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "Attribútumadat megjelenítés" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "Szerkesztés indítása" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "Szerkesztés befejezése" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "Topológia újraépítés" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "Raszter statisztika jelentés" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "Metszet" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "Web szolgáltatás réteg mentése" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -23965,21 +24279,28 @@ msgstr "A letöltés folyamatban, várjon amíg befejeződik" #: ../gui/wxpython/startup/locdownload.py:466 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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>" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format <<<<<<< HEAD msgid "Make a copy of %s <%s>" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/lmgr/layertree.py:1085 +======= #: ../gui/wxpython/lmgr/layertree.py:1047 ======= msgid "Location named <%s> already exists, rename it first" @@ -24235,39 +24556,48 @@ msgstr "" #: ../gui/wxpython/startup/guiutils.py:693 #: ../gui/wxpython/image2target/ii2t_gis_set.py:593 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +#, fuzzy +msgid "Set opacity of <{}>" +msgstr "Átlátszóság színt beállítás" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "Réteg csoport:" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "Kérem várjon, adatok aktualizálása..." @@ -24508,6 +24838,15 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"Az aktuális hely <%(loc)s>.\n" +"Az aktuális térképcsoport <%(mapset)s>." + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 #, python-format @@ -24522,100 +24861,309 @@ msgstr "" msgid "Please wait, loading workspace..." msgstr "Kérem várjon, munkaterület betöltése..." -#: ../gui/wxpython/lmgr/workspace.py:364 -msgid "Choose file to save current workspace" -msgstr "Válasszon fájlt a munkaterület mentéséhez" +#: ../gui/wxpython/lmgr/workspace.py:364 +msgid "Choose file to save current workspace" +msgstr "Válasszon fájlt a munkaterület mentéséhez" + +#: ../gui/wxpython/lmgr/workspace.py:385 ../gui/wxpython/lmgr/workspace.py:408 +#, python-format +msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" +msgstr "<%s> munkaterület fájl már létezik. Felül akarja írni ezt a fájlt?" + +#: ../gui/wxpython/lmgr/workspace.py:437 +msgid "Writing current settings to workspace file failed." +msgstr "Az aktuális beállítások munkaterület fájlba mentése nem sikerült." + +#: ../gui/wxpython/lmgr/workspace.py:467 +msgid "Do you want to save changes in the workspace?" +msgstr "Menteni akarja a munkaterületen történt változásokat?" + +#: ../gui/wxpython/lmgr/workspace.py:470 +msgid "Do you want to store current settings to workspace file?" +msgstr "Tárolni akarja az aktuális beállításokat a munkaterület fájlban?" + +#: ../gui/wxpython/lmgr/workspace.py:554 +msgid "File <{}> doesn't exist. It was probably moved or deleted." +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:141 +msgid "There were some issues when loading menu or Tools tab:" +msgstr "" + +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "Nem kaptam helyet/térképcsoportot. A művelet megszakadt." + +#: ../gui/wxpython/dbmgr/manager.py:92 +msgid "Attribute Table Manager" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:95 +#, python-brace-format +msgid "{document} (read-only)" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:114 +#, python-format +msgid "" +"Database connection for vector map <%s> is not defined in DB file. You can " +"define new connection in 'Manage layers' tab." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:123 +msgid "Please wait, loading attribute data..." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:133 +msgid "Browse data" +msgstr "Adatok böngészése" + +#: ../gui/wxpython/dbmgr/manager.py:139 +msgid "Manage tables" +msgstr "Táblák kezelése" + +#: ../gui/wxpython/dbmgr/manager.py:144 +msgid "Manage layers" +msgstr "Rétegek kezelése" + +#: ../gui/wxpython/dbmgr/manager.py:155 +msgid "Close Attribute Table Manager" +msgstr "Attribútum tábla kezelő bezárása" + +#: ../gui/wxpython/dbmgr/manager.py:157 +msgid "Reload currently selected attribute data" +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:160 +msgid "Reload all attribute data (drop current selection)" +msgstr "" + +#: ../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 +#, python-format +msgid "Number of loaded records: %d" +msgstr "Betöltött rekordok száma: %d" + +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#, python-format +msgid "Loading attribute data for vector map <%s>..." +msgstr "" + +#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:55 +msgid "Attribute Table Manager - GRASS GIS" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 +msgid "Fractal dimension of boundary defining a polygon" +<<<<<<< HEAD +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:505 +msgid "Perimeter length of an area" +msgstr "Egy terület kerülete" + +#: ../gui/wxpython/dbmgr/base.py:507 +msgid "Number of features for each category" +msgstr "Elemek száma minden egyes kategóriára" + +#: ../gui/wxpython/dbmgr/base.py:510 +msgid "Slope steepness of 3D line" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:511 +msgid "Line sinuousity" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:512 +msgid "Line azimuth" +msgstr "Vonal azimut" + +#: ../gui/wxpython/dbmgr/base.py:646 +#, python-format +msgid "Add column to table <%s>" +msgstr "Oszlop hozzáadás a táblához <%s>" + +#: ../gui/wxpython/dbmgr/base.py:1040 +msgid "Unable to add column to the table. No column name defined." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1054 +#, python-format +msgid "Column <%(column)s> already exists in table <%(table)s>." +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1137 +msgid "Attribute data - right-click to edit/manage records" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1152 ../gui/wxpython/dbmgr/base.py:2275 +#: ../gui/wxpython/dbmgr/base.py:2970 ../gui/wxpython/dbmgr/base.py:3105 +#: ../gui/wxpython/dbmgr/base.py:3370 +msgid "Table" +msgstr "Tábla" + +#: ../gui/wxpython/dbmgr/base.py:1154 ../gui/wxpython/dbmgr/base.py:2277 +msgid " (read-only)" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1168 +msgid "SQL Query" +msgstr "SQL lekérdezés" + +#: ../gui/wxpython/dbmgr/base.py:1198 +msgid "Simple" +msgstr "Egyszerű" + +#: ../gui/wxpython/dbmgr/base.py:1205 +msgid "Apply SELECT statement and reload data records" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:498 +#, python-format +msgid "Example: %s" +msgstr "Példa: %s" + +#: ../gui/wxpython/dbmgr/base.py:1239 +msgid "Builder" +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:1244 +msgid "SQL Builder" +msgstr "SQL szerkesztő" + +#: ../gui/wxpython/dbmgr/base.py:1426 ../gui/wxpython/dbmgr/base.py:1615 +msgid "Insert new record" +msgstr "Új rekord beszúrás" + +#: ../gui/wxpython/dbmgr/base.py:1427 +msgid "Delete selected record(s)" +msgstr "Kiválasztott rekord(ok) törlése" -#: ../gui/wxpython/lmgr/workspace.py:385 ../gui/wxpython/lmgr/workspace.py:408 -#, python-format -msgid "Workspace file <%s> already exists. Do you want to overwrite this file?" -msgstr "<%s> munkaterület fájl már létezik. Felül akarja írni ezt a fájlt?" +#: ../gui/wxpython/dbmgr/base.py:1428 +msgid "Delete all records" +msgstr "Minden rekord törlése" -#: ../gui/wxpython/lmgr/workspace.py:437 -msgid "Writing current settings to workspace file failed." -msgstr "Az aktuális beállítások munkaterület fájlba mentése nem sikerült." +#: ../gui/wxpython/dbmgr/base.py:1434 ../gui/wxpython/gui_core/widgets.py:1109 +#: ../gui/wxpython/gui_core/dialogs.py:782 +#: ../gui/wxpython/gui_core/dialogs.py:850 +#: ../gui/wxpython/gui_core/dialogs.py:1592 +msgid "Select all" +msgstr "Mindent szelektál" -#: ../gui/wxpython/lmgr/workspace.py:467 -msgid "Do you want to save changes in the workspace?" -msgstr "Menteni akarja a munkaterületen történt változásokat?" +#: ../gui/wxpython/dbmgr/base.py:1435 ../gui/wxpython/gui_core/widgets.py:1110 +#: ../gui/wxpython/gui_core/dialogs.py:1594 +msgid "Deselect all" +msgstr "Semmit sem szelektál" -#: ../gui/wxpython/lmgr/workspace.py:470 -msgid "Do you want to store current settings to workspace file?" -msgstr "Tárolni akarja az aktuális beállításokat a munkaterület fájlban?" +#: ../gui/wxpython/dbmgr/base.py:1437 +#: ../gui/wxpython/gui_core/preferences.py:1506 +msgid "Highlight selected features" +msgstr "Szelektált elemek kiemelése" -#: ../gui/wxpython/lmgr/workspace.py:554 -msgid "File <{}> doesn't exist. It was probably moved or deleted." -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1440 +msgid "Highlight selected features and zoom" +msgstr "Szelektált elemek kiemelése és nagyítás" -#: ../gui/wxpython/lmgr/frame.py:140 -msgid "There were some issues when loading menu or Tools tab:" +#: ../gui/wxpython/dbmgr/base.py:1444 ../gui/wxpython/dbmgr/base.py:1955 +msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 -msgid "Attribute Table Manager" -msgstr "" +#: ../gui/wxpython/dbmgr/base.py:1445 +msgid "Delete selected features" +msgstr "Szelektált elemek törlése" -#: ../gui/wxpython/dbmgr/manager.py:94 -#, python-brace-format -msgid "{document} (read-only)" +#: ../gui/wxpython/dbmgr/base.py:1508 +msgid "Update existing record" +msgstr "Létező rekord frissítése" + +#: ../gui/wxpython/dbmgr/base.py:1535 ../gui/wxpython/dbmgr/base.py:1648 +#, python-format +msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/base.py:1554 #, python-format msgid "" -"Database connection for vector map <%s> is not defined in DB file. You can " -"define new connection in 'Manage layers' tab." +"Unable to update existing record.\n" +"%s" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 -msgid "Please wait, loading attribute data..." +#: ../gui/wxpython/dbmgr/base.py:1626 +#, python-format +msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 -msgid "Browse data" -msgstr "Adatok böngészése" +#: ../gui/wxpython/dbmgr/base.py:1636 +#, python-format +msgid "Category number (column %s) is missing." +msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 -msgid "Manage tables" -msgstr "Táblák kezelése" +#: ../gui/wxpython/dbmgr/base.py:1660 +#, python-format +msgid "" +"Unable to insert new record.\n" +"%s" +msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 -msgid "Manage layers" -msgstr "Rétegek kezelése" +#: ../gui/wxpython/dbmgr/base.py:1713 +#, python-format +msgid "Selected data records (%d) will be permanently deleted from table. Do you want to delete them?" +msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 -msgid "Close Attribute Table Manager" -msgstr "Attribútum tábla kezelő bezárása" +#: ../gui/wxpython/dbmgr/base.py:1716 ../gui/wxpython/dbmgr/base.py:1766 +msgid "Delete records" +msgstr "Rekordok törlése" -#: ../gui/wxpython/dbmgr/manager.py:156 -msgid "Reload currently selected attribute data" +#: ../gui/wxpython/dbmgr/base.py:1763 +#, python-format +msgid "All data records (%d) will be permanently deleted from table. Do you want to delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 -msgid "Reload all attribute data (drop current selection)" +#: ../gui/wxpython/dbmgr/base.py:1950 +msgid "Nothing to extract." msgstr "" -#: ../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 -#, python-format -msgid "Number of loaded records: %d" -msgstr "Betöltött rekordok száma: %d" +#: ../gui/wxpython/dbmgr/base.py:1984 +msgid "Nothing to delete." +msgstr "Nincs mit törölni." -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51 +#: ../gui/wxpython/dbmgr/base.py:2055 ../gui/wxpython/dbmgr/base.py:2091 #, python-format -msgid "Loading attribute data for vector map <%s>..." +msgid "" +"Loading attribute data failed.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:55 -msgid "Attribute Table Manager - GRASS GIS" +#: ../gui/wxpython/dbmgr/base.py:2074 +#, python-format +msgid "" +"Loading attribute data failed.\n" +"Invalid SQL select statement.\n" +"\n" +"%s" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/base.py:2291 ../gui/wxpython/dbmgr/sqlbuilder.py:101 +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +msgid "Database connection" +msgstr "Adatbázis kapcsolat" + +#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +msgid "Set SQL statement to default" ======= -#: ../gui/wxpython/dbmgr/base.py:502 -msgid "Fractal dimension of boundary defining a polygon" +>>>>>>> osgeo-main msgstr "" #: ../gui/wxpython/dbmgr/base.py:505 @@ -24807,92 +25355,93 @@ msgstr "" #: ../gui/wxpython/dbmgr/base.py:2291 ../gui/wxpython/dbmgr/sqlbuilder.py:101 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Database connection" msgstr "Adatbázis kapcsolat" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "Oszlopok" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "Interaktív beszúrás" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "Értékek" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "Ugrás:" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "Példa: %s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "Ellenőrzés" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "SQL mondat ellenőrzés" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "Nem ellenőrzött SQL mondat" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "Az SQL mondat hibás" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -24903,35 +25452,41 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "Az SQL mondat hibátlan" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "Függvények" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/base.py:185 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/base.py:184 ======= #: ../gui/wxpython/dbmgr/manager.py:78 @@ -24945,29 +25500,33 @@ msgstr "" #: ../gui/wxpython/dbmgr/manager.py:100 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "Csak 256 oszlop jeleníthető meg." -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -24976,19 +25535,19 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "Megjelenítési korlát: 100000 rekord." -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "Ismeretlen érték" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -24997,190 +25556,190 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "Rendezés növekvőbe" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "Rendezés csökkenőbe" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "Számítás (csak numerikus oszlopokra)" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "Mezőkalkulátor" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "Terület" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "Vonal hossz" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "Egy terület kerülete" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "Elemek száma minden egyes kategóriára" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "Vonal azimut" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "Oszlop hozzáadás a táblához <%s>" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "Tábla" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "SQL lekérdezés" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "Egyszerű" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "SQL szerkesztő" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "Új rekord beszúrás" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "Kiválasztott rekord(ok) törlése" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "Minden rekord törlése" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "Szelektált elemek kiemelése és nagyítás" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "Szelektált elemek törlése" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "Létező rekord frissítése" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " "want to delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "Rekordok törlése" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " "delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "Nincs mit törölni." -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -25188,7 +25747,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -25197,63 +25756,63 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "Oszlop" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "Hossz" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "Hozzáad" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "Kiválasztott oszlopok eldobása" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "Minden oszlop eldobása" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " "column?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "Oszlop(ok) eldobása" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -25261,144 +25820,144 @@ msgid "" "will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "Rétegek lista" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "Oszlopnév" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "Adat hossz" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "Kulcs" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "Réteg hozzáadás" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "Réteg leírás" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "Kulcs oszlop" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "Vigyen be egy rekordot a táblába minden katagóriához" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "A v.category modullal kategóriákat kell hozzáadnia." -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "Tábla leírás" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "Táblanév" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "Tábla létrehozás" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "Alapértelmezés beállítása" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "Réteg eltávolítás" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "Eltávolítandó réteg" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "&Réteg eltávolítás" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "Réteg módosítás" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "Réteg &módosítás" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " "exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "Statisztika másolása a vágólapra (Ctrl+C)" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "Nem tudok statisztikát számítani." -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "Nem tudok szórást számítani." -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format msgid "" "No attribute table found.\n" @@ -25407,40 +25966,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "Tábla létrehozása?" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "Nincsenek attribútumok" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "Új&ratöltés" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "Ismeretlen" @@ -25553,7 +26112,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "A %s tér-idő adatok topológiája hibás." @@ -25571,13 +26130,13 @@ msgstr "Kérjük csak egy réteget adjon meg a listában." msgid "No map series nor space-time dataset is added." msgstr "Sem térkép sorozatot sem tér-idő adatállományt nem adtak meg." -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "Maximális animáció szám %d." -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " @@ -25586,60 +26145,60 @@ msgstr "" "Több animáció használ egy ablakot. Kérjük válasszon más ablakot minden " "animációhoz." -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "Nem tudom a jelmagyarázatot megjeleníteni." -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "Inkonzisztens számú térkép, ellenőrizze az input adatokat." -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "Nincs exportálható animáció." -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "Export előkészítése, kérem várjon..." -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "%(from)s %(dash)s %(to)s" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "%(start)s %(unit)s" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "Animáció exportálás, kérem várjon..." -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "Nem választott animáció nevet." -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "Nem választott munkaterület fájlt." -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "%s fájlt nem találom" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "Animáció %d" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "A tér-adat adathalmazokban a térképek számának azonosnak kell lennie." -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." @@ -25647,13 +26206,19 @@ msgstr "" "A tér-adat adathalmazok idő típusának (abszolút/relatív) azonosnak kell " "lennie." -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" "A tér-idő adathalmazok térkép típusának (pont/intervallum) egyeznie kell." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/utils.py:209 ======= #: ../gui/wxpython/gui_core/gselect.py:886 @@ -25927,17 +26492,21 @@ msgstr "Fájlok" #: ../gui/wxpython/gui_core/goutput.py:388 #, python-format >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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." -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" "Az animálandó térképek számának azonosnak kell lennie minden " "térképsorozatban." -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." @@ -25945,46 +26514,46 @@ msgstr "" "Az animálandó térképek számának egyeznie kell a térképek számával az idő " "adathalmazban." -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "Animáció sebesség módosítása" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "Lejátszás előre" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "Lejátszás vissza" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "Ismétlés" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "Lejátszás előre és hátra" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "Új animáció hozzáadás" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "Animáció hozzáadása, szerkesztése vagy eltávolítása" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "Animáció export" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "Tér-idő adatok vagy térkép régtegek sorozatának hozzáadása" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "Tér-idő adatok vagy térkép régtegek sorozatának hozzáadása animációhoz" @@ -26099,7 +26668,7 @@ msgstr "" "rétegek egy sorozatát." #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "Raszter jelmagyarázat megjelenítés" @@ -26177,7 +26746,7 @@ msgid "Edit" msgstr "Szerkesztés" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "Formátum" @@ -26424,7 +26993,14 @@ msgid "Invalid" msgstr "Hibás" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Térkép rétegek rajzolása" ======= @@ -26433,6 +27009,7 @@ msgid "PROJ string (required):" msgstr "PROJ szöveg (kötelező):" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26444,12 +27021,23 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "Térkép rétegek átfedés vizsgálata" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -27105,28 +27693,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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." -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "Animáció eszközssor" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "Adatok betöltése" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr " ({c} a {p})-ből" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -28073,17 +28665,17 @@ msgstr "" "%s" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "Utasítások beolvasása sikertelen %s" @@ -28113,7 +28705,7 @@ msgstr "" "A térkép keret pozíciója változott, régi érték: %(old1)s %(old2)s\n" "új érték: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" @@ -28122,7 +28714,7 @@ msgstr "" "A térkép keret mérete módosult, régi érték: %(old1)s %(old2)s\n" "új érték: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" @@ -28131,12 +28723,12 @@ msgstr "" "Utasítások beolvasása sikertelen%(file)s.\n" "Ismeretlen formátum %(for)s" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "Az utasítások beolvasása sikertelen %s." -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -28146,39 +28738,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "hüvelyk" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "pont" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "centiméter" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "milliméter" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "tengeri mérföld" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "pixel" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "méter" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "fok" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "Nem tudom futtatni a `ps.map -b` parancsot" @@ -28250,612 +28842,612 @@ msgstr "" "Pozíció a papír\n" "bal felső sarkától" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "Betűkészlet:" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "Válasszon színt:" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "Párbeszédablak lezárása és a változások érvényesítése" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "Egységek" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "Tájékozás" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "Szélesség" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "Magasság" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "Bal" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "Jobb" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "Lapméret" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "Margók" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "Álló" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "Fekvő" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "Térkép beálítások" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "Térkép keret beállítások" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "Térkép keret opciók:" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "keret illesztés a kiválasztott térképhez" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "keret illesztés a mentett régióhoz" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "keret illesztés az aktuális számítási régióhoz" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "rögzített méretarány és térkép középpont" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "Térkép szelekció" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "Térkép:" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "Régió:" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "Térkép méretarány és középpont" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "Középpont:" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "K:" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "É:" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "Méretarány:" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "Térkép max felbontás (dpi):" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "Határ" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "keretvonal rajzolás a térkép körül" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "körvonal szín" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "körvonal vastagság (pt):" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "Régió szelektálás" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "Nem választott térképet!" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "Nem választott régiót!" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "Hibás méretarány vagy térkép középpont!" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "Válasszon raszter térképet" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "nincs raszter térkép" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "raszter:" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "Kérjük készítsen először egy térkép keretet." -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "Térkép hozáadás" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "pontok" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "vonalak" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "területek" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "Adattípus" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "Vektor térképek kezelése" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "A legfelső vektor térkép letakarja a többit" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "Tulajdonságok..." -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "Raszter térkép beállítások" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "Vektor térkép beállítások" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "%s tulajdonságok" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "Adat szelekció" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "centrálisok" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "határok" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "Réteg szelektálás" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "Adatbázis kapcsolat nincs megadva a DB fájlban" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "Válasszon réteget:" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "kategória lista (pl. 1,3,5-7)" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "Aktuális maszk használata" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "Színek" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "Körvonal" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "körvonal rajzolás" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "Szélesség (pt):" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "kitöltés szín" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "válasszon színt:" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "szín a térkép tábla oszlopából:" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "Vonalak színe:" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "Méret és stílus" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "eps fájl:" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" "Adjon egy fájlnevet vagy kattintson a tallózásra a fájl kiválasztásához" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "Válasszon egy fájlt" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "méret a térkép tábla oszlopból:" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "méretarány:" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "Forgatás" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "szimbólumok forgatása:" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "Óramutató járásával ellentétesen fokokban:" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "térkép tábla oszlopból:" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "Szélesség (pt):" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "változó szélesség a kategória értékkel" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "Vonal stílus:" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "Vonal csatlakozás:" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "Minta" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "használt minta:" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "Minta fájl:" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "minta vonal szélesség (pts):" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "minta méretarány szorzó" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "Raszter jelmagyarázat" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "Forrás raszter" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "aktuális raszter" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "válasszon rasztert" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "%(rast)s : %(type)s típus" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "Jelmagyarázat típus" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "Haladó jelmagyarázat beállítások" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "Vektor jelmagyarázat" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "Vektor jelmagyarázat megjelenítés" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "Forrás vektor térképek" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "Válasszon vektor térképeket és a sorrendjüket a jelmagyarázatban" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "Címke szerkesztés" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "körvonal rajzolás a jelmagyarázat körül" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "Méret és pozíció" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "Hagyja üresen a mezőt az alapértelmezett értékek használatához." -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "Oszlopok:" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "Jelmagyarázat címke szerkesztés:" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "Nem választott raszter térképet!" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "Nincs raszter" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "Színbeállítások" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "határ szín:" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "háttér szín" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "Hossz:" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "A léptékvonalzó hossza térképi egységekben" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "A léptékvonalzó valódi magassága a papíron" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "alapértelmezett" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "Típus:" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "Szegmensek száma:" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "Mindet címkézi" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "szegmensek" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "átlátszó szövegháttér" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "A léptékvonalzó hosszát nem adták meg" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "Szöveg:" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "Szöveg hatások" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "szöveg háttér" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "kiemel" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "szöveg határ" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "Eltolás" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "vízszintes (pt):" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "függőleges (pt):" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "Referencia pont" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "Szöveg fogatás" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "szövegforgatás (óramutató irányába)" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "Nem adott meg szöveget!" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "Válassza ki a képeket tartalmazó könyvtárat" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "Megjegyzés: csak az EPS formátum támogatott" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "Méretarány és forgatás" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "Forgatási szög (fok):" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "Óramutató járása szerint fokokban" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" @@ -28863,83 +29455,83 @@ msgstr "" "PIL\n" "hiányzik" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "Nem tudom a(z) %s fájl olvasni" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "méret: %(width)s x %(height)s pt" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "Nincs kiválasztott kép." -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "Észak nyíl beállítások" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "Konvergencia számítás" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "Szimbólum" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "Körvonal szín:" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "Kitöltés szín:" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "Méret és forgatás" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "Méret (pt):" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "Szimbólum méret pontokban" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "Téglalap beállítások" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "Vonal beállítások" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "Vonalvastagság pontokban" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "Vektor címkék" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "Előzőleg a v.label modullal készült vektor címke fájlok" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "Több címke fájlt választhat ki." @@ -28973,29 +29565,29 @@ msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" "A ps2pdf program nem érhető el. Kérjük a PDF létrehozáshoz előbb telepítse." -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "PDF generálás..." -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "PostScript generálás..." -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "Előnézet generálás" -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "Ps.map kilépett %s visszaadott kóddal" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 #, fuzzy msgid "Program {} is not available." msgstr "Előnézet nem érhető el" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, fuzzy, python-brace-format msgid "" "{title} Please install it to create PDF.\n" @@ -29004,7 +29596,7 @@ msgstr "" "A ps2pdf program nem érhető el. Kérjük telepítse PDF létrehozásához.\n" "%s" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 #, fuzzy msgid "" "Program {} is not available. Please install it to create PDF.\n" @@ -29014,32 +29606,32 @@ msgstr "" "A ps2pdf program nem érhető el. Kérjük telepítse PDF létrehozásához.\n" "%s" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "%(prg)s kilépett %(code)skóddal visszaadott " -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "PDF elkészült" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "PostScript fájl elkészült" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "Előnézet generálás, kérem várjon" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "Előnézet nem érhető el" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." @@ -29047,73 +29639,74 @@ msgstr "" "Előnézet nem érhető el valószínűleg, mert nem telepítette a Ghostscript " "programot vagy nincs rajta a PATH-on." -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "Előnézet elkészült" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "File mentés másként" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "Sikertelen fájl olvasás %s." -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "A léptékvonalzó nem megfelelő ehhez a vetülethez" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" "Az előnézet előállításához nyomja meg a gombot a zöld háromszög ikonnal." -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "wxGUI kartográfiai szerkesztő" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "TÉRKÉP KERET" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "RASZTER JELMAGYARÁZAT" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "VEKTOR JELMAGYARÁZAT" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "TÉRKÉP INFO" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "LÉPTÉKVONALZÓ" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "KÉP" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "ÉSZAK NYÍL" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "Kattintson és húzza az objektumot az átméretezéshez" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "címkék:" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/g.gui.psmap.py:51 @@ -29124,6 +29717,23 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +#~ msgid "Abort download location" +#~ msgstr "Hely letöltés megszakítása" + +#~ msgid "Location Name:" +#~ msgstr "Hely név:" + +#~ msgid "Change location and mapset" +#~ msgstr "Hely és térképcsoport váltás" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "Use defined projection" #~ msgstr "Felhasználó definiált vetület" @@ -29147,10 +29757,15 @@ msgid "Cartographic Composer - GRASS GIS" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +<<<<<<< HEAD +======= #~ msgid "Download sample location" #~ msgstr "Minta hely letöltése" @@ -29162,6 +29777,7 @@ msgstr "" #~ "\n" #~ "%s" +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) #, fuzzy, python-format #~ msgid "Unable to rename location: %s" #~ msgstr "" @@ -29173,9 +29789,6 @@ msgstr "" #~ msgid "Unable to delete location: %s" #~ msgstr "Nem tudom törölni a helyet" -#~ msgid "Unable to create new GRASS Database" -#~ msgstr "Nem tudok új GRASS adatbázist létrehozni" - #~ msgid "Vector network analysis settings" #~ msgstr "Vektor hálózat elemzés beállítások" @@ -29345,10 +29958,6 @@ msgstr "" #~ msgid "Unknown format '{0}'." #~ msgstr "Ismeretlen formátum '{0}'." -#, fuzzy -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "Létre akar hozni egy GRASS helyet <%s>?" - #~ msgid "Command prompt" #~ msgstr "Parancs prompt" @@ -29647,6 +30256,13 @@ msgid "Optional location title, you can leave this field blank." msgstr "Opcionális hely cím, ezt a mezőt üresen hagyhatja." <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Unable to create location" +#~ msgstr "Nem tudom létrehozni a helyet" +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #~ msgid "" #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII " #~ "characters excluding %(chars)s and space." @@ -29660,6 +30276,10 @@ msgstr "<%(name)s> név nem megfelelő név egy helyhez. Csak az ASCII karaktere msgid "Unable to create location" msgstr "Nem tudom létrehozni a helyet" +<<<<<<< HEAD +======= +>>>>>>> 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" @@ -29902,6 +30522,10 @@ msgid "GRASS GIS Histogramming Tool (d.histogram)" msgstr "GRASS GIS hisztogram eszköz (d.histogram)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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 ae7ca91a6dc..903e428c8bd 100644 --- a/locale/po/grasswxpy_id_ID.po +++ b/locale/po/grasswxpy_id_ID.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: grasslibs_id_ID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2017-05-23 21:08+0200\n" "Last-Translator: \n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/grass-gis/" @@ -25,12 +25,12 @@ msgstr "" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "" @@ -38,837 +38,837 @@ msgstr "" msgid "Analysis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1063,8 +1063,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "" @@ -1108,7 +1108,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1216,14 +1216,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "" @@ -1333,8 +1333,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1405,12 +1405,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1472,115 +1472,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1621,7 +1621,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1632,169 +1632,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1903,13 +1903,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "" @@ -1980,56 +1980,56 @@ msgid "Data catalog" msgstr "" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" +#: ../gui/wxpython/datacatalog/catalog.py:212 +msgid "Do you want to create a new project (also known as location)?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" +#: ../gui/wxpython/datacatalog/catalog.py:217 +msgid "Create project?" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2037,316 +2037,316 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" +#: ../gui/wxpython/datacatalog/tree.py:2168 +msgid "&Delete project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" +#: ../gui/wxpython/datacatalog/tree.py:2174 +msgid "&Rename project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" +#: ../gui/wxpython/datacatalog/tree.py:2193 +msgid "&Create new project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" +#: ../gui/wxpython/datacatalog/tree.py:2239 +msgid "&Delete projects (locations)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2366,78 +2366,78 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" +msgid "Create new mapset in current project" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2450,9 +2450,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "" @@ -2513,7 +2513,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "" @@ -2537,27 +2537,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "" @@ -2566,29 +2566,29 @@ msgstr "" msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -2602,193 +2602,289 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 msgid "&Remove" msgstr "" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 msgid "Remove command" msgstr "" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +msgid "Timestamp:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:41 +msgid "Runtime duration:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:42 +msgid "Status:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:43 +msgid "Mask 2D:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:44 +msgid "Mask 3D:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:45 +msgid "North:" +msgstr "" + #: ../gui/wxpython/history/browser.py:46 +msgid "South:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:47 +msgid "West:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:48 +msgid "East:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:49 +msgid "North-south resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:50 +msgid "East-west resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:51 +msgid "Number of rows:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Kolom kunci" + +#: ../gui/wxpython/history/browser.py:53 +msgid "Number of cells:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:63 +msgid "{} sec" +msgstr "" + +#: ../gui/wxpython/history/browser.py:117 +msgid "General info" +msgstr "" + +#: ../gui/wxpython/history/browser.py:138 +msgid "Computational region during command execution" +msgstr "" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +msgid "Update current region" +msgstr "" + +#: ../gui/wxpython/history/browser.py:271 +msgid "Region match" +msgstr "" + +#: ../gui/wxpython/history/browser.py:294 +msgid "Set current computational region to the region of executed command" +msgstr "" + +#: ../gui/wxpython/history/browser.py:359 msgid "History browser" msgstr "" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 msgid "&Export history" msgstr "" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." +#: ../gui/wxpython/history/browser.py:466 +msgid "JSON files" +msgstr "" + +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" msgstr "" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." msgstr "" -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample project to download:" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/startup/locdownload.py:295 +msgid "Download selected project" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" +#: ../gui/wxpython/startup/locdownload.py:439 +msgid "Dataset Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" +#: ../gui/wxpython/startup/locdownload.py:447 +msgid "Download selected dataset" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" +#: ../gui/wxpython/startup/locdownload.py:490 +msgid "Do you want to cancel dataset download?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +msgid "Invalid project name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" +#: ../gui/wxpython/startup/guiutils.py:173 +msgid "Do you want to import {} to the newly created project?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2798,82 +2894,80 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/startup/guiutils.py:288 +msgid "Unable to rename selected project" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" +#: ../gui/wxpython/startup/guiutils.py:300 +msgid "Rename selected project" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2883,11 +2977,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2897,15 +2991,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2915,50 +3009,50 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" +#: ../gui/wxpython/startup/guiutils.py:463 +msgid "Unable to delete selected projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" +#: ../gui/wxpython/startup/guiutils.py:484 +msgid "Delete selected projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" +#: ../gui/wxpython/startup/guiutils.py:497 +msgid "Error when deleting projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -2968,11 +3062,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -2982,15 +3076,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3000,14 +3094,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3019,15 +3114,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3035,101 +3130,99 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 +#: ../gui/wxpython/startup/guiutils.py:693 #, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 +#: ../gui/wxpython/startup/guiutils.py:711 #, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "" #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -3138,19 +3231,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "" @@ -3159,17 +3252,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -3177,34 +3270,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3212,42 +3305,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3257,37 +3350,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3297,334 +3390,334 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "" -#: ../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 +#: ../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 msgid "source E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -3659,10 +3752,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3671,7 +3764,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3680,7 +3773,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3694,14 +3787,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "" @@ -3714,32 +3807,32 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 msgid "Pan to GCP by number" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -3769,7 +3862,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3805,462 +3898,517 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +msgid "Define new GRASS project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +msgid "Name of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/location_wizard/wizard.py:271 +msgid "Project will be created in GRASS database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +msgid "Project Name:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2530 +#: ../gui/wxpython/location_wizard/wizard.py:2531 #, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +msgid "Unable to create new project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +msgid "Project already exists in GRASS Database." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4277,7 +4425,6 @@ msgid "Disabled:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "" @@ -4286,10 +4433,10 @@ msgid "GRASS API:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "" @@ -4315,7 +4462,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "" @@ -4344,13 +4491,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "" @@ -4359,7 +4506,7 @@ msgid "Commands" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4370,19 +4517,19 @@ msgid "Apply properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "" @@ -4391,686 +4538,668 @@ msgstr "" msgid "Author(s):" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" +#: ../gui/wxpython/gmodeler/panels.py:189 +msgid "Script editor" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:317 +#: ../gui/wxpython/gmodeler/panels.py:861 #, python-format -msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:431 +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 #, python-format -msgid "Data: %s" +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:463 -msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +msgid "Run script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" +#: ../gui/wxpython/gmodeler/panels.py:1617 +msgid "Save the script to a file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" +#: ../gui/wxpython/gmodeler/panels.py:1654 +msgid "Python script type" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/gmodeler/toolbars.py:54 +msgid "Save current model to file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +msgid "Set model properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format +#: ../gui/wxpython/gmodeler/dialogs.py:308 msgid "" -"Model is not valid.\n" +"Command not defined.\n" "\n" -"%s" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 +#: ../gui/wxpython/gmodeler/dialogs.py:317 #, python-format -msgid "Model exported to <%s>" +msgid "" +"'%s' is not a GRASS tool.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1116 +#: ../gui/wxpython/gmodeler/dialogs.py:431 #, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" +#: ../gui/wxpython/gmodeler/dialogs.py:473 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format +msgid "" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -msgid "Run script" +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2042 -msgid "Save the script to a file" +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -msgid "Python script type" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2110 -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "" @@ -5082,7 +5211,7 @@ msgstr "" msgid "Create new workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "" @@ -5090,7 +5219,7 @@ msgstr "" msgid "Load workspace from file" msgstr "" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "" @@ -5100,7 +5229,7 @@ msgstr "" msgid "Save workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "" @@ -5113,7 +5242,7 @@ msgid "Close workspace file" msgstr "" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "" @@ -5150,7 +5279,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -5178,649 +5307,652 @@ msgstr "" msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +msgid "Module not installed" msgstr "" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +msgid "Re-projects a raster map from given project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "" -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +msgid "Reproject vector map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +msgid "Re-projects a vector map from one project to the current project." msgstr "" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." msgstr "" -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "" @@ -5828,20 +5960,20 @@ msgstr "" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "" @@ -5859,13 +5991,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "" @@ -5879,16 +6011,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -5908,7 +6040,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "" @@ -5916,8 +6048,8 @@ msgstr "" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "" @@ -5925,42 +6057,42 @@ msgstr "" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" @@ -5973,7 +6105,7 @@ msgid "Mapset access" msgstr "" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +msgid "Set/unset access to other mapsets in current project" msgstr "" #: ../gui/wxpython/menustrings.py:234 @@ -5997,11 +6129,11 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" +msgid "Change project (location) and mapset" msgstr "" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +msgid "Change current project and mapset." msgstr "" #: ../gui/wxpython/menustrings.py:240 @@ -6035,15 +6167,17 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +msgid "Create new project (location)" msgstr "" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" #: ../gui/wxpython/menustrings.py:252 @@ -6067,8 +6201,7 @@ msgstr "" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6099,7 +6232,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "" @@ -6107,411 +6240,411 @@ msgstr "" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "" -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " "regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6522,22 +6655,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6545,127 +6678,127 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " "represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6676,323 +6809,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7000,21 +7133,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7023,203 +7156,203 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7227,106 +7360,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7335,503 +7468,503 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -7839,96 +7972,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -7936,818 +8069,818 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 msgid "Input for supervised SVM" msgstr "" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 msgid "Manage signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -8755,999 +8888,991 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 -msgid "Interactive editing and digitization of raster maps." -msgstr "" - #: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -9780,7 +9905,7 @@ msgid "Text settings" msgstr "" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -9841,74 +9966,74 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" "Reason: %s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -9932,7 +10057,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "" @@ -9978,11 +10103,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "" @@ -10007,11 +10132,11 @@ msgid "Label font size (pts):" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "" @@ -10027,402 +10152,401 @@ msgstr "" msgid "Weight:" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 -msgid "No map or image group selected to plot." -msgstr "" - #: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" +msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -10462,13 +10586,13 @@ msgstr "" msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "" @@ -10484,105 +10608,105 @@ msgstr "" msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 msgid "Save output to a file" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -10590,7 +10714,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "" @@ -10673,7 +10797,7 @@ msgstr "" msgid "category" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "" @@ -10694,8 +10818,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -10721,424 +10845,437 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:348 +msgid "Layout settings" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:392 +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 -msgid "History" +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 +msgid "History" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 msgid "Window layout settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 msgid "Font for manual pages:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11147,7 +11284,7 @@ msgid "" " - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "" @@ -11164,7 +11301,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "" @@ -11286,7 +11423,7 @@ msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "" @@ -11320,7 +11457,7 @@ msgid "Map Display Settings" msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +msgid "(Un)dock" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 @@ -11344,7 +11481,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -11400,7 +11537,7 @@ msgid "Optional" msgstr "" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "" @@ -11412,79 +11549,79 @@ msgstr "" msgid "valid range" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11492,94 +11629,94 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "" @@ -11587,381 +11724,381 @@ msgstr "" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +msgid "Select GRASS project and mapset" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +msgid "Project or mapset is not defined." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +msgid "Name of GRASS project:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +msgid "Select mapset in GRASS project" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " "overwrite it?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12041,9 +12178,9 @@ msgid "Snap also to vertex" msgstr "" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "" @@ -12065,226 +12202,226 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12302,197 +12439,197 @@ msgstr "" msgid "Topology missing" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 msgid "Digitize new point (Ctrl+P)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 msgid "Digitize new line (Ctrl+L)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 msgid "Digitize new boundary (Ctrl+B)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 msgid "Digitize new centroid (Ctrl+C)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 msgid "Delete selected area(s) (Ctrl+F)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 msgid "Display/update attributes (Ctrl+K)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 msgid "Display/update categories (Ctrl+J)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 msgid "Edit selected line/boundary (Ctrl+E)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 msgid "Remove selected vertex (Ctrl+X)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 msgid "Settings (Ctrl+T)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 msgid "Show manual (Ctrl+H)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 msgid "Undo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 msgid "Redo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12501,42 +12638,42 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "" @@ -12549,8 +12686,8 @@ msgid "Add new category" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "" @@ -12559,11 +12696,11 @@ msgid "Ignore changes and close dialog" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "" @@ -12608,24 +12745,24 @@ msgstr "" msgid "Layer (Categories)" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -12633,97 +12770,97 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -12735,19 +12872,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -12766,32 +12903,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "" @@ -12901,100 +13038,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13023,12 +13160,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "" @@ -13102,11 +13239,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13117,50 +13254,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -13176,116 +13313,128 @@ msgstr "" msgid "3. Select GRASS Mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." msgstr "" #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be renamed." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13293,14 +13442,14 @@ msgid "" "Enter new name:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13308,7 +13457,7 @@ msgid "" "Mapset <%s> already exists in location." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13316,7 +13465,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13324,7 +13473,7 @@ msgid "" "Location <%s> already exists in GRASS database." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13332,27 +13481,27 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" "This mapset cannot be deleted." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13360,37 +13509,37 @@ msgid "" "ALL MAPS included in this location will be PERMANENTLY DELETED!" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13399,16 +13548,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13420,12 +13569,12 @@ msgid "" "this operation) and continue?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13433,7 +13582,7 @@ msgid "" "your data. Have another look in the processor manager just to be sure..." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13441,164 +13590,164 @@ msgid "" "Details: %(reason)s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " "ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " "located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -13606,7 +13755,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -13614,45 +13763,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -13660,38 +13809,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -13788,117 +13937,117 @@ msgstr "" msgid "Output" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "" @@ -13914,41 +14063,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -13990,7 +14139,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "" @@ -14021,19 +14170,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "" @@ -14057,25 +14206,25 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -14087,8 +14236,8 @@ msgstr "" msgid "Execution failed:" msgstr "" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "" @@ -14138,7 +14287,7 @@ msgstr "" msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14147,21 +14296,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14182,147 +14331,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14330,11 +14479,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14342,11 +14491,11 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "" @@ -14413,22 +14562,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14458,22 +14607,22 @@ msgstr "" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14482,33 +14631,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "" @@ -14554,46 +14703,46 @@ msgstr "" msgid "Status bar" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 msgid "Go to XY coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 msgid "Display extent" msgstr "" @@ -14667,14 +14816,14 @@ msgid "Click mouse to unzoom" msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "" @@ -14694,47 +14843,47 @@ msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -14744,59 +14893,59 @@ msgid "" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -14898,7 +15047,7 @@ msgstr "" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "" @@ -14965,8 +15114,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "" @@ -15057,7 +15206,7 @@ msgid "List of %s layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -15071,13 +15220,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "" @@ -15100,82 +15249,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -15473,14 +15622,14 @@ msgstr "" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -15488,15 +15637,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -15506,7 +15655,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -15518,30 +15667,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -15552,114 +15701,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -15727,99 +15876,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -16173,7 +16323,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -16181,7 +16331,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -16332,7 +16482,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -16340,184 +16490,184 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 msgid "Map Swipe Tool" msgstr "" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995 +#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003 #, python-format msgid "" "Command '%s' not yet implemented in the WxGUI. Try adding it as a command " "layer instead." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." +#: ../gui/wxpython/main_window/frame.py:1456 +msgid "No project provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -16525,37 +16675,37 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -16563,26 +16713,26 @@ msgid "" "from layer tree?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "" @@ -16610,55 +16760,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "" @@ -16731,7 +16881,7 @@ msgstr "" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "" @@ -16763,112 +16913,116 @@ msgstr "" msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +msgid "Set opacity of <{}>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "" @@ -17098,6 +17252,13 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 #, python-format @@ -17135,57 +17296,61 @@ msgstr "" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " "define new connection in 'Manage layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "" @@ -17199,93 +17364,93 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -17293,58 +17458,58 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -17353,19 +17518,19 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -17374,190 +17539,190 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " "want to delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " "delete them?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -17565,7 +17730,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -17574,63 +17739,63 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " "column?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -17638,144 +17803,144 @@ msgid "" "will PERMANENTLY removed from table. Do you want to drop the columns?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " "exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format msgid "" "No attribute table found.\n" @@ -17784,40 +17949,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "" @@ -17839,7 +18004,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "" @@ -17857,138 +18022,138 @@ msgstr "" msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " "each animation." msgstr "" -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "" -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:209 +#: ../gui/wxpython/animation/utils.py:210 msgid "" "The temporal extents of maps in space-time datasets have to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" @@ -18101,7 +18266,7 @@ msgid "" msgstr "" #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "" @@ -18179,7 +18344,7 @@ msgid "Edit" msgstr "" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "" @@ -18422,13 +18587,21 @@ msgid "Invalid" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" ======= #: ../gui/wxpython/gui_core/preferences.py:1739 msgid "PROJ string (required):" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18440,13 +18613,24 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -19097,28 +19281,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -19143,17 +19331,17 @@ msgid "" msgstr "" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "" @@ -19179,26 +19367,26 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" "Unknown format %(for)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -19207,39 +19395,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -19307,693 +19495,693 @@ msgid "" "edge of the paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -20020,135 +20208,135 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 msgid "Program {} is not available." msgstr "" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" @@ -20156,10 +20344,6 @@ msgstr "" #~ msgid "The copied layer needs to be reprojected:" #~ msgstr "Layer yang akan dihapus" -#, fuzzy -#~ msgid "Numeric column:" -#~ msgstr "Kolom kunci" - #, fuzzy #~ msgid "Kriging" #~ msgstr "Tiling " diff --git a/locale/po/grasswxpy_it.po b/locale/po/grasswxpy_it.po index d6e3187d3bf..6bba4230337 100644 --- a/locale/po/grasswxpy_it.po +++ b/locale/po/grasswxpy_it.po @@ -9,13 +9,21 @@ msgstr "" "Project-Id-Version: grasswxpy_it\n" "Report-Msgid-Bugs-To: \n" <<<<<<< HEAD +<<<<<<< HEAD +======= +"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" ======= "POT-Creation-Date: 2021-02-17 23:13-0500\n" "PO-Revision-Date: 2022-05-23 10:50+0000\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27,6 +35,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -37,12 +50,15 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "X-Generator: Weblate 4.12.2\n" ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "X-Generator: Weblate 5.3\n" ======= "X-Generator: Weblate 4.12.2\n" @@ -51,6 +67,9 @@ msgstr "" "X-Generator: Weblate 4.12.2\n" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -62,12 +81,12 @@ msgstr "Vista" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "Dati" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "Aspetto" @@ -75,31 +94,31 @@ msgstr "Aspetto" msgid "Analysis" msgstr "Analisi" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "Animazione" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "Vista di controllo" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "Regola la distanza e la prospettiva angolare del punto di vista" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "Prospettiva:" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "Ruota il piano della superficie dall'orizzontale" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "Rotazione:" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" @@ -107,37 +126,37 @@ msgstr "" "Regola l'altezza della vista dalla superficie (l'angolo di visione è " "regolato automaticamente per mantenere lo stesso centro della vista)" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" "Regola l'altezza relativa degli elementi al di sopra del piano della " "superficie" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "Altezza:" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "esagerazione verticale" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "Vista:" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "qui" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." @@ -145,19 +164,19 @@ msgstr "" "Permette di selezionare un punto sulla superficie che diventa il nuovo " "centro della vista. Clicca sul bottone e poi sulla superficie." -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "centro" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "Reimposta la vista all'impostazione di default del centro della vista." -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "sopra" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." @@ -165,26 +184,26 @@ msgstr "" "Imposta il visualizzatore direttamente sopra alla posizione del centro della " "scena. Questa vista dall'alto si orienta approssimativamente nord sud." -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "resetta" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "Resetta alla visualizzazione di default" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "Aspetto dell'Immagine" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "Colore sfondo: " -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." @@ -193,310 +212,310 @@ msgstr "" "raccomanda di utilizzare la modalità fly-through (strumenti del " "Visualizzatore) per ottenere un movimento scorrevole." -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "Registra" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "Esegui" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "Pausa" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "Ferma" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "Numero totali di frame :" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "Velocità del frame (FPS):" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "I frames sono registrati con frequenza data (FPS)." -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "Salva sequenza di immagini" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "Scegli una directory:" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "Scegli una directory per le immagini" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "Naviga" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "Prefisso del file:" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "I file generati saranno chiamati come: prefix_1.ppm, prefix_2.ppm, ..." -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "Formato del file:" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "Superficie" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "Superficie costante" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "Vettoriale" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "Raster 3D" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "Evidenziazione" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "Bordo" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "Decorazioni" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "Piani di taglio" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "Mappa Raster" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "Disegna" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "Tipologia:" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "scabro" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "liscio" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "entrambi" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "Ombreggiatura:" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "piano" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "Imposta a tutti" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "Usa impostazioni di disegno per tutte le superfici caricate" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "Modalità grezza:" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "risoluzione:" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "stile:" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "linea" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "superficie" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "Cambia colore della linea" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "Modalità fine:" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "Attributi della superficie" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Colore" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "Mask" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "Trasparenza" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "Luminosità" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "mappa" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "deseleziona" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "costante" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "Posizione" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "Cambia la posizione x, y e z delle superficie corrente" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "Resetta" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "Resetta alla posizione di default" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "Piano di taglio attivo:" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "cancella" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "ombreggiato" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "X orizzontale:" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "Imposta la coordinata X del corrente piano di taglio" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "Y orizzontale:" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "Imposta la coordinata Y del corrente piano di taglio" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "Rotazione:" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "Ruota l'attuale piano di taglio rispetto all'asse verticale" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "Ruota l'attuale piano di taglio rispetto all'asse orizzontale" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" @@ -504,421 +523,421 @@ msgstr "" "Imposta la coordinata Z del corrente piano di taglio (significativo solo se " "l'inclinazione non è 0)" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Nuovo" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "Elimina" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "Alta risoluzione:" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Valore:" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "Trasparenza:" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "Colore:" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "Mappa vettoriale" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "Mostra le linee vettoriale" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "Linee vettoriali" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Linea:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "larghezza:" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "colore:" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "usa colore per mappe tematiche" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "usa la larghezza per mappe tematiche" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "Imposta opzioni..." -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "Visualizza" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "sulla superficie:" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "come 3D" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "Altezza sulla superficie:" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "Mostra punti vettoriali" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "Punti vettoriale" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Icona:" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "dimensione:" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "simbolo:" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "usa la dimensione per " -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "Raster 3D" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "isosuperfici" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "Risoluzione:" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "Lista delle isosuperfici" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "Mostra il modello leggero" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "Posizione della luce" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "Regola l'altezza della luce" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "Colore e intensità della luce" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "Luminosità:" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "Regola la luminosità" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "Ambiente:" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "Regola la luce ambiente" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "Vertici con bordo" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "N && O" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "N && E" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "S && O" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "S && E" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "Impostazioni" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "Altezza del bordo dalla base:" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "Freccia del nord" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "La lunghezza della freccia (in unità della mappa):" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "Colore della freccia:" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "Posiziona freccia" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "Barra della scala" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "Lunghezza della barra della scala (in unità della mappa): " -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "Colore della barra della scala:" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "Aggiungi nuova barra della scala" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "Vuoi registrare una nuova animazione senza salvare la precedente?" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "L'animazione esiste già" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "Nessun prefisso del file passato." -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "La directory %s non esiste." -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "costante#" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "Attributi delle isosuperfici" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "Valore isosuperfici" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "O" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "N" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "S" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "E" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "NO" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "NE" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "SE" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "SO" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "Livello" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "Livello {level}" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "Barra della scala %d" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "Nessuno" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "Piano" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "Mappa vettoriale è 3D" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "Mappa vettoriale è 2D" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "%(features)d elementi (%(points)d points)" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "sulla superficie" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "intervallo:" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "Vertice nord:" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "Vertice sud:" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "Vertice ovest:" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "Bordo a est:" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "Nord (Y)" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "Altezza (Z):" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "Est (X)" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "Vertice basso:" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "Bordo superiore:" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "Regola distanza e direzione del punto di vista" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1121,8 +1140,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "Larghezza:" @@ -1172,7 +1191,7 @@ msgstr "Raster <%s> non trovato" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "Vettoriale <%s> non trovato." @@ -1207,8 +1226,8 @@ msgid "" "The Temporal Plot Tool needs the \"matplotlib\" (python-matplotlib) package " "to be installed. {0}" msgstr "" -"Lo Strumento Grafici Temporali ha bisogno che il pacchetto \"matplotlib" -"\" (python-matplotlib) sia installato. {0}" +"Lo Strumento Grafici Temporali ha bisogno che il pacchetto \"matplotlib\" " +"(python-matplotlib) sia installato. {0}" #: ../gui/wxpython/tplot/frame.py:104 msgid "Temporal Plot Tool" @@ -1290,14 +1309,14 @@ msgstr "percorso CSV" msgid "Do you want the CSV header?" msgstr "È richiesto l'header del CSV" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "Esporta" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "Aiuto" @@ -1418,8 +1437,8 @@ msgid "Invalid input vector dataset" msgstr "Dataset vettoriale di input non valido" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "Dataset spazio temporale <%s> non trovato." @@ -1490,12 +1509,12 @@ msgstr "" msgid "Set opacity level" msgstr "Imposta il livello di opacità" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "Gestore di classi" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "Seleziona gruppo di immagini" @@ -1558,33 +1577,33 @@ msgstr "Aggiungi raster" msgid "Loading imagery lib failed" msgstr "Caricamento libreria delle immagini fallito" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Crea/modifica gruppo..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "Nome del gruppo di immagini mancante." -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "Nome del gruppo di immagini:" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "Nome del sotto gruppo di immagini:" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "Scegliere un sottogruppo." -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "Sotto gruppo <%s> non trovato nel gruppo <%s>" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" @@ -1593,7 +1612,7 @@ msgstr "" "Nessun dato trovato nel sottogruppo <%s> del gruppo <%s>.\n" "." -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" @@ -1602,76 +1621,76 @@ msgstr "" "Nessun dato nel gruppo <%s>.\n" "." -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "Gruppo <%s> non trovato" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "Manca il nome della mappa." -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Nome del raster:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Nome del vettoriale:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "Classi" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "Nome della classe" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "Usare solo caratteri ASCII" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "Effettuare lo zoom alle aree di addestramento della classe selezionata" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "Salva file delle firme spettrali" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "Inserire il nome del file delle firme spettrali:" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "Percorso al file delle firme spettrali:" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "Esporta le aree di addestramento" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "Inserire il nome del nuovo vettoriale:" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "Esporta tabella degli attributi" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" "Esporta tabella degli attributi contenente i dati delle statistiche calcolate" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "Vettoriale <%s> esiste già. Si vuole sovrascriverlo?" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "Vettoriale <%s> esiste" @@ -1712,7 +1731,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "Nessuna classe selezionata" @@ -1725,144 +1744,144 @@ msgstr "" "Caricamento della librerie di immagini fallito.\n" "%s" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Barra degli strumenti della mappa" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "Barra degli strumenti IClass" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "Barra degli strumenti della digitalizzazione" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "Grafici" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "Anteprima display" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "Visualizza aree di training" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "Sincronizzazione del display ON" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "Sincronizzazione del display OFF" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "Tutti i cambiamenti saranno persi. Si vuole continuare?" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "Importa mappa vettoriale" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "Nessuna area nel vettoriale <%s>.\n" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "Impossibile aprire vettoriale <%s>" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "Impossibile copiare gli elementi del vettoriale da<%s>" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "Impossibile aprire il vettoriale temporaneo" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "Nessuna area di training da esportare." -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" "%d aree di formazione (%d classi) esportate in una mappa vettoriale <%s>." -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "Creazione del vettoriale temporaneo fallito." -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "Analisi fallita" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "risultati" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "Nessuno gruppo di immagini selezionato." -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "Firme spettrali da aggiornare" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" @@ -1871,15 +1890,15 @@ msgstr "" "Il file della signature denomito %s esiste già.\n" "Si vuole sovrascrivere?" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "Il file esiste già" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "Nessun gruppo di immagini selezionato. Operazione cancellata." -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " @@ -1888,11 +1907,11 @@ msgstr "" "Gruppo <%(group)s> non ha abbastanza file (ha %(files)d file). Operazione " "cancellata." -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "Nessun'area selezionata. Operazione cancellata." -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" "Gli elementi del vettoriale sono al di fuori del raster. Operazione " @@ -2005,13 +2024,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "Importa mappa vettoriale" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Importa mappa raster" @@ -2082,56 +2101,58 @@ msgid "Data catalog" msgstr "Catalogo dei dati" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "Scegli la cartella dei dati GRASS:" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "Si vuole creare un nuovo mapset?" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "Crea pacchetto" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "Collega dati esterni" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2139,17 +2160,17 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 -#, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:96 +#, fuzzy, python-brace-format +msgid "Failed to read mapsets from project <{l}>." msgstr "Impossibile leggere il mapset dalla location <{l}>." -#: ../gui/wxpython/datacatalog/tree.py:121 -#, python-brace-format -msgid "Failed to read maps from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:122 +#, fuzzy, python-brace-format +msgid "Failed to read maps from project <{l}>." msgstr "Impossibile leggere le mappe dalla location <{l}>." -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " @@ -2158,301 +2179,310 @@ msgstr "" "La mappa di tipo {elem} <{name}> esiste già nel mapset <{mapset}>. Vuoi " "sovrascriverla?" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "Sovrascrivi?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "La mappa <{layer}> marcata per essere spostata." -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "La mappa <{layer}> marcata per essere copiata." -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "Nuovo nome" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "Rinomina mappa" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "Ridenominazione della mappa <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "{cmd} -- completato" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "Nessuna mappa selezionata per la copia" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "Nessuna mappa selezionata per essere spostata" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "Nuovo nome per <{n}>" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "Seleziona nuovo nome" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "Copia di <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "Spostando <{name}>" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "g.copy completato" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "Riproiezione non è implementata per raster 3D" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "g.remove completato" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "Elimina mappa" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "Cancellazione di {name}..." -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" "Per muovere o copiare mappe in altri mapset, sbloccare la modifica di altri " "mapset" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 +#, fuzzy msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" +"Per muovere o copiare mappe in altri mapset, sbloccare la modifica di altri " +"mapset" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "&Taglia" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "&Copia" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "Copia &nome" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "&Incolla" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "&Elimina" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "&Rinomina" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "&Visualizza layers" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "&Visualizza layer" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "Mostra &metadati" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "&Cambia mapset" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "&Elimina mapset" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "&Rinomina mapset" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "&Copia percorso al mapset" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "&Crea mapset" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "&Elimina location" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "&Elimina mapset" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "&Rinomina location" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "&Rinomina mapset" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" msgstr "&Crea nuova location" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +#, fuzzy +msgid "&Download sample project (location)" msgstr "&Scarica location di esempio" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "&Rimuovi il database di GRASS dal catalogo dei dati" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "&Elimana di database di GRASS dal disco" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" msgstr "&Elimina locations" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "&Elimina mapsets" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "&Copia percorsi ai mapsets" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "Opzioni non disponibili" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +#, fuzzy +msgid "Reload GRASS projects" msgstr "Ricarica le location di GRASS" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2472,59 +2502,61 @@ msgid "Add existing or create new database" msgstr "Aggiungi un database esistente o creane uno nuovo" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "Crea un nuovo Mapset nella Location selezionata" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" -msgstr "" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +#, fuzzy +msgid "Create new project (location) in current GRASS database" +msgstr "Crea nuova mapset nella location attuale, cambia il mapset attuale." -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "Riproiezione" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "Riproiezione" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "Riproiezione di raster" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "Riproiezione di mappe vettoriali" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" @@ -2533,19 +2565,19 @@ msgstr "" "La mappa <{ml}> dev'essere riproiettata.\n" "Si prega di controllare e modificare i parametri di riproiezione:" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "Risoluzione estimata:" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "Metodo di ricampionamento:" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "Lunghezza massima del segmento: " -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2558,9 +2590,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Strumenti" @@ -2621,7 +2653,7 @@ msgid "Switch to simple mode" msgstr "Passa alla modalità semplice" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Chiudi" @@ -2645,27 +2677,27 @@ msgstr "Cursore della modalità specchio" msgid "Shape:" msgstr "Forma:" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "Grandezza linea:" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "Map Swipe" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "Barra degli strumenti principale" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "Barra degli strumenti generale" @@ -2674,23 +2706,23 @@ msgstr "Barra degli strumenti generale" msgid "Map <%s> not found. " msgstr "Mappa <%s> non trovata." -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "Mappa <%s> non trovata." #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "Niente da visualizzare (mappa vuota). Operazione cancellata" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" @@ -2698,7 +2730,7 @@ msgstr "" "Scegli il nome del file dove salvare l'immagine (non bisogna aggiungere " "l'estensione)" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" "Nessun raster o mappa vettoriale selezionata per interrogazione del layer." @@ -2716,86 +2748,202 @@ msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" "Impossibile caricare il tema delle icone. Motivazione: %s. Esce da wxGUI..." -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 #, fuzzy msgid "Double-click to open the tool" msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 msgid "&Remove" msgstr "&Rimuovi" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 #, fuzzy msgid "Do you really want to remove <{}> command?" msgstr "Si vuole salvare i cambiamenti?" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Rimuove legenda" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 #, fuzzy msgid "Removing <{}>" msgstr "Spostando <{name}>" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "<{}> rimosso" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "Timestamp" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Durata del frame:" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Mostra barra dello stato" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Mask" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Mask" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Nord" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "Sud" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Ovest" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Est" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "risoluzione N-S" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Risoluzione estimata:" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Numero dei segmenti:" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Colonna numerica:" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Numero dei segmenti:" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d sec" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "Generale" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "Imposta regione computazionale da una regione precedentemente salvata" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "Mostra la region corrente" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "La proiezione corrisponde" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "Salva la ragione computazionale in un file" + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "Naviga nei dati" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 msgid "&Export history" msgstr "&Esporta storia dei comandi" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 #, fuzzy msgid "Export history of executed commands to a file" msgstr "Esporta mappa vettoriale GRASS in file SVG." -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" -msgstr "" +#: ../gui/wxpython/history/browser.py:465 +#, fuzzy, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" +msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Salva file come..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" +msgstr "Salva file come" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "File" + +#: ../gui/wxpython/history/browser.py:470 #, fuzzy, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "File di testo" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "File" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Salva file come..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 #, fuzzy msgid "Command history saved to '{}'" msgstr "Output dei comandi salvati in '{}'" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "Scaricamento in progresso, aspettare fino che non è finito 0%" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " @@ -2804,116 +2952,125 @@ msgstr "" "Scaricamento in progresso, aspettare fino che non è finito {0}%,{1} MB, {2} " "KB/s, {3:0f} secondi passati" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +#, fuzzy +msgid "Downloaded project is not valid" msgstr "La location scaricata non è valida" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "Termina" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" -msgstr "Termina lo scaricamento della location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" +msgstr "Scaricamento annullato" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" msgstr "Seleziona una location di esempio da scaricare:" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "Scarica" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" msgstr "Scarica la location selezionata" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "Scarica" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "Scaricamento in progresso, aspettare fino che non è finito" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, fuzzy, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "La location <%s> esiste già, scaricamento cancellato" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "Scaricamento falliro: %s" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 +#, fuzzy msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" "Scaricamento completato. I dati di esempio scaricati sono visibili nel " "pannello location/mapset una volta chiusa questa finestra" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, fuzzy, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "La location <%s> esiste già, prima rinominarla" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Errore: {text}" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:439 +#, fuzzy +msgid "Dataset Download" +msgstr "Scarica" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "Si vuole cancellare lo scaricamento della location? " +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Scarica la location selezionata" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "Scaricamento annullato" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Si vuole cancellare lo scaricamento della location? " -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" msgstr "Nome della location non valido" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "Nome per il nuovo mapset:" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Crea un nuovo mapset" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "Vuoi importare <%(name)s> nella nuova location creata?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "Importare dati?" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2923,82 +3080,89 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Rinomina il mapset selezionato" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Errore" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" msgstr "" +"Impossibile rinominare il mapset.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Rinomina la location selezionata" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Rinomina il mapset selezionato" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" +"Impossibile rinominare il mapset.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -3008,11 +3172,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -3022,15 +3186,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -3040,50 +3204,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "Deselezionare oggetto" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "Deselezionare oggetto" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:497 +#, fuzzy +msgid "Error when deleting projects" +msgstr "Errore leggendo il file '%s'." -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -3093,11 +3260,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3107,15 +3274,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3125,14 +3292,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "sconosciuto" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3144,15 +3312,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3160,8 +3328,8 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" @@ -3170,97 +3338,97 @@ msgstr "" "Importazione di <%(name)s> fallita.\n" "Motivazione: %(msg)s" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:662 +#, fuzzy, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" "Il file dei dati <%(name)s> è stato importato correttamente. La regione di " "default della location è stata impostata dalla mappa importata." -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"Location corrente è <%(loc)s>.\n" +"Mapset corrente è <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "Location corrente è <%(loc)s>.\n" "Mapset corrente è <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "Mapset corrente è <%s>" #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "Impostazioni per la georettifica" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "Impostazioni per la georettifica cancellate." #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "Seleziona il tipo di mappa e location/mapset" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "Tipo della mappa da georettificare" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "raster" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vettoriale" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "Seleziona location di partenza" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "Seleziona mapset di partenza" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "Devi selezionare una location valida prima di selezionare un mapset" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "Devi selezionare una location e un mapset validi per continuare" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "Seleziona immagine/gruppo di immagini da georettificare" @@ -3269,19 +3437,19 @@ msgid "Select/create group:" msgstr "Seleziona/crea gruppo" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "Crea gruppo se non esiste" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "Aggiungi mappa vettoriale al gruppo..." -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "Estensione per la mappa di output" @@ -3290,17 +3458,17 @@ msgid "No vector maps." msgstr "Nessuna mappa vettoriale." #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "Devi selezionare un immagine/gruppo di immagini validi per continuare" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "Per poter continuare devi inserire il nome dell'estensione della mappa" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" "Seleziona mappa da visualizzare per creare i punti di controllo sul terreno " @@ -3310,34 +3478,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "Seleziona mappa sorgente da visualizzare:" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "Seleziona raster target da visualizzare:" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "Seleziona vettoriale target da visualizzare:" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "Devi selezionare una mappa sorgente per continuare" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3347,42 +3515,42 @@ msgstr "" "Editare il gruppo o selezionarne un altro." #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "Gestione Punti di Controllo sul Terreno" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "Sono richiesti almeno %d GCPs. Operazione cancellata." #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "sorgente" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "destinazione" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "Imposta coordinate GCP" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3396,37 +3564,37 @@ msgstr "" "Nord:%(coor1)s" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "Scrittura del file POINTS fallita" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "File POINTS salvato per il group <%s>" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "sorgente del mapwin non definita" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "destinazione del mapwin non definita" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "Lettura file POINTS fallita" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3441,55 +3609,55 @@ msgstr "" "6+ punti per II ordine, e\n" "10+ punti per III ordine." -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "La mappa {map_type} {map_name} esiste. Si vuole sovrascriverlo?" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "Rettifica immagine, attendere..." -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "Sto trasformando <%s>..." -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "Rettifica vettoriale <%s>, attendere..." -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "Georettifica della mappa vettoriale <%s> fallita" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "Impostazione del Gestore GCP" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "Esci dal manager GCP" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "Salva punti di controllo sul terreno?" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." @@ -3497,8 +3665,8 @@ msgstr "" "Non è possibile calcolare l'errore RMS.\n" "Possibile un errore con m.transform." -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." @@ -3506,167 +3674,167 @@ msgstr "" "Non è possibile calcolare la nuova estensione.\n" "Possibile un errore con m.transform." -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "Aggiusta il display di sorgente al display del destinazione" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "Aggiusta il display di destinazione al display del sorgente" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "usare" -#: ../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 +#: ../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 msgid "source E" msgstr "sorgente E" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "sorgente N" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "destinazione E" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "destinazione N" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "Errore successivo" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "Errore precedente" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "Valore della coordinate invalido. Operazione cancellata." -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "Crea gruppo vettoriale" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "Seleziona mappa/e vettoriale/i da aggiungere al gruppo:" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "Modifica GCP" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "Punto di controllo sul terreno." -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "sorgente E:" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "destinazione E:" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "sorgente N:" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "destinazione N:" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "Applica i cambiamenti per la sessione corrente" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "Applica e salva cambiamenti per le impostazione per l'utente" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Chiudi dialogo" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "Simbologia" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "Evidenzia solo gli errori con scarto quadratico medio più elevato" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "Evidenzia gli errori dello scarto quadratico medio > M + SD * fattore:" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" @@ -3677,98 +3845,98 @@ msgstr "" "media + deviazione standard * fattore assegnato.\n" "Valori raccomandati per questo fattore sono compresi tra 1 e 2." -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "Impostazioni dei simboli" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "Coloro per l'errore dello scarto quadratico medio errore:" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "Colore per GCP selezionati:" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "Colore per GCP non selezionati:" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "Mostra GCPs non usati" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "Dimensione dei simboli:" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "Rettificazione" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "Seleziona l'ordine di rettificazione" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "I grado" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "II grado" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "III grado" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "Seleziona metodo di interpolazione:" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "adatta la regione computazionale nella location di destinazione" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "Sovrascrivi mappa del risultato" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "La soglia del fattore dello scarto quadratico medio dev'essere > 0" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" @@ -3776,9 +3944,9 @@ msgstr "" "La soglia del fattore dello scarto quadratico è < 1\n" "Troppi punti potrebbero essere evidenziati" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "Impostazione del Gestore GCP salvate nel file '%s'." @@ -3813,10 +3981,10 @@ msgstr "Visualizza sorgente" msgid "Target Display" msgstr "Visualizza targer" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3825,7 +3993,7 @@ msgstr "Impostazione della pagina" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3834,7 +4002,7 @@ msgstr "Anteprima di stampa" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3848,14 +4016,14 @@ msgstr "Zoom alla regione computazionale (impostata con g.region)" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "Zoom alla region di default" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "Zoom alla region salvata" @@ -3868,33 +4036,33 @@ msgstr "Imposta la regione computazionale dal display" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "Salva le geometrie del display alla regione denominata" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Numero di categoria" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Range valido:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "Errore RMS" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "Successivo: %(forw)s, Precedente: %(back)s" @@ -3924,7 +4092,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3960,300 +4128,310 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "Definisci la nuova GRASS location" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "Questa opzione è richiesta" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "(opzionale)" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Nome" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" msgstr "Nome della location nella directory GIS Data" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Descrizione" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:251 +#, fuzzy +msgid "Description of project directory in GIS Data Directory" +msgstr "Nome della location nella directory GIS Data" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "Impossibile creare il nuovo Database di GRASS" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 +#, fuzzy msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" +"Il nome <%(name)s> non è un nome valido per la location. Si prega di usare " +"solo caratteri ASCII %(chars)s and spazi." -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "Nome invalido" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 +#, fuzzy msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" "Il titolo della location è limitato ad una sola linea e 256 caratteri. Il " "resto del testo sarà ignorato" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "Ulteriori metodi:" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Codice" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Codice della proiezione:" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Cerca nella descrizione:" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "Impossibile leggere la lista: %s" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "Scegli i parametri della proiezione" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "Seleziona datum con elissoide associato (prossima pagina)" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "Datum con elissoide associato" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "Solo Elissoide" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "È necessario inserire un valore per %s" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "Inserisci parametro per la proiezione %s" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "No" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Si" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "Specifica il datum geodetico" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "Elissoide" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Codice del datum:" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "Specifica l'elissoide" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "Basati sulla terra" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "Corpi planetari" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "Codice dell'elissoide:" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "File georeferenziato:" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "Seleziona file georeferenziato" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Parametri" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "Impossibile leggere i codici EPSG: {0}" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "Sceglie codice IAU" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "Percorso al file file dei codici IAU" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "codice IAU:" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "Scegliere il file dei codici IAU" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "Impossivilea leggere i codici IAU: {0}" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "Inserisci la stringa dei parametri PROJ.4:" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "Trasformazione del datum richiesta." -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Sommario" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "Database di GRASS:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Nome della Location:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Codice della proiezione:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Descrizione:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Proiezione:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" @@ -4261,15 +4439,15 @@ msgstr "" "Definizione PROJ.4:\n" " (non-definitivo)" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "personalizzato" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" @@ -4277,152 +4455,208 @@ msgstr "" "\n" "Dettagli: %(err)s" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" msgstr "Impossibile creare nuova location" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "La location esiste già nel Database GRASS" -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "Codice EPSG mancante." -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "File <%s> non trovato." -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "Imposta l'estensione e la risoluzione della region di default" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "&Imposta region" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "Location selezionata non valida" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "Region non valida" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "Clicca qui per mostrare le impostazioni 3D" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "Clicca qui per nascondere le impostazioni 3D" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Righe: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Colonne: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Celle: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Profondità: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "Celle 3D: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "Alto" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "Basso" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "Risoluzione alto-basso" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Nord" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Ovest" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Est" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Sud" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "risoluzione N-S" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "risoluzione E-O" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "Valore non valido: %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "Seleziona trasformazione datum" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "Seleziona dalla lista dei datum" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Rimuovi" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Disattiva" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Attiva" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "Imposta etichetta" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "Imposta commento" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "Aggiungi Punto di controllo sul terreno" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "Rimuovi punti di controllo sul terreno" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "Intermedio" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Proprietà" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "Etichetta:" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "Nota:" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "Impostazione del Modellizzatore" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4439,7 +4673,6 @@ msgid "Disabled:" msgstr "Disabilitato:" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "Editor Python" @@ -4449,10 +4682,10 @@ msgid "GRASS API:" msgstr "Aiuto su GRASS" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Comando" @@ -4478,7 +4711,7 @@ msgid "Shape size" msgstr "Dimensione dello shape" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Tipe" @@ -4507,13 +4740,13 @@ msgid "Comment" msgstr "Nota" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "Proprietà del modello" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Metadati" @@ -4522,7 +4755,7 @@ msgid "Commands" msgstr "Comandi" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4533,19 +4766,19 @@ msgid "Apply properties" msgstr "Applica proprietà" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "Chiudi e ignora i cambiamenti" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Nome:" @@ -4554,64 +4787,448 @@ msgstr "Nome:" msgid "Author(s):" msgstr "Autore(i):" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "Modellizzatore Grafico" + +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Modello" + +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Elementi" + +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Variabile" + +#: ../gui/wxpython/gmodeler/panels.py:189 +#, fuzzy +msgid "Script editor" +msgstr "&Editor semplice" + +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "output del comando" + +#: ../gui/wxpython/gmodeler/panels.py:273 +#, fuzzy +msgid "{} script contains local modifications" +msgstr "Lo script Python contiene modifiche locali" + +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +#, fuzzy +msgid "{} script is up-to-date" +msgstr "Lo script Python è aggiornato" + +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d sec" + +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" +msgstr "%(min)d min %(sec)d sec" + +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "Comando terminato" + +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" +msgstr "Esecuzione del modello finito" + +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" +msgstr "%d le mappe intermediare eliminate dal mapset corrente" + +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" +msgstr "" +"Lettura file del modello <%s> fallita.\n" +"File invalido, impossibile parsare il documento XML.\n" +"\n" +" %s" + +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "Per favore aspettare, caricamento modello..." + +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." +msgstr "Scrittura delle impostazioni correnti nel file del modello fallita." + +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." +msgstr "Impossibile aprile il file <%s> per scriverlo." + +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" +msgstr "" +"Il modello corrente non è vuoto. Vuoi salvare le impostazioni correnti in un " +"file?" + +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "Crea un nuovo modelo?" + +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "Scegli file del modello" + +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "FIle del modello di GRASS (*.gxm)|*.gxm" + +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" +msgstr "%(items)d elementi (%(actions)d actions) caricati nel modello" + +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "Il file del modello <%s> esiste già. Vuoi sovrascrivvere questo file?" + +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "Salva modello" + +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" +msgstr "File <%s> salvato" + +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "Scegli il file dove salvare il modello attuale" + +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "Il modello esportato a <%s>" + +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "Aggiungi nota" + +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." +msgstr "Commento vuoto. Niente da aggiungere al modello." + +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." +msgstr "Nessun dato intermediario da eliminare." + +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "Vuoi eliminare permanentemente i dati?%s" + +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "Elimina dati intermediari?" + +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "Il modello è vuoto. Niente da validare." + +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Si sta validando il modello..." + +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" +msgstr "" +"Il modello non è valido.\n" +"\n" +"%s" + +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "Il modello è valido" + +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "Modellizzatore Grafico wxGUI" + +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Si sta ridisegnando il modello...." + +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Vuoi salvare i cambiamenti nel modello?" + +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "Vuoi salvare le impostazioni del modello correnti in un file?" + +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Esci dal Modellizzatore Grafico" + +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "Lista delle variabili - click-destro per eliminare" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Tipo dei dati" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "Valore di default" + +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "Aggiungi nuova variabile" + +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" +msgstr "intero" + +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "float" + +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "stringa" + +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "regione" + +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "mapset" + +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "file" + +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" +msgstr "dir" + +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "Aggiungi nuova variabile al modello" + +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "Lista degli elementi - click-destro per eliminare" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "Etichetta" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "In ciclo" + +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" +msgstr "Parametrizzato" + +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." +msgstr "Nessuna elemento selezionata." + +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Python script" + +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" +msgstr "&Esegui" + +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "Lancia script" + +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Salva lo script python in un file" + +#: ../gui/wxpython/gmodeler/panels.py:1622 +#, fuzzy +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" +"Aggiorna lo script Python basato sul modello.\n" +"Le modifiche locali saranno scartate." + +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" +msgstr "Python" + +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Python script" + +#: ../gui/wxpython/gmodeler/panels.py:1710 +#, fuzzy +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" +msgstr "" +"Lo script Python è modificato localmente. Aggiornando saranno scartate tutte " +"le modifiche. Vuoi continuare comunque?" + +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" +msgstr "Aggiorna" + +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Python script (*.py)|*.py" + +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "Scegli il file da salvare" + +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "Il file <%s> esiste già. Vuoi sovrascrivvere questo file?" + +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "Salva file" + +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" +msgstr "Impossibile lanciare lo script Python. %s" + +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" +msgstr "" + +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "Crea un nuovo modello" + +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "Carica modello dal file" + +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "Salva modello in un file" + +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 msgid "Export model to image" msgstr "Esporta modello ad un'immagine" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 msgid "Export model to Python script" msgstr "Esporta modello in un script Python" -#: ../gui/wxpython/gmodeler/toolbars.py:52 +#: ../gui/wxpython/gmodeler/toolbars.py:63 msgid "Add GRASS tool (module) to model" msgstr "Aggiungi uno strumento (modulo) di GRASS al modello" -#: ../gui/wxpython/gmodeler/toolbars.py:54 +#: ../gui/wxpython/gmodeler/toolbars.py:66 msgid "Add data to model" msgstr "Aggiungi dati al modello" -#: ../gui/wxpython/gmodeler/toolbars.py:57 +#: ../gui/wxpython/gmodeler/toolbars.py:70 msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 +#: ../gui/wxpython/gmodeler/toolbars.py:73 msgid "Add loop/series to model" msgstr "Aggiungi cicli/serie al modello" -#: ../gui/wxpython/gmodeler/toolbars.py:60 +#: ../gui/wxpython/gmodeler/toolbars.py:76 msgid "Add comment to model" msgstr "Aggiungi commento al modello" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 msgid "Run model" msgstr "Esegui modello" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 msgid "Validate model" msgstr "Valida modello" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" -msgstr "" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "Proprietà del modello" -#: ../gui/wxpython/gmodeler/toolbars.py:66 +#: ../gui/wxpython/gmodeler/toolbars.py:83 msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 +#: ../gui/wxpython/gmodeler/toolbars.py:85 msgid "Redraw model canvas" msgstr "" @@ -4636,16 +5253,6 @@ msgstr "Aggiungi comando di GRASS al modello" msgid "Label and comment" msgstr "Etichetta e commento" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "Etichetta:" - -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "Nota:" - #: ../gui/wxpython/gmodeler/dialogs.py:308 msgid "" "Command not defined.\n" @@ -4675,7 +5282,7 @@ msgstr "Proprietà della relazione" msgid "From" msgstr "Da" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 msgid "To" msgstr "A" @@ -4720,12 +5327,6 @@ msgstr "" msgid "Condition" msgstr "Condizione" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "Etichetta" - #: ../gui/wxpython/gmodeler/dialogs.py:564 msgid "Loop properties" msgstr "Proprietà del ciclo" @@ -4772,50 +5373,46 @@ msgstr "Vuoi rimuove tutte le variabili dal modello?" msgid "Delete variables" msgstr "Elimina variabili" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 #: ../gui/wxpython/vdigit/dialogs.py:304 msgid "Delete selected" msgstr "Elimina selezionato" -#: ../gui/wxpython/gmodeler/dialogs.py:914 +#: ../gui/wxpython/gmodeler/dialogs.py:913 #: ../gui/wxpython/vdigit/dialogs.py:308 msgid "Delete all" msgstr "Elimina tutto" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 msgid "Reload" msgstr "Ricarica" -#: ../gui/wxpython/gmodeler/model.py:74 +#: ../gui/wxpython/gmodeler/model.py:80 msgid "model" msgstr "modello" -#: ../gui/wxpython/gmodeler/model.py:75 +#: ../gui/wxpython/gmodeler/model.py:81 msgid "Script generated by wxGUI Graphical Modeler." msgstr "Script generato dal Modellizzatore Grafico wxGUI" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 #, python-format msgid "undefined variable '%s'" msgstr "variabile non definita '%s'" -#: ../gui/wxpython/gmodeler/model.py:612 +#: ../gui/wxpython/gmodeler/model.py:618 msgid "Running model..." msgstr "Si sta eseguendo il modello..." -#: ../gui/wxpython/gmodeler/model.py:633 +#: ../gui/wxpython/gmodeler/model.py:639 msgid "Model is empty. Nothing to run." msgstr "Il modello è vuoto. Niente da eseguire." -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Si sta validando il modello..." - -#: ../gui/wxpython/gmodeler/model.py:650 +#: ../gui/wxpython/gmodeler/model.py:656 #, python-format msgid "" "Model is not valid. Do you want to run the model anyway?\n" @@ -4826,450 +5423,71 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/gmodeler/model.py:653 +#: ../gui/wxpython/gmodeler/model.py:659 msgid "Run model?" msgstr "Eseguire modello?" -#: ../gui/wxpython/gmodeler/model.py:688 +#: ../gui/wxpython/gmodeler/model.py:696 msgid "Variables below not defined:" msgstr "Le seguenti variabili non sono definite:" -#: ../gui/wxpython/gmodeler/model.py:801 +#: ../gui/wxpython/gmodeler/model.py:809 msgid "Raster maps" msgstr "Mappe raster" -#: ../gui/wxpython/gmodeler/model.py:804 +#: ../gui/wxpython/gmodeler/model.py:812 msgid "3D raster maps" msgstr "Mappe raster 3D" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 msgid "Vector maps" msgstr "Mappe Vettoriali" -#: ../gui/wxpython/gmodeler/model.py:1556 +#: ../gui/wxpython/gmodeler/model.py:1564 msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 +#: ../gui/wxpython/gmodeler/model.py:1758 msgid "Condition: " msgstr "Condizione:" -#: ../gui/wxpython/gmodeler/model.py:1752 +#: ../gui/wxpython/gmodeler/model.py:1760 msgid "Condition: not defined" msgstr "Condizione: non definito" -#: ../gui/wxpython/gmodeler/model.py:1894 +#: ../gui/wxpython/gmodeler/model.py:1902 msgid "if-else" msgstr "if-else" -#: ../gui/wxpython/gmodeler/model.py:2000 +#: ../gui/wxpython/gmodeler/model.py:2008 msgid "empty" msgstr "vuoto" -#: ../gui/wxpython/gmodeler/model.py:2001 +#: ../gui/wxpython/gmodeler/model.py:2009 #, python-brace-format msgid "Details: unsupported tag name '{0}'." msgstr "Dettagli: nome del tag '{0}' non supportato" -#: ../gui/wxpython/gmodeler/model.py:3479 +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "Attenzione" + +#: ../gui/wxpython/gmodeler/model.py:3643 msgid "Model parameters" msgstr "Parametri del modello" -#: ../gui/wxpython/gmodeler/model.py:3500 +#: ../gui/wxpython/gmodeler/model.py:3665 msgid "Delete intermediate data when finish" msgstr "Elimina dati intermediari quando finito" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" -msgstr "&Esegui" - -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" -msgstr "Variabile" - -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" -msgstr "Modellizzatore Grafico" - -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" -msgstr "Modello" - -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" -msgstr "Elementi" - -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" -msgstr "output del comando" - -#: ../gui/wxpython/gmodeler/frame.py:251 -#, fuzzy -msgid "{} script contains local modifications" -msgstr "Lo script Python contiene modifiche locali" - -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -#, fuzzy -msgid "{} script is up-to-date" -msgstr "Lo script Python è aggiornato" - -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." -msgstr "Si sta ridisegnando il modello...." - -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" -msgstr "%d sec" - -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" -msgstr "%(min)d min %(sec)d sec" - -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" -msgstr "Comando terminato" - -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" -msgstr "Esecuzione del modello finito" - -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "Vuoi salvare i cambiamenti nel modello?" - -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" -msgstr "Vuoi salvare le impostazioni del modello correnti in un file?" - -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" -msgstr "Esci dal Modellizzatore Grafico" - -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "%d le mappe intermediare eliminate dal mapset corrente" - -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." -msgstr "Nessun dato intermediario da eliminare." - -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "Vuoi eliminare permanentemente i dati?%s" - -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "Elimina dati intermediari?" - -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" -msgstr "" -"Il modello corrente non è vuoto. Vuoi salvare le impostazioni correnti in un " -"file?" - -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" -msgstr "Crea un nuovo modelo?" - -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" -msgstr "Scegli file del modello" - -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" -msgstr "FIle del modello di GRASS (*.gxm)|*.gxm" - -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" -msgstr "%(items)d elementi (%(actions)d actions) caricati nel modello" - -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" -msgstr "Il file del modello <%s> esiste già. Vuoi sovrascrivvere questo file?" - -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" -msgstr "Salva modello" - -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" -msgstr "File <%s> salvato" - -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" -msgstr "Scegli il file dove salvare il modello attuale" - -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." -msgstr "Il modello è vuoto. Niente da validare." - -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" -msgstr "" -"Il modello non è valido.\n" -"\n" -"%s" - -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." -msgstr "Il modello è valido" - -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" -msgstr "Il modello esportato a <%s>" - -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" -msgstr "Aggiungi nota" - -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." -msgstr "Commento vuoto. Niente da aggiungere al modello." - -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" -msgstr "Modellizzatore Grafico wxGUI" - -#: ../gui/wxpython/gmodeler/frame.py:1116 -#, python-format -msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" -msgstr "" -"Lettura file del modello <%s> fallita.\n" -"File invalido, impossibile parsare il documento XML.\n" -"\n" -" %s" - -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "Per favore aspettare, caricamento modello..." - -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." -msgstr "Scrittura delle impostazioni correnti nel file del modello fallita." - -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "Impossibile aprile il file <%s> per scriverlo." - -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "Rimuovi" - -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" -msgstr "Disattiva" - -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" -msgstr "Attiva" - -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" -msgstr "Imposta etichetta" - -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" -msgstr "Imposta commento" - -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" -msgstr "Aggiungi Punto di controllo sul terreno" - -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "Rimuovi punti di controllo sul terreno" - -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" -msgstr "Intermedio" - -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" -msgstr "Proprietà" - -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "Lista delle variabili - click-destro per eliminare" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" -msgstr "Tipo dei dati" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "Valore di default" - -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" -msgstr "Aggiungi nuova variabile" - -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" -msgstr "intero" - -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "float" - -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "stringa" - -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "regione" - -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" -msgstr "mapset" - -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "file" - -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" -msgstr "dir" - -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" -msgstr "Aggiungi nuova variabile al modello" - -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "Lista degli elementi - click-destro per eliminare" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" -msgstr "In ciclo" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" -msgstr "Parametrizzato" - -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." -msgstr "Nessuna elemento selezionata." - -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" -msgstr "Python script" - -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -#, fuzzy -msgid "Run script" -msgstr "Lancia script" - -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Salva lo script python in un file" - -#: ../gui/wxpython/gmodeler/frame.py:2047 -#, fuzzy -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." -msgstr "" -"Aggiorna lo script Python basato sul modello.\n" -"Le modifiche locali saranno scartate." - -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" -msgstr "Python" - -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:2078 -#, fuzzy -msgid "Python script type" -msgstr "Python script" - -#: ../gui/wxpython/gmodeler/frame.py:2110 -#, fuzzy -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" -msgstr "" -"Lo script Python è modificato localmente. Aggiornando saranno scartate tutte " -"le modifiche. Vuoi continuare comunque?" - -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" -msgstr "Aggiorna" - -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" -msgstr "Scegli il file da salvare" - -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" -msgstr "Python script (*.py)|*.py" - -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" -msgstr "Il file <%s> esiste già. Vuoi sovrascrivvere questo file?" - -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" -msgstr "Salva file" - -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" -msgstr "Impossibile lanciare lo script Python. %s" - -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" -msgstr "" - -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "&File" @@ -5281,7 +5499,7 @@ msgstr "Ambiente di lavoro" msgid "Create new workspace" msgstr "Crea una nuova area di lavoro" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "Apri" @@ -5289,7 +5507,7 @@ msgstr "Apri" msgid "Load workspace from file" msgstr "Carica l'area di lavoro dal file" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "Salva" @@ -5299,7 +5517,7 @@ msgstr "Salva" msgid "Save workspace" msgstr "Salva ambiente di lavoro" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "Salva come" @@ -5312,7 +5530,7 @@ msgid "Close workspace file" msgstr "Chiudi file dell'ambiente di lavoro" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "Visualizzatore delle mappe" @@ -5349,7 +5567,7 @@ msgid "Add RGB raster map layer to current display" msgstr "Aggiunge mappa raster RGB al display corrente" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "Aggiungi layer da servizi web" @@ -5377,25 +5595,25 @@ msgstr "Chiudi la corrente finestra per la visualizzazione della mappa" msgid "Close all open map display windows" msgstr "Chiudi tutte le finestre per la visualizzazione della mappa" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "Importa in modo semplificato raster affettuando riproiezione" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" "Importa dati raster in una mappa raster di GRASS usando la libreria GDAL." -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "Importa formati raster comuni" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "Importa punti ASCII x,y,z e crea una griglia" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." @@ -5403,75 +5621,75 @@ msgstr "" "Crea un raster da un assemblaggio di molte coordinate usando statistiche " "univariate." -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "Importa ASCII grid" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "Converte un file raster GRASS ASCII in un raster binario." -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "Importa poligoni, linee e punti ASCII" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "Crea raster da file ASCII poligonale/lineare/puntuale" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "Importa array binari grezzi" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "Importa file raster binario in un raster GRASS" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "Importa GRIDATB.FOR" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "Importa file GRIDATB.FOR (TOPMODEL) in un raster GRASS." -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "Importa array di Matlab 2D" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "Importa un MAT-File(v4) binario in un raster GRASS" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "Importa PNG" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "Importa un'immagine PNG non georeferenziata." -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "Importa SPOT NDVI" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "Importa dati SPOT VGT NDVI in un raster." -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "Importa SRTM HGT" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "Importa file SRTM HGT in un raster" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Importa Terra ASTER HDF" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." @@ -5480,34 +5698,42 @@ msgstr "" "usando gdalwarp." #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "Importa punti LAS LiDAR" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." -msgstr "" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +#, fuzzy +msgid "Module not installed" +msgstr "Modulo <%s> non trovato." #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "Estrai mappa raster" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" @@ -5516,99 +5742,97 @@ msgstr "" "(creato con r.pack)" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +#, fuzzy +msgid "Reproject raster map from different GRASS project" msgstr "Riproietta raster da diverse location GRASS" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." msgstr "Riproietta un raster da una location data alla location corrente" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "Importa in modo semplificato vettoriali affettuando riproiezione" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" "Importa dati raster in una mappa vettoriale di GRASS usando la libreria OGR." -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "Importa formati vettoriali comuni" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "Formato punti ASCII o GRASS ASCII" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "Crea un vettoriale da file ASCII points o ASCII vector." -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "Punti ASCII come vettoriale lineare" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "Importa coordinate ASCII x,y[,z] come una serie di linee." -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "Importa DXF" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "Converte file in formato DXF in una mappa vettoriale in formato GRASS" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "Importa GetFeature da un server WFS" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "Importa ESRI e00" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "Importa file E00 in un vettoriale." -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "Importa Geonames" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" "Importa file di nazioni da geonames.org in vettoriale di punti di GRASS." -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "Importa formati array di Matlab e MapGen" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "Importa vettoriali Mapgen o Matlab-ASCII in GRASS." -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "Estrai mappa vettoriale" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" @@ -5617,185 +5841,187 @@ msgstr "" "GIS (creato con v.pack)" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" msgstr "Riproietta un vettoriale da una diversa location di GRASS." #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "Riproietta un vettoriale da una location alla location corrente." -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "Importa dati raster 3D" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "Importa ASCII 3D" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" "Converte un file testuale raster ASCII 3D in un layer raster 3D (binario)." -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "Importa array binary 3D" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "Importa file raster binario in un raster 3D di GRASS." -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Importa Vis5D" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "Importa file Vis5D tridimensionale." -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "Importa tabella di database" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "Formati comuni di importazione" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "Importa tabella degli attributi in diversi formati." -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "Esporta mappa raster" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "Formati comuni di esportazione" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "Esporta raster GRASS in formati supportati da GDAL" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "Esporta ASCII grid" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "Converte un raster in un file di testo GRASS ASCII." -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "Esporta punti x,y,z in ASCII" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" "Esporta un raster in un file di testo come valori x,y,z basato sui centri " "delle celle." -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "Esporta GRIDATB.FOR" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "Esporta raster GRASS in un file GRIDATB.FOR (TOPMODEL)." -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "Esporta array Matlab 2D" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "Esporta a raster GRASS in un MAT-File binario" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "Esporta array binari" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "Esporta un raster GRASS in un array binario" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "Esporta MPEG-1" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "Converte serie di file raster in video MPEG." -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "Esporta PNG" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "Esporta un raster GRASS in un'immagine PNG non georeferenziata." -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "Esporta PPM" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "Converte un raster GRASS in un immagine PPM" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "Esporta PPM da RGB" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "Converte 3 raster GRASS (R,G,B) in un'immagine PPM." #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "Esporta POV-Ray" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "Converte un raster in un file otto campi POV-Ray." -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "Esporta VRML" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "Esporta raster in Virtual Reality Modeling Language (VRML)." #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "Esporta VTK" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "Converte un raster in formato VTK-ASCII." -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "Comprimi raster" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "Esporta mappa raster come un file archivio specifico di GRASS GIS" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "Esporta mappa vettoriale" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." @@ -5804,120 +6030,120 @@ msgstr "" "da OGR. Di default una mappa vettoriale è esportata nel formato OGC " "GeoPackage." -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "Esporta vettoriale in ASCII points o GRASS ASCII" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "Esporta DXF" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "Esporta vettoriale GRASS in file formato DXF." -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "Esporta PostGIS" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "Esporta una mappa vettoriale in una tabella di PostGIS." -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "Converte punti x,y,z di GRASS x,y,z nel formato POV-Ray x,z,y" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "Esporta SVG" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "Esporta mappa vettoriale GRASS in file SVG." -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "Converte una mappa vettoriale in un VTK ASCII" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "Comprimi vettoriale" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" "Esporta una mappa vettoriale come file archivio specifico per GRASS GIS" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "Esporta mappa raster 3D" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "Esporta ASCII 3D" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "Converte un raster 3D in un file di testo ASCII." -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "Esporta array binari 3D" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "Esporta un raster 3D GRASS in un array binario." -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Esporta Vis5D" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "Esporta raster GRASS 3D in un file Vis5D tridimensionale." -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "Converte un raster 3D in formato VTK-ASCII." -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "Esporta tabella database" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "Esporta tabella degli attributi in diversi formati" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "Collega a un raster esterno" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "Collega file raster supportato da GDAL in un layer raster di GRASS." -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "Collega a un vettoriale esterno" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "Crea nuovo pseudo-vettore come link in a un layer supportato da OGR." -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "Formato di output per i dati raster" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." @@ -5925,36 +6151,36 @@ msgstr "" "Salva l'output raster in un file utilizzando la libreria GDAL invece di " "salvarlo nel formato raster di GRASS." -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "Formato di output per i dati vettoriale" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "Imposta il formato di output vettoriale utilizzando la libreria OGR" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "Gestisci mappe" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "Copia" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "Lista" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." @@ -5962,87 +6188,87 @@ msgstr "" "Lista dei file del database di GRASS disponibili secondo il tipo specificato " "dall'utente." -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "Rinomina" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "Rinomina i file degli elementi nel corrente mapset nel database" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "Conversioni tipo di mappa" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "Da raster a vettoriale" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "Converte un raster in un vettoriale." #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "Da serie di raster a raster 3D" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "Converte una serie di raster 2D in una volume raster 3D" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "Da raster 2.5D a raster 3D" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" "Crea una mappa 3D basandosi sui valori dell'elevazione di un raster 2D." #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "Da vettoriale a raster" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "Converte (rasterizza) un vettoriale in un raster." #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "Da vettoriale a raster 3D" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "Converte un vettore (solo puntuale) in un raster 3D" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "Da vettoriale 2D a vettoriale 3D" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "Esegue trasformazione da vettoriali 2D a 3D" @@ -6050,20 +6276,20 @@ msgstr "Esegue trasformazione da vettoriali 2D a 3D" msgid "3D raster to raster series" msgstr "Da raster 3D a serie di raster" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "Converte raster 3D in raster 2D" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "Gestione dei Punti di controllo sul terreno per la georettifica" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "Modellizzatore Grafico" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "Avvia Modellizzatore Grafico" @@ -6083,13 +6309,13 @@ msgstr "" "Crea una visualizzazione 3D di dati GIS. Visualizza superfici (dati raster), " "dati vettoriali 2D/3D, e volumi (dati raster 3D) in 3D." -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "Strumento per animazione" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "Avvia lo strumento per l'animazione" @@ -6106,16 +6332,16 @@ msgstr "" "coordinate e vice versa. Si suppone lavorare in un sistema di coordinate " "cartesiane" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "Compositore Cartografico" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "Avvia Compositore Cartografico" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "Avvia Map Swipe" @@ -6135,7 +6361,7 @@ msgstr "Semplice editor di Python" msgid "Launches Simple Python Editor." msgstr "Apre l'editor semplice di Python" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "Chiudi GUI" @@ -6143,8 +6369,8 @@ msgstr "Chiudi GUI" msgid "Close graphical user interface." msgstr "Chiude l'interfaccia grafica dell'utente." -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "Esci da GRASS GIS" @@ -6152,42 +6378,42 @@ msgstr "Esci da GRASS GIS" msgid "Close GUI and exit GRASS GIS shell." msgstr "Chiude la GUI e esce dalla shell di GRASS GIS" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "&Impostazioni" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "Regione computazionale" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "Mostra la region corrente" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "Mostra l'estensione e risoluzione della region computazionale." -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "Mostra region usando latitudine e longitudine" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "Mostra l'estensione della region corrente nel Map Display" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "Mostra l'estensione della region computazionale nel Map Display" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "Imposta region" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "Gestisci i confini per la region." @@ -6200,7 +6426,8 @@ msgid "Mapset access" msgstr "Accesso al mapset" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#, fuzzy +msgid "Set/unset access to other mapsets in current project" msgstr "" "Seleziona/deseleziona l'accesso ad altri mapset nelle location corrente" @@ -6225,11 +6452,13 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "Cambia location e mapset" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "Cambia i correnti location e mapset" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#, fuzzy +msgid "Change current project and mapset." msgstr "Cambia i correnti location e mapset" #: ../gui/wxpython/menustrings.py:240 @@ -6263,15 +6492,20 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" +#, fuzzy +msgid "Create new project (location)" msgstr "Crea nuova location" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +#, fuzzy +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "Lancia location wizard per creare una nuova GRASS location." #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +#, fuzzy +msgid "Creates new mapset in the current project, changes current mapset." msgstr "Crea nuova mapset nella location attuale, cambia il mapset attuale." #: ../gui/wxpython/menustrings.py:252 @@ -6297,8 +6531,7 @@ msgstr "Gestione proiezioni" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6329,7 +6562,7 @@ msgstr "Gestisci estensioni installate" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "Aggiorna o rimuove l'estensione degli GRASS AddOns installata." -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "Preferenze" @@ -6337,51 +6570,51 @@ msgstr "Preferenze" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "Preferenze della GUI (font del display, comandi ecc)" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "&Raster" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "Sviluppa raster" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "Comprimi/decomprimi" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "Comprimi e decomprimi raster" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "Confini della region" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "Imposta i confini per un raster" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "Gestisci valori nulli" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "Gestisci valori nulli di un raster" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "Quantificazione" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "Produce il file della quantificazione per una mappa floating-point" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "Timestamp" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." @@ -6389,35 +6622,35 @@ msgstr "" "Modifica un timestamp per un raster. Stampa/aggiunge/rimuove un timestamp " "per un raster." -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "Risemplifica usando statistiche aggregate" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "Ricampiona il raster ad una griglia meno fitta usando aggregazione." -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "Ricampiona usando diversi metodi" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "Ricampiona il raster ad una griglia più fitta usando interpolazione." -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "Ricampiona usando il metodo dei punti più vicini" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "Capacità di ricampionamento della mappa raster di GRASS" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "Ricampiona usando tensione spline" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " @@ -6427,48 +6660,48 @@ msgstr "" "input e crea una nuova mappaa (possibilmente con risoluzione differente) " "utilizzando spline regolarizzate con tensione e smooting." -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "Ricampiona usando bspline" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" "Interpolazione spline bicubica o bilineare con regolarizzazione Tykhonov." -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "Ricampiona usando kernel analitico" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "Ricampiona il raster usando un kernel analitico." #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "Gestione metadati" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" "Permette la creazione e/o la modificazione dei file di supporto ai raster" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "Aggiorna le statistiche della mappa" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "Aggiorna statistiche per un raster" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "Creazione di tile" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." @@ -6476,80 +6709,80 @@ msgstr "" "Genera tiling della proiezione della sorgente da usare nelal regione e " "proiezione di destinazione." -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "Gestisci colori" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "Tabella dei colori" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "Crea/modifica la tabella dei colori associata ad un raster." -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "Tabelle dei colori (stddev)" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" "Imposta le regole di colore sulla base della stddev del valore medio della " "mappa. " #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "Gestisci interattivamente le regole di colore" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" "Modifica i valori della tabella dei colori di un raster interattivamente" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "Esporta tabella dei colori" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "Esporta la tabella dei colori associata ad un raster." -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "Fondi i colori di 2 raster" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "Fonde i colori di due raster secondo un rapporto stabilito." -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "Crea RGB" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "Combina raster rosso, verde e blu in un singolo raster" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "Da RGB a HIS" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " @@ -6558,35 +6791,35 @@ msgstr "" "Genera un raster rosso, verde e blu combinando i valori di colore, intensità " "e saturazione (HIS) da un raster di input specificato dall'utente. " -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "Interroga raster" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "Interroga utilizzando coordinate" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "Interroga il raster sui suoi valori di cateogria ed etichette." -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "Interroga colori dal valore" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "Interroga colori per raster" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "Raster buffer e distanza" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "Buffer raster" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." @@ -6594,74 +6827,74 @@ msgstr "" "Crea un raster mostrando una zona di buffer intorno alle celle che " "contengono valori non nulli." -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "Cerchi concentrici" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "Crea un raster contenente cerchi concentrici intorno ad un dato punto." -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "Punti chiusi" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "Localizza i punti più vicini degli oggetti in due raster." -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "Accresci di una cella" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "Genera un raster con le aree contigue maggiorate di una cella." #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "Distanza alla features" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "Crea una maschera per limitare le operazioni sui raster." #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "Calcolatore per raster map algebra" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "Calcolatore per raster map algebra" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "Analisi vicinanze" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "Muovi finestra" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " @@ -6670,36 +6903,36 @@ msgstr "" "Assegna alla categoria di ogni cella una funzione della categoria delle " "celle adiacenti e salva i valori delle celle in una nuova mappa raster." -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "Punti più vicini" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "Sovrapponi raster" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "Prodotto trasversale" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "Crea un prodotto incrociato dai valori delle categorie di più raster. " -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "Unire raster" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." @@ -6707,11 +6940,11 @@ msgstr "" "Crea un raster composto usando i valori conosciuti da una (o più) mappa(e) " "per riempire le aree di valori nulli in un'altra mappa." -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "Aggregazione serie di raster" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." @@ -6719,51 +6952,51 @@ msgstr "" "Assegna il valore di ogni cella in output come una funzione dei valori " "assegnati alle celle corrispondenti nella mappa raster di input." -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "Somma serie di raster" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "Statistiche di sovrapposizioni" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "Calcola le categorie dei quantili utilizzando due raster." -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "Radianza solare e ombreggiatura" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "Mappa LatLong" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "Crea un raster latitudine/longitudine." -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "Irraggiamento e irradiazione solare" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6774,22 +7007,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "Mappa delle ombre" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "Ore di sole e angoli del sole" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6797,23 +7030,23 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "Analisi terreno" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "Genera curve di livello" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "Produce una mappa vettoriale dei contorni specificati da un raster" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "Superficie Coste" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " @@ -6823,19 +7056,19 @@ msgstr "" "località geografiche partendo da un raster contenente nelle celle il valore " "rappresentante il costo." -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "Costi comulativi di movimento" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " @@ -6845,37 +7078,37 @@ msgstr "" "località geografiche partendo da un raster contenente nelle celle il valore " "rappresentante il costo." -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "Itinerario o flusso meno costoso" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "Calcola il rilievo ombreggiato" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" "Crea mappa dell'ombreggiatura dei rilievi da una mappa dell'elevatione (DEM)." -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "Applica ombre al raster" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "Pendenza e esposizione" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " @@ -6885,49 +7118,49 @@ msgstr "" "da un raster con valori dell'elevazione. L'esposizione è calcolare in senso " "antiorario da est." -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "Parametri del terreno" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "Elementi di tessitura" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "Genera immagini con elementi di tessitura da un raster" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "Visibilità" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "Angolo dell'orizzonte" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6938,15 +7171,15 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "Caratteristiche di trasformazione" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "Raggruppa" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." @@ -6954,45 +7187,45 @@ msgstr "" "Ricrea le categorie di una mappa raster raggruppando celle che formano aree " "fisicamente discrete in un'unica categoria." -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "Aumenta" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "Sottile" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "Modellazione idrologica" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "Incide la rete" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "Riempi i laghi" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "Riempie i laghi partendo da un punto iniziale al livello dato." -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "Mappa senza depressioni e mappa delle direzioni di flusso" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." @@ -7000,71 +7233,71 @@ msgstr "" "Filtra e genera una mappa delle elevazioni senza depressioni e una mappa " "delle direzioni di flusso data una mappa raster delle elevazioni." -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "Flusso di accumulo" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "Linee di flusso" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "Analisi dei bacini idrografici" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "Sottobacini dello spartiacque " -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "Genera sottobacini idrografici di un raster." -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "Creazione dei bacini idrografici" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "Genera bacini idrografici da una mappa della direzione del drenaggio." -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "Estrazione della rete idrografica" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "Esegue l'estrazione della rete." -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "Modello SIMWE per flusso superficiale" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" "Modello idrologico per il calcolo del flusso superficiale utilizzando il " "metodo path sampling (SIMWE)." -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "Modello SIMWE per flusso di sedimenti" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." @@ -7072,50 +7305,50 @@ msgstr "" "Modellazione di trasporto di sedimenti e erosione/deposito usando il metodo " "path sampling (SIMWE)." -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "Mappa degli indici topografici" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "Simulazione TOPMODEL" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "Modellazione idrologica fisicamente basata con TOPMODEL." -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "USLE K-factor" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "Calcola USLE Soil Erodibility Factor (K)." -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "USLE R-factor" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "Modellistica delle acque sotterranee " -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "Punto di controllo sul terreno" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." @@ -7123,54 +7356,54 @@ msgstr "" "Programma per il calcolo numerico del transiente, flusso sotterraneo " "confinato e non confinato in due dimensioni." -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "Analisi delle patch del paesaggio" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "Imposta campioni e l'ambiente di analisi" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "Editor per la configurazione di r.li" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "Densità dei bordi" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Calcola l'indice di densità dei bordi su un raster, usando un algoritmo che " "considera i 4 pixel più vicini" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "Indice di densità dei bordi pesato sull'area" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "Calcola l'indice di densità dei bordi pesato sull'area su un raster" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "Area media delle patch" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" @@ -7178,103 +7411,103 @@ msgstr "" "Calcola l'indice della dimensione media della tessera su un raster, usando " "un algoritmo che considera i 4 pixel più vicini" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "Intervallo di area per la particella" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" "Calcola l'intervallo di dimensione della particella su una mappa raster" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "Deviazione Standard dell'area della particella" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "Calcola deviazione standard dell'area della particella su un raster" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "Coefficienze di variazione dell'area della particella" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" "Calcola coefficiente di variazione dell'area della particella su un raster" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "Densità delle patch" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" "Calcola indice di densità delle particelle su un raster, usando un algoritmo " "che considera i 4 pixel più vicini" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "Combina numero" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" "Calcola l'indice del numero di particelle su un raster, usando un algoritmo " "che considera i 4 pixel più vicini" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "Diversità della dominanza" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "Calcola l'indice di diversità di posizione dominante su un raster" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "Diversità di Shannon" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "Calcola l'indice di diversità di Shannon su un raster" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "Diversità di Simpson" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "Calcola l'indice di diversità di Simpson su un raster" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "Ricchezza" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "Calcola l'indice di ricchezza su un raster" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "Indice shape" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "Calcola l'indice shape su un raster" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "Modellistica degli incendi" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "Diffusione di fuoco" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7282,11 +7515,11 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "Percorso di diffusione a costo minore" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." @@ -7294,11 +7527,11 @@ msgstr "" "Traccia ricorsivamente il percorso di minor costo partendo dalle celle da " "cui il costo complessivo è stato determinato." -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "Simulazione di diffusione anisotropica" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7307,17 +7540,17 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "Cambia i valori e le etichette delle categorie" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "Gestisci le informazioni delle categorie" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." @@ -7325,19 +7558,19 @@ msgstr "" "Gestisce i valori delle categorie e le etichette associate con un raster " "specificato dall'utente" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "Modifica i valori interattivamente" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "Modifica i valori delle celle in un raster." -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "Riclassifica dalla dimensione" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." @@ -7346,38 +7579,38 @@ msgstr "" "specifica dall'utente (in ettaari)." #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "Riclassifica" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "Ricodifica" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "Ricodifica categorie del raster." -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "Riscala" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "Riscala il range dei valori elle categorie in un raster." -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "Ricampiona con istogramma " -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." @@ -7385,103 +7618,103 @@ msgstr "" "Riscala l'istogramma dei valori equalizzati nell'intervallo di categorie per " "una mappa raster." -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "Genera celle random" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "Celle casuali" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "Genera valori di celle casuali con dipendenza spaziale" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "Celle e punti vettoriale random" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "Genera superfici" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "Superfici frattali" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "Crea una superficie frattale di una data dimensione frattale" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "Superficie " -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "Superfici derivate gaussiane" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "Superfici derivate casuali" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "Superfice casuale con dipendenza spaziale" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "Genera superfici casuali con dipendenza spatiale." -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "Interpolazione superfici" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "Bilineare e bicubica da vettore puntuale" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "IDW da punti raster" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." @@ -7489,11 +7722,11 @@ msgstr "" "Interpolazione della superficie da un raster di punti con peso inverso delle " "distanze al quadrato IDW." -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "IDW da punti vettoriali" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." @@ -7501,19 +7734,19 @@ msgstr "" "Interpolazione della superficie da un vettoriale puntuale con peso inverso " "delle distanze al quadrato IDW." -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "Raster contorni" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "Genera raster della superficie da isolinee rasterizzate" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "Tensione spline regolarizzata" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7521,106 +7754,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "Interpolazione serie di raster" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "Riempi celle nulle" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "Riempi aree senza dati di un raster usando interpolazione spline. " -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "Reports e statistiche" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "Metadata del raster" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "Stampa informazioni di base di un raster." -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "Statistiche generali" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "Genera aree statistiche per un raster." -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "Quantili per grandi data set" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "Calcola quantili utilizzando due raster." -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "Range dei valori della categoria" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "Stampa lista concisa dei valori delle categorie trovate nel raster" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "Somma area di raster" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "Stampa statistiche per raster." -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "Statistiche per celle raggruppate" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "Totale delle aree corrette" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "Statistiche univariate raster" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7629,32 +7862,32 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "Transetto semplice" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" "Produce una mappa raster contenente i valori presenti lungo la linea/le " "linee definite dall'utente." -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "Valori campione lungo i transetti (orientamento, distanza)" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" "Produce una mappa raster contenente i valori presenti lungo la linea/le " "linee del transetto." -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "Covarianza/correlazione" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." @@ -7662,27 +7895,27 @@ msgstr "" "Output una matrice della covarianza/correlazione per un raster specificato " "dall'utente." -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "Regressione lineare" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "Calcola la regressione lineare per due raster: y = a + b*x." -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "Regressione multipla" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "Presenza reciproca" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." @@ -7690,29 +7923,29 @@ msgstr "" "Cataloga il verificarsi reciproca (coincidenza) di categorie per due strati " "raster." -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "&Vettore" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "Sviluppa vettoriale" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "Crea nuova mappa vettoriale" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "Crea un nuova mappa vettoriale vuota" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "Modifica mappa vettoriale (in maniera non interattiva)" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." @@ -7720,74 +7953,75 @@ msgstr "" "Modifica una mappa vettoriale, permette aggiunte, eliminazione e modifica " "degli elementi del vettore selezionato." -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "Converti tipologia d'oggetto" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "Cambia tipologia degli elementi vettoriali." -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "Linee parallele" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "Crea linee parallele di un vettore lineare di input." -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "Dissolvi confini" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" "Dissolve i confini tra aree adiacenti che condividono categorie o attributi " "comuni." -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "Crea vettore 3D sopra un raster" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "Crea vettoriale 3D" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "Crea label" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "Crea un'etichetta con disegno per una mappa vettoriale con attributi." -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "Riposizione vettori" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "Rettifica mappa vettoriale" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." @@ -7795,131 +8029,131 @@ msgstr "" "Rettifica un vettoriale eseguendo una trasformazione per ogni oggetto nel " "vettoriale basata sui punti di controllo." -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "Aggiorna metadati per vettoriale" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "Gestione topologia" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "Crea o ricrea topologia" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "Ricostruisci la topologia di tutti i vettoriali" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "Ricostruisci la topologia di tutti i vettoriali nell'attuale mapset." -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "Costruisce polilinee" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "Crea polilinee da linee o confini." -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "Dividi linee" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "Dividi polilinee" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "Crea punti/segmenti da linee vettoriali e posizioni di input." -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "Aggiusta vettore" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "Strumenti per aggiustare la topologia di una mappa vettoriale." -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "Arrotondare o semplificare" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "Calcola la generalizzazione vettoriale." -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "Aggiungi centroidi" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "Aggiungi i centroidi mancanti ai confini chiusi." -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "Crea/modifica la tabella dei colori associata a un vettoriale." -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "Gestione interattiva della tabella dei colori per vettoriale" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "Esporta la tabella dei colori associata a un vettoriale." -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "Interroga vettoriale" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "Interrogazione dalle coordinate" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "Interroga un vettore in posizioni date." -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "Interroga gli attributi del vettoriale" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "Visualizza gli attributi del vettoriale" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "Selezione feature" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "Seleziona tramite attributi" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." @@ -7927,103 +8161,103 @@ msgstr "" "Seleziona oggetti vettoriali da una mappa esistente e crea una nuova mappa " "contenente solo gli oggetti selezionati." -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "Seleziona da un'altra mappa" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" "Elementi selezionati di un vettoriale (A) con gli elementi di un altro " "vettoriale (B)." -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "Buffer vettori" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "Crea un buffer intorno agli elementi di un dato tipo." -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "Analisi dei punti" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "Identifica e rimuovi i valori anomali" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "Rimuove i fuori campo da un vettore di punti." -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "Perturba punti" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "Disturbo casuale del posizionamento di punti vettoriali." #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "Set di punti di prova" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "Suddivisione casuale dei punti del set di dati." -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "Test di normalità per punti vettoriali" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "Analisi dati lidar" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "Cancella vertici" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "Rileva i bordi dell'oggetto da un dataset LIDAR" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "Rileva interni" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" @@ -8031,11 +8265,11 @@ msgstr "" "Esegue la determinazione delle isolinee e l'algoritmo di Region Growing per " "determinare gli edifici interni" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "Corregge e riclassifica oggetti" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." @@ -8043,31 +8277,31 @@ msgstr "" "Correzione del risultato di v.lidar.growing. Questo è l'ultimo dei tre " "algoritmi per filtrare dati LIDAR." -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "Riferimento lineare" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "Crea LRS" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "Crea un sistema di riferimento lineare." -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "Crea dislocazioni" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "Crea punti/segmenti" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." @@ -8075,11 +8309,11 @@ msgstr "" "Crea punti/segmenti da linee, il sistema di riferimento lineare e i punti " "sono letti dallo stdin o da file" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "Trova id linea e offset" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." @@ -8087,11 +8321,11 @@ msgstr "" "Cerca id e offset in km per un punto dato nella mappa vettoriale usando un " "sistema di riferimento lineare." -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "Elemento più vicino" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." @@ -8099,61 +8333,61 @@ msgstr "" "Trova l'elemento più vicino nel vettoriale 'to' per gli elementi nel " "vettoriale 'from'." -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "Analisi Network" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "Strumento per l'analisi di reti vettoriali" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "Strumento per l'analisi di reti vettoriali interattivo" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "Preparazione della rete" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "Esegue la manutenzione della rete." -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "Alloca subnets" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "Dividi linea" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "Percorso più breve" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "Trova il percorso più breve in una rete vettoriale." -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "Percorso più breve per insiemi di elementi" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -8161,67 +8395,67 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "Percorso più breve usando tabelle dei tempi" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "Trova il percorso più breve usanto tabelle dei tempi" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "Percorso più breve per tutte le coppie" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "Calcola il percorso più breve tra tutte le coppie di nodi nella rete." -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "Visibilità della rete" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "Esegue la costruzione del grafico di visibilità." -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "Ponti e punti di articolazione" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "Calcola ponti e punti di articolazione sulla rete." -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "Portata massima" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "Calcola il flusso massimo tra due set di nodi sulla rete." -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "Connessione vertici" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "Connette due set di nodi sulla rete." -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "Componenti" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "Calcola i punti forti e deboli di connessione sulla rete" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "Centralità" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." @@ -8229,32 +8463,32 @@ msgstr "" "Misura grado, centralità, contenimento, vicinanza e centralità degli " "eigenvector sulla rete." -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "Albero Steiner" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "Algoritmo spanning tree" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "" "Applica l'algoritmo di spannin tree alla rete (per reti complesse senza " "loop)." -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "Analisi viaggio venditore" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8262,45 +8496,45 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "Overlay vettori" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "Unisci vettori" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "Crea un nuovo vettori combinando altri vettori." -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "Gestisce categorie" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "Cambia o visualizza categorie" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." @@ -8309,93 +8543,93 @@ msgstr "" "risultati di interrogazioni SQL o valori di una colonna della tabella degli " "attributi" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "Aggiornamento attributi" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "Aggiorna gli attributi dell'area da raster" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "Aggiorna gli attributi dell'area da un vettoriale" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" "Conta i punti nelle aree, calcola statistiche univariate dagli attributi dei " "punti." -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "Aggiorna gli attributi del punto da aree" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" "Carica valori di un vettoriale nella tabella degli attributi di un " "vettoriale puntuale" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "Aggiorna i valori del database da elementi vettoriali" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "Popola i valori del database da elementi vettoriali." -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "Campioni raster alle posizioni dei punti" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" "Carica valori di un raster nella tabella degli attributi di un vettoriale " "puntuale" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "Raster campioni vicine attorno ai punti" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "Campioni raster alle posizioni dei punti vettoriali." -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "Genera area per la regione corrente" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" "Crea un nuovo vettoriale poligonale dalla estensione delle regione corrente." -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "Genera aree da punti" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "Poligoni convessi" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "Crea poligoni convessi 2D/3D da un dato vettoriale." -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "Triangoli di Delaunay" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." @@ -8403,86 +8637,86 @@ msgstr "" "Crea una triangolazione Delaunay da un vettoriale contenente punti o " "centroidi." -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "Diagramma Voronoi/poligoni Thiessen" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "Genera griglie" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "Crea un vettore di una griglia definita dall'utente." -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "Genera punti" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "Genera punti da database" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "Crea un nuovo vettoriale (punti) da una tabella contenente coordinate" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "Genera punti lungo linee " -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "Crea punti lungo una linea di input in un nuovo vettore con 2 layer." -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "Genera punti casuali" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "Genera un vettoriale di punti casuali 2D/3D." -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "Rimuove i punti fuori campo dal set" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "Metadati basilari per vettoriale" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "Visualizza informazioni basilari su un vettoriale" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "Classifica attributi dei dati" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "Classifica i dati degli attributi, es. per mappe tematiche" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "Visualizza topologia per categoria" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "Visualizza le statistiche delle geometrie per i vettori." -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "Statistiche univariate attributi per punti" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." @@ -8490,11 +8724,11 @@ msgstr "" "Calcola statistiche univariate per gli attributi di un vettoriale. Varianza " "e deviazione standard è calcolate solo per punti se specificato." -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "Statistiche univariate attributi delle colonne" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." @@ -8502,67 +8736,67 @@ msgstr "" "Calcola statistiche univariate per una mappa vettoriale GRASS sulla colonna " "della tabella seleziona" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "Indici quadratici" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "Test di normalità" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "&Immagini" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "Lavora su immagini e gruppi" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "Crea/edita gruppo" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "Crea, modifica e visualizza gruppi di file di immagini." -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "Gruppo di destinazione" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "Gruppo di immagini di destinazione in una location e mapset di GRASS" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "Mosaica immagine" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "Crea un mosaico da più immagini ed estende la mappa dei colore." -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "Gestione colori image" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "Bilancio dei colori RGB" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "Esegue l'auto bilanciamento dei colori per immagini RGB." -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "HIS a RGB" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." @@ -8570,7 +8804,7 @@ msgstr "" "Trasforma raster dallo spazio di colore HIS (Hue-Intensity-Saturation) allo " "spazio di colore RGB (Red-Green-Blue)" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." @@ -8578,11 +8812,11 @@ msgstr "" "Trasforma raster dallo spazio di colore RGB (Red-Green-Blue) allo spazio di " "colore HIS (Hue-Intensity-Saturation)" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "Rettifica un'immagine o un raster" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." @@ -8590,31 +8824,31 @@ msgstr "" "Rettifica un'immagine eseguendo una trasformazione sulle coordinate per ogni " "pixel dell'immagine basata sui punti di controllo." -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "Istogramma" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "Genera istogramma dell'immagine" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "Responso spettrale" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" "Visualizza la risposta spettrale in punti specificati dall'utente per un " "gruppo di immagini." -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "Pan sharpening" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" @@ -8622,15 +8856,15 @@ msgstr "" "Algoritmo di fusione di immagini per intensificare i pixel multispettrali " "con canali pancromatici ad alta risoluzione" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "Classifica immagine" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "Input di clustering per classificazione non guidata" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." @@ -8641,49 +8875,49 @@ msgstr "" "come input di i.maxlik, per generare una classificazione non supervisionata " "dell'immagine" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "Input per MLC controllato" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "Genera statistiche per i.maxlik per il raster." -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "Classificazione maximum likelihood (MLC)" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "Input interattivo per classificazione controllata" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "Input per SMAP controllato" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "Genera statistiche per i.smap per il raster." -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "Classificazione sequential maximum a posteriori (SMAP)" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." @@ -8691,142 +8925,142 @@ msgstr "" "Esegue classificazione contestuale di immagini usando la stima sequential " "maximum a posteriori (SMAP)." -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "Input per SMAP controllato" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "Salva file delle firme spettrali" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "Segmentazione ad oggetti" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "Filtra immagine" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "Rilevamento dei bordi" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" "Funzione zero-crossing \"identificazione dei contorni\" per il processamento " "di immagini." -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "Filtro matrice/convolving" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "Applica un filtro su una mappa raster." -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "Trasforma immagine" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "Correlazione canonica" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" "Programma per l'Analisi dei Componenti Standard (CCA) per il processamento " "di immagini" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "Componenti principali" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" "Programma per l'Analisi dei Principali Componenti (pca) per il processamento " "di immagini." -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "Fast Fourier" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "Trasformazione Fast Fourier IFFT) per il processamento di immagini" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "Fast Fourier inversa" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" "Trasformazione Fast Fourier inversa (IFFT) per il processamento di immagini" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "Strumenti per le immagini satellitari" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "DN Landsat a radianza/riflettanza" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "Valutazione della copertura nuvolosa per Landsat" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" "Esegue la valutazione automatica della copertura nuvolosa (ACCA) per Landsat " "TM/ETM+" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "Controllo qualità Modis" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "Estrai i parametri di controllo di qualità da layer MODIS QC." -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "Correzione atmosferica" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." @@ -8834,46 +9068,46 @@ msgstr "" "Esegue la correzione atmosferica usando l'algoritmo 6S. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "Correzione topografica" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "Calcola la correzione topografica della riflettanza." -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "Strumenti ortofoto" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "Prodotti immagini satellitari" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "Indici vegetazionali" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." @@ -8881,87 +9115,87 @@ msgstr "" "Calcola differenti tipologie di indici di vegetazione. Usa prevalentemente " "le bande del rosso e del nir, e alcuni indici richiedono bande addizionali." -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "Indice di vegetazione Tasseled cap" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "Trasformazione Tasseled cap (Kauth Thomas)." -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "Albedo" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "Emissività" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "Calcola l'emissività da NDVI, metodo genereico per terreni radi." -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "Crescita biomassa" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "Calcola evapotraspirazione" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "Approssimazione del flusso di calore del suolo (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "Flusso di calore del suolo" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "Approssimazione del flusso di calore del suolo (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "Flusso di calore sensibile" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "Calcola flusso di calore sensibile con iterazione SEBAL 01." -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "Frazione di evaporazione" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "Evapotraspirazione attuale" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "Evapotraspirazione attuale per il periodo diurno (Bastiaanssen, 1995)." -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "Integrazione temporale ETa" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." @@ -8969,41 +9203,41 @@ msgstr "" "Calcola l'integrazione temporale del satellite ET actual (ETa) seguento il " "ET reference (ETo) giornaliero per stazione(i) meteo." -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "Evapotraspirazione Hargreaves" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "Evapotraspirazione Penman-Monteith" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "Evapotraspirazione Priestley-Taylor" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "Analisi Kappa" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." @@ -9011,78 +9245,78 @@ msgstr "" "Calcola la matrice d'errore e il parametro kappa per valutare la precisione " "della classificazione risultante." -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "Fattore Indice Ottimale per LandSat TM" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "Calcolate la tabella Fattore Indice Ottimale per le bande spettrali" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "Raster 3D" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "Sviluppa raster 3D" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "Gestisci valori 3D nulli" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "Crea direttamente il file bitmap dei valori nulli di una mappa 3D." -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "Gestione timestamp" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "Da raster 3D a serie raster" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "Tabella dei colori 3D" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "Crea/modifica la tabella dei colori associata ad un raster 3D." -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "Esporta tabella dei colori 3D" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "Esporta la tabella dei colori associata a un raster 3D." -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "Maschera 3D" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "Imposta la mask corrente per lavorare con raster 3D" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "Map calculator per raster 3D" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "Sezione trasversale" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" @@ -9090,7 +9324,7 @@ msgstr "" "Crea una sezione trasversale 2D da un raster 3D e una mappa dell'elevazione " "2D" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." @@ -9098,11 +9332,11 @@ msgstr "" "Programma per il calcolo numerico del transiente, flusso sotterraneo " "confinato in tre dimensioni." -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "Interpolazione raster 3D da punti" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." @@ -9110,28 +9344,28 @@ msgstr "" "Interpola un set di punti in un raster 3D usando l'algoritmo spline " "regolarizzate con tensione (RST)." -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "Metadata fondamentali del raster" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" "Visualizza le informazioni basilari su un raster 3D specificato dall'utente" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "Statistiche per raster 3D" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "Genera statistiche volumetriche per raster 3D." -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "Statistiche univariate per raster 3D" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -9139,158 +9373,158 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "&Database" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "Informazione Database" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "Mostra database" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "Visualizza tutti i database per un dato driver e location." -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "Lista drivers" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "Visualizza tutti i driver del database" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "Lista tabelle" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "Visualizza tutte le tabelle per un database" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "Descrizione tabella" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "Descrive una tabella in dettaglia" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "Lista colonne" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "Visualizza tutte le colonne per una tabella" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "Gestione database" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "Connessione" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "Stampa/imposta la connessione generale al DB per il mapset attuale." -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "Login" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "Imposta utente/password per driver/database." -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "Crea database" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "Crea un database vuoto." -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "Elimina database" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "Elimina un database esistente." -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "Elimina tabella" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "Elimina una tabella degli attributi" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "Copia tabella" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "Cancella colonna" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "Elimina una colonna dalla tabella degli attributi selezionata." -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "Test" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" "Prova il driver del database, il database deve esistere e impostato " "utilizzando db.connect" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "Interroga" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "Interroga ogni tabella" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "Seleziona dati dalla tabella degli attributi. Esegue istruzione SQL." -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "Istruzione SQL" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" "Esegue qualsiasi istruzione SQL. Per i comandi SELECT utilizzare 'db.select'." -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "Connessione al database vettoriale" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "Nuova tabella" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." @@ -9298,27 +9532,27 @@ msgstr "" "Crea e connette una nuova tabella degli attributi per un certo layer di una " "mappa vettoriale esistente." -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "Rimuovi tabella" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "Rimuovi gli attributi esistenti di vettoriale." -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "Unisci tabella" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "Unisce una tabella di un database a una tabella di un vettoriale." -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "Aggiungi colonne" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." @@ -9326,49 +9560,49 @@ msgstr "" "Aggiunge una o più colonne alla tabella degli attributi connessa ad una " "mappa vettoriale" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "" "Cancella una colonna dalla tabella degli attributi connessa a un dato " "vettoriale." -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "Rinomina colonna" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" "Rinomina una colonna nella tabella degli attributi connessa a una mappa " "vettoriale" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "Cambia valori" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" "Aggiorna una colonna nella tabella degli attributi connessa a un vettoriale." -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "Elimina riga" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" "Rimuove un elemento del vettoriale da una mappa vettoriale attraverso la " "selezione degli attributi." -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "Riconnetti vettoriali al database" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." @@ -9376,110 +9610,110 @@ msgstr "" "Riconnette le tabelle degli attributi di tutti i vettoriali del mapset " "attuale a un nuovo database" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "Imposta connessione al database della mappa vettoriale" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" "Visualizza/imposta la connessione per una mappa vettoriale alla tabella " "degli attributi" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "&Temporale" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "Gestiosce dataset" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "Connette un database temporale" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" "Stampa/imposta la connessione generale al database GIS temporale per il " "mapset attuale." -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "Crea" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "Crea un dataset spazio temporale" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "Rinomina un dataset spazio temporale" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "Elimina un dataset spazio temporale dal database temporale" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "Aggiorna metadati" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "Modifica i metadati di un dataset spazio temporale." -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "Unisce" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" "Unisce diversi dataset spazio temporali in un unico dataset spazio temporale" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" "Mostra i dataset spazio temporali e le mappe registrate nel database " "temporale." -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "Gestisce mappe in un dataset" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "Registra mappe in un dataset" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "Rimuove mappe da un dataset" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." @@ -9487,131 +9721,131 @@ msgstr "" "Rimuove mappe raster, vettoriali e raster3d dal database temporale o da un " "dataset spazio temporale specifico" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "Mostra mappe di un dataset raster" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "Mostra le mappe registrate di un dataset spazio temporale raster." -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "Mostra mappe di un dataset vettoriale" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "Mostra le mappe registrate di un dataset spazio temporale vettoriale." -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "Mostra le mappe raster 3D del dataset" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "Mostra le mappe registrate di un dataset spazio temporale raster 3D." -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "Importa" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "Importa dataset raster" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "Importa dataset spazio temporale raster." -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "Importa dataset vettoriale" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" "Importa un dataset spazio temporale vettoriale da un archivio specifico di " "GRASS GIS." -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "Esporta dataset raster" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "Esporta dataset spazio temporale raster." -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "Esporta dataset raster come una serie temporale VTK" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "Esporta dataset spazio temporale raster con serie temporali VTK" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "Esporta dataset vettoriale" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" "Esporta un dataset spazio temporale vettoriale come un archivio specifico di " "GRASS GIS." -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "Converte un dataset raster in un raster 3D" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "Converte un dataset spazio temporale raster in un raster 3D" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "Estrazione" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "Estrae un sottoinsieme di un dataset raster" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "Estrae un sottoinsieme di un dataset spazio temporale raster." -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "Estrae un sottoinsieme di un dataset vettoriale" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "Estrae un sottoinsieme di un dataset spazio temporale vettoriale." -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "Estrae un sottoinsieme del dataset raster 3D" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "Estrae un sottoinsieme di un dataset spazio temporale raster 3D." -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "Interroga gli attributi di un dataset vettoriale" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" "Stampa gli attributi di vettoriali registrati in un dataset spazio temporale " "vettoriale." -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "Tabella dei colori di un dataset raster" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." @@ -9619,11 +9853,11 @@ msgstr "" "Crea/modifica la tabella dei colori associata con ogni raster di un dataset " "spazio temporale raster" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "Analisi raster" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." @@ -9631,48 +9865,48 @@ msgstr "" "Esegue espressioni mapcalc spazio temporali sulle mappe del dataset spazio " "temporale 3D ." -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "Analisi raster 3D" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" "Esegue espressioni di r3.mapcalc sulle mappe del dataset spazio temporale 3D " -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "Interpola i buchi in dataset raster" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" "Sostituisce i buchi in un dataset spazio temporale raster con mappe " "interpolate" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "Aggregazione" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "Analisi vicinanze in un dataset raster" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" "Esegue analisi delle vicinanze per ogni mappa in un dataset spazio temporale " "raster." -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "Aggregazione di dataset raster" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." @@ -9680,21 +9914,21 @@ msgstr "" "Esegue diversi algoritmi di aggregazione da r.series su tutte o un " "sottoinsieme delle mappe in un dataset spazio temporale raster." -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "Aggregazione temporale" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "Aggregazione temporale tramite dataset" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." @@ -9702,15 +9936,15 @@ msgstr "" "Aggrega dati di un dataset spazio temporale raster esistente usando " "l'intervallo temporale di un secondo dataset spazio temporale." -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "campionamento" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "Campiona un dataset spazio temporale raster alle coordinate del punto " -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" @@ -9718,11 +9952,11 @@ msgstr "" "Campiona uno dataset spazio temporale raster alle coordinate specifiche di " "un punto vettoriale e scrive l'output allo stdout usando differente layout." -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "Interroga dataset raster con un dataset di punti vettoriali" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." @@ -9730,11 +9964,11 @@ msgstr "" "Carica i valori della mappa raster alle posizioni spaziali e temporali di un " "punto vettoriale come attributi." -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "Esamina posizioni specifiche in un dataset raster" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." @@ -9742,11 +9976,11 @@ msgstr "" "Esamina posizioni specifiche in un dataset spazio temporale raster lungo un " "periodo di tempo usando punti vettoriali. " -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "Campionamento temporale" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." @@ -9754,19 +9988,19 @@ msgstr "" "Campiona i/il dataset spazio temporali di input con un dataset spazio " "temporale campione e stampa il risultato allo stdout." -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "Metadati del dataset spazio temporale" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "Stampa informazioni sul dataset spazio temporale e le sue mappe." -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "Statistiche univariate dataset raster" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." @@ -9774,11 +10008,11 @@ msgstr "" "Calcola le statistiche univariate per le celle non nulle per ogni mappa " "registrata di un dataset spazio temporale raster" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "Statistiche univariate dataset vettoriale" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" @@ -9786,11 +10020,11 @@ msgstr "" "Calcola le statistiche univariate degli attributi per ogni mappa registrata " "di un dataset spazio temporale vettoriale" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "Statistiche univariate dataset raster 3D" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." @@ -9798,398 +10032,390 @@ msgstr "" "Calcola le statistiche univariate per le celle non nulle per ogni mappa " "registrata di un dataset spazio temporale raster 3D" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "Effettua un report della topologia temporale" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "Visualizza la topologia temporale di un dataset spazio temporale" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "Strumenti grafici" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "Strumento Timelina" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "Disegna l'estensione temporale." -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "Strumento rappresentazioni temporali" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "Rappresenta i valori temporali." -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "&Aiuto" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "Aiuto su GRASS" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "Visualizza la pagina di supporto HTML di GRASS GIS" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "Aiuto sulla GUI" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "Info sistema" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "Stampa informazione del sistema" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "Informazioni su GRASS GIS" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "Importa, esporta e collega dati" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "Gestore Tabella degli Attributi" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "Digitalizzatore vettoriale" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "Digitalizzatore raster" -#: ../gui/wxpython/menustrings.py:2052 +#: ../gui/wxpython/menustrings.py:2057 msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "Crea un nuovo modello" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" -msgstr "Carica modello dal file" - -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "Salva modello in un file" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "Chiudi file del modello" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "Esporta a immagine" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "Esporta a Python" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "Esci dal Modellizzatore" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "Chiudi la finestra del Modellizzatore" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "&Modello" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "Aggiungi comando" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "Aggiungi azione (comando di GRASS) al modello" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "Aggiungi dati" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "Aggiungi dati al modello" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "Definisci relazione" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "Definisci relazione tra dato e azione" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "Aggiungi ciclo / serie" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "Aggiungi ciclo (serie) al modello" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "Aggiungi condizione" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "Aggiungi condizione (if/else) al modello" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "Aggiungi commento al modello" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "Rimuovi elemento" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "Elimina azione/dati dal modello" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "Proprietà del modello (nome, scopo, ecc.)" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "Elimina dati intermediari" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "Elimina i dati intermedi definiti nel modello" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "Esegui il modello per intero" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "Valida il modello per intero" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "Visualizza le pagine HTML del manuale del Modellizzatore Grafico" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "Informazione sul Modellizzatore Grafico" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "Visualizza informazioni sul Modellizzatore Grafico" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "Specifica dimensione del foglio, margini e orientazione" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "Carica file delle istruzioni" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "Carica file di testo con le istruzione per la stampa" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "Esporta file delle istruzioni" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "Genera file di testo con le istruzione per la stampa" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "Esporta in PostScript" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "Genera output PostScript" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "Esporta in PDF" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "Genera output PDF" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "Avvia la finestra di ps.map" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "Esci" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "Chiudi il Compositore Cartografico" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "&Inserisci" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "Cornice della mappa" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "Aggiungi o modifica la cornice della mappa" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "Aggiungi o modifica raster" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "Aggiungi o modifica vettoriale" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "Legenda" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "Aggiungi o modifica legenda raster e vettoriale" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "Informazioni mappa" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "Aggiungi o modifica informazioni della mappa" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "Aggiungi o modifica barra della scala" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "Testo" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "Aggiungi testo" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "Immagine" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "Aggiungi immagine" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "Aggiungi freccia del nord" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "Deselezionare oggetto" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "Visualizza le pagine HTML del manuale del Compositore Cartografico" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "Informazioni sul Compositore Cartografico" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "Visualizza informazioni sul Compositore Cartografico" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "Valori delle celle del raster" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "Niente da disegnare." -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "Almeno due raster devono essere specificati" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "Raster <%s> valori delle celle" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr ": %s" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -10222,7 +10448,7 @@ msgid "Text settings" msgstr "Impostazioni del testo" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -10283,57 +10509,57 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "Statistiche per il raster <%s>" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "GRASS Strumento Analisi di profilo" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "Profilo di" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "Distanza (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "Distanza lungo il transetto" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "Valori della cella" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "Non tutti i punti del profilo cadono dentro la regione computazionale." -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "Valori del raster" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" "Devi disegnare un transetto per il profilo nella finestra di visualizzazione." -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "Nessun elemento per creare il profilo" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "Scegliere il prefisso per il file dove salvare i valori del profilo..." -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "Comma separated value (*.csv)|*.csv" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "Sovrascrivere il file?" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" @@ -10342,7 +10568,7 @@ msgstr "" "Impossibile aprile il file <%s> per scriverlo.\n" "Motivazione: %s" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" @@ -10351,11 +10577,11 @@ msgstr "" "%d files creati:\n" "%s" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "Nessun file generato." -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "Statistiche del profilo(i)" @@ -10379,7 +10605,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "Statistiche" @@ -10425,11 +10651,11 @@ msgid "Selected group must be in current mapset" msgstr "Il gruppo selezionato dev'essere nel mapset attuale" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "Input invalido" @@ -10454,11 +10680,11 @@ msgid "Label font size (pts):" msgstr "Dimensione del font delle etichette (pts):" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "Impostazioni del font" @@ -10474,196 +10700,190 @@ msgstr "Stile:" msgid "Weight:" msgstr "Larghezza:" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "Applica i cambiamenti per la sessione corrente e chiudi la finestra" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "Nessuna mappa o gruppi di immagini selezionate da disegnare." -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "Attenzione" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "Impostazione per la mappa selezionata" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "Colore della linea" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "Grandezza linea" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "Stile della linea" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "Legenda" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "Opzioni di evidenziazione del segmento del transetto" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "Dimensione" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "Riempimento" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "Stile" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "Impostazioni delle assi" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "Asse X" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Asse Y" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "Scala" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "Personalizza min" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "Personalizza max" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "Log della scala" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "Impostazioni della griglia e legenda" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "Colore della griglia" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "Mostra griglie" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "Dimensione del font della legenda" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "Mostra legend" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "Impostazioni del grafico salvate nel file '%s'." -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "Ricerca ava&nzata..." -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "&Esegui..." -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "H&elp" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "La documentazione per %s è ora aperta nel browser web" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "&File recenti" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "Elemento non selezionabile" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "Mapset" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "Tipologia:" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "GSelect: elemento invalido: %s" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" @@ -10672,208 +10892,213 @@ msgstr "" "Impossibile importare pyGRASS: %s\n" "Alcune funzionalità non sarà accessibile" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "Nessuna tabella collegata al layer <{}>" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "Selezionare cartella del database GIS" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "Impostazioni degli output" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "Sorgente di input" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "Nativo" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "File" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "Cartella" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "Database" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "Protocollo" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "Tipologia di output" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "Tipo di sorgente" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "Tutti i file" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "Files ZIP" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "Files GZIP" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "Files TAR" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "Files TARGZ" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "File:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "Scegli file da importare" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "Cartella:" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "Scegli cartella di input" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "Estensione:" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "Scegli file:" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "Tipologia delle feature:" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "features semplici" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "topologico" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "Creazione delle opzioni:" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "Formato:" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "Protocollo:" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "Nessuna impostazione disponibile" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "Nessuna sorgente dei dati definita, impostazioni non salvate." -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "Punto" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "LineString" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "Poligono" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" "Nessuna mappa vettoriale selezionata nel layer manager. Operazione " "cancellata." -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "Mappa vettoriale di input non selezionata" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "Nessuna mappa vettoriale selezionata" @@ -10913,13 +11138,13 @@ msgstr "Traduttori" msgid "Translation status" msgstr "Stato della traduzione" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "Impossibile ottenere la versione di GRASS\n" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "Versione sconosciuta" @@ -10935,107 +11160,107 @@ msgstr "Revisione del codice" msgid "Build Date" msgstr "Data di compilazione" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "Linguaggio" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "File %s mancante" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "Errore leggendo il file '%s'." -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "Linee:" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "E-mail" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "Stato" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "OSGeo_ID" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "Nazione" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr " %d tradotte" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr " %d non corrette" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr " %d non tradotte" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "%d tradotte" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "File <%s> non trovato" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "&Prosegui" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "&Precedente" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 #, fuzzy msgid "Clear prompt and output window" msgstr "Pulisci il contenuto della finestra di output" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "Salva modello in un file" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "Ferma l'esecuzione del comando" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -11046,7 +11271,7 @@ msgstr "" "\n" "Dettagli: %(error)s" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "Output dei comandi salvati in '%s'" @@ -11131,7 +11356,7 @@ msgstr "" msgid "category" msgstr "categoria" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "tipologia" @@ -11154,8 +11379,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "Nessun layer vettoriale selezionato. Operazione cancellata." -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "Nessun layer selezionato. Operazione cancellata." @@ -11184,439 +11409,458 @@ msgstr "" "\n" "Motivo: %s" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "Impostazioni dell'utente" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "Imposta default" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "Ritorna alle impostazioni di default" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "Applica i cambiamenti solo per la sessione corrente e chiudi" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "Salva solo per questa sessione" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "Impostazioni applicate alla sessione corrente ma non salvate" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "La chiave primaria non può essere una stringa vuota" -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "Impostazioni dell'interfaccia grafica" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "Impostazione del Layer Manager" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "Chiedi quando si sta rimuovendo un layer dal layer tree" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "Chiedi quando si sta chiudendo wxGUI o un display" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "Impostazioni del font" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "Salva il layout corrente della finestra come default" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" +"Salva la posizione e dimensione correnti della finestra Layer Manager e le " +"finestre Map Display aperte e usa come default per la prossima sessione" + +#: ../gui/wxpython/gui_core/preferences.py:379 +#, fuzzy +msgid "Save current single window panes layout as default" +msgstr "Salva il layout corrente della finestra come default" + +#: ../gui/wxpython/gui_core/preferences.py:392 +#, fuzzy +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" +"Salva la posizione e dimensione correnti della finestra Layer Manager e le " +"finestre Map Display aperte e usa come default per la prossima sessione" + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +#, fuzzy +msgid "Hide '{}' tab (requires GUI restart)" msgstr "Nascondi la scheda '%s' (richiede riavvio dell'interfaccia grafica)" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "Istogramma" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "All'avvio carica mappe solo dal mapset in uso (nel pannello Dati)" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "Impostazioni dell'ambiente di lavoro" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "Salva il layout corrente della finestra come default" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" -"Salva la posizione e dimensione correnti della finestra Layer Manager e le " -"finestre Map Display aperte e usa come default per la prossima sessione" - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "Impostazioni della region" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "Allinea la region alla risoluzione" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 #, fuzzy msgid "Window layout settings" msgstr "Impostazioni del colore" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 #, fuzzy msgid "Use single-window mode (requires GUI restart)" msgstr "Tema delle icone (richiede riavvio dell'interfaccia grafica)" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "Font per output del comando:" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "Imposta carattere" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "Mostra pagina del manuale" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "Impostazioni lingua" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "Scegli la lingua (richiede di salvare e riavviare GRASS):" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "Impostazioni dell'aspetto" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "Lista degli elementi:" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" "Stile del menu (richiede di salvare e riavviare l'interfaccia grafica):" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "Altezza della finestra della selezione della mappa (in pixel):" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "Tema delle icone (richiede riavvio dell'interfaccia grafica)" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "Visualizzatore di mappe" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "Font di default per i display di GRASS:" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "Impostazioni di default del display" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "Visualizza driver:" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "Barra di stato:" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "Allinea l'estensione della regione basata sulla dimensione del display" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" "Forza la risoluzione del display all'impostazione della regione " "computazionale" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "Attiva auto-rendering" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "Attiva auto-zoom al layer selezionato." -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "Mostra l'estensione della region computazionale" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "Azione della rotella del mouse:" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "Impostazioni avanzate del display" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "Aggiungi la mappa creata nel layer tree" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "Permetti input interattivo" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "Livello di verbosità:" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "Layer" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "Impostazioni per i raster di default" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "Rendi celle nulle opache" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "Tabella dei colori di default" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "Impostazioni per i vettoriali di default" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "Visualizza:" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "Colore dell'elemento:" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "Trasparente" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "Colore riempimento dell'area:" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "Colori casuali secondo il numero di categoria" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "Simbolo:" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "Attributi" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "Evidenza elementi selezionati" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "Larghezza linea (in pixel):" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" "Evidenzia automaticamente gli elementi selezionati nel visualizzatore di " "mappe" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "Naviga nei dati" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "Doppio click tasto sinistro:" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "Codifica (es utf-8, ascii, iso8859-1, koi8-r):" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "Chiedi quando si sta eliminando record(s) dalla tabella" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "Crea tabella" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "Chiave della colonna:" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "Proiezione" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "Impostazioni della proiezione nella barra di stato" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "codice EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "Stringa PROJ (richiesto):" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "File EPSG:" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "Carica codici EPSG (essere pazienzi), inserisci codice EPSG o direttamente " "una stringa PROJ" -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "&Carica codici EPSG" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "Formato delle coordinate" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "Proiezioni Lat/long" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "Precisione:" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "Impossibile leggere codici EPSG: %s" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "Codice EPSG %s non trovato" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "Seleziona il font di default" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" "Impostazione del carattere di default del display non riuscita. Provare con " "un carattere diverso." -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "Selezionare il carattere di output di default" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "Gestisci l'accesso ai mapset" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11630,7 +11874,7 @@ msgstr "" " - Puoi scrivere solo nel mapset corrente.\n" " - Puoi scrivere solo nei tuoi mapset." -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "Proprietario" @@ -11647,7 +11891,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "Copia i nomi delle mappe negli appunti (dal basso verso l'alto)" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "Imposta opacità <%s>" @@ -11770,7 +12014,7 @@ msgstr "Salva il display in un file" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "Seleziona font " @@ -11805,7 +12049,7 @@ msgid "Map Display Settings" msgstr "Impostazioni della mappa" #: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +msgid "(Un)dock" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 @@ -11829,7 +12073,7 @@ msgid "Apply" msgstr "Applica" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "&Applica" @@ -11887,7 +12131,7 @@ msgid "Optional" msgstr "Opzionale" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "Parametrizzato nel modello" @@ -11899,44 +12143,45 @@ msgstr "[multiplo]" msgid "valid range" msgstr "Range valido" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +#, fuzzy +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" "Mostra la rappresentazione grafica dell'estensione temporale di uno o più " "dataset. " -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "Seleziona colore" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "Scegli %s" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "&Carica" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "Carica e modifica contenuto di un file" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "&Salva come" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "Salva il contenuto in un file per ulteriori utilizzi" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "o inserisci interattivamente i valori:" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." @@ -11944,38 +12189,38 @@ msgstr "" "Inserire direttamente il contenuto del file invece di specificare un file. " "Un file temporaneo sarà automaticamente creato. " -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "Layer id" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "Layer name" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "Tipologia delle feature" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "La proiezione corrisponde" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "Manuale" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "Niente da caricare." -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11986,95 +12231,95 @@ msgstr "" "\n" "Ragione: %s" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "Niente da salvare." -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "Salva input come..." -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "Nessuna dataset selezionata." -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "Errore in %s" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "Impossibile analizzare il comando '%s'" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "%(cmd)s: parametro '%(key)s' non disponibile" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "Prova di impostare la variabile GRASS_ADDON_PATH o GRASS_ADDON_BASE" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "Risultato dell'interrogazione" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" "Cliccare con il tasto destro per copiare i valori selezionati negli appunti. " -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "Elemento" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "Valore" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "Copia tutto negli appunti" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "Ridireziona alla console" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "Copia dalla colonna '%s'" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "Copia le linee selezionate" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "Copia '%s'" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "Copia linea" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "Risultato dell'interrogazione:" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr " " -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "est, nord" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "Non è stato trovato nulla" @@ -12082,60 +12327,64 @@ msgstr "Non è stato trovato nulla" msgid "Required item is not set." msgstr "L'oggetto richiesto non è impostato." -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "Seleziona location e mapset di GRASS" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." msgstr "Location o mapset non definito." -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +#, fuzzy +msgid "Name of GRASS project:" msgstr "Nome della GRASS location" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "Nome del mapset:" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "Seleziona mapset nella GRASS location" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "Manca il nome del mapset." -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "Seleziona mappa vettoriale" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "Manca il nome della mappa vettoriale." -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "Crea tabella degli attributi" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "Manca il nome per la nuova mappa vettoriale." -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "Nome per la nuova mappa vettoriale:" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "Impossibile creare mappa vettoriale <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" @@ -12144,7 +12393,7 @@ msgstr "" "Chiave della colonna vuota o invalida.\n" "Impossibile creare mappa vettoriale <%s>." -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " @@ -12152,15 +12401,15 @@ msgid "" msgstr "" "La mappa vettoriale <%s> esiste già nel corrente mapset. Vuoi sovrascriverlo?" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "Carica region:" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "Salva region:" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." @@ -12168,24 +12417,24 @@ msgstr "" "Il nome non può iniziare con '.' e non deve contenere spazi, virgole, '/', " "''', '@', ',', '=', '*', e tutti i caratteri non alfanumerici." -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "Crea o modifica gruppi di immagini" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "Applica cambiamenti al gruppo selezionato e chiudi finestra" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "Applica cambiamenti al gruppo selezionato" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "Chiudi finestra, cambiamenti non saranno applicati" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." @@ -12193,214 +12442,214 @@ msgstr "" "Inserire qui un'espressione regolare. I caratteri '.*' stanno per tutto, il " "carattere '^' sta per inizio e '$' per fine." -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" "Seleziona il gruppo che vuoi editare o inserisci il nome del nuovo gruppo:" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "Modica/crea sottogruppo" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" "Seleziona il sotto gruppo che vuoi editare o inserisci il nome del nuovo " "sotto gruppo:" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "Seleziona tutto" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "Lista delle mappe:" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "Seleziona layers della mappa e aggiungili alla lista." -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "Rimuove i layer selezionati dalla lista." -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "Controlla le mappe del gruppo da essere incluse nel sottogruppo." -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "Aggiungi i layer selezionati nel gruppo" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "Il gruppo <%s> è cambiato, vuoi applicare le modifiche?" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "Non applicare i cambi" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "Il sotto gruppo <%s> è cambiato, vuoi applicare le modifiche?" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "Nessuno raster selezionato." -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "Nessun cambiamento da applicare al gruppo <%s>" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "Gruppo <%s> è stato creato con successo." -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "Gruppo <%s> è stato cambiato con successo." -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "Creazione del nuovo gruppo <%s> fallita." -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "La modifica del gruppo <%s> è fallita." -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "Nessuno gruppo selezionato." -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "Nessuno sotto gruppo selezionato." -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "Usare nomi della mappa completo" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "Tipologia della mappa:" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "Seleziona interuttore" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "Mapset:" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "Inverti selezione" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "Deseleziona tutto" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "Serie dinamiche (%s)" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "Imposta l'opacità del layer" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "trasparenza" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "opaco" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "Imposta dimensione dell'immagine" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "Dimensione dell'immagine" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "Template:" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr " Istruzione SQL" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "Simboli" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "Directory del simbolo:" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "Nome del simbolo:" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "Seleziona font:" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "Codifica dei caratteri:" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "Dimensione del font:" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "Esempio" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr " (...)" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " @@ -12409,67 +12658,67 @@ msgstr "" "Il nome <%(name)s> non è un nome valido per mappa di GRASS. Utilizzare solo " "carattere ASCII escludendo %(chars)s e spazi" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "Ricerca testo completo" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "Cercando, si prega di digitare più caratteri." -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 #, fuzzy msgid "{} tools matched" msgstr "%d moduli che combaciano" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "Profili" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "Salva le impostazioni attuali" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "Elimina le impostazioni selezionate attualmente" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "Carica:" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "Impostazioni <%s> non trovato" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "Salva impostazioni" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "Nome non inserito, impostazioni non salvate" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "Impostazioni <%s> esiste già. Vuoi sovrascrivvere le impostazioni?" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "Nessuna impostazione è definita. Operazione cancellata." -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "Impossibile salvare le impostazioni" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12554,9 +12803,9 @@ msgid "Snap also to vertex" msgstr "Snap ai vertici" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "La soglia di snap è %(value).1f %(units)s" @@ -12580,141 +12829,141 @@ msgstr "" "Di default sono selezionati tutti gli elementi sovrapposti alla bounding box " "di selezione" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "Controlla duplicati" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "Digitalizza linee/confini" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "Spezza linee all'intersezione" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "Digitalizza aree" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "Chiudere il perimetro (agganciare al nodo di partenza)" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "Salva cambiamenti" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "Salva cambiamenti in uscite" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "Strumento interrogazione" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "Scegli strumento di interrogazione" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "Seleziona con box" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "lunghezza" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "Selezione linee" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "più corto di" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "più lungo di" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "dangle" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "Seleziona sporgenze" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "Digitalizza nuovo elemento" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "Aggiungi record nella tabella" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "Layer" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "Categoria" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "Modalità" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "Prossimo da usare" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "Numero di categoria" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "Tipologia di categoria" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "Inserisci manualmente" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "Nessuna categoria" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "Elimina elemento/i esistente/i" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "Elimina record dalla tabella" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "Attributi della geometria" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "area" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "perimetro" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." @@ -12722,88 +12971,88 @@ msgstr "" "Nota: Queste impostazioni sono salvate nell'ambiente di lavoro e non nelle " "preferenze del digitalizzatore di vettori." -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "Digitalizza un nuovo segmento lineare" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "Digitalizza una nuova linea/boundary" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "Evidenziato" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "Evidenzia (duplicati)" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "Linea" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "Confine (no area)" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "Confine (un'area)" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "Confine (due aree)" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "Centrode (in area)" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "Centrode (fuori area)" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "Centroide (duplicato in area)" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "Nodo (una linea)" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "Node (due linee)" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "Vertice" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "Area (confine chiuso + centroide)" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "Direzione" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "Snap disabilitato" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" "La soglia di snap è %(value).1f %(units)s (basata sulla risoluzione " "computazionale)" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "Impostazione del digitalizzatore dei vettori salvato nel file <%s>." -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12824,219 +13073,219 @@ msgstr "" msgid "Topology missing" msgstr "Topologia mancante" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "Strumento per la selezione di area/confine/centroide" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "Digitalizza un nuovo punto" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "Sinistro: nuovo punto" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "Digitalizza una nuova linea" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" "Sinistro: nuovo punto; Ctrl+Sinistro: torna all'ultimo punto; Destro: chiudi " "linea" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 #, fuzzy msgid "Digitize new boundary (Ctrl+B)" msgstr "Digitalizza un nuovo boundary" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 #, fuzzy msgid "Digitize new centroid (Ctrl+C)" msgstr "Digitalizza un nuovo centroide" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 #, fuzzy msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "Digitalizza nuova area (confine senza categoria)" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "Aggiungi nuovo vertice a linee o confini (Ctrl+V)" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "Sinistro: Seleziona; Ctrl+Sinistro: Deseleziona; Destro: Conferma" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 #, fuzzy msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "Elimina punti, linee, confini, centroidi selezionati" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "Elimina le aree selezionate" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 #, fuzzy msgid "Display/update attributes (Ctrl+K)" msgstr "Visualizza/aggiorna attributi" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "Sinistro: Seleziona" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 #, fuzzy msgid "Display/update categories (Ctrl+J)" msgstr "Visualizza/aggiorna categorie" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "Modifica la linea/confine selezionato" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 #, fuzzy msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "Muove i punti, linee, perimetri o centroidi selezionati" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 #, fuzzy msgid "Move selected vertex (Ctrl+G)" msgstr "Muovi vertice selezionato" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "Rimuove il vertice selezionato" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "Apre (Ctrl+O)" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 #, fuzzy msgid "Quit (Ctrl+Q)" msgstr "Esegue (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "Esci dal digitalizzatore e salva i cambiamenti" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "Mostra manuale" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "Visualizza il manuale del Digitalizzatore Vettoriale" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "Strumenti addizionali (copia, flip, connessione, ecc.)" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 #, fuzzy msgid "Undo (Ctrl+Z)" msgstr "Esegue (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "Annulla il cambiamento precedente" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 #, fuzzy msgid "Redo (Ctrl+Y)" msgstr "Esegue (Ctrl+R)" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "Riprisitna il cambiamento precedente" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "Spezza le linee/aree selezionate all'intersezione" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "Connetti linee/aree selezionate" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "Copia categorie" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "Copia elemento dalla mappa vettoriale (in background)" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "Copia attributi" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "Conversione tipologia dell'elemento" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "Inverti le linee/confini selezionati" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "Unisci le linee/aree selezionate" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "Scollega linee/perimetri selezionati (solo nei nodi)" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "Dividi linea/confine" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "Interroga elemento" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "Etichetta Z-bulk delle linee 3D" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "Seleziona sfondo per la mappa vettoriale" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "La mappa vettoriale non è 3D. Operazione cancellata." -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -13049,18 +13298,18 @@ msgstr "" "Vuoi ricostruire la topologia (richiede un po' di tempo) e aprire il " "vettoriale per l'editing?" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "Errore nella digitalizzatore" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "" "Per favore aspettare, sta caricando la mappa vettoriale <%s> per " "l'editing...." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." @@ -13068,29 +13317,29 @@ msgstr "" "Tipologia dell'elemento '%(type)s' non supportata. Impossibile modificare il " "layer OGR <%(layer)s>." -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "Vuoi salvare i cambiamenti nella mappa vettoriale <%s>?" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "Salva cambiamenti?" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" "Per favore aspettare, si sta chiudendo e si sta ricostruendo la topologia " "della mappa vettoriale <%s>..." -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "Editing del vettoriale <%s> è finito correttamente" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "Nuova mappa vettoriale" @@ -13103,8 +13352,8 @@ msgid "Add new category" msgstr "Aggiungi nuova categoria" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "Applica cambiamenti" @@ -13113,11 +13362,11 @@ msgid "Ignore changes and close dialog" msgstr "Ignora cambiamenti e chiudi dialogo" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "Applica cambiamenti e chiudi dialogo" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "Feature id:" @@ -13165,24 +13414,24 @@ msgstr "Id dell'elemento" msgid "Layer (Categories)" msgstr "Layer (Categorie)" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "Errore nella digitalizzazione" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "Impossibile aprire vettoriale <%s>." -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "Nessuno vettoriale aperto per l'editing." -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -13193,23 +13442,23 @@ msgstr "" "\n" "Motivazione: %s" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "Lettura dell'elemento con id %d fallita. Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "Connessione al database %d non disponibile. Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" "Impossibile avviare il driver del database <%s>. Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." @@ -13217,32 +13466,32 @@ msgstr "" "Impossibile aprire database <%(db)s> con il driver <%(driver)s>. Operazione " "cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "Impossibile eseguire la query SQL '%s'. Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "Elemento con id %d è marcato come morto. Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "Tipologia dell'elemento %d non supportata. Operazione cancellata." -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "Tipologia dell'elemento '%s' sconosciuta" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "Non ci sono abbastanza punti per linea" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." @@ -13250,45 +13499,45 @@ msgstr "" "Installare Python Imaging Library (PIL)\n" "per un miglior controllo della legenda e altre decorazioni." -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "Rimuove testo" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "Rimuove barra della scala" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "Rimuove freccia del nord" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "Rimuove legenda" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -13300,19 +13549,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -13331,32 +13580,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "Per favore aspettare, esportando immagine..." -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "Zoom all'estensione della regione salvata" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "Imposta la regione computazionale dalla regione salvata" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "Region <%s> non trovata. Operazione cancellata" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "Salva l'estensione del display in un file" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "Salva la ragione computazionale in un file" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "Il file della regione <%s> esiste gi?. Vuoi sovrascriverlo?" @@ -13470,102 +13719,102 @@ msgstr "Password:" msgid "Connecting to <%s>..." msgstr "Connettendo a <%s>..." -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "Servizi web disponibili" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "Connesso a <%s>" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "Impossibile connettersi a <%s>" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "&Aggiungi layer" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" "Aggiunge il layer selezionato del servizio web con layer nell'albero dei " "layer" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "Proprietà del layer da servizio Web" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "&OK" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "Nome per la mappa raster di output:" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "Esporta region" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "Region salvata" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "Estensione e risoluzione sono basate sulla geometri del Map Display" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "Estensione e risoluzione sono basate sulla regione computazionale" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "Estensione e risoluzione sono basate sulla region salvata." -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "Sovrascrive il raster esistente" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "Scegliere la region salvata:" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "&Save layer" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "Salva il layer del servizio web come raster" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "Raster di output mancante." -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "La mappa di output può essere aggiunta solo al mapset corrente." -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "La mappa di output <%s> esiste già." -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "La regione <%s> non esiste." -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "Scaricamento dati..." -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "Impossibile ottenere i dati.\n" @@ -13594,12 +13843,12 @@ msgid "Order of layers in raster" msgstr "Ordine dei layers in raster" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "Su" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "Giù" @@ -13678,42 +13927,42 @@ msgstr "Seleziona la proiezione della sorgente.\n" msgid "Choose output layer name.\n" msgstr "Scegliere il nome del layer di output:\n" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "Aggiunge valore di dafault" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" "Keeping user defined server" msgstr "" -"Il server definito dall'utente ha lo stesso nome del server di default <" -"%s> .\n" +"Il server definito dall'utente ha lo stesso nome del server di default " +"<%s> .\n" "Viene mantenuto il server definito dall'utente." #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:50 msgid "GRASS GIS Manage Ground Control Points" msgstr "GRASS GIS Gestore Punti di Controllo sul Terreno" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "Seleziona gruppo:" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." @@ -13721,7 +13970,7 @@ msgstr "" "Non è possibile calcolare l'errore RMS.\n" "Possibile un errore con i.ortho.transform." -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." @@ -13729,21 +13978,21 @@ msgstr "" "Non è possibile calcolare la nuova estensione.\n" "Possibile un errore con i.ortho.transform." -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "sorgente Z" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "destinazione Z" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "sorgente Z:" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "destinazione Z:" @@ -13759,11 +14008,11 @@ msgstr "2. Seleziona GRASS location" msgid "3. Select GRASS Mapset" msgstr "3. Seleziona mapset di GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "La directory del database di GRASS GIS contiene Location. " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." @@ -13772,7 +14021,7 @@ msgstr "" "(proiezione). Una Location può essere un progetto. Location contiene i " "Mapset." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." @@ -13780,29 +14029,29 @@ msgstr "" "Il Mapset contiene i dati GIS relativi a un progetto, attività divisi per " "progetto, sottoregione o utente." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "Avvia sessione di GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "&Naviga" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "&Nuovo" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "Crea un nuovo Mapset nella Location selezionata" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "N&uovo" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." @@ -13811,65 +14060,79 @@ msgstr "" "sarà creata correttamente, la sessione di GRASS sarà avviata." #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "Ri&nomina" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "Rinomina la location selezionata" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "E&limina" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "Elimina la location selezionata" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "Elimina il mapset selezionato" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "Avvio%s di GRASS GIS %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "Entra nella sessione di GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" "Impossibile impostare il database di GRASS. Controlla le tue impostazioni " "locali." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "ERROR: Location <%s> non trovata\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "ERROR: Mapset <%s> non trovato\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "Linea non valida nel file GISRC (%s): %s\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "Vuoi importare <%(name)s> nella nuova location creata?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "Nuovo mapset:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" +"Il file dei dati <%(name)s> è stato importato correttamente. La regione di " +"default della location è stata impostata dalla mappa importata." + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13879,8 +14142,8 @@ msgstr "" "\n" "Questo mapset non può essere rinominato." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13891,14 +14154,14 @@ msgstr "" "\n" "Inserisci il nuovo nome:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "Messaggio" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13909,7 +14172,7 @@ msgstr "" "\n" "Il mapset <%s> esiste già nella location." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13920,7 +14183,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13931,7 +14194,7 @@ msgstr "" "\n" "La location <%s> esiste già nel database di GRASS" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13942,7 +14205,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13952,24 +14215,24 @@ msgstr "" "\n" "Questo mapset non può essere cancellato." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" -"Vuoi continuare eliminando il mapset <%(mapset)s> dalla location <" -"%(location)s>?\n" +"Vuoi continuare eliminando il mapset <%(mapset)s> dalla location " +"<%(location)s>?\n" "\n" "TUTTE LE MAPPE incluse in questo mapset saranno ELIMINATE DEFINITIVAMENTE!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "Impossibile eliminare il mapset" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13980,17 +14243,17 @@ msgstr "" "\n" "TUTTE LE MAPPE incluse in questo mapset saranno ELIMINATE DEFINITIVAMENTE!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "Impossibile eliminare la location" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" "Errore di Unicode rilevato. Controllare le impostazioni locali. Dettagli: {0}" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " @@ -13999,21 +14262,21 @@ msgstr "" "Nessuna Location di GRASS trovata in '%s'. Creare una nuova Location o " "scegliere una differente directory del database di GRASS " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "La directory '%s' non esiste." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "Inserisci il nome per il nuovo mapset:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "Il Mapset <%s> esiste già." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -14026,16 +14289,16 @@ msgstr "" "\n" "Siete realmente sicuri che volete creare questo mapset? " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "Nome del mapset riservato" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "Impossibile creare il nuovo mapset: %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -14054,12 +14317,12 @@ msgstr "" "Vuoi rimuovere .gislock (bisogna avere il permesso per questa operazione) e " "continuare?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "Lock file trovato" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -14071,7 +14334,7 @@ msgstr "" "Se si sta eseguendo un'altra sessione di GRASS si potrebbero corrompere i " "vostri dati. Controllate il gestore dei processi per essere sicuri..." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -14082,7 +14345,7 @@ msgstr "" "\n" "Dettagli: %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " @@ -14091,7 +14354,7 @@ msgstr "" "Il nome <%(name)s> non è un nome valido per Location o Mapset. Utilizzare " "solo carattere ASCII escludendo %(chars)s e spazi" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " @@ -14102,47 +14365,47 @@ msgstr "" "situata nella tua directory home. Premese il bottone Naviga per selezionare " "la directory." -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "Il modulo <%s> non supporta i costi di svolta" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "Il vettoriale '%s' non esiste." -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "Vettoriale non è stato scelto." -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "Layer degli archi" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "Layer dei nodi" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "Layer con la tabella delle svolte" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "Layer delle categorie uniche" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "Scegli l'esistente %s.\n" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " @@ -14151,103 +14414,103 @@ msgstr "" "La colonna scelta %s non esiste nella tabella degli attributi del layer '%s' " "del vettoriale '%s'.\n" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "topologia" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "Punto iniziale" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "Punto finale" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "nuovo punto" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "arco" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "Colonna dei costi per i nodi:" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "nodo" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "Percorso più breve %s " -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "Punto finale" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "Commesso viaggiatore %s" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "Portata massima %s" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "Punto di partenza" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "Crea albero di Streiner per la rete e i punti scelti %s" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "Sovrascrivere layer" @@ -14255,7 +14518,7 @@ msgstr "Sovrascrivere layer" msgid "Unable to perform analysis." msgstr "Impossibile eseguire l'analisis." -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -14263,45 +14526,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "Risultato cambiato da fuori" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "Le mappe possono essere create solo nel mapset corrente" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "Il vettoriale %s esiste già. Si vuole sovrascriverlo?" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "Sovrascrivere vettoriale" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "Creazione della tabella delle svolte fallita." -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "La mappa vettoriale con i risultati dell'analisi non esiste." -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "Le mappe possono essere salvate solo nel mapset corrente" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "Scegliere il punto '%s' e '%s'." -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "Scegliere almeno due punti" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -14309,11 +14572,11 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "Input cambiato da fuori" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" @@ -14322,27 +14585,27 @@ msgstr "" "La mappa temporanea %s esiste già.\n" "Si vuole continuare e sovrascriverla?" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "Impossibile usare ctypes. \n" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "Modalità di snap non può essere attivata." -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "Sovrascrivi mappa" @@ -14441,117 +14704,117 @@ msgstr "Isolinee:" msgid "Output" msgstr "Uscita" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "Aggiungi il vettoriale nel layer tree" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "Tabelle di input" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "Tabelle con i risultati" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "Caricamento tabelle..." -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "Creando la tabella delle svolte..." -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "Il vettoriale di input non esiste." -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "Analizzando..." -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "Elaborando i nodi..." -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "Altre impostazioni" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "Stile del punto:" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "Stile del risultato dell'analisi:" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "Tabella dei colori dello stle %s:" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "Inverti colori %s:" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "Colore della linea:" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "Colore per i punti non utilizzati:" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "Coloro per il punto Iniziale/Da/Sorgente/Usato:" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "Colore per il punto Finale/A:" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "Colore per punti selezionati:" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "Dimensione del punto:" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "Grandezza del punto:" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "Numero massimo di risultati nella cronologia" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "Nuova mappa vettoriale con la tabelle delle svolte" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "Salva il risultato dell'analisi" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "Modifica i costi delle intersezioni di svolta " -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "Definire i costi di svolta globali" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "Valore inserito invalido. Operazione cancellata." -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "Modifica punto" @@ -14567,41 +14830,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "Selezionare prima il raster" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "Tasto destro per finire l'area" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "Click col tasto destro per finire la linea" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "Si vuole salvare i cambiamenti?" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "Salva cambiamenti del raster" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "Impossibile creare una copia di backup della mappa modificata." -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "Impossibile creare nuovo raster." -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "Rasterizzando..." -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" "Impostazione della tabella di colore di default non riuscito per la mappa " @@ -14645,7 +14908,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "Nuovo raster" @@ -14677,19 +14940,19 @@ msgid "" msgstr "" "Il raster <%s> esiste già nel corrente mapset. Si vuole sovrascriverlo?" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "metri" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "chilometri" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "miglie" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "piede" @@ -14713,21 +14976,21 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" "Impossibile analizzare i file XML delle toolbox utente. Verranno caricati i " "file di dafault." -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "Impossibile creare la directory dei toolboxes" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "Strumenti personalizzati" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" @@ -14735,7 +14998,7 @@ msgstr "" "La lista degli addons non può essere ottenuta a causa di un errore di g." "extension. Dettagli: %s" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "Addons" @@ -14747,8 +15010,8 @@ msgstr "Motivo" msgid "Execution failed:" msgstr "Esecuzione fallita:" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "Dettagli:" @@ -14800,7 +15063,7 @@ msgstr "Chiave duplicata: %s\n" msgid "Unable to create file '%s'\n" msgstr "Impossibile creare il file '%s'\n" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14813,22 +15076,22 @@ msgstr "" "\n" "Opzioni <%(opt)s>: la lettura dallo standard input non è supportata da wxGUI" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "Modulo <%s> non trovato." -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" "Attenzione notare che i dati sono inconistenti e possono essere corrotti" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "Comando interrotto" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14850,147 +15113,147 @@ msgid "" msgstr "" "ATTENZIONE: Livello di wx debug non supportato (dev'essere >=0 e <=5). {0}\n" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "Rompi segmento" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "Dati puntuali" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "animazione" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "Collassa tutto eccetto PERMANENT e il corrente" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "Collassa tutto eccetto PERMANENT" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "Collassa tutto eccetto corrente" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "Collassa tutto" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "Espandi tutto" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "Edita il record selezionato" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "Visualizza i selezionati" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "Classico (solo descrizione)" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "Lista sinistra" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "Zooma e ricentra" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "Zoom al cursore del mouse" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "Niente" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "Ruota in avanti per aumentare lo zoom" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "Ruota indietro per aumentare lo zoom" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "box" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "sfera" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "cubo " -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "diamante" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "aster" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "istogramma" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "croce" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "cerchio" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "Impossibile leggere il file delle impostazioni <%s>\n" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -15001,11 +15264,11 @@ msgstr "" "\t\tDettagli: %(detail)s\n" "\t\tLinea: '%(line)s'\n" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "Impossibile creare la directory delle impostazioni" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -15015,11 +15278,11 @@ msgstr "" "Scrittura delle impostazione nel file <%(file)s> fallita.

    Dettagli: " "%(detail)s" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "Impossibile da settare" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "Impossibile analizzare le impostazioni '%s'" @@ -15090,22 +15353,22 @@ msgstr "" "\n" "ERRORE: Impossibile leggere il file WIND: %s\n" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "Impossibile zoomare al raster <%s>." -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "Impossibile zoomare al vettoriale <%s>." -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "Impossibile fare zoom al raster 3d <%s>." -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -15142,22 +15405,22 @@ msgstr "riga %d:" msgid "Unsupported command %s." msgstr "Comando non supportato %s." -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "Avvia nuovo map display <%s>..." -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "Impossibile creare il file <%s>" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "Ferma map display <%s>..." @@ -15166,33 +15429,33 @@ msgstr "Ferma map display <%s>..." msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "Abilita/disabilita auto-visualizzazione" @@ -15251,47 +15514,47 @@ msgstr "" msgid "Status bar" msgstr "Mostra barra dello stato" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "Visualizza" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "Scala mappa" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "Imposta coordinate GCP" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "Proiezione non definita (controlla le impostazioni)" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "Errore nella proiezione (controlla le impostazioni)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "Visualizza geometrie" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "Coordinate" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 #, fuzzy msgid "Display extent" msgstr "Visualizza geometrie" @@ -15379,14 +15642,14 @@ msgid "Click mouse to unzoom" msgstr "Clicca col mouse per diminuire lo zoom" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "Vista 2D" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "Vista 3D" @@ -15410,6 +15673,7 @@ msgstr "Digitalizzatore vettoriale non disponibile" #: ../gui/wxpython/mapdisp/toolbars.py:125 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15421,14 +15685,25 @@ 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. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -15635,6 +15910,10 @@ msgstr "Visualizzatore di mappe" #: ../gui/wxpython/mapdisp/frame.py:246 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" @@ -15643,23 +15922,23 @@ msgstr "" "Esecuzione del comando '%(command)s' fallita. Dettagli\n" "%(error)s" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "Nascondi barra degli strumenti" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "Visualizza le barre degli strumenti" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "Nascondi barra dello stato" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "Mostra barra dello stato" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" @@ -15668,11 +15947,11 @@ msgstr "" "Impossibile avviare il digitalizzatore vettoriale wxGUI.\n" "Motivazione: %s" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "Barra degli strumenti per il digitalizzatore vettoriale" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -15687,23 +15966,30 @@ msgstr "" "\n" "Dettagli: %s" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "Avviando la visualizzazione 3D..." -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "Per favore aspettare, caricamento dei dati..." -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "Per favore aspettare, scaricamento dei dati..." -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "Ritorna alla modalità di visualizzazione 2D..." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 #: ../gui/wxpython/mapdisp/frame.py:892 ======= @@ -15735,19 +16021,29 @@ msgstr "" #: ../gui/wxpython/mapdisp/frame.py:720 ../gui/wxpython/mapdisp/frame.py:728 #: ../gui/wxpython/mapdisp/frame.py:743 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Failed to run d.to.rast:\n" msgstr "Impossibile eseguire d.to.rast:\n" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "d.to.rast può essere usato solo in modalità 2D." -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "Vettoriale <%s> aperto per l'editing - saltato." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -15757,6 +16053,10 @@ msgstr "" #: ../gui/wxpython/mapdisp/frame.py:973 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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." @@ -15764,23 +16064,23 @@ msgstr "" "Interrogazione fallita per la mappa vettoriale <{maps}>. Controllare le " "impostazioni del database e la topologia." -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "Imposta la regione computazionale dall'estensione del display" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "Imposta la region computazionale interattivamente" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "Imposta regione computazionale da una regione precedentemente salvata" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "Salva la regione computazionale a una regione con nome" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "Barra degli strumenti per il digitalizzatore di raster" @@ -16003,7 +16303,7 @@ msgstr "Inserisci valore o percentuale nella categoria del raster" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "intervallo" ======= @@ -19401,6 +19701,7 @@ msgid "Change" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19412,6 +19713,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -19617,6 +19923,9 @@ msgid "Find more information at:" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -19740,8 +20049,8 @@ msgstr "Salva larghezza nella colonna:" msgid "Use color column instead of color table:" msgstr "Usa una colonna dei colori invece della tabella dei colori:" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "Aggiungi colonna" @@ -19790,17 +20099,23 @@ msgstr "Attendere, caricamento dei dati dalla tabella degli attributi..." msgid "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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?" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -22885,7 +23200,7 @@ msgid "List of %s layers" msgstr "Lista dei layers %s" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "tasto destro per (de)selezionare tutto" @@ -22899,13 +23214,13 @@ msgstr "Sovrascrive la proiezione (usa la proiezione della location)" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "&Importa" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "Importa layer selezionati" @@ -22923,6 +23238,7 @@ msgstr "Impostazione dell'import" #: ../gui/wxpython/modules/import_export.py:240 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22934,6 +23250,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 "" @@ -22944,6 +23265,7 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:245 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22955,78 +23277,90 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "Aggiungi i layer collegati nel layer tree" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "Aggiungi i layer importati nel layer tree" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "&Link" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "Link layer selezionato" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "Nessun layer selezionato. Operazione cancellata." -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "Imposibbile determinare il numero di bande raster" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "Definire il formato di output per i vettoriali" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "Definire il formato di output per i raster" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "Imposta il formato esterno e chiudi dialogo" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "Nessuna sorgente di dati selezionata." -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "Importa layers DXF" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "Scegli file DXF da importare" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "Nessuno layer selezionato." -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "Nome per la mappa GRASS di output" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/modules/import_export.py:978 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/modules/import_export.py:962 ======= #: ../gui/wxpython/modules/import_export.py:940 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23038,6 +23372,15 @@ msgstr "Nome per la mappa GRASS di output" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Projection of following layers do not match with projection of current " "location. " @@ -23045,15 +23388,15 @@ msgstr "" "La proiezione dei seguenti layers sembra non corrispondere a quella della " "location corrente." -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "Layers da riproiettare" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "&Importa && riproietta" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "Riproietta i layers selezionati" @@ -23063,6 +23406,7 @@ msgstr "Riproietta i layers selezionati" #: ../gui/wxpython/modules/histogram.py:296 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23074,6 +23418,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 "" @@ -23464,6 +23813,7 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23475,6 +23825,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -23662,7 +24017,7 @@ msgstr "Scegliere il nome di un file per caricare l'espressione" msgid "'{cmd}' copied to clipboard" msgstr "'{cmd}' copiato negli appunti" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " @@ -23671,7 +24026,7 @@ msgstr "" "Lo Strumento Scatterplot ha bisogno che il pacchetto \"matplotlib\" (python-" "matplotlib) sia installato. {0}" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "Zoom all'estensione dello scatter plot" @@ -23679,15 +24034,15 @@ msgstr "Zoom all'estensione dello scatter plot" msgid "Loading ctypes libs failed" msgstr "Caricamento librerie ctypes fallito" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "Caricamento dati..." -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "Nessun dato impostato." -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -23703,7 +24058,7 @@ msgstr "" "È possibile ridurre il numero di celle nella regione corrente usando il " "comando ." -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -23723,7 +24078,7 @@ msgstr "" "Si vuole continuare usando lo strumento Scatter Plot interattivo con questa " "regione?" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." @@ -23731,27 +24086,27 @@ msgstr "" "Uno scatter plot con la stessa combinazione di bande (trascurando l'ordine x " "y) è già visualizzato." -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "La banda <%s> non è di tipologia CELL (interi).\n" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "Scatter plot non può essere aggiunto.\n" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" "Lo scatter plot non può essere aggiunto.\n" "Diversi intervalli delle bande <%s:%d * %s:%d = %d> è più alto che il limite " "massimo <%d>.\n" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -23768,7 +24123,7 @@ msgstr "" "\n" "Si vuole aggiungere veramente questo scatter plot?" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" @@ -23779,7 +24134,7 @@ msgstr "" "\n" "Non ci sono ancora classi, se ne vuole creare una?" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" @@ -23789,17 +24144,17 @@ msgstr "" "plot:\n" "%s" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "Esporta la classe raster <%s> dello scatter plot" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "La classe raster <%s> dello scatter plot esportata nel raster <%s>." -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" @@ -23809,24 +24164,24 @@ msgstr "" "fallita.\n" "%s" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "Aggiungi scatter plot" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "Seleziona area con poligono" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "Modalità sposta per lo scatter plot" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" "Modalità zoom per lo scatter plot (bottone sinistro del mouse, rotella)" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" @@ -23834,62 +24189,62 @@ msgstr "" "Modalità di zoom all'estensione dei dati da scatter plot (cliccare sullo " "scatter plot per zoommare all'estensione)" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "Visualizza/nascondi il manager delle classi" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "Include l'area selezionata alla classe" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "Esclude l'area selezionata dalla classe" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "Aggiungi nuovo vertice" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "Aggiungi nuovo vertice al contorno del poligono per lo scatter plot" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "Crea poligono di selezione" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "Aggiungi nuovo vertice tra il primo e l'ultimo punto del contorno" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "Muovi vertici" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "Muovi vertice del confine" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "Rimuovi vertici" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "Rimuove vertice del confine" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" "Rimuove poligono (cliccare sullo scatter plot per rimuovere il suo poligono)" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "Aggiungi classe" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "Rimuove la classe selezionata" @@ -23959,28 +24314,28 @@ msgstr "Seleziona colore area:" msgid "Selected area opacity:" msgstr "Seleziona l'opacità dell'area:" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "Seleziona stile:" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "Impostazioni delle ellissi:" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "Seleziona la categoria per l'editing" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "Elaborazione dello sctter plot fallita." -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" @@ -23989,7 +24344,7 @@ msgstr "" "v.build fallito:\n" "%s" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" @@ -23998,64 +24353,65 @@ msgstr "" "v.to.rast fallito:\n" "%s" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "scatter plot" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "Limite massimo del numero di categorie è stato raggiunto." -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "Rinomina classe" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "Imposta colore" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "Cambia il livello di opacità" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "Nascondere" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "Mostra" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "Spostare in alto" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "Spostare in basso" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "Muove categoria in su" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "Muove categoria in giù" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "Esporta classe raster" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "cambia opacità della classe <%s>" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "È stato inserito un nome vuoto." @@ -24411,7 +24767,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "Seleziona area campione 1 di " #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -24421,7 +24777,7 @@ msgstr "" "'%s' o selezionare l'opzione per sovrascrivere le mappe esistenti" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "Il poligono sembra avere 0 aree" @@ -24573,6 +24929,7 @@ msgstr "ATTENZIONE" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24584,6 +24941,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 "" @@ -24636,7 +24998,7 @@ msgstr "" msgid "Rename configuration file" msgstr "Rinomina file di configurazione" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -24644,11 +25006,17 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -24725,34 +25093,45 @@ msgstr "Unità non riconosciute, misurazione fallita." #: ../gui/wxpython/mapwin/analysis.py:390 #: ../gui/wxpython/mapwin/analysis.py:392 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Barra degli strumenti dello spazio di lavoro" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "Barra degli strumenti degli strumenti" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "Barra degli strumenti di visualizzazione 3D" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "Console" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 #, fuzzy msgid "Map Swipe Tool" msgstr "Map Swipe" @@ -24762,6 +25141,7 @@ msgid "Text properties" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24773,12 +25153,23 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "Scegli il modello da eseguire" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -24962,6 +25353,10 @@ msgstr "Sovrascrivere il file?" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " @@ -24970,30 +25365,30 @@ msgstr "" "Comando '%s' non è ancora implementato nella WxGUI. Piuttosto prova " "utilizzando la barra dei comandi. " -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "La mappa selezionata non è vettoriale" -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "Le modifiche sono permesse solo per i vettoriali nell'attuale mapset." -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "Scegli file script da eseguire" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "Il file di script '%s' non esiste. Operazione cancellata." -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " @@ -25002,15 +25397,21 @@ msgstr "" "Lo script <%s> non è eseguibile. Volete impostare i permessi per permettervi " "di eseguire questo script (dovete essere i proprietari del file)?" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "Imposta permesso?" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "Impossibile impostare i permessi. Operazione cancellata." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -25104,6 +25505,10 @@ msgstr "" #: ../gui/wxpython/wxplot/scatter.py:271 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " @@ -25112,24 +25517,31 @@ msgstr "" "La directory '%s' non è definita nel GRASS_ADDON_PATH. Volete aggiungere " "questa directory al GRASS_ADDON_PATH?" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "Aggiornare il percorso degli Addons?" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "Si sta lanciando lo script '%s'..." -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "Nessuna location/mapset forniro. Operazione cancellata" +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "Nessun mapset fornito. Operazione cancellata" -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "Nessun mapset fornito. Operazione cancellata" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -25330,6 +25742,10 @@ msgstr "Sotto gruppo <%s> non trovato nel gruppo <%s>" #: ../gui/wxpython/iclass/dialogs.py:193 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Working directory changed to:\n" @@ -25338,19 +25754,19 @@ msgstr "" "La directory di lavoro cambiata a:\n" "\"%s\"" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "Cambia ambiente di lavoro per questa GUI." -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "Utilizzo: cd [directory]" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "Senza parametri apre una finestra." -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" <<<<<<< HEAD "If ~ (tilde) is present as the first directory on the path, it is replaced " @@ -25433,12 +25849,19 @@ msgid "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "Più di un parametro fornito." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Scegli una directory di lavoro" ======= @@ -25447,6 +25870,7 @@ msgid "Supervised Classification Tool" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25458,33 +25882,45 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "Informazioni di sistema" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "Versione di GRASS" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "Data di compilazione" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "Piattaforma di compilazione" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "Piattaforma" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" ======= #: ../gui/wxpython/iclass/frame.py:395 @@ -25742,12 +26178,19 @@ msgid "Close all open map display windows" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "Chiudi tutte le finestre per la visualizzazione della mappa" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "Inserisci nuovo nome:" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Rinomina Map Display" ======= @@ -25758,6 +26201,7 @@ msgstr "" "Importa dati raster in una mappa raster di GRASS usando la libreria GDAL." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25769,8 +26213,13 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -25781,12 +26230,19 @@ msgstr "" "\n" "Motivo: %s" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "Impossibile avviare lo strumento Timeline." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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." msgstr "Impossibile avviare lo Strumento Grafico Temporale" ======= @@ -25799,6 +26255,7 @@ msgstr "" "univariate." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25810,19 +26267,24 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "Aggiungi layers selezionato nel layer tree" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "Tipologia della mappa <%s> non supportata." -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." @@ -25830,12 +26292,12 @@ msgstr "" "I valori della cella possono essere visualizzati solo per regioni da meno di " "10000 celle. " -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "opacità:" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -25843,27 +26305,34 @@ msgid "" "from layer tree?" msgstr "Vuoi rimuovere i layer %s dal layer tree" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "Vuoi rimuove i layer selezionati dal layer tree" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "Rimuovi layer" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "Esci dalla GUI di GRASS" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" ======= #: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1073 @@ -26035,6 +26504,7 @@ msgstr "" "GIS (creato con v.pack)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26046,6 +26516,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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)" @@ -26248,6 +26723,7 @@ msgid "" "features with category are exported. To export all features use 'layer=-1'." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26259,6 +26735,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 @@ -26269,55 +26750,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "Esiste un file POINTS, rinominato in POINTS_BAK" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "sorgente X" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "sorgente Y" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "destinazione X" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "destinazione Y" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "sorgente X:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "destinazione X:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "sorgente Y:" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "destinazione Y:" @@ -26390,7 +26871,7 @@ msgstr "Modalità di editing" msgid "Background vector map" msgstr "Mappa vettoriale di sfondo" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "Layer" @@ -26422,41 +26903,48 @@ msgstr "Imposta la regione computazionale dalla/e mappa/e selezionata/e" msgid "Align computational region to selected map" msgstr "Imposta la regione computazionale alla mappa selezionata" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "Esporta formati comuni" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "Esporta PostGIS" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "Crea pacchetto" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "Fare una copia nel mapset attuale" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "Imposta la tabella di colore" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "Imposta la tabella dei colori interattivamente" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "Mostra gli attributi dei dati" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "Incomincia l'editing" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Ferma l'editing" ======= @@ -26466,6 +26954,7 @@ msgstr "" "Esporta una mappa vettoriale come file archivio specifico per GRASS GIS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26477,28 +26966,39 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "Ricrea topologia" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "Statistiche del raster" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "Profilo" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "Salva layer da servizi web" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "Impossibile creare profilo del raster" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -30730,16 +31230,26 @@ msgstr "Scaricamento in progresso, aspettare fino che non è finito" #: ../gui/wxpython/startup/locdownload.py:466 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Unsupported map type <%s>" msgstr "Tipologia della mappa <%s> non supportata" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "Inserisci il nome per il nuovo %s nell'attuale mapset:" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/lmgr/layertree.py:1067 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/lmgr/layertree.py:1029 ======= #: ../gui/wxpython/startup/locdownload.py:478 @@ -30752,11 +31262,21 @@ msgstr "" #: ../gui/wxpython/startup/locdownload.py:509 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Make a copy of %s <%s>" msgstr "Copiare %s <%s>" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/lmgr/layertree.py:1085 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/lmgr/layertree.py:1047 ======= #: ../gui/wxpython/startup/locdownload.py:563 @@ -31011,48 +31531,60 @@ msgstr "" #: ../gui/wxpython/startup/guiutils.py:693 #: ../gui/wxpython/image2target/ii2t_gis_set.py:593 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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?" msgstr "%s <%s> esiste già nel corrente mapset. Si vuole sovrascriverlo?" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msgid "Unable to make copy of <%s>" msgstr "Impossibile copiare <%s>" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "Impossibile copiare <%s>. Mapset <%s> non mapset corrente." -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" "Impossibile visualizzare l'istogramma del raster. Nessun nome della mappa " "definito." -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +#, fuzzy +msgid "Set opacity of <{}>" +msgstr "Imposta opacità <%s>" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "Gruppo di layer:" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "Clicca per editare le impostazione del layer" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "(doppio click per impostare le propriet?)" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "Per favore aspettare, aggiornamento dei dati..." @@ -31257,6 +31789,9 @@ msgstr "Vettoriale <%s> aggiunto" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31272,6 +31807,9 @@ msgstr "" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -31341,6 +31879,15 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"Location corrente è <%(loc)s>.\n" +"Mapset corrente è <%(mapset)s>." + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 #, python-format @@ -31385,7 +31932,7 @@ msgstr "Vuoi salvare le impostazioni correnti in un file d'ambiente di lavoro?" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" ======= #: ../gui/wxpython/dbmgr/base.py:282 @@ -31393,6 +31940,7 @@ msgid "There were some issues when loading menu or Tools tab:" msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." +<<<<<<< HEAD msgstr "" #: ../gui/wxpython/dbmgr/base.py:299 @@ -31410,19 +31958,35 @@ msgid "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/dbmgr/base.py:299 +#, python-brace-format +msgid "" +"Unable to read the table <{table}> from the database due to seemingly " +"inconsistent number of columns in the data transfer. Check row: {row}... " +"Likely, a newline character is present in the attribute value starting with: " +"'{value}' Use the v.db.select module to investigate." +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "Nessuna location/mapset forniro. Operazione cancellata" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "Gestore della Tabella degli Attributi" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format <<<<<<< HEAD msgid "{document} (read-only)" msgstr "{document} (sola lettura)" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " @@ -31438,37 +32002,37 @@ msgstr "" "La connessione al database per la mappa vettoriale <%s> non è definito nel " "DB file. Puoi definire una nuova connessione nel tab 'Gestisci layers'" -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "Attendere, caricamento attributi..." -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "Naviga dati" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "Gestione delle tabelle" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "Gestione dei layer" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "Chiude Gestore Tabella degli Attributi" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "Ricarica gli attributi attualmente selezionati" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "Ricarica tutti gli attributi (elimina la selezione corrente)" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "Numero di record caricati: %d" @@ -31508,63 +32072,70 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "Gestore della Tabella degli Attributi - GRASS GIS" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "Connessione al database" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "Imposta istruzione SQL a quella di default" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "Applica istruzione SQL" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "Chiudi il dialogo" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "Colonne" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "Inserimento interattivo" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "Valori" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "Ottieni tutti i valori" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "Ottieni un esempio" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "Ottiene i primi 256 valori unici come campioni" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "Vai a:" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "Chiudi dialogo dopo l'invio" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "GRASS SQL Builder (%(type)s) - <%(map)s>" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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)" msgstr "Colonna da mostrare (clausola SELECT)" ======= @@ -31575,6 +32146,7 @@ msgstr "" "definito." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31586,13 +32158,25 @@ msgstr "" ======= >>>>>>> 8422103f4c (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:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "Vincolo per l'interrogazione (clausola WHERE)" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 #: ../gui/wxpython/dbmgr/base.py:1274 ======= @@ -31625,27 +32209,31 @@ msgstr "Applica l'istruzione SELECT e ricarica i record dei dati" #: ../gui/wxpython/dbmgr/base.py:1228 ../gui/wxpython/dbmgr/base.py:1254 #: ../gui/wxpython/dbmgr/sqlbuilder.py:498 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Example: %s" msgstr "Esempio: %s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "Verifica" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "Verifica istruzione SQL" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "Istruzione SQL non verificata" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "Istruzione SQL non valida" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -31656,58 +32244,58 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "Istruzione SQL valida" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "Colonna da impostare (clausola SET)" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "Calcola il valore della colonna da impostare" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "Funzioni" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "Istruzione SQL non è stata applicata" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "Istruzione SQL applicata" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "Il driver DBF non supporta l'utilizzo di funzioni SQL." -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "Tabella degli attributi <%s> non trovata. Per creare la tabella " -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "Colonna <%(column)s> non trovata nella tabella <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "Si può visualizzare solo 256 colonne" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -31716,21 +32304,21 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "Limite di visualizzazione: 100000 record." -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "Valore sconosciuto" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" "Impossibile decodificare valore. Imposta codifica nelle preferenze della GUI " "('Attributi')." -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -31744,142 +32332,142 @@ msgstr "" "\n" "Dettagli: %(detail)s" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "Ordina in ordine decrescente" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "Ordina in modo decrescente" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "Calcola (solo colonne numeriche)" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "Calcolatore del campo" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "Dimensione dell'area" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "Lunghezza della linea" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "Densità di un'area" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "Dimensione frattale di un perimetro definendo un poligono" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "Lunghezza del perimetro di un'area" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "Numero di elementi per ogni categoria" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "Pendenza della linea 3D" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "Sinuosità della linea" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "Azimuth della linea" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "Aggiungi colonna alla tabella <%s>" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" "Impossibile aggiungere la colonna alla tabella. Nessun nome della colonna " "definito." -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "La colonna <%(column)s> esiste già nella tabella <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "Attributi dei dati - clicca col destro per editera/gestire i record" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "Tabella" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr " (sola lettura)" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "Query SQL" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "Semplice" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "Applica l'istruzione SELECT e ricarica i record dei dati" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "Generatore" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "Generatore SQL" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "Inserisci nuovo record" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "Elimina i record selezionati" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "Elimina tutti i record" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "Evidenza elementi selezionati e fare zoom" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "Estrai features selezionate" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "Elimina features selezionate" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "Aggiorna i record esistenti" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "Valore '%(value)s' dev'essere inserito come %(type)s." -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" @@ -31888,17 +32476,17 @@ msgstr "" "Impossibile aggiornare i record esistenti.\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "Record con numero di categoria %d esiste già nella tabella" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "Il numero di categorie (colonne %s) mancano" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" @@ -31907,7 +32495,7 @@ msgstr "" "Impossibile inserire nuovo record.\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " @@ -31916,11 +32504,11 @@ msgstr "" "I record (%d) selezionati saranno permanentemente eliminati della tabella. " "Vuoi eliminarli?" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "Elimina record" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " @@ -31929,15 +32517,15 @@ msgstr "" "Tutti i record (%d) saranno permanentemente eliminati della tabella. Vuoi " "eliminarli?" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "Niente da estrarre" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "Niente da eliminare" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -31948,7 +32536,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -31961,30 +32549,30 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "Tabella <%s> - clicca col destro per eliminare la colonna" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "Colonna" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "Lunghezza" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "Aggiungi" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "Impossibile rinominare colonna. Nessun nome della colonna definito" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " @@ -31993,24 +32581,24 @@ msgstr "" "Impossibile rinominare colonna <%(column)s> in <%(columnTo)s>. La colonna " "esiste già nella tabella <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" "Impossibile rinominare la colonna. La colonna <%(column)s> non esiste nella " "tabelle <%(table)s>." -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "Cancella la colonna selezionata" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "Cancella tutte le colonne" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " @@ -32019,11 +32607,11 @@ msgstr "" "La selezione %s sarà permanentemente eliminata della tabella. Vuoi eliminara " "la colonna?" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "Cancella colonna(e)" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -32034,91 +32622,91 @@ msgstr "" "%s\n" "saranno PERMANENTEMENTE eliminate della tabella. Vuoi eliminarle?" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "Lista dei layer" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "Elimina anche la tabella degli attributi linkate (%s)" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "Nome della colonna" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "Lunghezza dei dati" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "Driver" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "Chiave" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "Aggiungi layer" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "Descrizione dei layer" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "Chiave della colonna" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "Inserire record per ogni categoria nella tabella" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "Bisogna aggiungere le categorie col modulo v.category" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "Descrizione della tabella" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "Nome della tabella" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "&Crea tabella" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "&Impostazioni di default" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "Rimuovi layer" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "Layer da eliminare" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "&Rimuovi layer" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "Modifica layer" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "&Modifica layer" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." @@ -32126,19 +32714,19 @@ msgstr "" "Impossibile restituire la lista delle tabelle.\n" "Per favore usare db.connect per settare i parametri dei database." -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" "Impossibile creare nuova tabella. Il nome della tabella o il nome della " "colonna manca" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" "Impossibile creare nuova tabella. La tabella <%s> esiste già nel database" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " @@ -32147,23 +32735,23 @@ msgstr "" "Impossibile aggiungere un nuovo layer alla mappa vettoriale <%(vector)s> Il " "layer %(layer)d esiste gi?" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "Statistiche del campo" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "Copia le statistiche negli appunti (Ctrl+C)" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "Statistiche non è supportato per le tabelle DBF." -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "Impossibile calcolare le statistiche." -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." @@ -32171,16 +32759,22 @@ msgstr "" "Impossibile calcolare le statistiche. Numero non valido di linee %d " "(dovrebbe essere %d)." -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "Impossibile calcolare la deviazione standard." -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "Statistiche del campo <%s>" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/dialogs.py:80 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/dialogs.py:79 ======= #: ../gui/wxpython/dbmgr/sqlbuilder.py:133 @@ -32346,6 +32940,10 @@ msgstr "Ricarica tutti gli attributi (elimina la selezione corrente)" #: ../gui/wxpython/dbmgr/dialogs.py:76 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "No attribute table found.\n" @@ -32357,41 +32955,41 @@ msgstr "" "Vuoi creare una nuova tabella di attributi e definire un link alla mappa " "vettoriale <%s>?" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "Creare tabella?" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "Chiudi dialogo dopo l'invio" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "Nessun attributo trovato" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "Definisci attributi" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "Visualizza attributi" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "&Ricarica" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "&Invia" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" "Colonna <%(col)s>: Valore '%(value)s' dev'essere inserito come %(type)s." -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "Sconosciuto" @@ -32508,7 +33106,7 @@ msgstr "" "(intervallo e punto). Si raccomanda di utilizzare la stessa tipologia di " "dati per evitare confusione." -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "La topologia del dataset spazio temporale %s non è valida." @@ -32519,12 +33117,20 @@ msgid "No 3d view information in workspace file <%s>." msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +"Informazioni sulla vista 3d non disponibili nel file di ambiente di lavoro " +"<%s>." +======= +<<<<<<< HEAD +>>>>>>> osgeo-main "Informazioni sulla vista 3d non disponibili nel file di ambiente di lavoro <" "%s>." +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) #: ../gui/wxpython/animation/nviztask.py:309 msgid "Please add only one layer in the list." @@ -32535,13 +33141,13 @@ msgid "No map series nor space-time dataset is added." msgstr "" "Non è stato aggiunta nessuna serie di mappe o dataset spazio temporali." -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "Il numero massimo di animazioni è %d." -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " @@ -32554,6 +33160,9 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -32562,51 +33171,57 @@ msgstr "" "Viene mantenuto il server definito dall'utente." >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "Impossibile visualizzare la legenda." -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "Numero inconsistente di mappe, controllare i dati di input. " -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "Nessuna animazione da esportare" -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "Si sta preparando l'esportazione, attendere..." -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "%(from)s %(dash)s %(to)s" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "%(start)s %(unit)s" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "Esportando l'animazione, attendere..." -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "Nessun nome per l'animazione selezionato." -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "Nessun file di ambiente di lavoro selezionato." -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "File %s non trovato." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/data.py:146 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/data.py:145 ======= #: ../gui/wxpython/web_services/dialogs.py:536 @@ -32688,16 +33303,20 @@ msgstr "La mappa di output può essere aggiunta solo al mapset corrente." #: ../gui/wxpython/web_services/dialogs.py:1024 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "Animation %d" msgstr "Animazione %d" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" "Il numero di mappe nei datasets spazio-temporali deve essere lo stesso." -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." @@ -32705,7 +33324,7 @@ msgstr "" "La tipologia di tempo (assoluto/relativo) nei datasets spazio-temporali deve " "essere la stessa." -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" @@ -32713,6 +33332,12 @@ msgstr "" "essere la stessa." <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/utils.py:209 ======= #: ../gui/wxpython/gui_core/gselect.py:886 @@ -32992,18 +33617,22 @@ msgstr "File" #: ../gui/wxpython/gui_core/goutput.py:388 #, python-format >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 "" "Il periodo di tempo delle mappe nei datasets spazio-temporali deve essere lo " "stesso." -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" "Il numero di mappe da animare deve essere lo stesso per ogni serie di mappe." -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." @@ -33011,46 +33640,46 @@ msgstr "" "Il numero di mappe da animare deve essere uguale al numero di mappe nel " "dataset temporale." -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "Cambia la velocità dell'animazione" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "Avanti" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "Indietro" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "Ripetere" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "Avanti e indietro" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "Aggiungi nuova animazione" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "Aggiunge, modifica o rimuove animazione" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "Esporta animazione" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "Aggiungi un dataset spazio temporali o una serie di mappe" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" "Aggiunge un dataset spazio temporale o una serie di mappe per l'animazione" @@ -33167,7 +33796,7 @@ msgstr "" "o una serie di tematismi della mappa." #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "Mostra legenda raster" @@ -33251,7 +33880,7 @@ msgid "Edit" msgstr "Modifica" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "Formato" @@ -33630,6 +34259,7 @@ msgid "" "error was: {0}" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33641,6 +34271,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?" @@ -34187,7 +34822,14 @@ msgid "Invalid" msgstr "Invalido" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" msgstr "Visualizzando i layers" ======= @@ -34196,6 +34838,7 @@ msgid "PROJ string (required):" msgstr "Stringa PROJ (richiesto):" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34207,12 +34850,23 @@ 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:559 +#: ../gui/wxpython/animation/provider.py:562 msgid "Overlaying map layers" msgstr "Sovrapposizione dei tematismi della mappa" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/provider.py:792 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/provider.py:789 ======= #: ../gui/wxpython/gui_core/preferences.py:1773 @@ -34910,28 +35564,32 @@ msgstr "" #: ../gui/wxpython/gcp/manager.py:1691 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-brace-format msgid "Directory {t} not removed." msgstr "Directory {t} non rimossa." -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "Strumento Animazione" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "Barra degli strumenti per l'animazione" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "Caricamento dati" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr " ({c} fuori di {p})" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "a %(to)s" @@ -35941,17 +36599,17 @@ msgstr "" "%s" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "Impossibile leggere l'istruzione %s" @@ -35984,7 +36642,7 @@ msgstr "" "%(old2)s\n" "nuovi valori: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" @@ -35994,7 +36652,7 @@ msgstr "" "%(old1)s %(old2)s\n" "nuovi valori: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" @@ -36003,12 +36661,12 @@ msgstr "" "Impossibile leggere l'istruzione %(file)s.\n" "Formato sconosciuto %(for)s" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "Impossibile leggere l'istruzione %s" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -36018,39 +36676,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "pollice" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "punto" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "centimetro" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "millimetro" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "miglio nautico" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "pixel" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "metro" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "grado" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "Impossibile eseguire `ps.map -b`" @@ -36122,149 +36780,149 @@ msgstr "" "Posizione dall'angolo in alto a sinistra\n" "del foglio" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "Font:" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "Scegli colore:" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "Chiudi finestra e applica i cambiamenti" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "Unità" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "Orientamento" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "Larghezza" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "Altezza" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "Sinistra" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "Destra" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "Testuale non è permesso!" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "Dimensione della pagina" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "Margini" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "Orizzontale" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "Territorio" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "Impostazioni della mappa" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "Impostazioni della cornice della mappa" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "Opzioni della cornice della mappa:" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "Adatta la cornice per corrispondere alla mappa selezionata" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "Adatta la cornice per corrispondere alla regione salvata" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "Adatta la cornice per combaciare con la regione computazionale attuale" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "Scala e centro della mappa fissi" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "Seleziona la mappa" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "Mappa:" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "Regione:" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "Scala della mappa e centro" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "Centro:" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "E:" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "N:" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "Scala:" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "Risoluzione massima della mappa (dpi):" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "Bordo" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "disegna bordo intorno alla cornice della mappa" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "colore del bordo:" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "Larghezza del bordo (pts):" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" @@ -36272,310 +36930,310 @@ msgstr "" "La regione è impostata per combaciare questa mappa,\n" "rester o vettoriali devono essere aggiunti dopo" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "Selezione della regione" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "Nessuno mappa selezionata!" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "Nessuna regione selezionato" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "Scala o centro della mappa invalido!" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "Scegli mappa raster" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "nessuna mappa raster" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "raster:" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "Creare prima la cornice della mappa" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "Aggiungi mappa" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "punti" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "linee" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "aree" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "Tipo dei dati" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "Gestisci vettoriali" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" "La mappa vettoriale più in alto nella lista delle mappe si sovrappone alle " "altre" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "Proprietà..." -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "Impostazioni raster" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "Impostazioni vettoriali" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "%s proprietà" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "Selezione dati" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "centroidi" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "confini" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "Selezione del layer" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "La connessione al database non è definito nel DB file" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "Seleziona layer:" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "lista di categorie (esempio 1,3,5-7)" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "Usa la maschera corrente" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "Colori" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "Contorno" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "disegna linee esterna" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "Larghezza (pts):" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "Colore del riempimento" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "Scegli colore:" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "colore dalla colonna della tabella della mappa:" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" "Nessun modifica per il colore di riempimento dalla colonna della tabella" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "Colore delle linee:" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "Dimensione e stile" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "eps file:" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "Scrivi il nome del file o clicca su naviga per scegliere un file" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "Scegli un file" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "dimensione per la colonna della tabella della mappa:" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "scala:" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "Rotazione" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "simboli ruotati:" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "senso orario in gradi:" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "dalla colonna della tabella della mappa:" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "Imposta larghezza (pts):" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "Multiple larghezza dal valore della categoria" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "Scegli stile della linea:" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "Scegli fine della linea:" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "Stile" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "usa stile:" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "Scegli file dello stile:" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "dimensione della linea dello stile (pts):" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "fattore di scala dello stile:" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "Legenda dei raster" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "Sorgente raster" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "raster corrente" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "seleziona raster" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "%(rast)s: tipologia %(type)s" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "Tipologia della legenda" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "Legenda discreta (mappe categoriali)" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "Legenda con gradiente colori continui (mappe decimali)" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "Impostazioni avanzate della legenda" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "disegna rettangolo \"no data\"" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "spuntare all'interno della tabella" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "Legenda dei vettoriali" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "Mostra legenda vettoriale" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "Sorgente vettoriale" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "Scegli vettoriali e ordinali nella legenda" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "Modifica etichetta" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "disegna bordo intorno alla legenda" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "Dimensione e posizione" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "Lascia il campo editato vuoto, usare i valori di default." -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" @@ -36583,15 +37241,15 @@ msgstr "" "Larghezza del simbolo colorato (per le linee)\n" "davanti al testo della legenda" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "Colonne:" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "ampiezza colonne:" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" @@ -36599,143 +37257,143 @@ msgstr "" "La distanza che separa la colonna tra l'angolo sinistro\n" "di due colonne in una legenda multicolonna" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "Edita l'etichetta della legenda" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "Nessuno raster selezionato!" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "Nessun raster" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "Impostazioni delle informazioni della mappa" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "Impostazioni del colore" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "usa colore del bordo:" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "usa colore dello sfondo: " -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "Lunghezza:" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "La lunghezza della barra della scale è impostata in unità della mappa" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "L'altezza della barra della scale è la reale altezza nel foglio" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "default" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "Tipologia:" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "Numero dei segmenti:" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "Aggiungi a tutto le etichette" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "segmenti" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "testo di sfondo trasparente" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "La lunghezza della barra della scale non è definita" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "Inserisci testo:" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "Effetti del testo" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "testo di sfondo" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "evidenziato" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "bordo del testo" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "Offset" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "orizzontale (pts):" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "verticale (pts):" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "Punto di riferimento" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "Rotazione del testo" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "ruota testo (senso orario)" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "Nessun testo inserito!" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "Scegli una directory con immagini" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "Nota: è supportato solo " -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "Scala e ruota" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "Angolo di rotazione (gradi):" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "Rotazione senso antiorario in gradi" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" @@ -36743,37 +37401,37 @@ msgstr "" "PIL\n" "mancante" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "Impossibile leggere il file %s" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "dimensione: %(width)s x %(height)s pts" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "Nessuna immagine selezionata." -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "Impostazioni Freccia del Nord" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "Calcola convergenza" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "Simbolo" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "Seleziona simbolo:" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" @@ -36781,47 +37439,47 @@ msgstr "" "Nota: il simbolo selezionato non visualizzato\n" "in modalità bozza (solo in modalità anteprima)" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "Colore della linea esterna:" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "Colore riempimento:" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "Dimensione e rotazione" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "Dimensione (pt):" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "Dimensione del simbolo in punti" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "Impostazioni rettangolo" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "Impostazioni linea" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "Larghezza linea in punti" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "Etichette vettoriali" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "Vector label files creato precedentemente dal modulo v.label" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "È possibile selezionare diversi files per le label" @@ -36848,6 +37506,7 @@ msgstr "" #: ../gui/wxpython/psmap/frame.py:286 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36859,6 +37518,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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." @@ -36870,29 +37534,29 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "Il programma ps2pdf non è disponibile. Installarlo per creare PDF" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "Generando PDF..." -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "Generando PostScript..." -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "Generando anteprima..." -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "Ps.map terminato con il seguente codice di output %s" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 #, fuzzy msgid "Program {} is not available." msgstr "Anteprima non disponibile" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, fuzzy, python-brace-format msgid "" "{title} Please install it to create PDF.\n" @@ -36902,7 +37566,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 #, fuzzy msgid "" "Program {} is not available. Please install it to create PDF.\n" @@ -36913,37 +37577,44 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "%(prg)s è terminato con il codice di ritorno %(code)s" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "PDF generato" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "File PostScript generato" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "Generando anteprima, attendere prego" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "Anteprima non disponibile" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/psmap/frame.py:509 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/psmap/frame.py:508 ======= #: ../gui/wxpython/psmap/frame.py:462 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36955,6 +37626,15 @@ msgstr "Anteprima non disponibile" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." @@ -36962,74 +37642,95 @@ msgstr "" "Anteprima non è disponibile probabilmente poichè Ghostscript non è " "installato o non è nel PATH." -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "Anteprima generata" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "Salva file come" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "Impossibile leggere il file %s." -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "La barra della scala non è appropriata per questa proiezione" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" "Premere il bottone con l'icona del triangolo verde per genereare l'anteprima." -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "Compositore Cartografico wxGUI" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "MAP FRAME" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "LEGENDA DEI RASTER" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "LEGENDA DEI VETTORIALI" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "INFORMAZIONI SULLA MAPPA" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "BARRA DELLA SCALA" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "IMMAGINE" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "FRECCIA DEL NORD" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "Clicca e trascina per ridimensionare l'oggetto" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "etichette:" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "&Delete location" +#~ msgstr "&Elimina location" + +#~ msgid "&Rename location" +#~ msgstr "&Rinomina location" + +#~ msgid "Abort download location" +#~ msgstr "Termina lo scaricamento della location" + +#~ msgid "Location Name:" +#~ msgstr "Nome della Location:" + +#~ msgid "Change location and mapset" +#~ msgstr "Cambia location e mapset" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "Show comp. extent" #~ msgstr "Mostra regione computazionale" ======= @@ -37038,6 +37739,7 @@ msgid "Cartographic Composer - GRASS GIS" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37049,6 +37751,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -37062,6 +37769,7 @@ msgstr "" #~ msgid "Use defined projection" #~ msgstr "Usa proiezione definita" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37069,12 +37777,17 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "MASK" #~ msgstr "MASK" ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37086,6 +37799,7 @@ msgstr "" "<{mapset}> nella location <{loc}>?" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37097,6 +37811,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -37249,6 +37968,7 @@ msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD #, fuzzy, python-format #~ msgid "Unable to rename mapset: %s" @@ -37256,6 +37976,8 @@ msgstr "" #~ "Impossibile rinominare il mapset.\n" #~ "\n" #~ "%s" +======= +>>>>>>> osgeo-main #, fuzzy, python-format #~ msgid "Unable to rename location: %s" @@ -37318,9 +38040,6 @@ msgstr "La mappa <{map}> esiste già nel mapset corrente. Vuoi sovrascriverla?" #~ msgid "Run python script" #~ msgstr "Esegui script python" -#~ msgid "Unable to create new GRASS Database" -#~ msgstr "Impossibile creare il nuovo Database di GRASS" - #~ msgid "Go to GCP No." #~ msgstr "Vai al GCP No." @@ -37566,6 +38285,7 @@ msgstr "" ======= "Trascina il testo con il mouse in modalità puntatore per posizionarlo.\n" "Dai un doppio clic per modificare le opzioni." +<<<<<<< HEAD msgid "Add text layer" msgstr "Aggiungi livello testo" @@ -37627,10 +38347,62 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main -#, fuzzy -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "Vuoi importare <%(name)s> nella nuova location creata?" +msgid "Add text layer" +msgstr "Aggiungi livello testo" + +msgid "Show/hide scale bar" +msgstr "Mostra/nascondi barra della scala" + +msgid "Show/hide legend" +msgstr "Mostra/nascondi legenda" + +msgid "Show/hide north arrow" +msgstr "Mostra/nascondi freccia del nord" + +msgid "Ordinary or block kriging" +msgstr "Kriging ordinario o a blocchi" + +msgid "Performs ordinary or block kriging." +msgstr "Esegue kriging ordinario o a blocchi" + +msgid "Overlays two vector maps." +msgstr "Overlay due vettori." + +msgid "Print/add/remove a timestamp for a 3D raster map" +msgstr "Stampa/aggiunge/rimuove un timestamp per un raster 3D" + +msgid "" +"Unable to import matplotlib (try to install it).\n" +"%s" +msgstr "" +"Impossibile importare matplotlib (provare ad installarlo).\n" +"%s" + +msgid "" +"Units of current projection are not supported,\n" +" meters will be used!" +msgstr "" +"Le unità dell'attuale proiezione non sono supportate,\n" +" saranno usati i metri" + +msgid "Unsupported units" +msgstr "Unità non supportate" + +msgid "Map layers" +msgstr "Layer" + +msgid "Search modules" +msgstr "Cerca moduli" + +msgid "" +"Failed to query vector map <{map}>. Check database settings and topology." +msgstr "" +"Interrogazione del vettoriale <{map}> fallita. Controllare le impostazioni " +"del database e la topologia." +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) #~ msgid "Command prompt" #~ msgstr "Prompt dei comandi" @@ -37761,9 +38533,6 @@ msgstr "" #~ msgid "Maps can be copied only to current mapset" #~ msgstr "Le mappe possono essere copiate solo nel mapset corrente" -#~ msgid "Do you want to create new mapset?" -#~ msgstr "Si vuole creare un nuovo mapset?" - #~ msgid "No GRASS-python library found." #~ msgstr "Nessuna librerie GRASS-python trovata." @@ -37773,9 +38542,6 @@ msgstr "" #~ msgid "Point dataset:" #~ msgstr "Dataset puntuale:" -#~ msgid "Numeric column:" -#~ msgstr "Colonna numerica:" - #~ msgid "Kriging" #~ msgstr "Kriging" @@ -38003,6 +38769,7 @@ msgstr "" "nulli)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38014,6 +38781,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -38047,6 +38819,7 @@ msgstr "" "stessa location." <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38058,6 +38831,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -38078,6 +38856,7 @@ msgstr "" "fiduciali)" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38089,10 +38868,16 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "GRASS GIS Raster Map Calculator" @@ -38433,6 +39218,8 @@ msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #~ msgid "Unpacks a raster map packed with r.pack." #~ msgstr "Estrai un raster compresso con r.pack" @@ -39146,6 +39933,13 @@ msgid "Resize legend" msgstr "Ridimensiona legenda" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Unable to create location" +#~ msgstr "Impossibile creare la location" +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #~ msgid "" #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII " #~ "characters excluding %(chars)s and space." @@ -39163,6 +39957,10 @@ msgstr "" msgid "Unable to create location" msgstr "Impossibile creare la location" +<<<<<<< HEAD +======= +>>>>>>> 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" @@ -39303,6 +40101,9 @@ msgid "Double-click or Ctrl-Enter to run selected module" msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasswxpy_ja.po b/locale/po/grasswxpy_ja.po index 17b8aa93ab1..7554181aba5 100644 --- a/locale/po/grasswxpy_ja.po +++ b/locale/po/grasswxpy_ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2012-03-08 17:45+0900\n" "Last-Translator: taniguchi \n" "Language-Team: Japanese \n" @@ -30,12 +30,12 @@ msgstr "ビュー" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "データ" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "外観" @@ -43,837 +43,837 @@ msgstr "外観" msgid "Analysis" msgstr "解析" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "コントロールビュー" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "視角：" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "高さ：" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "Z-鉛直: " -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "現在地" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "中央" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "上" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "リセット" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "デフォルトビューのリセット" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "外観イメージ" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "背景色：" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "停止" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "参照 " -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "曲面" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "ベクトル" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "3Dラスター " -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "照明" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "フリンジ" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "面分割" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "ラスターマップ" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "描画" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "モード：" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "粗い " -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "細かい" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "両方" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "シェーディング： " -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "フラット " -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "グロー " -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "全てにセット" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "ロードされた全曲面に描画設定を適用" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "解像度:" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "スタイル：" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "ワイヤー " -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "曲面" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "曲面属性 " -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "カラー" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "マスク " -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "透明度" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "光沢度" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "マップ" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "解除" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "定数" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "位置 " -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "リセット" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "有効分割面: " -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "クリア" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "上部色" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "底部色" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "ブレンド" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "陰影" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "回転：" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "新規 " -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "削除 " -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "カラー：" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "ベクトルマップ" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "ベクトルライン表示" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "ベクトルライン" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "ライン:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "幅：" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "カラー：" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "表示" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "表層からの高さ：" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "ベクトルポイント表示" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "ベクトルポイント" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "アイコン：" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "サイズ：" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "シンボル：" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "3Dラスターマップ" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "等位面" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "スライス" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "解像度：" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "等位面リスト " -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "光モデル表示" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "光源位置" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "光の色と強調" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "明るさ:" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "周囲:" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "フリンジ付きエッジ" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "北 && 西" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "北 && 東" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "南 && 西" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "南 && 東" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "設定 " -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "底部からフリンジの標高：" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "方位" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "場所表示矢印" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "縮尺" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "等位面属性 " -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "通常方向のトグル" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "西" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "北" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "南" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "東" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "レベル： " -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "無し" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "平面 " -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "ベクトルマップは3Dです" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "ベクトルマップは2Dです" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "%(features)d フィーチャー (%(points)d ポイント)" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "表層" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1071,8 +1071,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "幅：" @@ -1120,7 +1120,7 @@ msgstr "ラスターマップ <%s> が見つかりません" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "ベクトルマップ <%s> が見つかりません" @@ -1228,14 +1228,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "エクスポート " #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "ヘルプ " @@ -1345,8 +1345,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1417,12 +1417,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1484,115 +1484,115 @@ msgstr "3Dラスターマップ追加 " msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "グループを作成/編集..." -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "グループ<%s> は見つかりません" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "ラスターマップ名：" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "ベクトルマップ名：" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1633,7 +1633,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1644,169 +1644,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "マップツールバー " -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "ベクトルマップのインポート " -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "ベクトルマップ <%s> を開けません" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "ファイルはすでに存在します" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1917,13 +1917,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "ベクトルデータのインポート " #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "ラスターデータのインポート " @@ -1994,56 +1994,58 @@ msgid "Data catalog" msgstr "データカタログ" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "GRASSデータディレクトリの選択：" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "GRASS ロケーションを作成しますか <%s>?" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "新しいロケーションを作成しますか？" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2051,17 +2053,17 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 -#, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:96 +#, fuzzy, python-brace-format +msgid "Failed to read mapsets from project <{l}>." msgstr "ロケーション <{l}> からマップセットの読み込みに失敗しました." -#: ../gui/wxpython/datacatalog/tree.py:121 -#, python-brace-format -msgid "Failed to read maps from location <{l}>." +#: ../gui/wxpython/datacatalog/tree.py:122 +#, fuzzy, python-brace-format +msgid "Failed to read maps from project <{l}>." msgstr "ロケーション <{l}> からマップの読み込みに失敗しました." -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " @@ -2070,300 +2072,306 @@ msgstr "" "マップ {elem} <{name}> マップセット<{mapset}>は既に存在します. 上書きしてよろ" "しいですか ?" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "上書きしますか?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "新しい名前" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "マップセット名変更" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "<{name}> のマップ名を変更中 ..." -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "{cmd} -- 成功" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "コピーするマップが選択されていません" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "コピー中 <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "g.copy が完了しました" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "g.remove が完了しました" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "マップ削除" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "削除中 {name}..." -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "コピー &C" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "ペースト &P" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "削除 &D" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "名前変更(&R)" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "レイヤ表示 &D" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "マップセット切り替え &S" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "レコード削除" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "投影法の管理 " -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" +msgstr "新しいロケーションを作成しますか？" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2197 +#, fuzzy +msgid "&Download sample project (location)" +msgstr "プロジェクトのロケーションとマップセットを選択" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "選択ロケーションを削除する" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 #, fuzzy msgid "&Copy paths to mapsets" msgstr "マップセットへのアクセスを管理" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +#, fuzzy +msgid "Reload GRASS projects" msgstr "GRASSロケーションの再読み込み" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2383,78 +2391,79 @@ msgid "Add existing or create new database" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:35 -msgid "Create new mapset in current location" -msgstr "" +#, fuzzy +msgid "Create new mapset in current project" +msgstr "新しいマップセットの作成 " -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 msgid "Data Catalog" msgstr "" @@ -2467,9 +2476,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "ツール" @@ -2530,7 +2539,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "閉じる " @@ -2554,27 +2563,27 @@ msgstr "" msgid "Shape:" msgstr "形状:" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "線幅:" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "マップツールバー " @@ -2583,29 +2592,29 @@ msgstr "マップツールバー " msgid "Map <%s> not found. " msgstr "マップ <%s> が見つかりません " -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "マップ <%s> が見つかりません " #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "表示するものがありません (マップは空です). 処理はキャンセルされました." #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "保存するイメージのファイル名選択(拡張子を追加する必要はありません)" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "検索のためのラスターまたはベクトルマップレイヤーが選択されていません" @@ -2619,199 +2628,322 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 #, fuzzy msgid "Double-click to open the tool" msgstr "(ダブルクリックでプロパティの設定) " -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" msgstr "削除 " -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 #, fuzzy msgid "Do you really want to remove <{}> command?" msgstr "変更を保存しますか? " -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "列名称変更" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "タイムスタンプ " + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "量子化 " + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "ステータスバーモード：" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "マスク " + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "マスク " + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "北" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "南" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "西" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "東" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "北-南 解像度" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "東-西 解像度 " + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "マップセット名変更" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "数値列：" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "マップセット名変更" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d 秒" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "一般" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "対象ロケーション内の計算領域をクリップ" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "現在の領域からエリアを作成" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "領域" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "マップから計算領域をセット " + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "データブラウザ" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "Pythonにエキスポート" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." +#: ../gui/wxpython/history/browser.py:466 +#, fuzzy +msgid "JSON files" msgstr "名前を付けて保存する..." -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "ファイル" + +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "ファイル" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "名前を付けて保存する..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" +msgstr "表示するソースマップを選択：" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" +msgstr "選択ロケーションを削除する" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:439 +#, fuzzy +msgid "Dataset Download" +msgstr "断面図" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "選択したマップセット名を変更する " -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "GRASS ロケーションを作成しますか <%s>?" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" +msgstr "間違った領域" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "新しいマップセットの作成 " -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "GRASS ロケーションを作成しますか <%s>?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2821,82 +2953,89 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "選択したマップセット名を変更する " -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "エラー " -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" msgstr "" +"マップセットの名前を変更できません.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "選択したロケーション名を変更する " +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "選択したマップセット名を変更する " -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" msgstr "" +"マップセットの名前を変更できません.\n" +"\n" +"%s" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2906,11 +3045,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2920,15 +3059,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2938,50 +3077,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." -msgstr "" - -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "選択ロケーションを削除する" + +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "選択ロケーションを削除する" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:497 +#, fuzzy +msgid "Error when deleting projects" +msgstr "ファイル '%s'読み込み時のエラー" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -2991,11 +3133,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3005,15 +3147,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3023,14 +3165,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "不明" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3042,15 +3185,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3058,103 +3201,103 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:693 +#, fuzzy, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" +"現在のロケーションは <%(loc)s>.\n" +"現在のマップセットは <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 -#, python-format +#: ../gui/wxpython/startup/guiutils.py:711 +#, fuzzy, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" "現在のロケーションは <%(loc)s>.\n" "現在のマップセットは <%(mapset)s>." -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "現在のマップセットは <%s>." #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "幾何補正のセットアップ" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "幾何補正のセットアップをキャンセルしました" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "マップタイプとロケーション/マップセットの選択" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "幾何補正するマップタイプ" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "ラスター" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "ベクトル" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "元のロケーションの選択：" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "元のマップセットの選択：" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "マップセットを選択する前に有効なロケーションを選択する必要があります" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "有効なロケーションとマップセットを選択する必要があります" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "幾何補正を行う画像/マップ グループの選択" @@ -3163,19 +3306,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "無い場合はグループを作成" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "グループにベクトルマップを追加..." -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "マップ出力の拡張子：" @@ -3184,17 +3327,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "有効な画像/マップ グループを選択する必要があります" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "マップ名の拡張子を入力する必要があります" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "測量基準点 (GCP) 作成の為に表示するマップを選択" @@ -3202,34 +3345,34 @@ msgstr "測量基準点 (GCP) 作成の為に表示するマップを選択" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "表示するソースマップを選択：" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "続行するには、ソースマップを選択する必要があります" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3239,42 +3382,42 @@ msgstr "" "グループを編集するか別のグループを選択してください." #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "GCP（地上基準点）管理" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "ソース" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "ターゲット" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "GCP座標設定" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3288,37 +3431,37 @@ msgstr "" "北: %(coor1)s" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "ポイントファイル書き込みが失敗しました" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "グループのPOINTSファイル保存 <%s>" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "mapwinのソースが定義されていません" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "mapwinのターゲットが定義されていません" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "ポイントファイル読み込みが失敗しました" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3328,229 +3471,229 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "画像補正中, しばらくお待ちください..." -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "変換 <%s>... " -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "ベクトルマップ<%s> の幾何補正に失敗しました" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "GCPマネージャー設定" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "GCPマネージャー終了" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "GCP（地上基準点）を保存しますか?" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "ソースからターゲットへの表示を調整する" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "ターゲットからソースへの表示を調整する" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "使用" -#: ../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 +#: ../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 msgid "source E" msgstr "ソース E" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "ソース N" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "ターゲット E" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "ターゲット N" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "上位のエラー " -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "下位のエラー " -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "ベクトルマップグループの作成" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "グループに追加するベクトルマップ：" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "GCPの修正 " -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "GCP（地上基準点） No." -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "ソース E:" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "ターゲット 東:" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "ソース N:" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "ターゲット 北:" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "現在のセッションに変更を適用する" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" "ユーザー設定ファイルに変更情報を保存（次のセッションのデフォルトになります）" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "ダイアログを閉じる" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "シンボロジー" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "最大RMSエラーのみハイライト" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "ハイライト RMS エラー > M + SD * 要素:" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" @@ -3563,98 +3706,98 @@ msgstr "" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "シンボルの設定 " -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "高RMSエラーの色:" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "選択されたGCPの色:" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "選択解除されたGCPの色:" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "未使用のGCPを表示" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "シンボルサイズ:" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "補正" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "補正方法の選択" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "第１選択" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "第２選択" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "第３選択" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "補間方法の選択:" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "対象ロケーション内の計算領域をクリップ" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "RMSしきい値係数は > 0 でなければならない" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" @@ -3662,9 +3805,9 @@ msgstr "" "RMS しきい値係数は < 1\n" "あまりにも多くのポイントが強調表示される可能性があります" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "GCP管理情報をファイルに保存 '%s'." @@ -3699,10 +3842,10 @@ msgstr "ソース表示" msgid "Target Display" msgstr "ターゲット表示" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3711,7 +3854,7 @@ msgstr "ページセットアップ " #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3720,7 +3863,7 @@ msgstr "印刷プレビュー " #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3734,14 +3877,14 @@ msgstr "解析領域でズーム (g.regionで設定)" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "デフォルト領域でズーム" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "保存領域でズーム" @@ -3754,33 +3897,33 @@ msgstr "表示域からの解析領域を設定" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "ジオメトリを領域名を付けて保存" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "カテゴリー番号" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "有効範囲:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "RMSエラー" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "前進: %(forw)s, 後退: %(back)s" @@ -3810,7 +3953,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3846,314 +3989,320 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "新しいロケーション定義" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "名前" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" +msgstr "GISデータディレクトリの選択" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "説明 " -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "データベースにロケーションはすでに存在しています " -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 +#, fuzzy msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" "ロケーションのタイトルは1ラインと256文字に制限されています. あとのテキストは" "無視されます" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "コード " -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "投影コード： " -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "説明文を検索： " -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "リストが読ません： %s " -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "投影パラメータを選択" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "データムまたは楕円体の選択 (次のページ) " -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "楕円体に関連づけられたデータム " -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "楕円体のみ " -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "%s の値を入力してください" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "投影法 %s のパラメータを入力 " -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "いいえ" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "はい" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "測地系データムの定義 " -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "楕円体" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "データムコード：" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "楕円体定義" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "楕円体コード：" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "地理参照ファイル：" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "地理参照ファイルの選択" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "パラメータ" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "PROJ.4パラメータの入力：" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "データムの変換が必要です." -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "要約" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "GRASSデータベース：" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "ロケーション名：" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "投影コード： " -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "概要:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "投影法：" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "慣例" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" @@ -4161,152 +4310,208 @@ msgstr "" "\n" "詳細： %(err)s " -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" msgstr "新しいロケーションは作成できません" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "データベースにロケーションはすでに存在しています " -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "EPSGコードがありません" -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "ファイル <%s> が見つかりません" -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "デフォルト領域と解像度をセット" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "領域設定(&S)" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "ロケーションの選択が間違っています" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "間違った領域" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "3D設定を表示" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "3D設定を非表示 " -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "行： %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "列： %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "セル： %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "深さ： %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "3D セル： %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "上" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "下" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "上-下 解像度 " -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "北" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "西" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "東" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "南" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "北-南 解像度" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "東-西 解像度 " -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "間違った値： %s " -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "データム変換方法の選択" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "データム変換方法を一覧表から選択" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "削除 " + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "不可" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "可能" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "ラベル設定" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "コメント設定" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "CP（基準点）追加" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "CP（基準点）削除" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "中間" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "プロパティ " + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "モデラー設定" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4323,7 +4528,6 @@ msgid "Disabled:" msgstr "不可:" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "" @@ -4333,10 +4537,10 @@ msgid "GRASS API:" msgstr "GRASSのヘルプ " #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "コマンド" @@ -4362,7 +4566,7 @@ msgid "Shape size" msgstr "形状サイズ" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "タイプ" @@ -4391,13 +4595,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "モデルプロパティ" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "メタデータ" @@ -4406,7 +4610,7 @@ msgid "Commands" msgstr "コマンド" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4417,19 +4621,19 @@ msgid "Apply properties" msgstr "プロパティ適用" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "変更を行わずにダイアログを閉じる" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "名前:" @@ -4438,707 +4642,692 @@ msgstr "名前:" msgid "Author(s):" msgstr "著者:" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "描画モデラー" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "モデル" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" -msgstr "モデルをイメージにエクスポート" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "アイテム" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" -msgstr "Pythonスクリプトでモデルを出力" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "変数" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:189 +#, fuzzy +msgid "Script editor" +msgstr "編集開始 " -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "コマンド出力 " -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d 秒" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" -msgstr "モデル実行" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" +msgstr "%(min)d 分 %(sec)d 秒" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" -msgstr "モデル検証" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "コマンド終了" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" -msgstr "データプロパティ" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." +msgstr "しばらくお待ちください,モデルロード中..." -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" -msgstr "エレメント名:" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." +msgstr "現在の設定をモデルファイルへの出力に失敗しました" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" -msgstr "凡例表示" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." +msgstr "書き込み用ファイル <%s> がオープン出来ません" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" +"現在のワークスペースは空ではありません．ワークスペースに現在の設定を適用しま" +"すか? " -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "新しいモデルを作成しますか?" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" +msgstr "モデルファイル選択" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" +msgstr "GRASS モデル ファイル (*.gxm)|*.gxm" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -"コマンドが定義されていません.\n" -"\n" -"モデルに新しい動作を追加できません." +"%(items)d 個のアイテムが (%(actions)d actions) モデル内にロードされました" -#: ../gui/wxpython/gmodeler/dialogs.py:317 +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 #, python-format -msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." -msgstr "" - -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" -msgstr "レイヤープロパティ" - -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" -msgstr "から" +msgid "Model file <%s> already exists. Do you want to overwrite this file?" +msgstr "モデルファイル <%s> は既に存在します．上書きしてよろしいですか? " -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" -msgstr "To" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "モデル保存" -#: ../gui/wxpython/gmodeler/dialogs.py:431 +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 #, python-format -msgid "Data: %s" -msgstr "データベース %s" +msgid "File <%s> saved" +msgstr "ファイル <%s> が保存されました" -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" -msgstr "コマンド：" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" +msgstr "現在のモデルを保存するファイルを選択" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" -msgstr "オプション" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" +msgstr "モデルのエクスポート <%s>" -#: ../gui/wxpython/gmodeler/dialogs.py:463 -msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." -msgstr "" -"リレーションはデータアイテムから始められません.\n" -"リレーションを追加できません." +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "コメント追加" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -"リレーションはGRASSコマンドを示しません.\n" -"リレーションを追加できません." -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -"関連性のあるオプションは見つかりません.\n" -"リレーションを追加できません." - -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" -msgstr "条件" - -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "ラベル " -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" -msgstr "ループプロパティ" +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "データを完全に消去しますか?%s" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" -msgstr "ループの中の項目リスト" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "中間データを削除しますか?" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." +msgstr "モデルはからです. 検証できません." -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "検証モデル..." -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format +msgid "" +"Model is not valid.\n" +"\n" +"%s" msgstr "" +"モデルが有効ではありません\n" +"\n" +"%s " -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" -msgstr "if - else文のプロパティ" - -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" -msgstr "if'ブロック内の項目リスト" +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "モデルは有効です" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" -msgstr "else'ブロック内の項目リスト" +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "wxGUI グラフィカルモデラー" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." -msgstr "変数 <%s> はすでにモデルに存在します. 変数の追加に失敗しました." +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "モデル再描画..." -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" -msgstr "モデルから全ての変数を削除しますか?" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "モデルの変更を保存しますか? " -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" -msgstr "変数を削除" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" +msgstr "現在のモデルの設定をファイルに保存しますか? " -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" -msgstr "削除選択" +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "描画モデラーを終了" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" -msgstr "全てを削除" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "カテゴリー一覧 右クリックで削除" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" -msgstr "リロード" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "データタイプ " -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" -msgstr "モデル" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "デフォルト値" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." -msgstr "スクリプトはｗｘGUIモデラーで作成されます" +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" +msgstr "新しい変数追加" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" -msgstr "定義されていない変数です '%s'" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" +msgstr "整数" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." -msgstr "モデル実行中..." +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" +msgstr "実数" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." -msgstr "モデルは空です. 実行できません." +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" +msgstr "文字列" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "検証モデル..." +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" +msgstr "領域" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" -msgstr "" -"モデルが正しくない. このモデル名で実行しますか?\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" +msgstr "マップセット" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" -msgstr "モデルを実行しますか" +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" +msgstr "ファイル" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" -msgstr "ラスターマップ" - -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" -msgstr "3Dラスターマップ" - -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" -msgstr "ベクトルマップ" - -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" -msgstr "<定義されていません>" +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "モデルに新しい変数を追加します" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " -msgstr "条件: " +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "項目リスト - 右クリックで削除" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" -msgstr "条件：定義されていない" +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "ラベル " -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" -msgstr "if-else" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" +msgstr "ループ中" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" -msgstr "モデルパラメータ " - -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" +msgstr "Pythonスクリプト" -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 #: ../gui/wxpython/modules/mcalc_builder.py:169 msgid "&Run" msgstr "実行(&R)" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" -msgstr "変数" - -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" -msgstr "描画モデラー" - -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" -msgstr "モデル" +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +#, fuzzy +msgid "Run script" +msgstr "スクリプト実行" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" -msgstr "アイテム" +#: ../gui/wxpython/gmodeler/panels.py:1617 +#, fuzzy +msgid "Save the script to a file" +msgstr "Pythonスクリプトをファイルに保存" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" -msgstr "コマンド出力 " +#: ../gui/wxpython/gmodeler/panels.py:1622 +msgid "" +"Refresh the script based on the model.\n" +"It will discard all local changes." +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." -msgstr "モデル再描画..." +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" -msgstr "%d 秒" +#: ../gui/wxpython/gmodeler/panels.py:1654 +#, fuzzy +msgid "Python script type" +msgstr "Pythonスクリプト" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" -msgstr "%(min)d 分 %(sec)d 秒" +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" -msgstr "コマンド終了" +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" +msgstr "更新" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" +msgstr "Python スクリプト (*.py)|*.py" + +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "モデルの変更を保存しますか? " +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" +msgstr "保存するファイル選択" -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" -msgstr "現在のモデルの設定をファイルに保存しますか? " +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" +msgstr "ファイル <%s> は既に存在します．上書きしてよろしいですか? " -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" -msgstr "描画モデラーを終了" +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" +msgstr "ファイル保存" -#: ../gui/wxpython/gmodeler/frame.py:433 +#: ../gui/wxpython/gmodeler/panels.py:1806 #, python-format -msgid "%d intermediate maps deleted from current mapset" +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "データを完全に消去しますか?%s" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" +msgstr "新しいモデルの作成 " -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "中間データを削除しますか?" +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" +msgstr "ファイルからモデルをロード " -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" -msgstr "" -"現在のワークスペースは空ではありません．ワークスペースに現在の設定を適用しま" -"すか? " +#: ../gui/wxpython/gmodeler/toolbars.py:54 +#, fuzzy +msgid "Save current model to file" +msgstr "モデルをファイルに保存" -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" -msgstr "新しいモデルを作成しますか?" +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" +msgstr "モデルをイメージにエクスポート" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" -msgstr "モデルファイル選択" +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" +msgstr "Pythonスクリプトでモデルを出力" -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" -msgstr "GRASS モデル ファイル (*.gxm)|*.gxm" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -"%(items)d 個のアイテムが (%(actions)d actions) モデル内にロードされました" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" -msgstr "モデルファイル <%s> は既に存在します．上書きしてよろしいですか? " +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" -msgstr "モデル保存" +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 -#, python-format -msgid "File <%s> saved" -msgstr "ファイル <%s> が保存されました" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" -msgstr "現在のモデルを保存するファイルを選択" +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" +msgstr "モデル実行" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." -msgstr "モデルはからです. 検証できません." +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" +msgstr "モデル検証" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +#, fuzzy +msgid "Set model properties" +msgstr "モデルプロパティ" + +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" msgstr "" -"モデルが有効ではありません\n" -"\n" -"%s " -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." -msgstr "モデルは有効です" +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 -#, python-format -msgid "Model exported to <%s>" -msgstr "モデルのエクスポート <%s>" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" +msgstr "データプロパティ" -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" -msgstr "コメント追加" +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" +msgstr "エレメント名:" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" +msgstr "凡例表示" + +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" -msgstr "wxGUI グラフィカルモデラー" +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/dialogs.py:308 +msgid "" +"Command not defined.\n" +"\n" +"Unable to add new action to the model." +msgstr "" +"コマンドが定義されていません.\n" +"\n" +"モデルに新しい動作を追加できません." -#: ../gui/wxpython/gmodeler/frame.py:1116 +#: ../gui/wxpython/gmodeler/dialogs.py:317 #, python-format msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" +"'%s' is not a GRASS tool.\n" "\n" -"%s" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." -msgstr "しばらくお待ちください,モデルロード中..." +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" +msgstr "レイヤープロパティ" -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." -msgstr "現在の設定をモデルファイルへの出力に失敗しました" +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" +msgstr "から" -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "書き込み用ファイル <%s> がオープン出来ません" +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" +msgstr "To" -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "削除 " +#: ../gui/wxpython/gmodeler/dialogs.py:431 +#, python-format +msgid "Data: %s" +msgstr "データベース %s" -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" -msgstr "不可" +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" +msgstr "コマンド：" -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" -msgstr "可能" +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" +msgstr "オプション" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" -msgstr "ラベル設定" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." +msgstr "" +"リレーションはデータアイテムから始められません.\n" +"リレーションを追加できません." -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" -msgstr "コメント設定" +#: ../gui/wxpython/gmodeler/dialogs.py:473 +msgid "" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." +msgstr "" +"リレーションはGRASSコマンドを示しません.\n" +"リレーションを追加できません." -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" -msgstr "CP（基準点）追加" +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." +msgstr "" +"関連性のあるオプションは見つかりません.\n" +"リレーションを追加できません." -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "CP（基準点）削除" +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" +msgstr "条件" -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" -msgstr "中間" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" +msgstr "ループプロパティ" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" -msgstr "プロパティ " +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" +msgstr "ループの中の項目リスト" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "カテゴリー一覧 右クリックで削除" +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" -msgstr "データタイプ " +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "デフォルト値" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" +msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" -msgstr "新しい変数追加" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" +msgstr "if - else文のプロパティ" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" -msgstr "整数" +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" +msgstr "if'ブロック内の項目リスト" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "実数" +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" +msgstr "else'ブロック内の項目リスト" -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "文字列" - -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "領域" - -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" -msgstr "マップセット" +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." +msgstr "変数 <%s> はすでにモデルに存在します. 変数の追加に失敗しました." -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" -msgstr "ファイル" +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" +msgstr "モデルから全ての変数を削除しますか?" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" +msgstr "変数を削除" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" -msgstr "モデルに新しい変数を追加します" +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" +msgstr "削除選択" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "項目リスト - 右クリックで削除" +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" +msgstr "全てを削除" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" -msgstr "ループ中" +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" +msgstr "リロード" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" +msgstr "モデル" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." +msgstr "スクリプトはｗｘGUIモデラーで作成されます" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" -msgstr "Pythonスクリプト" +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" +msgstr "定義されていない変数です '%s'" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -#, fuzzy -msgid "Run script" -msgstr "スクリプト実行" +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." +msgstr "モデル実行中..." -#: ../gui/wxpython/gmodeler/frame.py:2042 -#, fuzzy -msgid "Save the script to a file" -msgstr "Pythonスクリプトをファイルに保存" +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." +msgstr "モデルは空です. 実行できません." -#: ../gui/wxpython/gmodeler/frame.py:2047 +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" +"モデルが正しくない. このモデル名で実行しますか?\n" +"\n" +"%s" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" +msgstr "モデルを実行しますか" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -#, fuzzy -msgid "Python script type" -msgstr "Pythonスクリプト" +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" +msgstr "ラスターマップ" -#: ../gui/wxpython/gmodeler/frame.py:2110 -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" +msgstr "3Dラスターマップ" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" -msgstr "更新" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" +msgstr "ベクトルマップ" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" -msgstr "保存するファイル選択" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" +msgstr "<定義されていません>" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" -msgstr "Python スクリプト (*.py)|*.py" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " +msgstr "条件: " -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" -msgstr "ファイル <%s> は既に存在します．上書きしてよろしいですか? " +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" +msgstr "条件：定義されていない" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" -msgstr "ファイル保存" +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" +msgstr "if-else" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " +msgstr "" + +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" +msgstr "警告" + +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" +msgstr "モデルパラメータ " + +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" +msgstr "" + +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "ファイル(&F)" @@ -5150,7 +5339,7 @@ msgstr "ワークスペース " msgid "Create new workspace" msgstr "ワークスペース新規作成 " -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "開く" @@ -5158,7 +5347,7 @@ msgstr "開く" msgid "Load workspace from file" msgstr "ファイルからワークスペースをロード " -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "保存 " @@ -5168,7 +5357,7 @@ msgstr "保存 " msgid "Save workspace" msgstr "ワークスペース保存 " -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "別名で保存 " @@ -5181,7 +5370,7 @@ msgid "Close workspace file" msgstr "ワークスペースファイルを閉じる" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "マップディスプレイ" @@ -5218,7 +5407,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -5246,566 +5435,573 @@ msgstr "現在のマップ表示画面を閉じる" msgid "Close all open map display windows" msgstr "全てのマップ画面を閉じる" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "GDALでGRASSマップレイヤーにラスターデータをインポート " -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "ASCII x,y,zポイントインポート グリッド化" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "ASCIIグリッドのインポート " -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "ASCII ポリゴン/ライン/ポイントデータファイルからラスターマップを作成 " -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "バイナリーファイルをラスターマップとしてインポート " -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "GRIDATB.FOR インポート " -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "Matlab ２次元配列インポート" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "MAT-File(v4) をラスターマップとしてインポート " -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "SPOT NDVI インポート " -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "SRTM HGT インポート " -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Terra ASTER HDF インポート " -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." -msgstr "" +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +#, fuzzy +msgid "Module not installed" +msgstr "モジュール <%s> が見つかりません." #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +msgid "Reproject raster map from different GRASS project" msgstr "" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "あるロケーションのベクトルマップを現在のロケーションに投影変換" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "ベクトルのラインとしてASCIIポイントを変換" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "DXFのインポート " -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "DXFフォーマットからGRASSベクトルフォーマットへ変換" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "WFS" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "ESRI e00のインポート " -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "Geonamesのインポート " -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "Matlab配列またはMapGenフォーマットのインポート " -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "Mapgen または Matlab-ASCII のベクトルマップをGRASSへインポート " -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" -msgstr "" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" +msgstr "あるロケーションのベクトルマップを現在のロケーションに投影変換" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." msgstr "あるロケーションのベクトルマップを現在のロケーションに投影変換" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "3Dラスターデータのインポート " -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "ASCII 3Dのインポート " -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Vis5Dのインポート " -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "データベーステーブルのインポート " -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "一般的なインポート形式" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "複数フォーマットからなる属性テーブルのインポート " -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "ラスターマップのエクスポート " #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "一般的なエキスポートフォーマット" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "GDAL用フォーマットへのラスターマップのエクスポート " -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "ASCIIグリッドのエクスポート " -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "ASCII XYZ形式のエクスポート " -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "GRIDATB.FORのエクスポート " -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "Matlab 2D 座標値 エキスポート" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "MAT-Fileへエクスポート " -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "バイナリー配列へエクスポート " -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "バイナリアレイとしてエクスポート " -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "MPEG-1のエクスポート " -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "PNGのエクスポート " -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "PPMのエクスポート " -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "RGBからPPMへのエクスポート " -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "POV-Rayのエクスポート " -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "VRMLのエクスポート " -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "VTKのエクスポート " -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "ベクトルマップのエクスポート " -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "DXFのエクスポート " -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "SVGフォーマットのエクスポート " -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "3Dラスターマップのエクスポート " -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "ASCII 3Dのエクスポート " -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Vis5Dのエクスポート " -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "GRASS 3D ラスターマップを3D Vis5D ファイルにエクスポート " -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "3Dラスターマップを VTK-Ascii フォーマットへ変換" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "データベーステーブルのエクスポート " -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "属性テーブルを別のフォーマットにエクスポート " -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "外部ラスターデータへのリンク" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" "GRASSの擬似ラスターマップレイヤーとしてGDALがサポートするラスターデータをリン" "ク" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "外部ベクトルデータへのリンク" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "OGRがサポートするレイヤーにリンクする擬似ベクトルマップを新しく作成" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "コピー " -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "リスト " -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." @@ -5813,86 +6009,86 @@ msgstr "" "ユーザーが検索オプションを使って指定したデータ型の、現在使用できるGRASSデータ" "ベースファイルの一覧を表示 " -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "名前変更 " -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "現在使用できるマップセットのエレメントファイル名を変更 " -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." msgstr "" #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "マップタイプの変換 " #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "ラスター → ベクトル " #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "2Dラスターマップ断面を １つの 3Dラスターマップの値として変換" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "標高データとラスターマップから3Dマップを作成 " #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "ベクトル → ラスター " #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "ラスターマップ内にベクトルマップを変換" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "2Dベクトル → 3Dベクトル " #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "2Dベクトルデータを3Dに変換します " @@ -5900,20 +6096,20 @@ msgstr "2Dベクトルデータを3Dに変換します " msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "3Dラスターマップから2Dラスターマップへ変換" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "幾何補正の為のGCP（地上基準点）管理" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "描画モデラー" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "描画モデラー起動" @@ -5931,13 +6127,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "" @@ -5951,16 +6147,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "カートグラフィックコンポーザー" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "カートグラフィックコンポーザーを起動する" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -5980,7 +6176,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "" @@ -5988,8 +6184,8 @@ msgstr "" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "" @@ -5997,42 +6193,42 @@ msgstr "" msgid "Close GUI and exit GRASS GIS shell." msgstr "" -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "設定(&S)" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "" -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "領域設定" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "領域の境界定義を管理 " @@ -6045,7 +6241,8 @@ msgid "Mapset access" msgstr "マップセット作成 " #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +#, fuzzy +msgid "Set/unset access to other mapsets in current project" msgstr "現在のロケーションに他のマップセットの追加をセットする/しない " #: ../gui/wxpython/menustrings.py:234 @@ -6069,11 +6266,13 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "ロケーションとマップセットを変更" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "プロジェクトのロケーションとマップセットを選択" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +#, fuzzy +msgid "Change current project and mapset." msgstr "現在のロケーションとマップセットを変更" #: ../gui/wxpython/menustrings.py:240 @@ -6107,15 +6306,18 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" -msgstr "" +#, fuzzy +msgid "Create new project (location)" +msgstr "新しいロケーションを作成しますか？" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" #: ../gui/wxpython/menustrings.py:252 @@ -6139,8 +6341,7 @@ msgstr "投影法の管理 " #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6171,7 +6372,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "GUI設定 " @@ -6179,85 +6380,85 @@ msgstr "GUI設定 " msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "ユーザーGUI設定 (フォント, コマンド,デジタイザー, etc.) " -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "ラスター(&R)" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "ラスターマップの作成" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "圧縮/解凍 " -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "ラスターマップの圧縮/解凍 " -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "領域境界 " -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "ラスターマップの境界を定義 " -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "NULL値の管理 " -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "ラスターマップのNULL値の管理 " -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "量子化 " -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "浮動小数点マップのための量子化ファイルを作成 " -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "タイムスタンプ " -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "総量統計を使用した再サンプリング " -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "疎グリッドの集成使用したラスターレイヤーの再サンプリング " -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "複数手法による再サンプリング " -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "近傍情報を利用した再サンプリング " -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "ラスターマップレイヤーの再サンプリング機能 " -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr " スプライン法による再サンプリング " -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " @@ -6266,230 +6467,230 @@ msgstr "" "再補間およびオプションで入力ラスターマップから新しいラスターマップに異なる解" "像度の（おそらく）張力と平滑化でスプライン正則化を使って地形解析します " -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "" #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "サポートファイルの保守 " -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "ラスターマップサポートファイルの作成・更新 " -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "マップ統計の更新 " -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "ラスターマップ統計の更新 " -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "タイル " -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "使用中の領域と投影法でタイルを作成する " -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "カラー調整 " #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "カラーテーブル " -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "カラーテーブル (標準偏差) " -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "ラスターカラーテーブルの対話型管理" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "カラーテーブルをエキスポート" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "2色のラスターをブレンド " -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "指定された比率で 2 色のラスターをブレンド " -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "RGB 作成 " -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "コンポジットラスターマップに R,G,Bラスターマップを合成する " #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "RGB → HIS " -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "ラスターマップの検索 " -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "座標値からの検索 " -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "カラーの値から検索 " -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "ラスターマップレイヤーのカラーから検索 " -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "ラスターバッファと距離" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "バッファリング" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "同心円の作成" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "指定されたポイントを中心に同心円を含むマップをラスターを作成します" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "近傍のポイント " -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "２つのラスターマップに最も近いポイントにオブジェクトを配置 " -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "１つのセルを拡大させることによって新しいラスターマップを作成する " #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "フィーチャの距離 " #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "ラスター操作制限用マスク作成 " #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "ラスターマップカリキュレータ" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "近傍性分析 " -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "ウィンドウを移動 " -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " @@ -6497,36 +6698,36 @@ msgid "" msgstr "" "各セルのカテゴリーで近傍点解析を行い，ラスターマップに新しいセルを作成します " -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "近傍点 " -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "ラスターマップの重ね合せ " -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "カテゴリー値の掛け合わせ " -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "カテゴリー値を掛け合わせて新たなラスターマップを作成します " -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "ラスターマップの重ね合せ " -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." @@ -6534,11 +6735,11 @@ msgstr "" "別のレイヤーによってデータが存在しないエリアのカテゴリー情報を挿入し、合成ラ" "スターマップレイヤーを作成する " -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." @@ -6546,51 +6747,51 @@ msgstr "" "各出力のセルの値の値を入力ラスターマップレイヤーに対応するセルに割り当てられ" "た関数を作成 " -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "統計オーバーレイ " -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "太陽照度と影 " -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "太陽照度と照射 " -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6601,22 +6802,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "陰影図 " -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6624,23 +6825,23 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "地形解析 " -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "コンターラインの作成" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "ラスターマップからコンターを作成しベクトルマップを作成" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "表層断面図 " -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " @@ -6649,104 +6850,104 @@ msgstr "" "異なるロケーションの移動コストを各セルの情報として表現したラスターマップを作" "成する " -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "移動コスト積算 " -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "最小コストルートあるいはフロー " -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "標高マップ（DEM）をより陰影マップを作成" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "傾斜と方位" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "地形パラメータ " -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "テキストフィーチャ" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "ラスターマップからテキストフィーチャを作成" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "可視域" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "水平角度 " -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -6757,323 +6958,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "フィーチャの変形" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "クランプ " -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "物理的離散領域をグルーピングすることによってデータを再分類する " -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "拡大" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "縮小" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "水文モデリング " -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "河川水路網の作成 " -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "湖沼の塗潰し " -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "凹地の無いマップとフローライン " -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "標高レイヤーから 凹地のない標高マップと流方向マップを作成 " -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "フローアキュミュレーション " -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "流線 " -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "分水界解析 " -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "分水界小盆地の作成" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "分水界ラスターマップ生成" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "分水界作成 " -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "SIMWE 地表流モデル " -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "経路サンプリング法(SIMWE)を使用した流水門シミュレーション" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "SIMWE 透過流束モデリング" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "経路サンプリング法(SIMWE)を使用した土砂流送 侵食/沈着 シミュレーション" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "地形図インデックスマップ " -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "TOPMODELシミュレーション " -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "物理的流域水文モデルに基づくトポモデルをシュミレーション" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "地下水 モデリング " -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "２層による非定常流 被圧/負圧地下水流の数値解析" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "景観パッチ分析" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "サンプリングと解析フレームワークのための設定 " -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "r.li.'index'のための設定エディタ" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "周辺密度" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "4近傍法を使用してラスターマップの周辺密度指標を解析" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "対照的加重周辺密度" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "ラスターマップで対照的加重周辺密度指標を解析" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "平均パッチ領域" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "4近傍法を使用して、ラスターマップ上で平均パッチサイズ指標を解析" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "パッチ領域の範囲" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "ラスターマップ上でパッチ領域サイズの範囲を解析" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "パッチ領域標準偏差" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "ラスターマップのパッチ領域の標準偏差を解析" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "パッチ領域COEFF演算子" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr " ラスターマップ上でパッチ領域の変動係数を解析" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "パッチ密度" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "4近傍法を使用して、ラスターマップ上でパッチ密度指標を解析" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "パッチ番号" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "4近傍法を使用して、ラスターマップ上でパッチ数指標を解析" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "順位多様性" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "ラスターマップで順位多様性指標を解析" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "シャノン 多様性 " -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "ラスターマップでシャノン多様性指標を解析" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "シンプソン多様性" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "ラスターマップでシンプソン多様性指標を解析" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "濃厚" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "形状係数" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "ラスターマップで形状係数を解析" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "森林火災モデリング " -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "拡散比率" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7081,21 +7282,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "最小コストの拡散経路" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "累積コストで計算されたセルから最小コストのパスで再帰的にトレース" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "非等方性拡散シミュレーション " -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7104,17 +7305,17 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "カテゴリー値・ラベルの変更 " #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "カテゴリー情報の管理" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." @@ -7122,187 +7323,187 @@ msgstr "" "ユーザー定義ラスターマップレイヤーに関連付けられたカテゴリー情報とラベルの管" "理" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "対話形式でカテゴリー値を編集" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "サイズで再分類" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "定義されたサイズ（ヘクタール）をしきい値としてラスターマップを再分類" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "再分類" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "再コード" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "カテゴリー分けされたラスターマップの再コード化" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "再スケール" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "ラスターマップのカテゴリー値の範囲を変更します " -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "ヒストグラムの再スケール" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "ラスターマップのカテゴリー値の範囲によりヒストグラムの再スケール" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "ランダムセルの作成" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "ランダムセル" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "空間に依存したランダムセル値を作成" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "ランダムセルとベクトルポイント" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "曲面の作成" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "フラクタル面" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "指定されたフラクタル次元のフラクタル曲面を作成" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "ガウスカーネル密度面" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "ガウス偏差面" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "ランダム逸脱曲面" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "空間依存性ランダム曲面" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "空間依存性ランダム曲面を作成" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "曲面補間 " -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "ベクトルポイントからの線形補間と三次補間" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "ラスターポイントから加重平均補間" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "ベクトルポイントでの加重平均補間" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "ラスターコンターから作成" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "正則化スプライン法" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7310,106 +7511,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "NULLセルの穴埋め " -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "レポートと統計" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "基本的なラスターメタデータ" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "一般統計" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "大規模データセットの分位数 " -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "２つのパスを使用した分位数の計算" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "カテゴリー値の範囲" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "ラスターマップのカテゴリー値一覧を表示" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "ラスターマップをカテゴリー別に集計" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "クランプセルによる統計解析" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "修正エリア合計" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "単変量ラスター統計" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7418,425 +7619,426 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "サンプル横断面" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "指定した直線上でのラスターマップの値を出力" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "単位（角度/距離） " -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "指定した横断面でラスターマップの値を出力" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "共分散/相関 " -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "ラスターマップの共分散と相関を求めます " -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "線形回帰" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "2つのラスターマップでの線形回帰計算: y = a + b*x" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "カテゴリー間の関係" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "２つのラスターマップのカテゴリー関係（一致）表を作成します " -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "ベクトル(&V)" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "ベクトルマップの作成 " -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "新しいベクトルマップ " -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "空のベクトルマップの作成 " -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "ベクトルマップ編集（非対話型）" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "選択したベクトルフィーチャの修正、追加、削除" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "オブジェクトタイプの変換" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "平行線" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "入力された線分から平行線を作成" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "境界の融合" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 +#, fuzzy msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "共通のカテゴリー番号や属性を共有するエリアを融合させる" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "3Dベクトルまたはラスターの作成" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "3Dベクトルマップの立上げ" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "ラベル作成" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "属性からベクトルマップのラベルを作成" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "ベクトルマップの再配置" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "ベクトルマップメタデータ更新" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "トポロジーの保守 " -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "トポロジーの作成/再ビルド" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "全ベクトルマップにトポロジを再構築" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "現在のマップセット内全ベクトルマップのトポロジを再構築" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "ポリラインの作成" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "線分や境界線からポリラインを作成" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "線分の分割" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "ポリラインの分割" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "入力された線分とポイントからセグメントを作成" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "ベクトルマップの消去" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "ベクトルマップのトポロジーの編集ツールキット" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "円滑化または単純化" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "セントロイド追加" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "閉領域の欠けているセントロイドを追加" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "ベクトルカラーテーブルの対話式管理" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "クエリベクトルマップ" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "座標で検索" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "ベクトル属性データの検索" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "ベクトルマップの属性を出力" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "フィーチャーの選択" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" "ベクトルマップ（B）からのフィーチャによって他のベクトルマップ（A）からフィー" "チャを選択" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "バッファリング" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "ベクトルポイントデータから異常値を削除" -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "摂動点を作成" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "テスト/トレーニング ポイントセット" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "テスト/トレーニングセットにランダムな分割点を作成" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "ライダー分析" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "エッジ検出" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "ライダー データセットからエッジを検出する" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "内面検出" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "コンター線定義と内部コンター線定義のための領域成長アルゴリズム" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "オブジェクトの修正と再分類" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "線形参照" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "線形参照システム作成" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "配置測点作成" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "ポイント/セグメントの作成 " -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." @@ -7844,11 +8046,11 @@ msgstr "" "入力された線分や線形参照システム、ファイルや標準入力のポイントから新しいポイ" "ント/セグメントを作成 " -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "ラインIDとオフセットを表示" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." @@ -7856,71 +8058,71 @@ msgstr "" "線形参照システムを利用し、ベクトルマップのポイントからラインIDと実距離（Km)オ" "フセットを表示" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "近傍のフィーチャ" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "ベクトルマップの２点に一番近いエレメントを探す" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "ネットワーク解析 " -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "ネットワークメンテナンスを実行" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "サブネットの設定 " -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "ネットの分割" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "最短経路" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "ベクトルネットワークの最短経路探査" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "フィーチャー間の最短経路" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -7928,97 +8130,97 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "時刻表による最短経路" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "時刻表による最短経路探査" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "すべてのペアの最短径路" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "ネットワークの全てのノード間を最短距離で計算." -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "ネットワーク可視化" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "接続点や節点" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "ネットワーク内の接続点や節点を計算する." -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "最大流量" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "ネットワーク内の２つのノード間の最大流量を計算する." -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "頂点接続" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "ネットワーク内の２つのノード間の頂点接続関係を計算する." -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "コンポーネント" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "ネットワークの強連結成分と弱連結成分を計算する" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "重要性" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" "ネットワークの角度、中心性、中間性、近接性、固有ベクトル中心性を計算する" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "シュタイナーツリー" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "最小全域木" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "ネットワークの最小全域木を計算する" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "巡回セールスマン問題 " -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8026,45 +8228,45 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "ベクトルマップの重ね合せ " -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "ベクトルマップのパッチ" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." @@ -8072,263 +8274,263 @@ msgstr "" "既存のベクトルマップのカテゴリー値は、SQLクエリまたは属性テーブルの列の値に" "よって変更されます" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "属性の更新" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "ラスターからエリア属性を更新" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "エリアからポイントの属性を更新" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "ポイントの位置のベクトルの値をテーブルにアップロード" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "ベクトルのフィーチャからデータベースの値を設定" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "ポイントの場所にあるラスターマップのサンプリング" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "ポイントの位置のラスターの値をテーブルにアップロード" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "ポイント近傍でのラスターマップのサンプリング " -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "ポイントロケーションでのラスターマップのサンプリング" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "現在の領域からエリアを作成" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "複数のポイントからエリアを作成" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "凸包 " -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "ドローネ三角形" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "ポイントやセントロイドを含むベクトルマップからするドローネ三角形を作成" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "ボロノイ図/ティーセンポリゴン" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "グリッドの作成" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "ポイントの作成" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "データベースから作成" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "座標を含むデータベースから新しいベクトルマップを作成" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "ラインに沿ったを作成" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "ランダムなポイントを作成" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "ポイント群から異常値を削除" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "基本ベクトルメタデータ" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "属性データの分類" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "主題図作成等の属性データの分類" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "カテゴリー別トポロジーのレポート作成" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "ポイントの単変量属性統計" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "属性列による単変量統計" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "ベクトルマップの選択されたテーブルの列で単変量統計解析を行う" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "２次補間インデックス" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "正規性検定" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "画像(&I)" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "画像とグループの作成 " -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "グループの作成/修正" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "対象グループ" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "画像グループをロケーションやマップセットの対象とする" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "モザイク画像" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "画像カラーの管理 " -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "RGBのカラーバランス" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "HIS → RGB" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." msgstr "カラーの定義をHIS（色相/照度/彩度）をRGB(赤/緑/青）に変換する" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." msgstr "カラーの定義をRGB(赤/緑/青）をHIS（色相/照度/彩度）に変換する" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "画像またはラスターを補正する" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." @@ -8336,489 +8538,489 @@ msgstr "" "コントロールポイントに基づいて、各ピクセルの座標変換を計算することによって画" "像を補正する" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "ヒストグラム" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "画像のヒストグラムを作成" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "スペクトル応答 " -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" "画像あるいはグループでユーザーが指定したロケーションのスペクトル応答を表示" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "画像分類 " -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "教師無し分類用クラスタリング入力" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." "maxlik, to generate an unsupervised image classification." msgstr "" -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "最尤法のためのシグネチャの作成" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "ラスターマップからi.maxlikの統計情報を作成" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "最尤法による分類(MLC) " -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "対話型入力による監視下分類" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "最大事後確率推定法のためのシグネチャの作成" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "ラスターマップから i.smapの統計情報を作成" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "逐次最大事後確率推定法 (SMAP) " -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "逐次最大事後確率推定法によりコンテキスト画像を分類します" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "最大事後確率推定法のためのシグネチャの作成" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 #, fuzzy msgid "Manage signature files" msgstr "画像カラーの管理 " -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "画像フィルター " -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "縁辺検出" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "ゼロ交差法を用いて画像のエッジを決定します " -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "行列/畳み込みフィルタ" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "ラスターマップ行列フィルター実行" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "画像変換 " -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "正準相関" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "画像処理の正準成分分析(cca)" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "主成分" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "画像処理のための主成分分析（PCA）" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "高速フーリエ変換" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "高速フーリエ変換を行います " -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "高速フーリエ逆変換 " -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "高速フーリエ逆変換を行います " -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "衛星画像ツール" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "大気補正 " -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "地形的補正 " -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "反射率の地形的補正を計算する" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "衛星画像製品" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "タッセルドキャップ植生指数" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "カッパー分析" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "ランドサットのバンド選定指標" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "3D NULL値の管理" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "3D NULL-値のビットマップファイルの作成 " -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "タイムスタンプ管理" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "3D マスク" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "現在作業中の 3D ラスターマスクを確立します " -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "断面図" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." @@ -8826,27 +9028,27 @@ msgstr "" "テンション（ＲＳＴ）アルゴリズムによる正規化スプライン曲線を使用して3Dグリッ" "ドのポイントを補間する" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "ユーザー定義3Dラスターマップの基礎情報を出力します " -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "3Dラスターマップにおいてボリューム統計解析値を作成" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -8854,1001 +9056,993 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "データベース(&D)" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "データベース情報" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "ドライバー一覧" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "テーブル一覧" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "データベースの全てのテーブルを表示します" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "テーブル定義" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "詳細なテーブル定義" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "列一覧" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "テーブルのすべての列を表示します " -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "データベース管理" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "接続 " -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "ログイン " -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "空のデータベースを作成する" -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "テーブル削除" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "属性テーブルの削除" -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "テーブルコピー" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "カラム削除" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "テストモード " -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" "データベースドライバのテスト, データベースは実存しdb.connectで接続されている" "必要があります" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "検索" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "テーブルの検索" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "SQL文" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "データベース接続" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "新規テーブル" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "ベクトルマップの指定されたレイヤーに新しい属性テーブルを作成・追加" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "テーブル削除" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "ベクトルマップ属性テーブルを消去" -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "テーブル結合" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "列追加" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "ベクトルマップに関連付けられている属性テーブルに列を追加する" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "ベクトルマップに接続された属性テーブルの列名を変更します" -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "列名称変更" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "ベクトルマップに接続された属性テーブルの列名を変更します" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "値の変更" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "ベクトルとデータベースの再接続" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "ベクトルマップ - データベース 接続設定" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "ベクトルマップと属性テーブルのDB接続を出力/設定" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "作成" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "インポート" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "ヘルプ(&H)" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "GRASSのヘルプ " -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "GUIのヘルプ " -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "システム情報 " -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "GRASS GIS について " -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "属性テーブルマネージャー" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 +#: ../gui/wxpython/menustrings.py:2057 msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "新しいモデルの作成 " - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" -msgstr "ファイルからモデルをロード " - -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "モデルをファイルに保存" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "モデルファイルを閉じる" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "イメージにエキスポート" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "Pythonにエキスポート" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "モデラー終了" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "モデラーウィンドウを閉じる" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "モデル(&M)" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "コマンド追加 " -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "データ追加" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "モデルにデータアイテムを追加" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "連携定義" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "データとアクションアイテムの関連付けを定義" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "条件追加" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "モデルに(if/else)条件追加" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "アイテム削除" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "モデルからアクション/データ消去" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "モデルプロパティ(名前,目的,etc.)" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "中間データ削除" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "モデル内に定義された中間データ削除" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "全体モデル実行" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "全体モデル検証" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "画像モデラーのHTMLマニュアルを表示" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "描画モデラーについて" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "画像モデラーに関する情報表示" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "用紙のサイズ、余白、方向を指定" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "マッピング命令を含むテキストファイルの読み込み" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "マッピング命令を含むテキストファイルを作成" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "ポストスクリプト出力ユーティリティ " -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "PDFへエクスポート" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "ポイントの作成" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "ps.map ダイアログ起動" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "終了 " -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "作図コンポーザーを閉じる" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "&挿入" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "縮尺" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "マップフレームの追加又は修正" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "ラスタマップの追加又は修正" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "ベクトルマップの追加又は修正" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "マップの凡例" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "ラスタとベクトルの凡例を追加又は修正" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "テキスト " -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "テキストレイヤー追加 " -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "画像" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "選択ロケーションを削除する" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -9881,7 +10075,7 @@ msgid "Text settings" msgstr "テキスト設定" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -9942,74 +10136,74 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "GRASSプロファイル解析ツール" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "断面" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "距離 (%s)" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "横断面に沿った距離" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "セル値" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "ラスター値" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "マップを表示するために横断面を設定する必要があります" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "断面がありません" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "カンマ区切り値 (*.csv)|*.csv" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" "Reason: %s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -10033,7 +10227,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "" @@ -10079,11 +10273,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "間違った領域" @@ -10108,11 +10302,11 @@ msgid "Label font size (pts):" msgstr "ラベルフォントサイズ （ポイント)：" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "フォント設定 " @@ -10128,402 +10322,401 @@ msgstr "スタイル：" msgid "Weight:" msgstr "太さ：" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "現在のセッションの変更を適用し、ダイアログを閉じる" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 +#: ../gui/wxpython/wxplot/dialogs.py:942 msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" -msgstr "警告" - -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "ライン色" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "線幅" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "ラインスタイル" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "凡例" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "横断面定義マーク設定" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "サイズ" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "ファイル " -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "スタイル" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "軸設定" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "X-軸" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "Y-軸" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "ユーザ定義最小値" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "ユーザ定義最大値" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "対数縮尺" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "グリッド 凡例 設定" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "グリッド色" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "グリッド表示" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "凡例フォントサイズ" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "凡例表示" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "選択可能な要素ではない" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "マップセット" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "タイプ" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "GSelect: 無効な項目: %s" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "GISデータディレクトリの選択" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "ファイル " -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "ディレクトリ" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "データベース " -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "プロトコル" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "出力タイプ" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "ソースタイプ" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "全ファイル" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "ファイル:" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "インポートするファイルを選択" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "ディレクトリ:" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "入力ディレクトリ選択 " -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "発光度" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "ファイルを選択" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "フィーチャタイプ：" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "フォーマット:" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "プロトコル:" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "ポイント" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -10563,13 +10756,13 @@ msgstr "翻訳" msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "" @@ -10585,106 +10778,106 @@ msgstr "" msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "言語" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "%s ファイルがありません" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "ファイル '%s'読み込み時のエラー" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "ライン" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "E-mail" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "国" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "OSGeo_ID" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "ファイル <%s> は見つかりませんでした" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "次(&N)" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "前(&P)" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 #, fuzzy msgid "Save output to a file" msgstr "モデルをファイルに保存" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -10692,7 +10885,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "" @@ -10777,7 +10970,7 @@ msgstr "" msgid "category" msgstr "カテゴリー" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "タイプ" @@ -10798,8 +10991,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -10825,433 +11018,452 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "ユーザー設定" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "デフォルトに戻す" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "デフォルト設定に戻す" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "設定は、現在のセッションに適用されますが、保存はされません" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "キー列は空白にはできません" -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "GUI設定" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "レイヤーマネージャー設定" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "レイヤツリーからマップレイヤーを削除する時に問い合わせる" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "ｗｘGUIの終了または画面を閉じる時に問い合わせる" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "フォント設定 " + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" +msgstr "現在のの画面レイアウトをデフォルトとして保存" + +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." +msgstr "" +"現在のレイヤマネージャー画面とマップ表示画面の位置とサイズを保存し、次のセッ" +"ションからデフォルトとして使用" + +#: ../gui/wxpython/gui_core/preferences.py:379 +#, fuzzy +msgid "Save current single window panes layout as default" +msgstr "現在のの画面レイアウトをデフォルトとして保存" + +#: ../gui/wxpython/gui_core/preferences.py:392 +#, fuzzy +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." +msgstr "" +"現在のレイヤマネージャー画面とマップ表示画面の位置とサイズを保存し、次のセッ" +"ションからデフォルトとして使用" + +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +#, fuzzy +msgid "Hide '{}' tab (requires GUI restart)" msgstr "%s'タブを隠す（GUIの再起動が必要です）" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 #, fuzzy msgid "History" msgstr "ヒストグラム" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" -msgstr "" - -#: ../gui/wxpython/gui_core/preferences.py:387 +#: ../gui/wxpython/gui_core/preferences.py:457 msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:392 +#: ../gui/wxpython/gui_core/preferences.py:462 msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 +#: ../gui/wxpython/gui_core/preferences.py:477 msgid "Workspace settings" msgstr "ワークスペース設定" -#: ../gui/wxpython/gui_core/preferences.py:417 +#: ../gui/wxpython/gui_core/preferences.py:487 msgid "Suppress positioning Map Display Window(s)" msgstr "マップ表示画面の位置を制限する" -#: ../gui/wxpython/gui_core/preferences.py:434 +#: ../gui/wxpython/gui_core/preferences.py:503 msgid "Suppress positioning Layer Manager window" msgstr "レイヤーマネージャー画面の位置を制限する" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" -msgstr "現在のの画面レイアウトをデフォルトとして保存" - -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." -msgstr "" -"現在のレイヤマネージャー画面とマップ表示画面の位置とサイズを保存し、次のセッ" -"ションからデフォルトとして使用" - -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 #, fuzzy msgid "Window layout settings" msgstr "一般設定" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 #, fuzzy msgid "Use single-window mode (requires GUI restart)" msgstr "アイコンテーマ（GUIの再起動が必要です）" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "コマンド出力のフォント:" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "フォント設定" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 #, fuzzy msgid "Font for manual pages:" msgstr "コマンド出力のフォント:" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "詳細設定" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "エレメントリスト：" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "マップ選択ポップアップウィンドウの高さ（ピクセル）" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "アイコンテーマ（GUIの再起動が必要です）" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "マップディスプレイ" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "GRASS表示のデフォルトフォント：" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "デフォルト画面設定" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "ディスプレイドライバ：" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "ステータスバーモード：" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "計算を行うための表示解像度を設定 " -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "自動レンダリングを有効にする" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "選択したマップレイヤーでオートズームを有効にする" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "レイヤーツリーに作成したマップを追加" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "対話形式の入力を許可" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "冗長レベル：" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "レイヤー" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "デフォルトラスター設定" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "デフォルトカラーテーブル" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "デフォルトベクトル設定" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "表示：" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "透過 " -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "シンボル：" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "属性" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "選択したフィーチャの強調表示" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "線幅（ピクセル）：" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "データブラウザ" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "左ボタンダブルクリック：" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "エンコード（例 utf-8, ascii, iso8859-1, koi8-r)：" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "テーブルからデータレコードを削除するときは問い合わせる" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "テーブル作成" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "キー列：" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "投影法" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "投影法ステータスバー設定" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "EPSGコード：" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "PROJ文字列（必須）:" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "EPSGファイル:" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" "ESPGコードの読み込み、ESPGコードの入力またはProj4ストリングを直接挿入する" -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "EPSGコードのロード(&L)" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "座標フォーマット" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "精度:" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "EPSGコードが読めません: %s" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "EPSGコード %s が見つかりません" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "デフォルトディスプレイフォントの選択" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" "デフォルトのディスプレイフォントの設定に失敗しました。別のフォントを試してく" "ださい。" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "デフォルトの出力フォントを選択" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "マップセットへのアクセスを管理" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11265,7 +11477,7 @@ msgstr "" " - 現在のマップセットのみ書き込み可能.\n" " - 自分が所有しているマップセットのみ書き込み可能." -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "所有者" @@ -11282,7 +11494,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "不透明度のセット <%s> " @@ -11404,7 +11616,7 @@ msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "フォントの選択 " @@ -11439,9 +11651,8 @@ msgid "Map Display Settings" msgstr "一般設定" #: ../gui/wxpython/gui_core/toolbars.py:86 -#, fuzzy -msgid "(Un)dock Map Display" -msgstr "マップディスプレイ" +msgid "(Un)dock" +msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 msgid "Clear" @@ -11464,7 +11675,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "適用(&A)" @@ -11522,7 +11733,7 @@ msgid "Optional" msgstr "オプション" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "モデルのパラメータ化" @@ -11534,79 +11745,79 @@ msgstr "[複数] " msgid "valid range" msgstr "有効範囲 " -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "カラー選択 " -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "選択 %s " -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "ロード(&L)" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "レイヤーID" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "レイヤー名" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "フィーチャタイプ" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "マニュアル " -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11614,94 +11825,94 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "保存するものがありません" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "%s でエラー " -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "コマンドを解析することができません '%s'" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "%(cmd)s: パラメーター '%(key)s' は利用できません" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "" @@ -11709,60 +11920,64 @@ msgstr "" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "GRASSのロケーションとマップセットを選択" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:143 +#, fuzzy +msgid "Project or mapset is not defined." +msgstr "mapwinのターゲットが定義されていません" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +#, fuzzy +msgid "Name of GRASS project:" msgstr "GRASSロケーショ名:" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "マップセット名:" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "GRASSロケーションからマップセット選択" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "ベクトルマップの選択" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "属性テーブル作成" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "新しいベクトルマップ名：" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "ベクトルマップを作れません <%s>" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" @@ -11771,322 +11986,322 @@ msgstr "" "不正もしくは空のキー項目\n" "ベクトルマップを作れません <%s>" -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " "overwrite it?" msgstr "ベクトルマップ <%s> は既に存在します。上書きしますか？" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "ロードする領域： " -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "領域保存：" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "すべて選択" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "マップ一覧：" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "マップタイプ:" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "トグル選択" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "マップセット：" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "選択の反転" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "全選択解除" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "レイヤーの透過度設定" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "透過 " -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "不透明" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "イメージサイズの設定" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "イメージサイズ" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "テンプレート:" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "SQL文" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "記号サイズ " -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "フォントの選択：" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "文字エンコーディング:" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "フォントサイズ:" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 #, fuzzy msgid "{} tools matched" msgstr "%d 個のモジュールが一致しました" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "設定保存" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "名前が指定されていません, 設定は保存されません." -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "コマンドを解析することができません %s" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12166,9 +12381,9 @@ msgid "Snap also to vertex" msgstr "頂点と共にスナップ " #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "スナップのしきい値は %(value).1f %(units)s " @@ -12190,141 +12405,141 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "デフォルトでは領域が重複している部分に存在するフィーチャが選択されます" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "重複のチェック" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "交差部分でラインを分割" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "エリアをデジタイズ" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "変更を保存" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "保存終了" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "クエリツール" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "クエリツールの選択" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "矩形で選択" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "長さ" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "ライン選択" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "より短い" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "より長い" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "ダングル" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "ダングル選択" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "フィーチャをデジタイズ" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "テーブルに新しいレコードを追加" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "レイヤー" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "カテゴリー" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "モード" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "次のを使用" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "カテゴリー番号" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "カテゴリーモード" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "手動入力" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "カテゴリーなし" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "既存のフィーチャを削除 " -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "テーブルからレコードを削除" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "ジオメトリ属性" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "エリア" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "周辺" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." @@ -12332,88 +12547,88 @@ msgstr "" "備考: これらの設定は、ベクトルデジタイザ優先でなくワークスペースに保存されて" "います" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "ハイライト" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "ハイライト（重複）" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "ライン" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "境界（エリアなし）" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "境界(1エリア)" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "境界(2エリア)" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "セントロイド（エリア）" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "セントロイド（エリア外）" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "セントロイド(重複エリア) " -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "ノード（１ライン）" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "ノード（２ライン）" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "頂点" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "エリア (閉空間 +セントロイド) " -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "方向" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "スナップ出来ません" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" "スナップのしきい値はs %(value).1f %(units)s (comp. resolutionを元にしていま" "す) " -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "ベクトルデジタイザー設定をファイルに保存 <%s>. " -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12434,210 +12649,210 @@ msgstr "" msgid "Topology missing" msgstr "トポロジーが有りません" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 #, fuzzy msgid "Digitize new point (Ctrl+P)" msgstr "ポイントをデジタイズ " -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "左: 新規ポイント " -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 #, fuzzy msgid "Digitize new line (Ctrl+L)" msgstr "ラインをデジタイズ " -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "Left: 新規ポイント; Ctrl+Left: 最後の点取り消し; Right: ラインを閉じる" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 #, fuzzy msgid "Digitize new boundary (Ctrl+B)" msgstr "境界をデジタイズ " -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 #, fuzzy msgid "Digitize new centroid (Ctrl+C)" msgstr "セントロイドをデジタイズ " -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "Left:選択; Ctrl+Left: 選択解除; Right: 確認" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "選択レコードの削除" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 #, fuzzy msgid "Display/update attributes (Ctrl+K)" msgstr "属性の表示/更新 " -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "左：選択 " -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 #, fuzzy msgid "Display/update categories (Ctrl+J)" msgstr "カテゴリーの表示/更新 " -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 #, fuzzy msgid "Edit selected line/boundary (Ctrl+E)" msgstr "選択したライン/境界を反転" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 msgid "Move selected vertex (Ctrl+G)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "選択したマップセット名を変更する " -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "設定 " -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "保存してデジタイズを終了" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 #, fuzzy msgid "Show manual (Ctrl+H)" msgstr "陰影図 " -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "追加ツール（コピー、フリップ、コネクト、etc.） " -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 #, fuzzy msgid "Undo previous change" msgstr "やり直し " -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 #, fuzzy msgid "Redo previous change" msgstr "以前の変更のやり直し" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "選択したライン/境界を交点で分割" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "選択したライン/境界を接続" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "カテゴリーコピー " -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "（背景の）ベクトルマップからフィーチャをコピー" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "属性表示" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "フィーチャタイプ変換" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "選択したライン/境界を反転" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "選択したライン/境界をマージ" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "選択したライン/境界（ノーののみ）をスナップ" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "ライン/境界の分割 " -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "フィーチャの検索" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "3DラインのZ軸ラベル設定" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "背景のベクターマップの選択" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "ベクトルマップは3Dではありません 処理はキャンセルされました" -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12646,44 +12861,44 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "しばらくお待ちください ベクトルマップ <%s> を開いています..." -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "ベクトルマップ <%s> を変更しますか?" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "変更を保存しますか？" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" "しばらくお待ちください ベクトルマップ <%s> のトポロジ再構成を行いファイルを閉" "じています... " -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "ベクトルマップ <%s> の修正は成城に終了しました" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "新しいベクトルマップ" @@ -12696,8 +12911,8 @@ msgid "Add new category" msgstr "新しいカテゴリーの追加" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "変更を保存する" @@ -12706,11 +12921,11 @@ msgid "Ignore changes and close dialog" msgstr "変更を行わずにダイアログを閉じる" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "変更してダイアログを閉じる " -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "フィーチャID：" @@ -12758,24 +12973,24 @@ msgstr "フィーチャID" msgid "Layer (Categories)" msgstr "レイヤー(カテゴリー)" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "デジタイザーエラー" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "ベクトルマップがオープンできません <%s>." -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "修正するベクトルマップがありません." -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "処理はキャンセルされました ." -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -12783,97 +12998,97 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "不明なフィーチャー形式 '%s'" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "線分として構成できない点列" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -12885,19 +13100,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -12916,32 +13131,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "しばらくお待ちください, イメージエクスポート中..." -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "保存領域をズーム" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "領域 <%s> が見つかりません.処理はキャンセルされました." -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "表示範囲を領域ファイルに保存" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "領域<%s>がすでに存在します。上書きしてよろしいですか? " @@ -13051,100 +13266,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "レイヤー追加(&A)" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13173,12 +13388,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "上" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "下" @@ -13252,11 +13467,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13267,50 +13482,50 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "GRASS GIS マネージャーGCP（地上基準点）" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "グループ選択：" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -13326,108 +13541,120 @@ msgstr "" msgid "3. Select GRASS Mapset" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "参照(&B)" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." msgstr "" #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "選択したロケーション名を変更する " + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "選択ロケーションを削除する" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "マップセットを削除" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "GRASSを実行する" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "GRASSデータベースをセット出来ません 設定をチェックして下さい" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13437,8 +13664,8 @@ msgstr "" "\n" "このマップセットの名前は変更できません." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13449,14 +13676,14 @@ msgstr "" "\n" "新しい名前:" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "メッセージ " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13467,7 +13694,7 @@ msgstr "" "\n" "マップセット <%s> はすでにロケーション内に存在します." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13478,7 +13705,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13489,7 +13716,7 @@ msgstr "" "\n" "ロケーション <%s> はすでにGRASSデータベース内に存在します." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13500,7 +13727,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13510,11 +13737,11 @@ msgstr "" "\n" "このマップセットの名前は削除できません." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" @@ -13522,11 +13749,11 @@ msgstr "" "\n" "マップセットに含まれるマップは全て削除されます! " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "マップセットを削除できません " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13537,37 +13764,37 @@ msgstr "" "\n" "このロケーションに含まれるすべてのマップが削除されます" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "ロケーションを作成できません" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "新しいマップセット名：" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13576,16 +13803,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "マップセットの作成ができません： %s " -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13603,12 +13830,12 @@ msgstr "" "\n" " .gislock ファイルを削除して継続を試みますか （この操作には権限が必要です）?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "ロックファイルが見つかりました" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13620,7 +13847,7 @@ msgstr "" "他にGRASSのセッションが動作中であれば、データを破損する可能性があります。タス" "クマネージャにて再度確認してください..." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13631,164 +13858,164 @@ msgstr "" "\n" "詳細: %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " "ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " "located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "Arc レイヤー" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "ノードレイヤー" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "トポロジ" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "ポイント" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "ノード" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "末端ポイント" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "ソースポイント" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -13796,7 +14023,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -13804,45 +14031,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -13850,38 +14077,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -13979,117 +14206,117 @@ msgstr "" msgid "Output" msgstr "出力 " -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "分析中..." -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "ノード計算中..." -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "その他の設定" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "ポイントスタイル:" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "" -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "ポイント編集" @@ -14105,41 +14332,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "変更を保存しますか? " -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "ラスターマップの変更を保存" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "ラスター化中..." -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -14181,7 +14408,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "新ラスターマップ" @@ -14212,19 +14439,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "パラメータ" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "パラメータ" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "ファイル " -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "リセット" @@ -14248,27 +14475,27 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" "ユーザーツールボックスのXMLファイルを解析できません. デフォルトのファイルが" "ロードされます." -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "ツールボックスディレクトリを作成できません" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "ユーザ定義ツールボックス" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "アドオン" @@ -14280,8 +14507,8 @@ msgstr "理由" msgid "Execution failed:" msgstr "実行失敗：" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "詳細：" @@ -14335,7 +14562,7 @@ msgstr "" "ファイル '%s' が作成出来ません\n" "\n" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14348,21 +14575,21 @@ msgstr "" "\n" "オプション <%(opt)s>: wxGUIでは標準入力からの読込はサポートされていません" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "モジュール <%s> が見つかりません." -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "データが矛盾した状態か破損して残っていますので注意してください" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "コマンド中止" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14383,147 +14610,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "セグメント中断" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "データポイント" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "アニメージョン" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "PERMANENT と 現在のマップセット以外を除去" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "PERMANENT以外を除去" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "現在のマップセット以外を除去" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "すべてを除去" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "全てを展開" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "選択レコードの修正" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "表示選択" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "クラシック（ラベルのみ）" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "ズーム後中心に" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "マウスの位置にズーム" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "存在しません" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "ボックス" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "球" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "立方体" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "菱形" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "アスター" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "ジャイロ" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "ヒストグラム" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "十字" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "円" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "コマンドを解析することができません %s\n" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14534,11 +14761,11 @@ msgstr "" "\t\t詳細： %(detail)s\n" "\t\t行： '%(line)s' \n" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "既存レコードの更新ができません" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14549,11 +14776,11 @@ msgstr "" "\n" "詳細： %(detail)s " -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "設定できません" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "コマンドを解析することができません '%s'" @@ -14622,22 +14849,22 @@ msgstr "" "\n" "エラー: WINDファイル: %s を読み込むことが出来ません\n" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "ラスターマップ <%s> をズーム出来ません" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "ベクトルマップを作れません <%s>" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "3Dラスタマップ <%s> ズームすることが出来ません" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14673,22 +14900,22 @@ msgstr " 行 %d：" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "ファイルが作成できません <%s>" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14697,33 +14924,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "オートレンダリング 許可/禁止 " @@ -14774,47 +15001,47 @@ msgstr "" msgid "Status bar" msgstr "ステータスバーモード：" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "レンダリング " -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "縮尺" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:516 +#: ../gui/wxpython/mapdisp/statusbar.py:518 #, fuzzy msgid "Go to XY coordinates" msgstr "GCP座標設定" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "投影法が定義されていません(設定をチェック)" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "投影法エラー(設定をチェック)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "ジオメトリ表示" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "座標" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 #, fuzzy msgid "Display extent" msgstr "ジオメトリ表示" @@ -14889,14 +15116,14 @@ msgid "Click mouse to unzoom" msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "2Dビュー " -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "3D表示" @@ -14916,47 +15143,47 @@ msgstr "ベクトルデジタイザは利用できません" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:178 +#: ../gui/wxpython/mapdisp/frame.py:163 #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "ベクトルデジタイザーツールバー " -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -14971,59 +15198,59 @@ msgstr "" "\n" "詳細: %s " -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "3D ビューモード スタート..." -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "しばらくお待ちください ロード中... " -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "更新するためのベクトルマップ <%s> が選択されていません" -#: ../gui/wxpython/mapdisp/frame.py:1136 +#: ../gui/wxpython/mapdisp/frame.py:1103 #, python-brace-format msgid "" "Failed to query vector map(s) <{maps}>. Check database settings and topology." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -17989,7 +18216,7 @@ msgstr "ラスターカテゴリー値またはパーセントの入力 " #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "範囲" ======= @@ -18505,8 +18732,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "列追加" @@ -21166,7 +21393,7 @@ msgid "List of %s layers" msgstr "%s レイヤ一覧" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -21180,13 +21407,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "インポート(&I)" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "選択レイヤーをインポート" @@ -21209,82 +21436,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "レイヤーツリーにレイヤーを追加 " #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "レイヤーツリーにインポートレイヤーを追加 " #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "リンク(&L)" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "選択レイヤーのリンク" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "DXFレイヤーのインポート " -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "インポートするDXFファイルを選択" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -21659,6 +21886,7 @@ msgid "3D Raster Map Calculator" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21670,6 +21898,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -21857,14 +22090,14 @@ msgstr "ロードする式のファイル名を選択" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -21872,15 +22105,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "データ ロード中... " -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -21890,7 +22123,7 @@ msgid "" "You can reduce number of cells in current region using command." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -21902,30 +22135,30 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -21936,114 +22169,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "新しい頂点を追加 " -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "頂点の移動 " -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "頂点の削除 " -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "" @@ -22111,99 +22344,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "カラーの選択 " -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "不透明度レベルの変更 " -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "非表示" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "表示" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "上部に移動" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "下部に移動" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "カテゴリを上に移動" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "カテゴリを下に移動" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "クラスラスタのエクスポート" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -22557,7 +22791,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -22565,7 +22799,7 @@ msgid "" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -22669,6 +22903,7 @@ msgstr "警告" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22680,6 +22915,11 @@ msgstr "警告" ======= >>>>>>> 8422103f4c (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 "" @@ -22732,7 +22972,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -22740,37 +22980,38 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "ワークスペース ツールバー" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "マップツールバー " -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "3Dビューツールバー" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/mapwin/decorations.py:203 @@ -22779,7 +23020,13 @@ 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 msgid "Map Swipe Tool" msgstr "マップツールバー " @@ -22789,22 +23036,38 @@ msgid "Text properties" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main msgstr "" +#: ../gui/wxpython/mapwin/decorations.py:226 +msgid "Remove scale bar" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +msgstr "" +>>>>>>> osgeo-main + #: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "実行するモデルの選択" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -22987,6 +23250,10 @@ msgstr "" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " @@ -22995,138 +23262,139 @@ msgstr "" "コマンド '%s' はまだGUIで実装されていません. コマンドラインより実行してくださ" "い." -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "選択した地図はベクトルではありません." -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "編集は、現在のマップセットからベクトルマップにのみ許可されています" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "実行するスクリプトファイルの選択" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "Python スクリプト (*.py)|*.py|Bash スクリプト (*.sh)|*.sh" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "スクリプト実行 '%s'..." -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "" +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "領域 <%s> が見つかりません.処理はキャンセルされました." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -23134,37 +23402,37 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "レイヤーツリーにレイヤーを追加 " -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "不透明度：" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -23175,26 +23443,26 @@ msgstr "" "%s\n" " レイヤーツリーから削除しますか? " -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "レイヤーツリーから選択したマップレイヤーを削除しますか? " -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "マップレイヤーの削除 " -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "GRASS GUI 終了 " -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341 +#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355 msgid "Constrain map to region geometry?" msgstr "ジオメトリをマップに割り当てますか？" @@ -23206,6 +23474,7 @@ msgstr "" msgid "Please provide a raster map name to process" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/wxplot/histogram.py:43 @@ -23215,6 +23484,8 @@ msgid "Histogram Tool" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/photo2image/g.gui.photo2image.py:109 msgid "Please provide a camera name (generated by i.ortho.camera)" msgstr "" @@ -23231,55 +23502,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "" @@ -23352,7 +23623,7 @@ msgstr "" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "マップレイヤー" @@ -23384,112 +23655,117 @@ msgstr "マップから計算領域をセット " msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "カラーテーブルのセット" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "属性データを表示 " -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "編集開始 " -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "編集終了 " -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "トポロジーの再ビルド" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "ラスター統計レポート" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "プロファイル" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "ラスターマップの断面を作成できません " -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +#, fuzzy +msgid "Set opacity of <{}>" +msgstr "不透明度のセット <%s> " + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "レイヤーグループ： " -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "クリックでレイヤー設定の編集 " -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "(ダブルクリックでプロパティの設定) " -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "データの更新中 しばらくお待ちください... " @@ -23512,6 +23788,9 @@ msgid "Histogram Tool" #: ../gui/wxpython/wxplot/histogram.py:43 msgid "Histogram Tool" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27516,6 +27795,9 @@ msgid "Interactive editing and digitization of vector maps." ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -27897,6 +28179,15 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" +"現在のロケーションは <%(loc)s>.\n" +"現在のマップセットは <%(mapset)s>." + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 ======= @@ -28135,24 +28426,39 @@ msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/dbmgr/manager.py:114 +======= #: ../gui/wxpython/dbmgr/manager.py:113 ======= #: ../gui/wxpython/startup/guiutils.py:717 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28164,6 +28470,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " @@ -28171,11 +28486,14 @@ msgid "" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "ベクトルマップ <%s> はDB接続の定義がされていません 接続の設定は レイヤー管" "理' タブで行ってください" ======= @@ -28183,41 +28501,44 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "しばらくお待ちください 属性データをロード中．．． " -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "データブラウザ" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "テーブル管理" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "レイヤー管理" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "属性テーブルマネージャーを閉じる" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "ロードされたレコード数: %d" @@ -28231,93 +28552,93 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "データベース接続" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "SQL文をデフォルトに設定" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "ダイアログを閉じる" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "列" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "値" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "すべての値を取得" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "サンプルを取得" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "実行してダイアログを閉じる" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "例: %s" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "確認" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "SQL文の確認" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "SQL文が有効ではありません" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "SQL文が有効ではありません" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -28328,35 +28649,35 @@ msgstr "" "\n" "%s " -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "SQL文は有効です" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:184 +#: ../gui/wxpython/dbmgr/base.py:185 #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " @@ -28365,23 +28686,23 @@ msgstr "" "属性テ-ブル <%s>が見つかりません 作成するためには 'レイヤー管理' タブで行って" "ください" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "列 <%(column)s>がテーブル <%(table)s>には見つかりません" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "256列までしか表示出来ません" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -28390,21 +28711,21 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "不明な値" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" "値をデコードすることができません。 GUIの設定で、エンコーディング設定 ('属性')" "してください" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -28417,164 +28738,164 @@ msgstr "" "\n" "詳細: %(detail)s" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "昇順で並び替え" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "降順で並び替え" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "計算（数値のカラムのみ）" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "エリア サイズ" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "ライン長" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "領域のコンパクト化" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "ポリゴンを定義する境界のフラクタル次元" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "アリアの境界長" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "各カテゴリのフューチャーの数" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "3Dラインのスロープ勾配線" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "ライン湾曲" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "ライン方位" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "列をテーブルに追加出来ません 列名が定義されていません" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "既に列 <%(column)s>はテーブル <%(table)s>に存在します" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "属性デ-タ - 右クリックで レコードの編集/マージ" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "テーブル" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "SQL検索" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "シンプル" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "SELECT文を実行しデータレコードを再ロード" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "SQLビルダー" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "新規レコードの挿入" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "選択レコードの削除" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "全レコード削除" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "選択したフィーチャの強調表示しズーム" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "選択したフィーチャを抽出" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "選択されたフィーチャを削除 " -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "既存レコードの更新" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "値 '%(value)s' は %(type)s として入力しなければなりません" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "カテゴリー番号 %d は既にテーブルに登録されています" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "カテゴリー番号 (列 %s)がありません" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " @@ -28583,11 +28904,11 @@ msgstr "" "選択したレコード (%d) は、テーブルから完全に消去されます 削除してよろしいで" "すか?" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "レコード削除" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " @@ -28596,15 +28917,15 @@ msgstr "" "全てのレコード (%d) は、テーブルから完全に消去されます 削除してよろしいです" "か?" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "抽出するものがありません" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "削除するものがありません" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -28615,7 +28936,7 @@ msgstr "" "\n" "%s" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -28628,67 +28949,67 @@ msgstr "" "\n" "%s " -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "テーブル <%s> - 右クリックで列を削除" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "列" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "長さ" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "加算" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "列名を変更ができません 列名が定義されていません" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -"列名を <%(column)s> から <%(columnTo)s> へ変更出来ません テーブル <" -"%(table)s> に既に定義されています" +"列名を <%(column)s> から <%(columnTo)s> へ変更出来ません テーブル " +"<%(table)s> に既に定義されています" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" "列名を変更することができません 列 <%(column)s>はテーブル <%(table)s> には存" "在しません" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "選択した列を消去" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "全列を消去" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " "column?" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "カラム消去" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -28699,91 +29020,91 @@ msgstr "" "%s\n" "は完全にテーブルから消去されます カラムを消去してよろしいですか?" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "レイヤ一覧 " -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "属性テーブルにリンクされているものを消去 (%s) " -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "列名" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "データ長" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "ドライバ" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "キー" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "レイヤー追加" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "レイヤー説明" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "キー列" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "テーブルの各々のカテゴリーにレコードを追加" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "v.category でカテゴリーを追加する必要があります" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "テーブル説明" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "テーブル名" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "テーブル作成(&C)" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "デフォルト設定(&S)" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "レイヤー消去" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "消去するレイヤー" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "レイヤー削除(&R)" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "レイヤー変更" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "レイヤー変更(&M)" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." @@ -28791,18 +29112,18 @@ msgstr "" "テーブル一覧を取得出来ません\n" "DBパラメータをセットするため db.connect を使用してください" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" "新しいテーブルを作成することができません テーブル名またはキー列名がありませ" "ん" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "新しいテーブルは作成出来ません テーブル <%s> は既に存在します" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " @@ -28811,38 +29132,44 @@ msgstr "" "ベクトルマップ<%(vector)s>に新しいレイヤーを追加することはできません .レイ" "ヤー %(layer)dは既に存在します" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/dialogs.py:80 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/dialogs.py:79 ======= #: ../gui/wxpython/dbmgr/sqlbuilder.py:133 @@ -29004,6 +29331,10 @@ msgstr "" #: ../gui/wxpython/dbmgr/dialogs.py:76 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "No attribute table found.\n" @@ -29012,40 +29343,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "実行してダイアログを閉じる" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "属性が見つかりません" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "属性定義" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "属性表示" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "リロード(&R)" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "実行(&S)" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "不明" @@ -29157,7 +29488,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "" @@ -29175,84 +29506,90 @@ msgstr "" msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "" -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " "each animation." msgstr "" -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "" -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "" -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "" -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/utils.py:209 ======= #: ../gui/wxpython/gui_core/gselect.py:886 @@ -29526,60 +29863,64 @@ msgstr "ファイル" #: ../gui/wxpython/gui_core/goutput.py:388 #, python-format >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 "" -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "" @@ -29692,7 +30033,7 @@ msgid "" msgstr "" #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "凡例表示" @@ -29770,7 +30111,7 @@ msgid "Edit" msgstr "" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "フォーマット" @@ -29881,518 +30222,1162 @@ msgstr "" msgid "Additional options:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1288 +#: ../gui/wxpython/animation/dialogs.py:1288 +msgid "" +"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " +"Options depend on ffmpeg version." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1320 +#, python-format +msgid "Current frame rate: %.2f fps" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1447 +#, python-format +msgid "File %s not found." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1451 +msgid "Decoration image file is missing." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1459 +#, python-format +msgid "Directory %s not found." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1461 +msgid "Export directory is missing." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1520 +msgid "Time stamp" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1544 +#, python-brace-format +msgid "Exported file directory '{base_dir}' does not exist." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1547 +msgid "Export file is missing." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1568 +#, python-brace-format +msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1654 +msgid "Add space-time dataset layer" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1676 +msgid "Multiple raster maps" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1677 +msgid "Multiple vector maps" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1678 +msgid "Multiple 3D raster maps" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1679 +msgid "Space time raster dataset" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1680 +msgid "Space time vector dataset" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1681 +msgid "Space time 3D raster dataset" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1720 +msgid "Input data type:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1797 +msgid "Select raster/vector maps." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1825 +msgid "Please select maps or dataset first." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1855 +msgid "Animation Tool settings" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1919 +msgid "Number of parallel processes:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1940 +msgid "Text foreground color:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1956 +msgid "Text background color:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:1989 +msgid "Absolute time format:" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:2007 +msgid "" +"Click and then press key up or down to preview different date and time " +"formats. Type custom format string." +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:2025 +msgid "Learn more about formatting options" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:2039 +msgid "Display instances with no data" +msgstr "" + +#: ../gui/wxpython/animation/dialogs.py:2042 +msgid "" +"When animating instant-based data which have irregular timestamps you can " +"display 'no data frame' (checked option) or keep last frame." +msgstr "" + +<<<<<<< HEAD +#: ../gui/wxpython/animation/dialogs.py:2073 +msgid "Invalid" +======= +#: ../gui/wxpython/gui_core/preferences.py:1721 +msgid "EPSG code:" +msgstr "EPSGコード：" + +#: ../gui/wxpython/gui_core/preferences.py:1739 +msgid "PROJ string (required):" +msgstr "PROJ文字列（必須）:" + +#: ../gui/wxpython/gui_core/preferences.py:1756 +msgid "EPSG file:" +msgstr "EPSGファイル:" + +#: ../gui/wxpython/gui_core/preferences.py:1773 +msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." +msgstr "ESPGコードの読み込み、ESPGコードの入力またはProj4ストリングを直接挿入する" + +#: ../gui/wxpython/gui_core/preferences.py:1781 +msgid "&Load EPSG codes" +msgstr "EPSGコードのロード(&L)" + +#: ../gui/wxpython/gui_core/preferences.py:1801 +msgid "Coordinates format" +msgstr "座標フォーマット" + +#: ../gui/wxpython/gui_core/preferences.py:1809 +msgid "Lat/long projections" +<<<<<<< HEAD +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1830 +msgid "Precision:" +msgstr "精度:" + +#: ../gui/wxpython/gui_core/preferences.py:1916 +#, python-format +msgid "Unable to read EPSG codes: %s" +msgstr "EPSGコードが読めません: %s" + +#: ../gui/wxpython/gui_core/preferences.py:1949 +#: ../gui/wxpython/gui_core/preferences.py:1961 +#: ../gui/wxpython/gui_core/preferences.py:1973 +#, python-format +msgid "EPSG code %s not found" +msgstr "EPSGコード %s が見つかりません" + +#: ../gui/wxpython/gui_core/preferences.py:1983 +msgid "Select default display font" +msgstr "デフォルトディスプレイフォントの選択" + +#: ../gui/wxpython/gui_core/preferences.py:1997 +msgid "Failed to set default display font. Try different font." +msgstr "デフォルトのディスプレイフォントの設定に失敗しました。別のフォントを試してください。" + +#: ../gui/wxpython/gui_core/preferences.py:2016 +msgid "Select default output font" +msgstr "デフォルトの出力フォントを選択" + +#: ../gui/wxpython/gui_core/preferences.py:2105 +msgid "Manage access to mapsets" +msgstr "マップセットへのアクセスを管理" + +#: ../gui/wxpython/gui_core/preferences.py:2120 +msgid "" +"Check a mapset to make it accessible, uncheck it to hide it.\n" +" Notes:\n" +" - The current mapset is always accessible.\n" +" - You may only write to the current mapset.\n" +" - You may only write to mapsets which you own." +msgstr "" +"チェックするとマップセットにアクセス可能, チェックを外すと非表示.\n" +" 注記:\n" +" - 現在のマップセットは常にアクセス可能.\n" +" - 現在のマップセットのみ書き込み可能.\n" +" - 自分が所有しているマップセットのみ書き込み可能." + +#: ../gui/wxpython/gui_core/preferences.py:2197 +msgid "Owner" +msgstr "所有者" + +#: ../gui/wxpython/gui_core/dialogs.py:74 +msgid "Required item is not set." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:105 +msgid "Select GRASS location and mapset" +msgstr "GRASSのロケーションとマップセットを選択" + +#: ../gui/wxpython/gui_core/dialogs.py:125 +msgid "Location or mapset is not defined." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:135 +msgid "Name of GRASS location:" +msgstr "GRASSロケーショ名:" + +#: ../gui/wxpython/gui_core/dialogs.py:146 +#: ../gui/wxpython/gui_core/dialogs.py:203 +msgid "Name of mapset:" +msgstr "マップセット名:" + +#: ../gui/wxpython/gui_core/dialogs.py:175 +msgid "Select mapset in GRASS location" +msgstr "GRASSロケーションからマップセット選択" + +#: ../gui/wxpython/gui_core/dialogs.py:195 +msgid "Name of mapset is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:216 +#: ../gui/wxpython/vdigit/toolbars.py:840 +#: ../gui/wxpython/vdigit/toolbars.py:997 +#: ../gui/wxpython/vdigit/toolbars.py:1095 +msgid "Select vector map" +msgstr "ベクトルマップの選択" + +#: ../gui/wxpython/gui_core/dialogs.py:230 +msgid "Name of vector map is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:292 +msgid "Create attribute table" +msgstr "属性テーブル作成" + +#: ../gui/wxpython/gui_core/dialogs.py:326 +msgid "Name of new vector map is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:348 +msgid "Name for new vector map:" +msgstr "新しいベクトルマップ名：" + +#: ../gui/wxpython/gui_core/dialogs.py:450 +#, python-format +msgid "Unable to create vector map <%s>." +msgstr "ベクトルマップを作れません <%s>" + +#: ../gui/wxpython/gui_core/dialogs.py:455 +#, python-format +msgid "" +"Invalid or empty key column.\n" +"Unable to create vector map <%s>." +msgstr "" +"不正もしくは空のキー項目\n" +"ベクトルマップを作れません <%s>" + +#: ../gui/wxpython/gui_core/dialogs.py:486 +#, python-format +msgid "Vector map <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "ベクトルマップ <%s> は既に存在します。上書きしますか？" + +#: ../gui/wxpython/gui_core/dialogs.py:576 +msgid "Load region:" +msgstr "ロードする領域： " + +#: ../gui/wxpython/gui_core/dialogs.py:582 +msgid "Save region:" +msgstr "領域保存：" + +#: ../gui/wxpython/gui_core/dialogs.py:634 +msgid "Name cannot begin with '.' and must not contain space, quotes, '/', ''', '@', ',', '=', '*', and all other non-alphanumeric characters." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:650 +msgid "Create or edit imagery groups" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:684 +msgid "Apply changes to selected group and close dialog" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:685 +msgid "Apply changes to selected group" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:686 +msgid "Close dialog, changes are not applied" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:727 +#: ../gui/wxpython/gui_core/dialogs.py:1524 +msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Select existing group or enter name of new group:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:745 +msgid "Edit/create subgroup" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:758 +msgid "Select existing subgroup or enter name of new subgroup:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:791 +#: ../gui/wxpython/gui_core/dialogs.py:859 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +msgid "Pattern:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:809 +#: ../gui/wxpython/gui_core/dialogs.py:877 +#: ../gui/wxpython/gui_core/dialogs.py:1533 +msgid "List of maps:" +msgstr "マップ一覧：" + +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select map layers and add them to the list." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:830 +msgid "Remove selected layer(s) from list." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Check maps from group to be included into subgroup." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1051 +msgid "Add selected map layers into group" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1188 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1191 +#: ../gui/wxpython/gui_core/dialogs.py:1207 +msgid "Unapplied changes" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1204 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1261 +msgid "No raster maps selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1290 +#, python-format +msgid "No changes to apply in group <%s>." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1293 +#, python-format +msgid "Group <%s> was successfully created." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1295 +#, python-format +msgid "Group <%s> was successfully changed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1298 +#, python-format +msgid "Creating of new group <%s> failed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1300 +#, python-format +msgid "Changing of group <%s> failed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1339 +msgid "No group selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1344 +msgid "No subgroup selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1451 +msgid "Use fully-qualified map names" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1477 +msgid "Map type:" +msgstr "マップタイプ:" + +#: ../gui/wxpython/gui_core/dialogs.py:1492 +msgid "Select toggle" +msgstr "トグル選択" + +#: ../gui/wxpython/gui_core/dialogs.py:1499 +msgid "Mapset:" +msgstr "マップセット：" + +#: ../gui/wxpython/gui_core/dialogs.py:1593 +msgid "Invert selection" +msgstr "選択の反転" + +#: ../gui/wxpython/gui_core/dialogs.py:1736 +#, python-format +msgid "Dynamic series (%s)" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1763 +msgid "Set Map Layer Opacity" +msgstr "レイヤーの透過度設定" + +#: ../gui/wxpython/gui_core/dialogs.py:1794 +#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 +#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 +msgid "transparent" +msgstr "透過 " + +#: ../gui/wxpython/gui_core/dialogs.py:1797 +msgid "opaque" +msgstr "不透明" + +#: ../gui/wxpython/gui_core/dialogs.py:1898 +msgid "Set image size" +msgstr "イメージサイズの設定" + +#: ../gui/wxpython/gui_core/dialogs.py:1913 +msgid "Image size" +msgstr "イメージサイズ" + +#: ../gui/wxpython/gui_core/dialogs.py:1960 +msgid "Template:" +msgstr "テンプレート:" + +#: ../gui/wxpython/gui_core/dialogs.py:2000 +msgid "SQL Query Utility" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2016 +msgid " SQL statement " +msgstr "SQL文" + +#: ../gui/wxpython/gui_core/dialogs.py:2064 +msgid "Symbols" +msgstr "記号サイズ " + +#: ../gui/wxpython/gui_core/dialogs.py:2099 +msgid "Symbol directory:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2111 +msgid "Symbol name:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2364 +msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2369 +msgid "Do you want to quit GRASS GIS?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2448 +msgid "Select font:" +msgstr "フォントの選択：" + +#: ../gui/wxpython/gui_core/dialogs.py:2479 +msgid "Character encoding:" +msgstr "文字エンコーディング:" + +#: ../gui/wxpython/gui_core/dialogs.py:2497 +#: ../gui/wxpython/psmap/dialogs.py:397 ../gui/wxpython/psmap/dialogs.py:4980 +msgid "Font size:" +msgstr "フォントサイズ:" + +#: ../gui/wxpython/gui_core/dialogs.py:2549 +msgid "Example" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1830 +msgid "Precision:" +msgstr "精度:" + +#: ../gui/wxpython/gui_core/preferences.py:1916 +#, python-format +msgid "Unable to read EPSG codes: %s" +msgstr "EPSGコードが読めません: %s" + +#: ../gui/wxpython/gui_core/preferences.py:1949 +#: ../gui/wxpython/gui_core/preferences.py:1961 +#: ../gui/wxpython/gui_core/preferences.py:1973 +#, python-format +msgid "EPSG code %s not found" +msgstr "EPSGコード %s が見つかりません" + +#: ../gui/wxpython/gui_core/preferences.py:1983 +msgid "Select default display font" +msgstr "デフォルトディスプレイフォントの選択" + +#: ../gui/wxpython/gui_core/preferences.py:1997 +msgid "Failed to set default display font. Try different font." +msgstr "デフォルトのディスプレイフォントの設定に失敗しました。別のフォントを試してください。" + +#: ../gui/wxpython/gui_core/preferences.py:2016 +msgid "Select default output font" +msgstr "デフォルトの出力フォントを選択" + +#: ../gui/wxpython/gui_core/preferences.py:2105 +msgid "Manage access to mapsets" +msgstr "マップセットへのアクセスを管理" + +#: ../gui/wxpython/gui_core/preferences.py:2120 +msgid "" +"Check a mapset to make it accessible, uncheck it to hide it.\n" +" Notes:\n" +" - The current mapset is always accessible.\n" +" - You may only write to the current mapset.\n" +" - You may only write to mapsets which you own." +msgstr "" +"チェックするとマップセットにアクセス可能, チェックを外すと非表示.\n" +" 注記:\n" +" - 現在のマップセットは常にアクセス可能.\n" +" - 現在のマップセットのみ書き込み可能.\n" +" - 自分が所有しているマップセットのみ書き込み可能." + +#: ../gui/wxpython/gui_core/preferences.py:2197 +msgid "Owner" +msgstr "所有者" + +#: ../gui/wxpython/gui_core/dialogs.py:74 +msgid "Required item is not set." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:105 +msgid "Select GRASS location and mapset" +msgstr "GRASSのロケーションとマップセットを選択" + +#: ../gui/wxpython/gui_core/dialogs.py:125 +msgid "Location or mapset is not defined." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:135 +msgid "Name of GRASS location:" +msgstr "GRASSロケーショ名:" + +#: ../gui/wxpython/gui_core/dialogs.py:146 +#: ../gui/wxpython/gui_core/dialogs.py:203 +msgid "Name of mapset:" +msgstr "マップセット名:" + +#: ../gui/wxpython/gui_core/dialogs.py:175 +msgid "Select mapset in GRASS location" +msgstr "GRASSロケーションからマップセット選択" + +#: ../gui/wxpython/gui_core/dialogs.py:195 +msgid "Name of mapset is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:216 +#: ../gui/wxpython/vdigit/toolbars.py:840 +#: ../gui/wxpython/vdigit/toolbars.py:997 +#: ../gui/wxpython/vdigit/toolbars.py:1095 +msgid "Select vector map" +msgstr "ベクトルマップの選択" + +#: ../gui/wxpython/gui_core/dialogs.py:230 +msgid "Name of vector map is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:292 +msgid "Create attribute table" +msgstr "属性テーブル作成" + +#: ../gui/wxpython/gui_core/dialogs.py:326 +msgid "Name of new vector map is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:348 +msgid "Name for new vector map:" +msgstr "新しいベクトルマップ名：" + +#: ../gui/wxpython/gui_core/dialogs.py:450 +#, python-format +msgid "Unable to create vector map <%s>." +msgstr "ベクトルマップを作れません <%s>" + +#: ../gui/wxpython/gui_core/dialogs.py:455 +#, python-format msgid "" -"Consider adding '-sameq' or '-qscale 1' if not satisfied with video quality. " -"Options depend on ffmpeg version." +"Invalid or empty key column.\n" +"Unable to create vector map <%s>." msgstr "" +"不正もしくは空のキー項目\n" +"ベクトルマップを作れません <%s>" -#: ../gui/wxpython/animation/dialogs.py:1320 +#: ../gui/wxpython/gui_core/dialogs.py:486 #, python-format -msgid "Current frame rate: %.2f fps" -msgstr "" +msgid "Vector map <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "ベクトルマップ <%s> は既に存在します。上書きしますか？" -#: ../gui/wxpython/animation/dialogs.py:1447 -#, python-format -msgid "File %s not found." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:576 +msgid "Load region:" +msgstr "ロードする領域： " -#: ../gui/wxpython/animation/dialogs.py:1451 -msgid "Decoration image file is missing." -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:582 +msgid "Save region:" +msgstr "領域保存：" -#: ../gui/wxpython/animation/dialogs.py:1459 -#, python-format -msgid "Directory %s not found." +#: ../gui/wxpython/gui_core/dialogs.py:634 +msgid "Name cannot begin with '.' and must not contain space, quotes, '/', ''', '@', ',', '=', '*', and all other non-alphanumeric characters." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1461 -msgid "Export directory is missing." +#: ../gui/wxpython/gui_core/dialogs.py:650 +msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1520 -msgid "Time stamp" +#: ../gui/wxpython/gui_core/dialogs.py:684 +msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1544 -#, python-brace-format -msgid "Exported file directory '{base_dir}' does not exist." +#: ../gui/wxpython/gui_core/dialogs.py:685 +msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1547 -msgid "Export file is missing." +#: ../gui/wxpython/gui_core/dialogs.py:686 +msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1568 -#, python-brace-format -msgid "Exported animation file <{file}> exists. Do you want to overwrite it?" +#: ../gui/wxpython/gui_core/dialogs.py:727 +#: ../gui/wxpython/gui_core/dialogs.py:1524 +msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1654 -msgid "Add space-time dataset layer" +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1676 -msgid "Multiple raster maps" +#: ../gui/wxpython/gui_core/dialogs.py:745 +msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1677 -msgid "Multiple vector maps" +#: ../gui/wxpython/gui_core/dialogs.py:758 +msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1678 -msgid "Multiple 3D raster maps" +#: ../gui/wxpython/gui_core/dialogs.py:791 +#: ../gui/wxpython/gui_core/dialogs.py:859 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +msgid "Pattern:" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1679 -msgid "Space time raster dataset" -msgstr "" +#: ../gui/wxpython/gui_core/dialogs.py:809 +#: ../gui/wxpython/gui_core/dialogs.py:877 +#: ../gui/wxpython/gui_core/dialogs.py:1533 +msgid "List of maps:" +msgstr "マップ一覧：" -#: ../gui/wxpython/animation/dialogs.py:1680 -msgid "Space time vector dataset" +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1681 -msgid "Space time 3D raster dataset" +#: ../gui/wxpython/gui_core/dialogs.py:830 +msgid "Remove selected layer(s) from list." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1720 -msgid "Input data type:" +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1797 -msgid "Select raster/vector maps." +#: ../gui/wxpython/gui_core/dialogs.py:1051 +msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1825 -msgid "Please select maps or dataset first." +#: ../gui/wxpython/gui_core/dialogs.py:1188 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1855 -msgid "Animation Tool settings" +#: ../gui/wxpython/gui_core/dialogs.py:1191 +#: ../gui/wxpython/gui_core/dialogs.py:1207 +msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1919 -msgid "Number of parallel processes:" +#: ../gui/wxpython/gui_core/dialogs.py:1204 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1940 -msgid "Text foreground color:" +#: ../gui/wxpython/gui_core/dialogs.py:1261 +msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1956 -msgid "Text background color:" +#: ../gui/wxpython/gui_core/dialogs.py:1290 +#, python-format +msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:1989 -msgid "Absolute time format:" +#: ../gui/wxpython/gui_core/dialogs.py:1293 +#, python-format +msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2007 -msgid "" -"Click and then press key up or down to preview different date and time " -"formats. Type custom format string." +#: ../gui/wxpython/gui_core/dialogs.py:1295 +#, python-format +msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2025 -msgid "Learn more about formatting options" +#: ../gui/wxpython/gui_core/dialogs.py:1298 +#, python-format +msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2039 -msgid "Display instances with no data" +#: ../gui/wxpython/gui_core/dialogs.py:1300 +#, python-format +msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/animation/dialogs.py:2042 -msgid "" -"When animating instant-based data which have irregular timestamps you can " -"display 'no data frame' (checked option) or keep last frame." +#: ../gui/wxpython/gui_core/dialogs.py:1339 +msgid "No group selected." msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/animation/dialogs.py:2073 -msgid "Invalid" -======= -#: ../gui/wxpython/gui_core/preferences.py:1721 -msgid "EPSG code:" -msgstr "EPSGコード：" +#: ../gui/wxpython/gui_core/dialogs.py:1344 +msgid "No subgroup selected." +msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1739 -msgid "PROJ string (required):" -msgstr "PROJ文字列（必須）:" +#: ../gui/wxpython/gui_core/dialogs.py:1451 +msgid "Use fully-qualified map names" +msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 -msgid "EPSG file:" -msgstr "EPSGファイル:" +#: ../gui/wxpython/gui_core/dialogs.py:1477 +msgid "Map type:" +msgstr "マップタイプ:" -#: ../gui/wxpython/gui_core/preferences.py:1773 -msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." -msgstr "ESPGコードの読み込み、ESPGコードの入力またはProj4ストリングを直接挿入する" +#: ../gui/wxpython/gui_core/dialogs.py:1492 +msgid "Select toggle" +msgstr "トグル選択" -#: ../gui/wxpython/gui_core/preferences.py:1781 -msgid "&Load EPSG codes" -msgstr "EPSGコードのロード(&L)" +#: ../gui/wxpython/gui_core/dialogs.py:1499 +msgid "Mapset:" +msgstr "マップセット：" -#: ../gui/wxpython/gui_core/preferences.py:1801 -msgid "Coordinates format" -msgstr "座標フォーマット" +#: ../gui/wxpython/gui_core/dialogs.py:1593 +msgid "Invert selection" +msgstr "選択の反転" -#: ../gui/wxpython/gui_core/preferences.py:1809 -msgid "Lat/long projections" +#: ../gui/wxpython/gui_core/dialogs.py:1736 +#, python-format +msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1830 -msgid "Precision:" -msgstr "精度:" - -#: ../gui/wxpython/gui_core/preferences.py:1916 -#, python-format -msgid "Unable to read EPSG codes: %s" -msgstr "EPSGコードが読めません: %s" +#: ../gui/wxpython/gui_core/dialogs.py:1763 +msgid "Set Map Layer Opacity" +msgstr "レイヤーの透過度設定" -#: ../gui/wxpython/gui_core/preferences.py:1949 -#: ../gui/wxpython/gui_core/preferences.py:1961 -#: ../gui/wxpython/gui_core/preferences.py:1973 -#, python-format -msgid "EPSG code %s not found" -msgstr "EPSGコード %s が見つかりません" +#: ../gui/wxpython/gui_core/dialogs.py:1794 +#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 +#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 +msgid "transparent" +msgstr "透過 " -#: ../gui/wxpython/gui_core/preferences.py:1983 -msgid "Select default display font" -msgstr "デフォルトディスプレイフォントの選択" +#: ../gui/wxpython/gui_core/dialogs.py:1797 +msgid "opaque" +msgstr "不透明" -#: ../gui/wxpython/gui_core/preferences.py:1997 -msgid "Failed to set default display font. Try different font." -msgstr "デフォルトのディスプレイフォントの設定に失敗しました。別のフォントを試してください。" +#: ../gui/wxpython/gui_core/dialogs.py:1898 +msgid "Set image size" +msgstr "イメージサイズの設定" -#: ../gui/wxpython/gui_core/preferences.py:2016 -msgid "Select default output font" -msgstr "デフォルトの出力フォントを選択" +#: ../gui/wxpython/gui_core/dialogs.py:1913 +msgid "Image size" +msgstr "イメージサイズ" -#: ../gui/wxpython/gui_core/preferences.py:2105 -msgid "Manage access to mapsets" -msgstr "マップセットへのアクセスを管理" +#: ../gui/wxpython/gui_core/dialogs.py:1960 +msgid "Template:" +msgstr "テンプレート:" -#: ../gui/wxpython/gui_core/preferences.py:2120 -msgid "" -"Check a mapset to make it accessible, uncheck it to hide it.\n" -" Notes:\n" -" - The current mapset is always accessible.\n" -" - You may only write to the current mapset.\n" -" - You may only write to mapsets which you own." +#: ../gui/wxpython/gui_core/dialogs.py:2000 +msgid "SQL Query Utility" msgstr "" -"チェックするとマップセットにアクセス可能, チェックを外すと非表示.\n" -" 注記:\n" -" - 現在のマップセットは常にアクセス可能.\n" -" - 現在のマップセットのみ書き込み可能.\n" -" - 自分が所有しているマップセットのみ書き込み可能." -#: ../gui/wxpython/gui_core/preferences.py:2197 -msgid "Owner" -msgstr "所有者" +#: ../gui/wxpython/gui_core/dialogs.py:2016 +msgid " SQL statement " +msgstr "SQL文" + +#: ../gui/wxpython/gui_core/dialogs.py:2064 +msgid "Symbols" +msgstr "記号サイズ " -#: ../gui/wxpython/gui_core/dialogs.py:74 -msgid "Required item is not set." +#: ../gui/wxpython/gui_core/dialogs.py:2099 +msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:105 -msgid "Select GRASS location and mapset" -msgstr "GRASSのロケーションとマップセットを選択" +#: ../gui/wxpython/gui_core/dialogs.py:2111 +msgid "Symbol name:" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:125 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:2364 +msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:135 -msgid "Name of GRASS location:" -msgstr "GRASSロケーショ名:" +#: ../gui/wxpython/gui_core/dialogs.py:2369 +msgid "Do you want to quit GRASS GIS?" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:146 -#: ../gui/wxpython/gui_core/dialogs.py:203 -msgid "Name of mapset:" -msgstr "マップセット名:" +#: ../gui/wxpython/gui_core/dialogs.py:2448 +msgid "Select font:" +msgstr "フォントの選択：" -#: ../gui/wxpython/gui_core/dialogs.py:175 -msgid "Select mapset in GRASS location" -msgstr "GRASSロケーションからマップセット選択" +#: ../gui/wxpython/gui_core/dialogs.py:2479 +msgid "Character encoding:" +msgstr "文字エンコーディング:" -#: ../gui/wxpython/gui_core/dialogs.py:195 -msgid "Name of mapset is missing." +#: ../gui/wxpython/gui_core/dialogs.py:2497 +#: ../gui/wxpython/psmap/dialogs.py:397 ../gui/wxpython/psmap/dialogs.py:4980 +msgid "Font size:" +msgstr "フォントサイズ:" + +#: ../gui/wxpython/gui_core/dialogs.py:2549 +msgid "Example" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:840 -#: ../gui/wxpython/vdigit/toolbars.py:997 -#: ../gui/wxpython/vdigit/toolbars.py:1095 -msgid "Select vector map" -msgstr "ベクトルマップの選択" +#: ../gui/wxpython/animation/provider.py:444 +msgid "Rendering map layers" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:230 -msgid "Name of vector map is missing." +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" +======= +#: ../gui/wxpython/gui_core/wrap.py:210 +msgid "&Clear" +<<<<<<< HEAD msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:292 -msgid "Create attribute table" -msgstr "属性テーブル作成" +#: ../gui/wxpython/gui_core/wrap.py:223 +msgid "&Cancel" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:326 -msgid "Name of new vector map is missing." +#: ../gui/wxpython/gui_core/wrap.py:235 +msgid "&Close" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:348 -msgid "Name for new vector map:" -msgstr "新しいベクトルマップ名：" +#: ../gui/wxpython/gui_core/wrap.py:245 +msgid "Apply" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:450 -#, python-format -msgid "Unable to create vector map <%s>." -msgstr "ベクトルマップを作れません <%s>" +#: ../gui/wxpython/gui_core/forms.py:564 +msgid "Enter parameters for '" +msgstr "パラメータを入力してください '" -#: ../gui/wxpython/gui_core/dialogs.py:455 -#, python-format -msgid "" -"Invalid or empty key column.\n" -"Unable to create vector map <%s>." -msgstr "" -"不正もしくは空のキー項目\n" -"ベクトルマップを作れません <%s>" +#: ../gui/wxpython/gui_core/forms.py:576 +msgid "Close this window without executing the command (Ctrl+Q)" +msgstr "コマンドを実行せずに画面を閉じる (Ctrl+Q)" -#: ../gui/wxpython/gui_core/dialogs.py:486 -#, python-format -msgid "Vector map <%s> already exists in the current mapset. Do you want to overwrite it?" -msgstr "ベクトルマップ <%s> は既に存在します。上書きしますか？" +#: ../gui/wxpython/gui_core/forms.py:607 +msgid "Run the command (Ctrl+R)" +msgstr "コマンド実行 (Ctrl+R)" -#: ../gui/wxpython/gui_core/dialogs.py:576 -msgid "Load region:" -msgstr "ロードする領域： " +#: ../gui/wxpython/gui_core/forms.py:631 +msgid "Show manual page of the command (Ctrl+H)" +msgstr "コマンドのマニュアルページを表示 (Ctrl+H)" -#: ../gui/wxpython/gui_core/dialogs.py:582 -msgid "Save region:" -msgstr "領域保存：" +#: ../gui/wxpython/gui_core/forms.py:670 +msgid "Add created map(s) into layer tree" +msgstr "レイヤーツリーに作成したマップを追加" -#: ../gui/wxpython/gui_core/dialogs.py:634 -msgid "Name cannot begin with '.' and must not contain space, quotes, '/', ''', '@', ',', '=', '*', and all other non-alphanumeric characters." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:700 +msgid "Close dialog when command is successfully finished. Change this settings in Preferences dialog ('Command' tab)." +msgstr "コマンドが成功した場合はダイアログを閉じます. ダイアログ（'コマンド'タブ）でこの設定を変更します." -#: ../gui/wxpython/gui_core/dialogs.py:650 -msgid "Create or edit imagery groups" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:885 +#, python-format +msgid "'%s' copied to clipboard" +msgstr "'%s' クリップボードにコピーしました" -#: ../gui/wxpython/gui_core/dialogs.py:684 -msgid "Apply changes to selected group and close dialog" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:975 ../gui/wxpython/gui_core/forms.py:989 +msgid "Required" +msgstr "必須" -#: ../gui/wxpython/gui_core/dialogs.py:685 -msgid "Apply changes to selected group" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:978 ../gui/wxpython/gui_core/forms.py:990 +msgid "Optional" +msgstr "オプション" -#: ../gui/wxpython/gui_core/dialogs.py:686 -msgid "Close dialog, changes are not applied" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1073 +#: ../gui/wxpython/gui_core/forms.py:2105 +msgid "Parameterized in model" +msgstr "モデルのパラメータ化" -#: ../gui/wxpython/gui_core/dialogs.py:727 -#: ../gui/wxpython/gui_core/dialogs.py:1524 -msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1163 +msgid "[multiple]" +msgstr "[複数] " -#: ../gui/wxpython/gui_core/dialogs.py:734 -msgid "Select existing group or enter name of new group:" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1221 +msgid "valid range" +msgstr "有効範囲 " -#: ../gui/wxpython/gui_core/dialogs.py:745 -msgid "Edit/create subgroup" +#: ../gui/wxpython/gui_core/forms.py:1578 +msgid "Show graphical representation of temporal extent of dataset(s) ." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:758 -msgid "Select existing subgroup or enter name of new subgroup:" -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:1845 +#: ../gui/wxpython/gui_core/forms.py:1936 +#, python-format +msgid "Choose %s" +msgstr "選択 %s " -#: ../gui/wxpython/gui_core/dialogs.py:791 -#: ../gui/wxpython/gui_core/dialogs.py:859 -#: ../gui/wxpython/gui_core/dialogs.py:1509 -msgid "Pattern:" +#: ../gui/wxpython/gui_core/forms.py:1890 +msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:809 -#: ../gui/wxpython/gui_core/dialogs.py:877 -#: ../gui/wxpython/gui_core/dialogs.py:1533 -msgid "List of maps:" -msgstr "マップ一覧：" +#: ../gui/wxpython/gui_core/forms.py:1893 +msgid "&Save as" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:825 -msgid "Select map layers and add them to the list." +#: ../gui/wxpython/gui_core/forms.py:1895 +msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:830 -msgid "Remove selected layer(s) from list." +#: ../gui/wxpython/gui_core/forms.py:1900 +msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:887 -msgid "Check maps from group to be included into subgroup." +#: ../gui/wxpython/gui_core/forms.py:1902 +msgid "Enter file content directly instead of specifying a file. Temporary file will be automatically created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1051 -msgid "Add selected map layers into group" +#: ../gui/wxpython/gui_core/forms.py:2318 +msgid "Manual" +msgstr "マニュアル " + +#: ../gui/wxpython/gui_core/forms.py:2362 +msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1188 +#: ../gui/wxpython/gui_core/forms.py:2370 #, python-format -msgid "Group <%s> was changed, do you want to apply changes?" +msgid "" +"Unable to load file.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1191 -#: ../gui/wxpython/gui_core/dialogs.py:1207 -msgid "Unapplied changes" +#: ../gui/wxpython/gui_core/forms.py:2400 +msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1204 -#, python-format -msgid "Subgroup <%s> was changed, do you want to apply changes?" +#: ../gui/wxpython/gui_core/forms.py:2733 +msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1261 -msgid "No raster maps selected." -msgstr "" +#: ../gui/wxpython/gui_core/forms.py:2902 +#: ../gui/wxpython/gui_core/forms.py:2919 +#, python-format +msgid "Unable to parse command '%s'" +msgstr "コマンドを解析することができません '%s'" -#: ../gui/wxpython/gui_core/dialogs.py:1290 +#: ../gui/wxpython/gui_core/forms.py:2926 #, python-format -msgid "No changes to apply in group <%s>." +msgid "%(cmd)s: parameter '%(key)s' not available" +msgstr "%(cmd)s: パラメーター '%(key)s' は利用できません" + +#: ../gui/wxpython/gui_core/forms.py:3008 +msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1293 -#, python-format -msgid "Group <%s> was successfully created." +#: ../gui/wxpython/gui_core/menu.py:155 +msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1295 +#: ../gui/wxpython/gui_core/menu.py:157 #, python-format -msgid "Group <%s> was successfully changed." +msgid "Do advanced search using %s module" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1298 -#, python-format -msgid "Creating of new group <%s> failed." +#: ../gui/wxpython/gui_core/menu.py:161 +msgid "Double-click to run selected module" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1300 -#, python-format -msgid "Changing of group <%s> failed." +#: ../gui/wxpython/gui_core/menu.py:164 +msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1339 -msgid "No group selected." +#: ../gui/wxpython/gui_core/menu.py:165 +msgid "Run selected module from the tree" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1344 -msgid "No subgroup selected." +#: ../gui/wxpython/gui_core/menu.py:166 +msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1451 -msgid "Use fully-qualified map names" +#: ../gui/wxpython/gui_core/menu.py:168 +msgid "Show manual for selected module from the tree" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1477 -msgid "Map type:" -msgstr "マップタイプ:" - -#: ../gui/wxpython/gui_core/dialogs.py:1492 -msgid "Select toggle" -msgstr "トグル選択" +#: ../gui/wxpython/gui_core/menu.py:278 +#, python-format +msgid "Documentation for %s is now open in the web browser" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1499 -msgid "Mapset:" -msgstr "マップセット：" +#: ../gui/wxpython/gui_core/menu.py:356 +msgid "&Recent Files" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1593 -msgid "Invert selection" -msgstr "選択の反転" +#: ../gui/wxpython/icons/icon.py:39 +#, python-format +msgid "Unknown iconset '%s', using default 'grass'...\n" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1736 +#: ../gui/wxpython/icons/icon.py:57 #, python-format -msgid "Dynamic series (%s)" +msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1763 -msgid "Set Map Layer Opacity" -msgstr "レイヤーの透過度設定" +#: ../gui/wxpython/gcp/mapdisplay.py:48 ../gui/wxpython/gcp/manager.py:994 +#: ../gui/wxpython/image2target/ii2t_manager.py:952 +msgid "Manage Ground Control Points" +msgstr "GCP（地上基準点）管理" -#: ../gui/wxpython/gui_core/dialogs.py:1794 -#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 -#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 -msgid "transparent" -msgstr "透過 " +#: ../gui/wxpython/gcp/manager.py:150 +#: ../gui/wxpython/image2target/ii2t_manager.py:179 +msgid "Setup for georectification" +msgstr "幾何補正のセットアップ" -#: ../gui/wxpython/gui_core/dialogs.py:1797 -msgid "opaque" -msgstr "不透明" +#: ../gui/wxpython/gcp/manager.py:183 ../gui/wxpython/gcp/manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:212 +#: ../gui/wxpython/image2target/ii2t_manager.py:216 +msgid "Georectifying setup canceled." +msgstr "幾何補正のセットアップをキャンセルしました" -#: ../gui/wxpython/gui_core/dialogs.py:1898 -msgid "Set image size" -msgstr "イメージサイズの設定" +#: ../gui/wxpython/gcp/manager.py:374 +#: ../gui/wxpython/image2target/ii2t_manager.py:381 +msgid "Select map type and location/mapset" +msgstr "マップタイプとロケーション/マップセットの選択" -#: ../gui/wxpython/gui_core/dialogs.py:1913 -msgid "Image size" -msgstr "イメージサイズ" +#: ../gui/wxpython/gcp/manager.py:388 +#: ../gui/wxpython/image2target/ii2t_manager.py:395 +msgid "Map type to georectify" +msgstr "幾何補正するマップタイプ" -#: ../gui/wxpython/gui_core/dialogs.py:1960 -msgid "Template:" -msgstr "テンプレート:" +#: ../gui/wxpython/gcp/manager.py:399 +#: ../gui/wxpython/image2target/ii2t_manager.py:406 +msgid "Select source location:" +msgstr "元のロケーションの選択：" -#: ../gui/wxpython/gui_core/dialogs.py:2000 -msgid "SQL Query Utility" -msgstr "" +#: ../gui/wxpython/gcp/manager.py:420 +#: ../gui/wxpython/image2target/ii2t_manager.py:427 +msgid "Select source mapset:" +msgstr "元のマップセットの選択：" -#: ../gui/wxpython/gui_core/dialogs.py:2016 -msgid " SQL statement " -msgstr "SQL文" +#: ../gui/wxpython/gcp/manager.py:476 +#: ../gui/wxpython/image2target/ii2t_manager.py:483 +msgid "You must select a valid location before selecting a mapset" +msgstr "マップセットを選択する前に有効なロケーションを選択する必要があります" -#: ../gui/wxpython/gui_core/dialogs.py:2064 -msgid "Symbols" -msgstr "記号サイズ " +#: ../gui/wxpython/gcp/manager.py:489 +#: ../gui/wxpython/image2target/ii2t_manager.py:496 +msgid "You must select a valid location and mapset in order to continue" +msgstr "有効なロケーションとマップセットを選択する必要があります" -#: ../gui/wxpython/gui_core/dialogs.py:2099 -msgid "Symbol directory:" -msgstr "" +#: ../gui/wxpython/gcp/manager.py:511 +#: ../gui/wxpython/image2target/ii2t_manager.py:518 +msgid "Select image/map group to georectify" +msgstr "幾何補正を行う画像/マップ グループの選択" -#: ../gui/wxpython/gui_core/dialogs.py:2111 -msgid "Symbol name:" +#: ../gui/wxpython/gcp/manager.py:533 +msgid "Select/create group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2364 -msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" -msgstr "" +#: ../gui/wxpython/gcp/manager.py:550 +#: ../gui/wxpython/image2target/ii2t_manager.py:557 +msgid "Create group if none exists" +msgstr "無い場合はグループを作成" -#: ../gui/wxpython/gui_core/dialogs.py:2369 -msgid "Do you want to quit GRASS GIS?" +#: ../gui/wxpython/gcp/manager.py:564 +#: ../gui/wxpython/image2target/ii2t_manager.py:571 +msgid "Add vector map to group..." +msgstr "グループにベクトルマップを追加..." + +#: ../gui/wxpython/gcp/manager.py:655 +msgid "No vector maps." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2448 -msgid "Select font:" -msgstr "フォントの選択：" +#: ../gui/wxpython/gcp/manager.py:662 +#: ../gui/wxpython/image2target/ii2t_manager.py:655 +msgid "You must select a valid image/map group in order to continue" +msgstr "有効な画像/マップ グループを選択する必要があります" -#: ../gui/wxpython/gui_core/dialogs.py:2479 -msgid "Character encoding:" -msgstr "文字エンコーディング:" +#: ../gui/wxpython/gcp/manager.py:669 +#: ../gui/wxpython/image2target/ii2t_manager.py:662 +msgid "You must enter an map name extension in order to continue" +msgstr "マップ名の拡張子を入力する必要があります" -#: ../gui/wxpython/gui_core/dialogs.py:2497 -#: ../gui/wxpython/psmap/dialogs.py:397 ../gui/wxpython/psmap/dialogs.py:4980 -msgid "Font size:" -msgstr "フォントサイズ:" +#: ../gui/wxpython/gcp/manager.py:738 +#: ../gui/wxpython/image2target/ii2t_manager.py:731 +msgid "Select maps to display for ground control point (GCP) creation" +msgstr "測量基準点 (GCP) 作成の為に表示するマップを選択" -#: ../gui/wxpython/gui_core/dialogs.py:2549 -msgid "Example" ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +#: ../gui/wxpython/gcp/manager.py:743 +msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/animation/provider.py:443 -msgid "Rendering map layers" +#: ../gui/wxpython/gcp/manager.py:802 ../gui/wxpython/gcp/manager.py:3060 +#: ../gui/wxpython/image2target/ii2t_manager.py:792 +#: ../gui/wxpython/image2target/ii2t_manager.py:2982 +msgid "Select target vector map to display:" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/animation/provider.py:559 -msgid "Overlaying map layers" +#: ../gui/wxpython/gcp/manager.py:874 +#: ../gui/wxpython/image2target/ii2t_manager.py:864 +msgid "You must select a source map in order to continue" +msgstr "続行するには、ソースマップを選択する必要があります" + +#: ../gui/wxpython/gcp/manager.py:901 ../gui/wxpython/gcp/manager.py:920 +#: ../gui/wxpython/image2target/ii2t_manager.py:891 +#: ../gui/wxpython/image2target/ii2t_manager.py:922 +#, python-format +msgid "" +"No maps in selected group <%s>.\n" +"Please edit group or select another group." +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= -#: ../gui/wxpython/gui_core/wrap.py:210 -msgid "&Clear" +>>>>>>> osgeo-main msgstr "" #: ../gui/wxpython/gui_core/wrap.py:223 @@ -30683,29 +31668,29 @@ msgid "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "" -#: ../gui/wxpython/animation/provider.py:789 +#: ../gui/wxpython/animation/provider.py:792 #, python-brace-format msgid "Directory {t} not removed." msgstr "" -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -31646,17 +32631,17 @@ msgid "" msgstr "領域をセットできません%s" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "リストが読ません： %s " @@ -31688,7 +32673,7 @@ msgstr "" "マップフレームの位置は変更しました, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" @@ -31697,7 +32682,7 @@ msgstr "" "マップフレームのサイズは変更しました, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" @@ -31706,12 +32691,12 @@ msgstr "" "%(file)s の指示が読み込めませんでした\n" "不明なフォーマット %(for)s " -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "リストが読ません： %s " -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -31720,39 +32705,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "インチ" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "ポイント" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "パラメータ" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "パラメータ" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "海里" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "ピクセル" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "パラメータ" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "Dツリー" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "ラスターマップをアンロード出来ません" @@ -31824,149 +32809,149 @@ msgstr "" "左上からの位置\n" "用紙の端" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "フォント：" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "ディレクトリ選択：" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "変更を行わずにダイアログを閉じる" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "単位" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "回転：" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "幅" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "高さ" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "左" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "右" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "文字は許可されていません!" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "アイコンサイズ：" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "余白" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "ポイント" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "景観分析 " -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "一般設定" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "ラスター設定" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "投影法の管理 " -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "選択したマップのズーム" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "保存領域でズーム" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "現在の算定領域にフレームを合わせます" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "固定スケールとマップ中心" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "投影法の管理 " -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "マップセット：" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "領域" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "縮尺" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "レンダリング " -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "E: " -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "N: " -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "スタイル：" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "1 :" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "マップ最大解像度 (dpi):" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "第１選択" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "マップフレームの周囲に境界線を描きます" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "境界色：" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "線幅（ピクセル）：" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" @@ -31974,307 +32959,307 @@ msgstr "" "領域はこのマップに合うように設定されています,\n" "ラスターまたはベクトルマップは後で追加しなければなりません" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "断面図" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "マップレイヤーが選択されていません " -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "マップレイヤーが選択されていません " -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "無効なスケールまたはマップ中心!" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "ラスターマップ" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "ラスターマップ" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "ラスター:" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "先にマップフレームを作成してください" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "レイヤーグループ追加 " -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "ポイント" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "ライン" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "エリア" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "データタイプ " -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "ベクトルマップの消去" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "一番上のベクトルマップはその他と重なります" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "プロパティ " -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "ラスター設定" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "ベクトル設定" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "%s プロパティ " -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "断面図" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "セントロイド" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "境界" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "断面図" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "DBファイルに接続設定が定義されていません" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "レイヤー削除" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "カテゴリのリスト（例、1,3,5-7）" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "現在のマップセット以外を除去" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "カラー" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "航程線 " -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "輪郭を描く" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "幅：" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "ワイヤー色：" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "ディレクトリ選択：" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "マップテーブル列からのカラー:" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "テーブル列からの塗りつぶしカラーに対する効果はありません" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "カラールール" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "ラインスタイル" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "WKTファイル：" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "ファイル名を入力またはブラウザをクリックしてファイルを選択" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "DXFファイル選択：" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "全列を消去" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "再スケール" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "回転：" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "シンボルを回転：" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "度で反時計回りに" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "全列を消去" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "線幅（ピクセル）：" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "対話形式でカテゴリー値を編集" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "粗密型：" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "DXFファイル選択：" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "アスター" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "パターン使用:" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "入力ディレクトリ選択 " -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "線幅（ピクセル）：" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "パターンスケールファクター" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "ラスターシリーズ " -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "列名" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "ベクトル → ラスター " -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "ラスターマップの選択：" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "%(rast)s: タイプ %(type)s" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "凡例表示" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "離散凡例（カテゴリマップ）" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "連続カラーグラデーション凡例（浮動小数点マップ）" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "詳細設定" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "\"no data\" ボックスを描く" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "カラーテーブル全体にチェックマークを描く" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "ベクトルライン" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "ベクトルライン表示" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "ベクトルマップの重ね合せ " -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "ベクトルマップと凡例での順序を選択" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "ラベル追加 " -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "凡例の周りに罫線を引く" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "サイズと位置" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "編集フィールドを空にしてデフォルト値を使用" -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" @@ -32282,15 +33267,15 @@ msgstr "" "カラーシンボル（ライン用）の幅\n" "凡例テキストの前" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "列" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "列" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" @@ -32298,225 +33283,225 @@ msgstr "" "左端の間での列分離距離\n" "複数列凡例の2列の" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "凡例ラベルを編集:" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "マップレイヤーが選択されていません " -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "ラスター" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "一般設定" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "使用| X 座標 " -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "背景色：" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "長さ" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "縮尺バーの長さはマップの単位で指定されています" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "用紙上の縮尺バーの高さは実際の高ささす" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "デフォルト" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "タイプ" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "マップセット名変更" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "すべてにラベルを付ける" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "凡例" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "透明なテキスト背景" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "スケールバーの長さは定義されていません" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "テキスト入力：" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "テキスト設定" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "テキスト背景" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "ハイライト" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "第１選択" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "オフセット" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "水平な（pts)" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "垂直な（pts）" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "左: 新規ポイント " -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "テキスト設定" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "テキスト回転（反時計回り）" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "テキストは入力されていません!" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "シンボル" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "ベクトルラベル" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -32549,29 +33534,29 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "ps2pdfのプログラムが利用できません。PDF作成" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "一般設定" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "ポストスクリプトを作成しています..." -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "印刷プレビュー " -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "Ps.map はリターンコード %s　で終了しました" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 #, fuzzy msgid "Program {} is not available." msgstr "ベクトルデジタイザは利用できません" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, fuzzy, python-brace-format msgid "" "{title} Please install it to create PDF.\n" @@ -32581,7 +33566,7 @@ msgstr "" "\n" " %s" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 #, fuzzy msgid "" "Program {} is not available. Please install it to create PDF.\n" @@ -32592,104 +33577,120 @@ msgstr "" "\n" " %s" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "プレビューが作成されました" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "名前を付けて保存する..." -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr " EPGSコードが読めません: %s" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "投影法 %s のパラメータを入力 " -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "wxGUIカートグラフィックコンポーザー" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "縮尺" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "ラスターシリーズ " -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "ベクトルライン" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "縮尺" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "画像" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "方位" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "クリックそれからドラッグをしてオブジェクトのサイズを変更する" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#~ msgid "Location Name:" +#~ msgstr "ロケーション名：" + +#~ msgid "Change location and mapset" +#~ msgstr "ロケーションとマップセットを変更" + +#, fuzzy +#~ msgid "(Un)dock Map Display" +#~ msgstr "マップディスプレイ" + +======= +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #~ msgid "Show comp. extent" #~ msgstr "編集範囲表示" ======= @@ -32699,6 +33700,9 @@ msgid "Cartographic Composer - GRASS GIS" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -32844,13 +33848,6 @@ msgstr "" #~ msgid "Unable to display the map" #~ msgstr "マップセットを削除できません " -#, fuzzy, python-format -#~ msgid "Unable to rename mapset: %s" -#~ msgstr "" -#~ "マップセットの名前を変更できません.\n" -#~ "\n" -#~ "%s" - #, fuzzy, python-format #~ msgid "Unable to rename location: %s" #~ msgstr "" @@ -33055,10 +34052,6 @@ msgstr "" #~ "ランダムに定義された地点を含むラスターマップレイヤーとベクトルポイントを作" #~ "成" -#, fuzzy -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "GRASS ロケーションを作成しますか <%s>?" - #~ msgid "Quit digitizer" #~ msgstr "デジタイザー終了" @@ -33120,10 +34113,6 @@ msgstr "" #~ msgid "Maps can be copied only to current mapset" #~ msgstr "マップは現在のマップセットにのみコピーすることが出来ます" -#, fuzzy -#~ msgid "Do you want to create new mapset?" -#~ msgstr "GRASS ロケーションを作成しますか <%s>?" - #~ msgid "No GRASS-python library found." #~ msgstr "GRASS-python ライブラリーが見つかりません." @@ -33133,9 +34122,6 @@ msgstr "" #~ msgid "Point dataset:" #~ msgstr "点データセット:" -#~ msgid "Numeric column:" -#~ msgstr "数値列：" - #~ msgid "Kriging" #~ msgstr "クリギング" @@ -33175,9 +34161,6 @@ msgstr "" #~ msgid "Work in progress! No functionality provided." #~ msgstr "作業中です! 他の機能は動作しません." -#~ msgid "Region" -#~ msgstr "領域" - #~ msgid "Display region" #~ msgstr "領域表示" @@ -33360,9 +34343,6 @@ msgstr "" #~ msgid "Add default servers" #~ msgstr "ループ追加 " -#~ msgid "Choose project location and mapset" -#~ msgstr "プロジェクトのロケーションとマップセットを選択" - #~ msgid "Manage" #~ msgstr "管理" @@ -33636,9 +34616,15 @@ msgid "Do you want to create GRASS location <%s>?" msgstr "GRASS ロケーションを作成しますか <%s>?" <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #~ msgid "Create new location?" #~ msgstr "新しいロケーションを作成しますか？" +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #~ msgid "Ask when quiting wxGUI or closing display" #~ msgstr "ｗｘGUIの終了または画面を閉じる時に問い合わせる" @@ -34048,6 +35034,10 @@ msgid "Create new location?" msgstr "新しいロケーションを作成しますか？" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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 da7936de417..6801f81cd89 100644 --- a/locale/po/grasswxpy_ko.po +++ b/locale/po/grasswxpy_ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_ko\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2014-05-03 16:44-0400\n" "Last-Translator: Huidae Cho \n" "Language-Team: Korean \n" @@ -25,12 +25,12 @@ msgstr "" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "" @@ -38,837 +38,837 @@ msgstr "" msgid "Analysis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "애니메이션" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "마스크" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "혼합" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "삭제" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "기존 애니메이션을 저장하지 않고 새로 녹화하길 원하십니까?" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "애니메이션이 이미 존재합니다" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "북거(northing) (Y):" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "동거(easting) (X):" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1063,8 +1063,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "" @@ -1112,7 +1112,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1220,14 +1220,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "도움말" @@ -1339,8 +1339,8 @@ msgid "Invalid input vector dataset" msgstr "무효한 입력 벡터 자료세트" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1411,12 +1411,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1478,115 +1478,115 @@ msgstr "" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "래스터 지도의 이름:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "벡터 지도의 이름:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1627,7 +1627,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1638,169 +1638,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "벡터 지도 <%s>를 열 수 없습니다" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "임시 벡터 지도를 열 수 없습니다" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1909,13 +1909,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "벡터 자료 가져오기" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "래스터 자료 가져오기" @@ -1986,56 +1986,58 @@ msgid "Data catalog" msgstr "" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:211 -msgid "Do you want to create a location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:212 +#, fuzzy +msgid "Do you want to create a new project (also known as location)?" +msgstr "자료를 영구히 삭제하길 원하십니까? %s" -#: ../gui/wxpython/datacatalog/catalog.py:215 -msgid "Create location?" -msgstr "" +#: ../gui/wxpython/datacatalog/catalog.py:217 +#, fuzzy +msgid "Create project?" +msgstr "원천 자료 투영:" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 msgid "Link external raster data [r.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 msgid "Link external vector data [v.external]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 msgid "Unpack GRASS raster map [r.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "외부 자료 연결" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 msgid "More options..." msgstr "" @@ -2043,316 +2045,320 @@ msgstr "" msgid "Data Catalog - GRASS GIS" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 msgid "name unknown" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, python-brace-format msgid "{name}" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 -msgid "Map in a different location" +#: ../gui/wxpython/datacatalog/tree.py:885 +msgid "Map in a different project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 msgid "Cannot rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 msgid "Cannot rename location" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, python-brace-format msgid "New name for <{n}>" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "g.remove를 완료했습니다" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "지도를 삭제합니다" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "삭제(&D)" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "이름 바꾸기(&R)" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 msgid "Re&load maps" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 msgid "&Copy path to mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "레코드를 삭제합니다" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "이름 바꾸기(&R)" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" +msgstr "선택된 로케이션을 삭제합니다" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +msgid "&Download sample project (location)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 msgid "&Delete GRASS database from disk" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2264 -msgid "&Delete locations" -msgstr "" +#: ../gui/wxpython/datacatalog/tree.py:2239 +#, fuzzy +msgid "&Delete projects (locations)" +msgstr "선택된 로케이션을 삭제합니다" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 msgid "&Copy paths to mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" +msgid "Reload GRASS projects" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:24 @@ -2373,6 +2379,7 @@ msgstr "" <<<<<<< HEAD #: ../gui/wxpython/datacatalog/toolbars.py:35 +<<<<<<< HEAD ======= #: ../gui/wxpython/datacatalog/toolbars.py:40 <<<<<<< HEAD @@ -2388,17 +2395,30 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +<<<<<<< HEAD +msgid "Create new mapset in current project" +======= +======= +#: ../gui/wxpython/datacatalog/toolbars.py:40 +<<<<<<< HEAD +>>>>>>> 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 "" -#: ../gui/wxpython/datacatalog/toolbars.py:38 -msgid "Create new location in current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:39 +msgid "Create new project (location) in current GRASS database" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:42 -msgid "Download sample location to current GRASS database" +#: ../gui/wxpython/datacatalog/toolbars.py:43 +msgid "Download sample project (location) to current GRASS database" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/datacatalog/toolbars.py:49 @@ -2408,15 +2428,25 @@ msgstr "" <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +#: ../gui/wxpython/datacatalog/toolbars.py:46 +======= +======= +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main <<<<<<< HEAD #: ../gui/wxpython/datacatalog/toolbars.py:45 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) msgid "Import raster data [r.import]" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 msgid "Import vector data [v.import]" msgstr "" +<<<<<<< HEAD +#: ../gui/wxpython/datacatalog/toolbars.py:52 +======= #: ../gui/wxpython/datacatalog/toolbars.py:51 ======= #: ../gui/wxpython/datacatalog/toolbars.py:49 @@ -2428,6 +2458,9 @@ msgid "Import raster data [r.import]" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2439,6 +2472,7 @@ msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:55 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2450,58 +2484,73 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Select another import option" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 msgid "Search" msgstr "" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -2853,6 +2902,7 @@ msgstr "" #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:1999 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2864,6 +2914,15 @@ msgstr "" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main msgid "Data Catalog" msgstr "" @@ -2876,9 +2935,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "" @@ -2939,7 +2998,7 @@ msgid "Switch to simple mode" msgstr "" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "" @@ -2963,27 +3022,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "" @@ -2992,29 +3051,29 @@ msgstr "" msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -3028,196 +3087,307 @@ msgstr "알려지지 않은 아이콘 세트 '%s', 기본 'grass'를 사용합 msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" msgstr "제거" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 msgid "Do you really want to remove <{}> command?" msgstr "" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "범례를 제거합니다" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 msgid "Removing <{}>" msgstr "" -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "타임스탬프" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "양자화" + +#: ../gui/wxpython/history/browser.py:42 +msgid "Status:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "마스크" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "마스크" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "북거(northing)" + #: ../gui/wxpython/history/browser.py:46 +msgid "South:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:47 +msgid "West:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "동거(easting)" + +#: ../gui/wxpython/history/browser.py:49 +msgid "North-south resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:50 +msgid "East-west resolution:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:51 +msgid "Number of rows:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "열을 삭제합니다" + +#: ../gui/wxpython/history/browser.py:53 +msgid "Number of cells:" +msgstr "" + +#: ../gui/wxpython/history/browser.py:63 +msgid "{} sec" +msgstr "" + +#: ../gui/wxpython/history/browser.py:117 +msgid "General info" +msgstr "" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "계산 영역" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "현재 영역 보기" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "영역:" + +#: ../gui/wxpython/history/browser.py:294 +msgid "Set current computational region to the region of executed command" +msgstr "" + +#: ../gui/wxpython/history/browser.py:359 msgid "History browser" msgstr "" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +msgid "Double-click to run selected tool" +msgstr "" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "애니메이션 내보내기" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 -msgid "Double-click to run selected tool" +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." +#: ../gui/wxpython/history/browser.py:466 +msgid "JSON files" +msgstr "" + +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" msgstr "" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." msgstr "" -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +msgid "Downloaded project is not valid" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +msgid "Select sample project to download:" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "내려받기(&w)" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" +msgstr "선택된 객체를 삭제합니다" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 msgid "Download" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:432 -msgid "Location Download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:439 +#, fuzzy +msgid "Dataset Download" +msgstr "내려받기(&w)" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "선택된 지도 세트를 삭제합니다" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "자료를 영구히 삭제하길 원하십니까? %s" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 msgid "Invalid mapset name" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" msgstr "무효한 로케이션 이름" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 msgid "Unable to create new mapset: {}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:175 -msgid "Do you want to import {} to the newly created location?" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:173 +#, fuzzy +msgid "Do you want to import {} to the newly created project?" +msgstr "자료를 영구히 삭제하길 원하십니까? %s" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -3227,82 +3397,83 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 msgid "Unable to rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 msgid "" "Current name: {}\n" "\n" "Enter new name:" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 msgid "" "Unable to rename mapset.\n" "\n" "{}" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 -msgid "Unable to rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:288 +#, fuzzy +msgid "Unable to rename selected project" +msgstr "지도 세트를 삭제할 수 없습니다" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "선택된 객체를 삭제합니다" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 +#, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" -msgstr "" +msgstr "지도 세트를 삭제할 수 없습니다" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -3312,11 +3483,11 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 msgid "Unable to delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -3326,15 +3497,15 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 msgid "Delete selected mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 msgid "Error when deleting mapsets" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -3344,50 +3515,52 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 -msgid "Unable to delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:463 +#, fuzzy +msgid "Unable to delete selected projects" +msgstr "선택된 객체를 삭제합니다" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 -msgid "Delete selected locations" -msgstr "" +#: ../gui/wxpython/startup/guiutils.py:484 +#, fuzzy +msgid "Delete selected projects" +msgstr "선택된 객체를 삭제합니다" -#: ../gui/wxpython/startup/guiutils.py:498 -msgid "Error when deleting locations" +#: ../gui/wxpython/startup/guiutils.py:497 +msgid "Error when deleting projects" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -3397,11 +3570,11 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 msgid "Unable to delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3411,15 +3584,15 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 msgid "Delete selected GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 msgid "Error when deleting GRASS database" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3429,14 +3602,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "알려지지 않은" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3448,15 +3622,15 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 msgid "Mapset is in use" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 msgid "Error when removing lock file" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3464,101 +3638,99 @@ msgid "" " Details: {error}." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 +#: ../gui/wxpython/startup/guiutils.py:693 #, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 +#: ../gui/wxpython/startup/guiutils.py:711 #, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "" #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -3567,19 +3739,19 @@ msgid "Select/create group:" msgstr "" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "" @@ -3588,17 +3760,17 @@ msgid "No vector maps." msgstr "" #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -3606,34 +3778,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3641,42 +3813,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3686,37 +3858,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3726,55 +3898,55 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." @@ -3782,8 +3954,8 @@ msgstr "" "RMS 오류를 계산할 수 없었습니다.\n" "m.transform에 오류가 있을 수 있습니다." -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." @@ -3791,273 +3963,273 @@ msgstr "" "새 범위를 계산할 수 없었습니다.\n" "m.transform에 오류가 있을 수 있습니다." -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "" -#: ../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 +#: ../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 msgid "source E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 msgid "overwrite result map" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -4092,10 +4264,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -4104,7 +4276,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -4113,7 +4285,7 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -4127,14 +4299,14 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "" @@ -4147,32 +4319,32 @@ msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 msgid "Pan to GCP by number" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -4202,7 +4374,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -4238,462 +4410,524 @@ msgstr "" msgid "Update GCP coordinates)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +msgid "Define new GRASS project" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:229 +msgid "Name of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" +msgstr "GRASS 데이터베이스 안에 로케이션이 이미 존재합니다." -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "무효한 이름" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 msgid "Select Coordinate Reference System (CRS)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 msgid "Read CRS from a georeferenced data file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 msgid "Additional methods:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "예" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 msgid "Select CRS from a list" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "매개변수" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "GRASS 데이터베이스:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "투영:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "투영:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2530 -#, python-format +#: ../gui/wxpython/location_wizard/wizard.py:2531 +#, fuzzy, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" +"'%(lock)s'를 제거할 수 없습니다.\n" +"\n" +"세부 사항: %(reason)s" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" +msgstr "지도 세트를 삭제할 수 없습니다" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "GRASS 데이터베이스 안에 로케이션이 이미 존재합니다." -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "영역 설정(&S)" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "무효한 로케이션이 선택됐습니다." -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "무효한 영역" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "무효한 값: %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "제거" + +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "제어 점을 제거합니다" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "" + #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 msgid "Graphical Modeler - GRASS GIS" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 msgid "Modeler settings" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 +#: ../gui/wxpython/gui_core/preferences.py:273 #: ../gui/wxpython/vdigit/preferences.py:129 #: ../gui/wxpython/mapdisp/properties.py:381 #: ../gui/wxpython/animation/dialogs.py:360 @@ -4710,7 +4944,6 @@ msgid "Disabled:" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "" @@ -4720,10 +4953,10 @@ msgid "GRASS API:" msgstr "GRASS 도움말" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "" @@ -4749,7 +4982,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "" @@ -4778,13 +5011,13 @@ msgid "Comment" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "" @@ -4793,7 +5026,7 @@ msgid "Commands" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4804,19 +5037,19 @@ msgid "Apply properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "" @@ -4825,686 +5058,668 @@ msgstr "" msgid "Author(s):" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -msgid "Create new model (Ctrl+N)" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:43 -msgid "Load model from file (Ctrl+O)" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:45 -msgid "Save current model to file (Ctrl+S)" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" +#: ../gui/wxpython/gmodeler/panels.py:189 +msgid "Script editor" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:54 -msgid "Add data to model" +#: ../gui/wxpython/gmodeler/panels.py:273 +msgid "{} script contains local modifications" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -msgid "Add comment to model" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:64 -msgid "Show model properties" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" +msgstr "현재 지도 세트로부터 %d개의 중간 지도가 삭제됐습니다" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -msgid "Manage model variables" +#: ../gui/wxpython/gmodeler/panels.py:607 +#, python-format +msgid "" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/toolbars.py:68 -msgid "Redraw model canvas" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 +#, python-format +msgid "Unable to open file <%s> for writing." +msgstr "파일 <%s>를 쓰기 위해 열 수 없습니다." + +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 +msgid "" +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:317 +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 #, python-format -msgid "" -"'%s' is not a GRASS tool.\n" -"\n" -"Unable to add new action to the model." +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:431 -#, python-format -msgid "Data: %s" +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." +msgstr "삭제할 중간 자료가 없습니다" + +#: ../gui/wxpython/gmodeler/panels.py:1269 +#, python-format +msgid "Do you want to permanently delete data?%s" +msgstr "자료를 영구히 삭제하길 원하십니까? %s" + +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" +msgstr "중간 자료를 삭제할까요?" + +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:463 +#: ../gui/wxpython/gmodeler/panels.py:1291 +#, python-format msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +"Model is not valid.\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "모델의 변경 사항을 저장하시겠습니까?" + +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" +msgstr "변수의 목록 - 삭제하려면 오른쪽 클릭" + +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "기본값" + +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/gmodeler/panels.py:1380 +msgid "integer" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:1381 +msgid "float" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" +#: ../gui/wxpython/gmodeler/panels.py:1382 +msgid "string" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" +#: ../gui/wxpython/gmodeler/panels.py:1385 +msgid "region" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" +#: ../gui/wxpython/gmodeler/panels.py:1386 +msgid "mapset" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:839 -#, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +#: ../gui/wxpython/gmodeler/panels.py:1387 +#: ../gui/wxpython/gui_core/forms.py:2039 +msgid "file" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" -msgstr "모델로부터 모든 변수를 삭제하길 원하십니까?" +#: ../gui/wxpython/gmodeler/panels.py:1388 +msgid "dir" +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" -msgstr "변수를 삭제합니다" +#: ../gui/wxpython/gmodeler/panels.py:1397 +msgid "Add new variable to the model" +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" -msgstr "선택을 삭제합니다" +#: ../gui/wxpython/gmodeler/panels.py:1515 +msgid "List of items - right-click to delete" +msgstr "항목의 목록 - 삭제하려면 오른쪽 클릭" -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" -msgstr "모두 삭제합니다" +#: ../gui/wxpython/gmodeler/panels.py:1520 +#: ../gui/wxpython/gmodeler/dialogs.py:536 +#: ../gui/wxpython/gmodeler/dialogs.py:662 +#: ../gui/wxpython/psmap/dialogs.py:3629 +msgid "Label" +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "In loop" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" +#: ../gui/wxpython/gmodeler/panels.py:1520 +msgid "Parameterized" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." +#: ../gui/wxpython/gmodeler/panels.py:1568 +msgid "No items to selected." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 -#, python-format -msgid "undefined variable '%s'" +#: ../gui/wxpython/gmodeler/panels.py:1607 +msgid "Python script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." +#: ../gui/wxpython/gmodeler/panels.py:1613 +#: ../gui/wxpython/gmodeler/model.py:3673 ../gui/wxpython/gui_core/forms.py:617 +#: ../gui/wxpython/modules/mcalc_builder.py:169 +msgid "&Run" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." +#: ../gui/wxpython/gmodeler/panels.py:1614 +#: ../gui/wxpython/gmodeler/panels.py:1851 +msgid "Run script" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." +#: ../gui/wxpython/gmodeler/panels.py:1617 +msgid "Save the script to a file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format +#: ../gui/wxpython/gmodeler/panels.py:1622 msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" +"Refresh the script based on the model.\n" +"It will discard all local changes." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" +#: ../gui/wxpython/gmodeler/panels.py:1630 +#: ../gui/wxpython/gui_core/preferences.py:441 +#: ../gui/wxpython/main_window/frame.py:716 ../gui/wxpython/lmgr/frame.py:650 +msgid "Python" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1631 +msgid "PyWPS" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1632 +msgid "actinia" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" +#: ../gui/wxpython/gmodeler/panels.py:1654 +msgid "Python script type" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" +#: ../gui/wxpython/gmodeler/panels.py:1710 +msgid "" +"{} script is locally modified. Refresh will discard all changes. Do you " +"really want to continue?" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" +#: ../gui/wxpython/gmodeler/panels.py:1714 +msgid "Update" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1750 -msgid "Condition: " +#: ../gui/wxpython/gmodeler/panels.py:1746 +#: ../gui/wxpython/gui_core/pyedit.py:403 +#: ../gui/wxpython/gui_core/pyedit.py:474 +msgid "Python script (*.py)|*.py" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1752 -msgid "Condition: not defined" +#: ../gui/wxpython/gmodeler/panels.py:1748 +msgid "JSON file (*.json)|*.json" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1894 -msgid "if-else" +#: ../gui/wxpython/gmodeler/panels.py:1752 +#: ../gui/wxpython/gui_core/pyedit.py:401 +msgid "Choose file to save" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2000 -msgid "empty" +#: ../gui/wxpython/gmodeler/panels.py:1773 +#: ../gui/wxpython/wxplot/profile.py:428 ../gui/wxpython/gui_core/pyedit.py:421 +#, python-format +msgid "File <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:2001 -#, python-brace-format -msgid "Details: unsupported tag name '{0}'." +#: ../gui/wxpython/gmodeler/panels.py:1776 +#: ../gui/wxpython/gui_core/pyedit.py:424 +msgid "Save file" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3479 -msgid "Model parameters" +#: ../gui/wxpython/gmodeler/panels.py:1806 +#, python-format +msgid "Unable to launch Python script. %s" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3500 -msgid "Delete intermediate data when finish" -msgstr "종료시 중간 자료를 삭제합니다" - -#: ../gui/wxpython/gmodeler/model.py:3508 -#: ../gui/wxpython/gmodeler/frame.py:2038 ../gui/wxpython/gui_core/forms.py:617 -#: ../gui/wxpython/modules/mcalc_builder.py:169 -msgid "&Run" +#: ../gui/wxpython/gmodeler/panels.py:1855 +msgid "Run script - enabled only for basic Python scripts" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:3556 ../gui/wxpython/gmodeler/frame.py:173 -msgid "Variables" +#: ../gui/wxpython/gmodeler/toolbars.py:46 ../gui/wxpython/menustrings.py:2062 +msgid "Create new model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520 -#: ../gui/wxpython/lmgr/toolbars.py:208 -msgid "Graphical Modeler" +#: ../gui/wxpython/gmodeler/toolbars.py:50 ../gui/wxpython/menustrings.py:2064 +msgid "Load model from file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:170 -msgid "Model" +#: ../gui/wxpython/gmodeler/toolbars.py:54 +msgid "Save current model to file" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:171 -msgid "Items" +#: ../gui/wxpython/gmodeler/toolbars.py:56 ../gui/wxpython/menustrings.py:2072 +msgid "Export model to image" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:179 ../gui/wxpython/gui_core/forms.py:2518 -msgid "Command output" +#: ../gui/wxpython/gmodeler/toolbars.py:59 ../gui/wxpython/menustrings.py:2074 +msgid "Export model to Python script" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:251 -msgid "{} script contains local modifications" +#: ../gui/wxpython/gmodeler/toolbars.py:63 +msgid "Add GRASS tool (module) to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239 -#: ../gui/wxpython/gmodeler/frame.py:2260 -msgid "{} script is up-to-date" +#: ../gui/wxpython/gmodeler/toolbars.py:66 +msgid "Add data to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:281 -msgid "Redrawing model..." +#: ../gui/wxpython/gmodeler/toolbars.py:70 +msgid "Manually define relation between data and commands" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:308 ../gui/wxpython/core/gconsole.py:712 -#, python-format -msgid "%d sec" +#: ../gui/wxpython/gmodeler/toolbars.py:73 +msgid "Add loop/series to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715 -#, python-format -msgid "%(min)d min %(sec)d sec" +#: ../gui/wxpython/gmodeler/toolbars.py:76 +msgid "Add comment to model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:324 ../gui/wxpython/core/gconsole.py:737 -msgid "Command finished" +#: ../gui/wxpython/gmodeler/toolbars.py:78 ../gui/wxpython/menustrings.py:201 +#: ../gui/wxpython/menustrings.py:2099 +msgid "Run model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:337 -msgid "Model computation finished" +#: ../gui/wxpython/gmodeler/toolbars.py:79 ../gui/wxpython/menustrings.py:2101 +msgid "Validate model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:354 -msgid "Do you want to save changes in the model?" -msgstr "모델의 변경 사항을 저장하시겠습니까?" - -#: ../gui/wxpython/gmodeler/frame.py:357 -msgid "Do you want to store current model settings to model file?" +#: ../gui/wxpython/gmodeler/toolbars.py:81 +msgid "Set model properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:364 -msgid "Quit Graphical Modeler" +#: ../gui/wxpython/gmodeler/toolbars.py:83 +msgid "Manage model variables" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:433 -#, python-format -msgid "%d intermediate maps deleted from current mapset" -msgstr "현재 지도 세트로부터 %d개의 중간 지도가 삭제됐습니다" - -#: ../gui/wxpython/gmodeler/frame.py:442 -msgid "No intermediate data to delete." -msgstr "삭제할 중간 자료가 없습니다" - -#: ../gui/wxpython/gmodeler/frame.py:447 -#, python-format -msgid "Do you want to permanently delete data?%s" -msgstr "자료를 영구히 삭제하길 원하십니까? %s" - -#: ../gui/wxpython/gmodeler/frame.py:448 -msgid "Delete intermediate data?" -msgstr "중간 자료를 삭제할까요?" - -#: ../gui/wxpython/gmodeler/frame.py:470 ../gui/wxpython/gmodeler/frame.py:620 -msgid "" -"Current model is not empty. Do you want to store current settings to model " -"file?" +#: ../gui/wxpython/gmodeler/toolbars.py:85 +msgid "Redraw model canvas" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:474 ../gui/wxpython/gmodeler/frame.py:624 -msgid "Create new model?" +#: ../gui/wxpython/gmodeler/dialogs.py:55 +msgid "Data properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:514 -msgid "Choose model file" +#: ../gui/wxpython/gmodeler/dialogs.py:98 +#: ../gui/wxpython/gmodeler/dialogs.py:115 +msgid "Name of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:516 ../gui/wxpython/gmodeler/frame.py:572 -#: ../gui/wxpython/main_window/frame.py:954 ../gui/wxpython/lmgr/frame.py:851 -msgid "GRASS Model File (*.gxm)|*.gxm" +#: ../gui/wxpython/gmodeler/dialogs.py:107 +msgid "Type of element:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:534 -#, python-format -msgid "%(items)d items (%(actions)d actions) loaded into model" +#: ../gui/wxpython/gmodeler/dialogs.py:173 +msgid "Add GRASS command to the model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:548 ../gui/wxpython/gmodeler/frame.py:590 -#, python-format -msgid "Model file <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/dialogs.py:199 +msgid "Label and comment" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:552 ../gui/wxpython/menustrings.py:2061 -msgid "Save model" +#: ../gui/wxpython/gmodeler/dialogs.py:308 +msgid "" +"Command not defined.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:560 ../gui/wxpython/gmodeler/frame.py:606 +#: ../gui/wxpython/gmodeler/dialogs.py:317 #, python-format -msgid "File <%s> saved" -msgstr "" - -#: ../gui/wxpython/gmodeler/frame.py:570 -msgid "Choose file to save current model" +msgid "" +"'%s' is not a GRASS tool.\n" +"\n" +"Unable to add new action to the model." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:692 -msgid "Model is empty. Nothing to validate." +#: ../gui/wxpython/gmodeler/dialogs.py:359 +msgid "Relation properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:701 -#, python-format -msgid "" -"Model is not valid.\n" -"\n" -"%s" +#: ../gui/wxpython/gmodeler/dialogs.py:380 +msgid "From" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:704 -msgid "Model is valid." +#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2488 +msgid "To" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:765 ../gui/wxpython/gmodeler/frame.py:772 +#: ../gui/wxpython/gmodeler/dialogs.py:431 #, python-format -msgid "Model exported to <%s>" +msgid "Data: %s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:913 ../gui/wxpython/menustrings.py:2086 -msgid "Add comment" +#: ../gui/wxpython/gmodeler/dialogs.py:440 +msgid "Command:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:921 -msgid "Empty comment. Nothing to add to the model." +#: ../gui/wxpython/gmodeler/dialogs.py:448 +msgid "Option:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:958 -msgid "wxGUI Graphical Modeler" +#: ../gui/wxpython/gmodeler/dialogs.py:463 +msgid "" +"Relation doesn't start with data item.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1116 -#, python-format +#: ../gui/wxpython/gmodeler/dialogs.py:473 msgid "" -"Reading model file <%s> failed.\n" -"Invalid file, unable to parse XML document.\n" -"\n" -"%s" +"Relation doesn't point to GRASS command.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1127 -msgid "Please wait, loading model..." +#: ../gui/wxpython/gmodeler/dialogs.py:488 +msgid "" +"No relevant option found.\n" +"Unable to add relation." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1193 -msgid "Writing current settings to model file failed." +#: ../gui/wxpython/gmodeler/dialogs.py:528 +msgid "Condition" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1205 ../gui/wxpython/lmgr/workspace.py:449 -#, python-format -msgid "Unable to open file <%s> for writing." -msgstr "파일 <%s>를 쓰기 위해 열 수 없습니다." - -#: ../gui/wxpython/gmodeler/frame.py:1577 ../gui/wxpython/menustrings.py:970 -#: ../gui/wxpython/menustrings.py:1933 -#: ../gui/wxpython/gui_core/simplelmgr.py:515 -#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 -#: ../gui/wxpython/animation/dialogs.py:788 -#: ../gui/wxpython/animation/dialogs.py:1030 -msgid "Remove" -msgstr "제거" - -#: ../gui/wxpython/gmodeler/frame.py:1581 -msgid "Disable" +#: ../gui/wxpython/gmodeler/dialogs.py:564 +msgid "Loop properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1584 -msgid "Enable" +#: ../gui/wxpython/gmodeler/dialogs.py:571 +msgid "List of items in loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1589 -#: ../gui/wxpython/gmodeler/frame.py:1667 -msgid "Set label" +#: ../gui/wxpython/gmodeler/dialogs.py:574 +msgid "Series" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1592 -#: ../gui/wxpython/gmodeler/frame.py:1683 -msgid "Set comment" +#: ../gui/wxpython/gmodeler/dialogs.py:575 +msgid "Define map series as condition for the loop" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1597 -msgid "Add control point" +#: ../gui/wxpython/gmodeler/dialogs.py:618 +msgid "Define series of maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1599 -msgid "Remove control point" -msgstr "제어 점을 제거합니다" - -#: ../gui/wxpython/gmodeler/frame.py:1613 -msgid "Intermediate" +#: ../gui/wxpython/gmodeler/dialogs.py:641 +msgid "If-else properties" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1642 ../gui/wxpython/lmgr/layertree.py:513 -msgid "Properties" +#: ../gui/wxpython/gmodeler/dialogs.py:650 +msgid "List of items in 'if' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1786 -msgid "List of variables - right-click to delete" -msgstr "변수의 목록 - 삭제하려면 오른쪽 클릭" - -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1847 ../gui/wxpython/dbmgr/base.py:2994 -msgid "Data type" +#: ../gui/wxpython/gmodeler/dialogs.py:658 +msgid "List of items in 'else' block" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1853 -msgid "Default value" -msgstr "기본값" - -#: ../gui/wxpython/gmodeler/frame.py:1797 -msgid "Add new variable" +#: ../gui/wxpython/gmodeler/dialogs.py:839 +#, python-format +msgid "Variable <%s> already exists in the model. Adding variable failed." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1805 -msgid "integer" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:872 +msgid "Do you want to delete all variables from the model?" +msgstr "모델로부터 모든 변수를 삭제하길 원하십니까?" -#: ../gui/wxpython/gmodeler/frame.py:1806 -msgid "float" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:873 +msgid "Delete variables" +msgstr "변수를 삭제합니다" -#: ../gui/wxpython/gmodeler/frame.py:1807 -msgid "string" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:912 +#: ../gui/wxpython/gmodeler/dialogs.py:1078 +#: ../gui/wxpython/vdigit/dialogs.py:304 +msgid "Delete selected" +msgstr "선택을 삭제합니다" -#: ../gui/wxpython/gmodeler/frame.py:1810 -msgid "region" -msgstr "" +#: ../gui/wxpython/gmodeler/dialogs.py:913 +#: ../gui/wxpython/vdigit/dialogs.py:308 +msgid "Delete all" +msgstr "모두 삭제합니다" -#: ../gui/wxpython/gmodeler/frame.py:1811 -msgid "mapset" +#: ../gui/wxpython/gmodeler/dialogs.py:919 +#: ../gui/wxpython/gmodeler/dialogs.py:1082 +#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1480 +#: ../gui/wxpython/dbmgr/base.py:2682 +msgid "Reload" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1812 -#: ../gui/wxpython/gui_core/forms.py:2019 -msgid "file" +#: ../gui/wxpython/gmodeler/model.py:80 +msgid "model" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1813 -msgid "dir" +#: ../gui/wxpython/gmodeler/model.py:81 +msgid "Script generated by wxGUI Graphical Modeler." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1822 -msgid "Add new variable to the model" +#: ../gui/wxpython/gmodeler/model.py:521 ../gui/wxpython/gmodeler/model.py:585 +#, python-format +msgid "undefined variable '%s'" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1940 -msgid "List of items - right-click to delete" -msgstr "항목의 목록 - 삭제하려면 오른쪽 클릭" - -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "In loop" +#: ../gui/wxpython/gmodeler/model.py:618 +msgid "Running model..." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1945 -msgid "Parameterized" +#: ../gui/wxpython/gmodeler/model.py:639 +msgid "Model is empty. Nothing to run." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:1993 -msgid "No items to selected." +#: ../gui/wxpython/gmodeler/model.py:656 +#, python-format +msgid "" +"Model is not valid. Do you want to run the model anyway?\n" +"\n" +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2032 -msgid "Python script" +#: ../gui/wxpython/gmodeler/model.py:659 +msgid "Run model?" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2039 -#: ../gui/wxpython/gmodeler/frame.py:2248 -msgid "Run script" +#: ../gui/wxpython/gmodeler/model.py:696 +msgid "Variables below not defined:" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2042 -msgid "Save the script to a file" +#: ../gui/wxpython/gmodeler/model.py:809 +msgid "Raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2047 -msgid "" -"Refresh the script based on the model.\n" -"It will discard all local changes." +#: ../gui/wxpython/gmodeler/model.py:812 +msgid "3D raster maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2055 -#: ../gui/wxpython/gui_core/preferences.py:347 -#: ../gui/wxpython/main_window/frame.py:719 ../gui/wxpython/lmgr/frame.py:649 -msgid "Python" +#: ../gui/wxpython/gmodeler/model.py:815 ../gui/wxpython/psmap/dialogs.py:1772 +msgid "Vector maps" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2056 -msgid "PyWPS" +#: ../gui/wxpython/gmodeler/model.py:1564 +msgid "" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2078 -msgid "Python script type" +#: ../gui/wxpython/gmodeler/model.py:1758 +msgid "Condition: " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2110 -msgid "" -"{} script is locally modified. Refresh will discard all changes. Do you " -"really want to continue?" +#: ../gui/wxpython/gmodeler/model.py:1760 +msgid "Condition: not defined" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2114 -msgid "Update" +#: ../gui/wxpython/gmodeler/model.py:1902 +msgid "if-else" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2146 -#: ../gui/wxpython/gui_core/pyedit.py:401 -msgid "Choose file to save" +#: ../gui/wxpython/gmodeler/model.py:2008 +msgid "empty" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2149 -#: ../gui/wxpython/gui_core/pyedit.py:403 -#: ../gui/wxpython/gui_core/pyedit.py:474 -msgid "Python script (*.py)|*.py" +#: ../gui/wxpython/gmodeler/model.py:2009 +#, python-brace-format +msgid "Details: unsupported tag name '{0}'." msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2167 ../gui/wxpython/wxplot/profile.py:399 -#: ../gui/wxpython/gui_core/pyedit.py:421 -#, python-format -msgid "File <%s> already exists. Do you want to overwrite this file?" +#: ../gui/wxpython/gmodeler/model.py:2840 +msgid "Module {task.get_name()} in your model contains " msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2170 -#: ../gui/wxpython/gui_core/pyedit.py:424 -msgid "Save file" +#: ../gui/wxpython/gmodeler/model.py:2846 ../gui/wxpython/wxplot/dialogs.py:943 +#: ../gui/wxpython/mapwin/buffered.py:2160 ../gui/wxpython/core/gcmd.py:119 +#: ../gui/wxpython/core/workspace.py:1775 +msgid "Warning" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2200 -#, python-format -msgid "Unable to launch Python script. %s" +#: ../gui/wxpython/gmodeler/model.py:3643 +msgid "Model parameters" msgstr "" -#: ../gui/wxpython/gmodeler/frame.py:2253 -msgid "Run script - enabled only for basic Python scripts" -msgstr "" +#: ../gui/wxpython/gmodeler/model.py:3665 +msgid "Delete intermediate data when finish" +msgstr "종료시 중간 자료를 삭제합니다" -#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055 -#: ../gui/wxpython/menustrings.py:2105 +#: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:2110 msgid "&File" msgstr "파일(&F)" @@ -5516,7 +5731,7 @@ msgstr "" msgid "Create new workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2058 +#: ../gui/wxpython/menustrings.py:7 ../gui/wxpython/menustrings.py:2063 msgid "Open" msgstr "" @@ -5524,7 +5739,7 @@ msgstr "" msgid "Load workspace from file" msgstr "" -#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2060 +#: ../gui/wxpython/menustrings.py:9 ../gui/wxpython/menustrings.py:2065 #: ../gui/wxpython/modules/colorrules.py:462 msgid "Save" msgstr "" @@ -5534,7 +5749,7 @@ msgstr "" msgid "Save workspace" msgstr "" -#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2062 +#: ../gui/wxpython/menustrings.py:11 ../gui/wxpython/menustrings.py:2067 msgid "Save as" msgstr "" @@ -5547,7 +5762,7 @@ msgid "Close workspace file" msgstr "" #: ../gui/wxpython/menustrings.py:15 -#: ../gui/wxpython/web_services/dialogs.py:877 +#: ../gui/wxpython/web_services/dialogs.py:879 msgid "Map display" msgstr "" @@ -5584,7 +5799,7 @@ msgid "Add RGB raster map layer to current display" msgstr "" #: ../gui/wxpython/menustrings.py:24 ../gui/wxpython/menustrings.py:25 -#: ../gui/wxpython/web_services/dialogs.py:527 +#: ../gui/wxpython/web_services/dialogs.py:529 msgid "Add web service layer" msgstr "" @@ -5612,564 +5827,571 @@ msgstr "" msgid "Close all open map display windows" msgstr "" -#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1073 +#: ../gui/wxpython/menustrings.py:35 ../gui/wxpython/menustrings.py:1075 msgid "Simplified raster import with reprojection" msgstr "재투영과 동시에 단순화된 래스터 가져오기" #: ../gui/wxpython/menustrings.py:36 ../gui/wxpython/menustrings.py:38 -#: ../gui/wxpython/menustrings.py:1074 ../gui/wxpython/menustrings.py:1076 +#: ../gui/wxpython/menustrings.py:1076 ../gui/wxpython/menustrings.py:1078 msgid "Imports raster data into a GRASS raster map using GDAL library." msgstr "" -#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1075 +#: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1077 msgid "Import of common raster formats" msgstr "일반적인 래스터 서식 가져오기" -#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1077 +#: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1079 msgid "ASCII x,y,z point import and gridding" msgstr "ASCII x,y,z 점 가져오기 및 격자화" -#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1078 +#: ../gui/wxpython/menustrings.py:40 ../gui/wxpython/menustrings.py:1080 msgid "" "Creates a raster map from an assemblage of many coordinates using univariate " "statistics." msgstr "" -#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1079 +#: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1081 msgid "ASCII grid import" msgstr "ASCII 격자 가져오기" -#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1080 +#: ../gui/wxpython/menustrings.py:42 ../gui/wxpython/menustrings.py:1082 msgid "Converts a GRASS ASCII raster file to binary raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1081 +#: ../gui/wxpython/menustrings.py:43 ../gui/wxpython/menustrings.py:1083 msgid "ASCII polygons, lines, and point import" msgstr "ASCII 다각형, 선, 점 가져오기" -#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1082 +#: ../gui/wxpython/menustrings.py:44 ../gui/wxpython/menustrings.py:1084 msgid "Creates raster maps from ASCII polygon/line/point data files." msgstr "" -#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1083 +#: ../gui/wxpython/menustrings.py:45 ../gui/wxpython/menustrings.py:1085 msgid "Raw binary array import" msgstr "순수 이진 배열 가져오기" -#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1084 +#: ../gui/wxpython/menustrings.py:46 ../gui/wxpython/menustrings.py:1086 msgid "Import a binary raster file into a GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1085 +#: ../gui/wxpython/menustrings.py:47 ../gui/wxpython/menustrings.py:1087 msgid "GRIDATB.FOR import" msgstr "GRIDATB.FOR 가져오기" -#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1086 +#: ../gui/wxpython/menustrings.py:48 ../gui/wxpython/menustrings.py:1088 msgid "Imports GRIDATB.FOR map file (TOPMODEL) into a GRASS raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1087 +#: ../gui/wxpython/menustrings.py:49 ../gui/wxpython/menustrings.py:1089 msgid "Matlab 2D array import" msgstr "매트랩 2차원 배열 가져오기" -#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1088 +#: ../gui/wxpython/menustrings.py:50 ../gui/wxpython/menustrings.py:1090 msgid "Imports a binary MAT-File(v4) to a GRASS raster." msgstr "" -#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1089 +#: ../gui/wxpython/menustrings.py:51 ../gui/wxpython/menustrings.py:1091 msgid "PNG import" msgstr "PNG 가져오기" -#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1090 +#: ../gui/wxpython/menustrings.py:52 ../gui/wxpython/menustrings.py:1092 msgid "Imports non-georeferenced PNG format image." msgstr "" -#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1091 +#: ../gui/wxpython/menustrings.py:53 ../gui/wxpython/menustrings.py:1093 msgid "SPOT NDVI import" msgstr "SPOT NDVI 가져오기" -#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1092 +#: ../gui/wxpython/menustrings.py:54 ../gui/wxpython/menustrings.py:1094 msgid "Imports SPOT VGT NDVI data into a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1093 +#: ../gui/wxpython/menustrings.py:55 ../gui/wxpython/menustrings.py:1095 msgid "SRTM HGT import" msgstr "SRTM HGT 가져오기" -#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1094 +#: ../gui/wxpython/menustrings.py:56 ../gui/wxpython/menustrings.py:1096 msgid "Imports SRTM HGT files into raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1095 +#: ../gui/wxpython/menustrings.py:57 ../gui/wxpython/menustrings.py:1097 msgid "Terra ASTER HDF import" msgstr "Terra ASTER HDF 가져오기" -#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1096 +#: ../gui/wxpython/menustrings.py:58 ../gui/wxpython/menustrings.py:1098 msgid "" "Georeference, rectify, and import Terra-ASTER imagery and relative DEMs " "using gdalwarp." msgstr "" #: ../gui/wxpython/menustrings.py:59 ../gui/wxpython/menustrings.py:88 -#: ../gui/wxpython/menustrings.py:1097 ../gui/wxpython/menustrings.py:1126 +#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 msgid "LAS LiDAR points import" msgstr "LAS LiDAR 점 가져오기" -#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:62 -#: ../gui/wxpython/menustrings.py:1098 ../gui/wxpython/menustrings.py:1100 -msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +#: ../gui/wxpython/menustrings.py:60 ../gui/wxpython/menustrings.py:89 +#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:805 +#: ../gui/wxpython/menustrings.py:1100 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:1768 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:2031 ../gui/wxpython/core/toolboxes.py:627 +msgid "Module not installed" msgstr "" #: ../gui/wxpython/menustrings.py:61 ../gui/wxpython/menustrings.py:90 -#: ../gui/wxpython/menustrings.py:1099 ../gui/wxpython/menustrings.py:1128 +#: ../gui/wxpython/menustrings.py:1101 ../gui/wxpython/menustrings.py:1130 msgid "Point cloud (LAS LiDAR) import" msgstr "" -#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101 +#: ../gui/wxpython/menustrings.py:62 ../gui/wxpython/menustrings.py:1102 +msgid "Creates a raster map from LAS LiDAR points using univariate statistics." +msgstr "" + +#: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1103 msgid "WMS/WMTS import" msgstr "" -#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102 +#: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1104 msgid "" "Downloads and imports data from OGC WMS and OGC WMTS web mapping servers." msgstr "" -#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1103 +#: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105 msgid "Unpack raster map" msgstr "래스터 지도 풀기" -#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1104 +#: ../gui/wxpython/menustrings.py:66 ../gui/wxpython/menustrings.py:1106 msgid "" "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a " "raster map" msgstr "" #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:294 -#: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1257 -msgid "Reproject raster map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1107 ../gui/wxpython/menustrings.py:1259 +#, fuzzy +msgid "Reproject raster map from different GRASS project" msgstr "다른 GRASS 로케이션으로부터 래스터 지도 재투영" #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:295 -#: ../gui/wxpython/menustrings.py:1106 ../gui/wxpython/menustrings.py:1258 -msgid "Re-projects a raster map from given location to the current location." -msgstr "" +#: ../gui/wxpython/menustrings.py:1108 ../gui/wxpython/menustrings.py:1260 +#, fuzzy +msgid "Re-projects a raster map from given project to the current project." +msgstr "다른 GRASS 로케이션으로부터 래스터 지도 재투영" -#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1108 +#: ../gui/wxpython/menustrings.py:70 ../gui/wxpython/menustrings.py:1110 msgid "Simplified vector import with reprojection" msgstr "재투영과 동시에 단순화된 벡터 가져오기" #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:73 -#: ../gui/wxpython/menustrings.py:1109 ../gui/wxpython/menustrings.py:1111 +#: ../gui/wxpython/menustrings.py:1111 ../gui/wxpython/menustrings.py:1113 msgid "Imports vector data into a GRASS vector map using OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1110 +#: ../gui/wxpython/menustrings.py:72 ../gui/wxpython/menustrings.py:1112 msgid "Import of common vector formats" msgstr "일반적인 벡터 서식 가져오기" -#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1112 +#: ../gui/wxpython/menustrings.py:74 ../gui/wxpython/menustrings.py:1114 msgid "ASCII points or GRASS ASCII format" msgstr "ASCII 점 또는 GRASS ASCII 포맷" -#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1113 +#: ../gui/wxpython/menustrings.py:75 ../gui/wxpython/menustrings.py:1115 msgid "Creates a vector map from an ASCII points file or ASCII vector file." msgstr "" -#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1114 +#: ../gui/wxpython/menustrings.py:76 ../gui/wxpython/menustrings.py:1116 msgid "ASCII points as a vector lines" msgstr "ASCII 점을 벡터 선으로 가져오기" -#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1115 +#: ../gui/wxpython/menustrings.py:77 ../gui/wxpython/menustrings.py:1117 msgid "Imports ASCII x,y[,z] coordinates as a series of lines." msgstr "" -#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1116 +#: ../gui/wxpython/menustrings.py:78 ../gui/wxpython/menustrings.py:1118 msgid "DXF import" msgstr "DXF 가져오기" -#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1117 +#: ../gui/wxpython/menustrings.py:79 ../gui/wxpython/menustrings.py:1119 msgid "Converts files in DXF format to GRASS vector map format." msgstr "" -#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1118 +#: ../gui/wxpython/menustrings.py:80 ../gui/wxpython/menustrings.py:1120 msgid "WFS" msgstr "" -#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1119 +#: ../gui/wxpython/menustrings.py:81 ../gui/wxpython/menustrings.py:1121 msgid "Imports GetFeature from a WFS server." msgstr "" -#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1120 +#: ../gui/wxpython/menustrings.py:82 ../gui/wxpython/menustrings.py:1122 msgid "ESRI e00 import" msgstr "ESRI e00 가져오기" -#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1121 +#: ../gui/wxpython/menustrings.py:83 ../gui/wxpython/menustrings.py:1123 msgid "Imports E00 file into a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1122 +#: ../gui/wxpython/menustrings.py:84 ../gui/wxpython/menustrings.py:1124 msgid "Geonames import" msgstr "Geonames 가져오기" -#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1123 +#: ../gui/wxpython/menustrings.py:85 ../gui/wxpython/menustrings.py:1125 msgid "Imports geonames.org country files into a vector points map." msgstr "" -#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1124 +#: ../gui/wxpython/menustrings.py:86 ../gui/wxpython/menustrings.py:1126 msgid "Matlab array or Mapgen format import" msgstr "매트랩 배열 또는 맵젠 포맷 가져오기" -#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1125 +#: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1127 msgid "Imports Mapgen or Matlab-ASCII vector maps into GRASS." msgstr "맵젠 또는 매트랩-ASCII 벡터 지도를 GRASS로 가져옵니다." -#: ../gui/wxpython/menustrings.py:89 ../gui/wxpython/menustrings.py:1127 -msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS." -msgstr "" - -#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1129 +#: ../gui/wxpython/menustrings.py:91 ../gui/wxpython/menustrings.py:1131 msgid "Converts LAS LiDAR point clouds to a GRASS vector map with PDAL." msgstr "" -#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1130 +#: ../gui/wxpython/menustrings.py:92 ../gui/wxpython/menustrings.py:1132 msgid "Unpack vector map" msgstr "벡터 지도 풀기" -#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1131 +#: ../gui/wxpython/menustrings.py:93 ../gui/wxpython/menustrings.py:1133 msgid "" "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a " "vector map" msgstr "" #: ../gui/wxpython/menustrings.py:94 ../gui/wxpython/menustrings.py:583 -#: ../gui/wxpython/menustrings.py:1132 ../gui/wxpython/menustrings.py:1546 -msgid "Reproject vector map from different GRASS location" +#: ../gui/wxpython/menustrings.py:1134 ../gui/wxpython/menustrings.py:1548 +#, fuzzy +msgid "Reproject vector map from different GRASS project" msgstr "다른 GRASS 로케이션으로부터 벡터 지도 재투영" #: ../gui/wxpython/menustrings.py:95 ../gui/wxpython/menustrings.py:584 -#: ../gui/wxpython/menustrings.py:1133 ../gui/wxpython/menustrings.py:1547 -msgid "Re-projects a vector map from one location to the current location." -msgstr "" +#: ../gui/wxpython/menustrings.py:1135 ../gui/wxpython/menustrings.py:1549 +#, fuzzy +msgid "Re-projects a vector map from one project to the current project." +msgstr "다른 GRASS 로케이션으로부터 벡터 지도 재투영" -#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1134 +#: ../gui/wxpython/menustrings.py:96 ../gui/wxpython/menustrings.py:1136 msgid "Import 3D raster data" msgstr "3차원 래스터 자료 가져오기" -#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1135 +#: ../gui/wxpython/menustrings.py:97 ../gui/wxpython/menustrings.py:1137 msgid "ASCII 3D import" msgstr "ASCII 3차원 가져오기" -#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1136 +#: ../gui/wxpython/menustrings.py:98 ../gui/wxpython/menustrings.py:1138 msgid "Converts a 3D ASCII raster text file into a (binary) 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1137 +#: ../gui/wxpython/menustrings.py:99 ../gui/wxpython/menustrings.py:1139 msgid "Raw binary array 3D import" msgstr "순수 이진 배열 3차원 가져오기" -#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1138 +#: ../gui/wxpython/menustrings.py:100 ../gui/wxpython/menustrings.py:1140 msgid "Imports a binary raster file into a GRASS 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1139 +#: ../gui/wxpython/menustrings.py:101 ../gui/wxpython/menustrings.py:1141 msgid "Vis5D import" msgstr "Vis5D 가져오기" -#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1140 +#: ../gui/wxpython/menustrings.py:102 ../gui/wxpython/menustrings.py:1142 msgid "Import 3-dimensional Vis5D files." msgstr "" -#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1141 +#: ../gui/wxpython/menustrings.py:103 ../gui/wxpython/menustrings.py:1143 msgid "Import database table" msgstr "데이터베이스 테이블 가져오기" -#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1142 +#: ../gui/wxpython/menustrings.py:104 ../gui/wxpython/menustrings.py:1144 msgid "Common import formats" msgstr "일반적인 가져오기 포맷" -#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1143 +#: ../gui/wxpython/menustrings.py:105 ../gui/wxpython/menustrings.py:1145 msgid "Imports attribute tables in various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1144 +#: ../gui/wxpython/menustrings.py:106 ../gui/wxpython/menustrings.py:1146 msgid "Export raster map" msgstr "래스터 지도 내보내기" #: ../gui/wxpython/menustrings.py:107 ../gui/wxpython/menustrings.py:136 -#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1145 -#: ../gui/wxpython/menustrings.py:1174 ../gui/wxpython/menustrings.py:1200 +#: ../gui/wxpython/menustrings.py:162 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:1176 ../gui/wxpython/menustrings.py:1202 msgid "Common export formats" msgstr "일반적인 내보내기 포맷" -#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1146 +#: ../gui/wxpython/menustrings.py:108 ../gui/wxpython/menustrings.py:1148 msgid "Exports GRASS raster maps into GDAL supported formats." msgstr "" -#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1147 +#: ../gui/wxpython/menustrings.py:109 ../gui/wxpython/menustrings.py:1149 msgid "ASCII grid export" msgstr "ASCII 격자 내보내기" -#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1148 +#: ../gui/wxpython/menustrings.py:110 ../gui/wxpython/menustrings.py:1150 msgid "Converts a raster map layer into a GRASS ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1149 +#: ../gui/wxpython/menustrings.py:111 ../gui/wxpython/menustrings.py:1151 msgid "ASCII x,y,z points export" msgstr "ASCII x,y,z 점 내보내기" -#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1150 +#: ../gui/wxpython/menustrings.py:112 ../gui/wxpython/menustrings.py:1152 msgid "" "Exports a raster map to a text file as x,y,z values based on cell centers." msgstr "" -#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1151 +#: ../gui/wxpython/menustrings.py:113 ../gui/wxpython/menustrings.py:1153 msgid "GRIDATB.FOR export" msgstr "GRIDATB.FOR 내보내기" -#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1152 +#: ../gui/wxpython/menustrings.py:114 ../gui/wxpython/menustrings.py:1154 msgid "Exports GRASS raster map to GRIDATB.FOR map file (TOPMODEL)." msgstr "" -#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1153 +#: ../gui/wxpython/menustrings.py:115 ../gui/wxpython/menustrings.py:1155 msgid "Matlab 2D array export" msgstr "매트랩 2차원 배열 내보내기" -#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1154 +#: ../gui/wxpython/menustrings.py:116 ../gui/wxpython/menustrings.py:1156 msgid "Exports a GRASS raster to a binary MAT-File." msgstr "" -#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1155 +#: ../gui/wxpython/menustrings.py:117 ../gui/wxpython/menustrings.py:1157 msgid "Raw binary array export" msgstr "순수 이진 배열 내보내기" -#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1156 +#: ../gui/wxpython/menustrings.py:118 ../gui/wxpython/menustrings.py:1158 msgid "Exports a GRASS raster to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1157 +#: ../gui/wxpython/menustrings.py:119 ../gui/wxpython/menustrings.py:1159 msgid "MPEG-1 export" msgstr "MPEG-1 내보내기" -#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1158 +#: ../gui/wxpython/menustrings.py:120 ../gui/wxpython/menustrings.py:1160 msgid "Converts raster map series to MPEG movie." msgstr "" -#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1159 +#: ../gui/wxpython/menustrings.py:121 ../gui/wxpython/menustrings.py:1161 msgid "PNG export" msgstr "PNG 내보내기" -#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1160 +#: ../gui/wxpython/menustrings.py:122 ../gui/wxpython/menustrings.py:1162 msgid "Export a GRASS raster map as a non-georeferenced PNG image." msgstr "" -#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1161 +#: ../gui/wxpython/menustrings.py:123 ../gui/wxpython/menustrings.py:1163 msgid "PPM export" msgstr "PPM 내보내기" -#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1162 +#: ../gui/wxpython/menustrings.py:124 ../gui/wxpython/menustrings.py:1164 msgid "Converts a GRASS raster map to a PPM image file." msgstr "" -#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1163 +#: ../gui/wxpython/menustrings.py:125 ../gui/wxpython/menustrings.py:1165 msgid "PPM from RGB export" msgstr "RGB를 PPM으로 내보내기" -#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1164 +#: ../gui/wxpython/menustrings.py:126 ../gui/wxpython/menustrings.py:1166 msgid "Converts 3 GRASS raster layers (R,G,B) to a PPM image file." msgstr "" #: ../gui/wxpython/menustrings.py:127 ../gui/wxpython/menustrings.py:144 -#: ../gui/wxpython/menustrings.py:1165 ../gui/wxpython/menustrings.py:1182 +#: ../gui/wxpython/menustrings.py:1167 ../gui/wxpython/menustrings.py:1184 msgid "POV-Ray export" msgstr "POV-Ray 내보내기" -#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1166 +#: ../gui/wxpython/menustrings.py:128 ../gui/wxpython/menustrings.py:1168 msgid "Converts a raster map layer into a height-field file for POV-Ray." msgstr "" -#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1167 +#: ../gui/wxpython/menustrings.py:129 ../gui/wxpython/menustrings.py:1169 msgid "VRML export" msgstr "VRML 내보내기" -#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1168 +#: ../gui/wxpython/menustrings.py:130 ../gui/wxpython/menustrings.py:1170 msgid "Exports a raster map to the Virtual Reality Modeling Language (VRML)." msgstr "" #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:148 -#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1169 -#: ../gui/wxpython/menustrings.py:1186 ../gui/wxpython/menustrings.py:1197 +#: ../gui/wxpython/menustrings.py:159 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:1188 ../gui/wxpython/menustrings.py:1199 msgid "VTK export" msgstr "VTK 내보내기" -#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1170 +#: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1172 msgid "Converts raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1171 +#: ../gui/wxpython/menustrings.py:133 ../gui/wxpython/menustrings.py:1173 msgid "Pack raster map" msgstr "래스터 지도 꾸리기" -#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1172 +#: ../gui/wxpython/menustrings.py:134 ../gui/wxpython/menustrings.py:1174 msgid "Exports a raster map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1173 +#: ../gui/wxpython/menustrings.py:135 ../gui/wxpython/menustrings.py:1175 msgid "Export vector map" msgstr "벡터 지도 내보내기" -#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1175 +#: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1177 msgid "" "Exports a vector map layer to any of the supported OGR vector formats. By " "default a vector map layer is exported to OGC GeoPackage format." msgstr "" -#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1176 +#: ../gui/wxpython/menustrings.py:138 ../gui/wxpython/menustrings.py:1178 msgid "ASCII points or GRASS ASCII vector export" msgstr "ASCII 점 또는 GRASS ASCII 벡터 내보내기" -#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1177 +#: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1179 msgid "" "Exports a vector map to a GRASS ASCII vector representation. By default only " "features with category are exported. To export all features use 'layer=-1'." msgstr "" -#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1178 +#: ../gui/wxpython/menustrings.py:140 ../gui/wxpython/menustrings.py:1180 msgid "DXF export" msgstr "DXF 내보내기" -#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1179 +#: ../gui/wxpython/menustrings.py:141 ../gui/wxpython/menustrings.py:1181 msgid "Exports vector map to DXF file format." msgstr "" -#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1180 +#: ../gui/wxpython/menustrings.py:142 ../gui/wxpython/menustrings.py:1182 msgid "PostGIS export" msgstr "PostGIS 내보내기" -#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1181 +#: ../gui/wxpython/menustrings.py:143 ../gui/wxpython/menustrings.py:1183 msgid "Exports a vector map layer to PostGIS feature table." msgstr "" -#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1183 +#: ../gui/wxpython/menustrings.py:145 ../gui/wxpython/menustrings.py:1185 msgid "Converts GRASS x,y,z points to POV-Ray x,z,y format." msgstr "" -#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1184 +#: ../gui/wxpython/menustrings.py:146 ../gui/wxpython/menustrings.py:1186 msgid "SVG export" msgstr "SVG 내보내기" -#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1185 +#: ../gui/wxpython/menustrings.py:147 ../gui/wxpython/menustrings.py:1187 msgid "Exports a vector map to SVG file." msgstr "" -#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1187 +#: ../gui/wxpython/menustrings.py:149 ../gui/wxpython/menustrings.py:1189 msgid "Converts a vector map to VTK ASCII output." msgstr "" -#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1188 +#: ../gui/wxpython/menustrings.py:150 ../gui/wxpython/menustrings.py:1190 msgid "Pack vector map" msgstr "벡터 지도 꾸리기" -#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1189 +#: ../gui/wxpython/menustrings.py:151 ../gui/wxpython/menustrings.py:1191 msgid "Exports a vector map as GRASS GIS specific archive file" msgstr "" -#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1190 +#: ../gui/wxpython/menustrings.py:152 ../gui/wxpython/menustrings.py:1192 msgid "Export 3D raster maps" msgstr "3차원 래스터 지도 내보내기" -#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1191 +#: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1193 msgid "ASCII 3D export" msgstr "ASCII 3차원 내보내기" -#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1192 +#: ../gui/wxpython/menustrings.py:154 ../gui/wxpython/menustrings.py:1194 msgid "Converts a 3D raster map layer into a ASCII text file." msgstr "" -#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1193 +#: ../gui/wxpython/menustrings.py:155 ../gui/wxpython/menustrings.py:1195 msgid "Raw binary array 3D export" msgstr "순수 이진 배열 3차원 내보내기" -#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1194 +#: ../gui/wxpython/menustrings.py:156 ../gui/wxpython/menustrings.py:1196 msgid "Exports a GRASS 3D raster map to a binary array." msgstr "" -#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1195 +#: ../gui/wxpython/menustrings.py:157 ../gui/wxpython/menustrings.py:1197 msgid "Vis5D export" msgstr "Vis5D 내보내기" -#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1196 +#: ../gui/wxpython/menustrings.py:158 ../gui/wxpython/menustrings.py:1198 msgid "Exports GRASS 3D raster map to 3-dimensional Vis5D file." msgstr "" -#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1198 +#: ../gui/wxpython/menustrings.py:160 ../gui/wxpython/menustrings.py:1200 msgid "Converts 3D raster maps into the VTK-ASCII format." msgstr "" -#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1199 +#: ../gui/wxpython/menustrings.py:161 ../gui/wxpython/menustrings.py:1201 msgid "Export database table" msgstr "데이터베이스 테이블 내보내기" -#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1201 +#: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1203 msgid "Exports attribute tables into various formats." msgstr "" -#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1203 +#: ../gui/wxpython/menustrings.py:165 ../gui/wxpython/menustrings.py:1205 #: ../gui/wxpython/modules/import_export.py:414 msgid "Link external raster data" msgstr "외부 래스터 자료 연결" -#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1204 +#: ../gui/wxpython/menustrings.py:166 ../gui/wxpython/menustrings.py:1206 msgid "Link GDAL supported raster data as a pseudo GRASS raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1205 -#: ../gui/wxpython/modules/import_export.py:560 +#: ../gui/wxpython/menustrings.py:167 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/modules/import_export.py:576 msgid "Link external vector data" msgstr "외부 벡터 자료 연결" -#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1206 +#: ../gui/wxpython/menustrings.py:168 ../gui/wxpython/menustrings.py:1208 msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer." msgstr "" -#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1207 +#: ../gui/wxpython/menustrings.py:169 ../gui/wxpython/menustrings.py:1209 msgid "Output format for raster data" msgstr "래스터 자료를 위한 출력 포맷" -#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1208 +#: ../gui/wxpython/menustrings.py:170 ../gui/wxpython/menustrings.py:1210 msgid "" "Redirects raster output to file utilizing GDAL library rather than storing " "in GRASS raster format." msgstr "" -#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1209 +#: ../gui/wxpython/menustrings.py:171 ../gui/wxpython/menustrings.py:1211 msgid "Output format for vector data" msgstr "벡터 자료를 위한 출력 포맷" -#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1210 +#: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1212 msgid "Defines vector output format utilizing OGR library." msgstr "" -#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211 +#: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213 msgid "Manage maps" msgstr "지도 관리" -#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1212 +#: ../gui/wxpython/menustrings.py:174 ../gui/wxpython/menustrings.py:1214 #: ../gui/wxpython/gui_core/forms.py:630 #: ../gui/wxpython/modules/mcalc_builder.py:176 msgid "Copy" msgstr "복사" -#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1213 +#: ../gui/wxpython/menustrings.py:175 ../gui/wxpython/menustrings.py:1215 msgid "" "Creates copies of maps and other elements Copies available data files in the " "current mapset search path to the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:980 -#: ../gui/wxpython/menustrings.py:1214 ../gui/wxpython/menustrings.py:1943 +#: ../gui/wxpython/menustrings.py:176 ../gui/wxpython/menustrings.py:982 +#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1947 msgid "List" msgstr "목록" -#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1215 +#: ../gui/wxpython/menustrings.py:177 ../gui/wxpython/menustrings.py:1217 msgid "" "Lists available GRASS data base files of the user-specified data type " "optionally using the search pattern." @@ -6177,17 +6399,17 @@ msgstr "" "사용자가 지정한 자료형의 유효한 GRASS 데이터베이스 파일을 나열합니다. 필요한 " "경우 검색패턴을 사용할 수도 있습니다." -#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:968 -#: ../gui/wxpython/menustrings.py:1216 ../gui/wxpython/menustrings.py:1931 +#: ../gui/wxpython/menustrings.py:178 ../gui/wxpython/menustrings.py:970 +#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:1935 #: ../gui/wxpython/rlisetup/frame.py:163 ../gui/wxpython/lmgr/layertree.py:457 msgid "Rename" msgstr "이름 바꾸기" -#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1217 +#: ../gui/wxpython/menustrings.py:179 ../gui/wxpython/menustrings.py:1219 msgid "Renames data base element files in the user's current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1219 +#: ../gui/wxpython/menustrings.py:181 ../gui/wxpython/menustrings.py:1221 msgid "" "Removes data base element files from the user's current mapset using the " "search pattern." @@ -6196,69 +6418,69 @@ msgstr "" "거합니다." #: ../gui/wxpython/menustrings.py:182 ../gui/wxpython/menustrings.py:320 -#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:881 -#: ../gui/wxpython/menustrings.py:1283 ../gui/wxpython/menustrings.py:1586 -#: ../gui/wxpython/menustrings.py:1844 +#: ../gui/wxpython/menustrings.py:623 ../gui/wxpython/menustrings.py:883 +#: ../gui/wxpython/menustrings.py:1285 ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1848 msgid "Map type conversions" msgstr "지도 유형 변환" #: ../gui/wxpython/menustrings.py:183 ../gui/wxpython/menustrings.py:321 -#: ../gui/wxpython/menustrings.py:1284 +#: ../gui/wxpython/menustrings.py:1286 msgid "Raster to vector" msgstr "래스터를 벡터로 변환" #: ../gui/wxpython/menustrings.py:184 ../gui/wxpython/menustrings.py:322 -#: ../gui/wxpython/menustrings.py:1285 +#: ../gui/wxpython/menustrings.py:1287 msgid "Converts a raster map into a vector map." msgstr "" #: ../gui/wxpython/menustrings.py:185 ../gui/wxpython/menustrings.py:323 -#: ../gui/wxpython/menustrings.py:1286 +#: ../gui/wxpython/menustrings.py:1288 msgid "Raster series to 3D raster" msgstr "래스터 계열을 3차원 래스터로 변환" #: ../gui/wxpython/menustrings.py:186 ../gui/wxpython/menustrings.py:324 -#: ../gui/wxpython/menustrings.py:1287 +#: ../gui/wxpython/menustrings.py:1289 msgid "Converts 2D raster map slices to one 3D raster volume map." msgstr "" #: ../gui/wxpython/menustrings.py:187 ../gui/wxpython/menustrings.py:325 -#: ../gui/wxpython/menustrings.py:1288 +#: ../gui/wxpython/menustrings.py:1290 msgid "Raster 2.5D to 3D raster" msgstr "2.5차원 래스터를 3차원 래스터로 변환" #: ../gui/wxpython/menustrings.py:188 ../gui/wxpython/menustrings.py:326 -#: ../gui/wxpython/menustrings.py:1289 +#: ../gui/wxpython/menustrings.py:1291 msgid "Creates a 3D volume map based on 2D elevation and value raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:189 ../gui/wxpython/menustrings.py:624 -#: ../gui/wxpython/menustrings.py:1587 +#: ../gui/wxpython/menustrings.py:1589 msgid "Vector to raster" msgstr "" #: ../gui/wxpython/menustrings.py:190 ../gui/wxpython/menustrings.py:625 -#: ../gui/wxpython/menustrings.py:1588 +#: ../gui/wxpython/menustrings.py:1590 msgid "Converts (rasterize) a vector map into a raster map." msgstr "" #: ../gui/wxpython/menustrings.py:191 ../gui/wxpython/menustrings.py:626 -#: ../gui/wxpython/menustrings.py:1589 +#: ../gui/wxpython/menustrings.py:1591 msgid "Vector to 3D raster" msgstr "" #: ../gui/wxpython/menustrings.py:192 ../gui/wxpython/menustrings.py:627 -#: ../gui/wxpython/menustrings.py:1590 +#: ../gui/wxpython/menustrings.py:1592 msgid "Converts a vector map (only points) into a 3D raster map." msgstr "" #: ../gui/wxpython/menustrings.py:193 ../gui/wxpython/menustrings.py:628 -#: ../gui/wxpython/menustrings.py:1591 +#: ../gui/wxpython/menustrings.py:1593 msgid "2D vector to 3D vector" msgstr "" #: ../gui/wxpython/menustrings.py:194 ../gui/wxpython/menustrings.py:629 -#: ../gui/wxpython/menustrings.py:1592 +#: ../gui/wxpython/menustrings.py:1594 msgid "Performs transformation of 2D vector features to 3D." msgstr "" @@ -6266,20 +6488,20 @@ msgstr "" msgid "3D raster to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:883 -#: ../gui/wxpython/menustrings.py:1846 +#: ../gui/wxpython/menustrings.py:196 ../gui/wxpython/menustrings.py:885 +#: ../gui/wxpython/menustrings.py:1850 msgid "Converts 3D raster maps to 2D raster maps" msgstr "" -#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2034 +#: ../gui/wxpython/menustrings.py:198 ../gui/wxpython/menustrings.py:2039 msgid "Manage Ground Control Points for Georectification" msgstr "" -#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2035 +#: ../gui/wxpython/menustrings.py:199 ../gui/wxpython/menustrings.py:2040 msgid "Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2036 +#: ../gui/wxpython/menustrings.py:200 ../gui/wxpython/menustrings.py:2041 msgid "Launch Graphical modeler" msgstr "" @@ -6297,13 +6519,13 @@ msgid "" "vector data, and volumes (3D raster data) in 3D." msgstr "" -#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1054 -#: ../gui/wxpython/menustrings.py:2017 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:205 ../gui/wxpython/menustrings.py:1056 +#: ../gui/wxpython/menustrings.py:2021 ../gui/wxpython/menustrings.py:2028 msgid "Animation tool" msgstr "애니메이션 도구" -#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1055 -#: ../gui/wxpython/menustrings.py:2018 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:206 ../gui/wxpython/menustrings.py:1057 +#: ../gui/wxpython/menustrings.py:2022 ../gui/wxpython/menustrings.py:2029 msgid "Launch animation tool." msgstr "애니메이션 도구를 시작합니다." @@ -6317,16 +6539,16 @@ msgid "" "coordinates and vice versa. It assumes a cartesian coordinate system" msgstr "" -#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2027 +#: ../gui/wxpython/menustrings.py:209 ../gui/wxpython/menustrings.py:2032 #: ../gui/wxpython/lmgr/toolbars.py:210 ../gui/wxpython/psmap/frame.py:55 msgid "Cartographic Composer" msgstr "지도 작성자" -#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2028 +#: ../gui/wxpython/menustrings.py:210 ../gui/wxpython/menustrings.py:2033 msgid "Launch Cartographic Composer" msgstr "지도 작성자를 시작합니다" -#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2042 +#: ../gui/wxpython/menustrings.py:212 ../gui/wxpython/menustrings.py:2047 msgid "Launch Map Swipe" msgstr "" @@ -6346,7 +6568,7 @@ msgstr "" msgid "Launches Simple Python Editor." msgstr "" -#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2388 +#: ../gui/wxpython/menustrings.py:217 ../gui/wxpython/gui_core/dialogs.py:2390 msgid "Close GUI" msgstr "GUI 닫기" @@ -6354,8 +6576,8 @@ msgstr "GUI 닫기" msgid "Close graphical user interface." msgstr "" -#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2358 -#: ../gui/wxpython/gui_core/dialogs.py:2391 +#: ../gui/wxpython/menustrings.py:219 ../gui/wxpython/gui_core/dialogs.py:2360 +#: ../gui/wxpython/gui_core/dialogs.py:2393 msgid "Quit GRASS GIS" msgstr "GRASS GIS 종료" @@ -6363,42 +6585,42 @@ msgstr "GRASS GIS 종료" msgid "Close GUI and exit GRASS GIS shell." msgstr "GUI를 닫고 GRASS GIS 셸을 종료합니다." -#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2072 +#: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:2077 msgid "&Settings" msgstr "설정(&S)" -#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1220 -#: ../gui/wxpython/web_services/dialogs.py:880 -#: ../gui/wxpython/mapdisp/statusbar.py:955 +#: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1222 +#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/mapdisp/statusbar.py:960 msgid "Computational region" msgstr "계산 영역" -#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1221 +#: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1223 msgid "Show current region" msgstr "현재 영역 보기" #: ../gui/wxpython/menustrings.py:224 ../gui/wxpython/menustrings.py:226 -#: ../gui/wxpython/menustrings.py:1222 ../gui/wxpython/menustrings.py:1224 +#: ../gui/wxpython/menustrings.py:1224 ../gui/wxpython/menustrings.py:1226 msgid "Shows the extent and resolution of the computational region." msgstr "" -#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1223 +#: ../gui/wxpython/menustrings.py:225 ../gui/wxpython/menustrings.py:1225 msgid "Show region using latitude and longitude" msgstr "위도 및 경도를 이용한 영역 보기" -#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1225 +#: ../gui/wxpython/menustrings.py:227 ../gui/wxpython/menustrings.py:1227 msgid "Show current region extent in Map Display" msgstr "지도 디스플레이 내 현재 영역의 범위 보기" -#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1226 +#: ../gui/wxpython/menustrings.py:228 ../gui/wxpython/menustrings.py:1228 msgid "Shows the extent of the computational region in Map Display." msgstr "지도 디스플레이 내 계산 영역의 범위를 보여 줍니다." -#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1227 +#: ../gui/wxpython/menustrings.py:229 ../gui/wxpython/menustrings.py:1229 msgid "Set region" msgstr "영역 설정" -#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1228 +#: ../gui/wxpython/menustrings.py:230 ../gui/wxpython/menustrings.py:1230 msgid "Manages the boundary definitions for the geographic region." msgstr "" @@ -6411,7 +6633,7 @@ msgid "Mapset access" msgstr "" #: ../gui/wxpython/menustrings.py:233 -msgid "Set/unset access to other mapsets in current location" +msgid "Set/unset access to other mapsets in current project" msgstr "" #: ../gui/wxpython/menustrings.py:234 @@ -6437,11 +6659,12 @@ msgstr "" "어진 로케이션 안에 유효한 지도 세트를 나열합니다." #: ../gui/wxpython/menustrings.py:238 -msgid "Change location and mapset" -msgstr "" +#, fuzzy +msgid "Change project (location) and mapset" +msgstr "GRASS 로케이션과 지도 세트를 선택하세요" #: ../gui/wxpython/menustrings.py:239 -msgid "Change current location and mapset." +msgid "Change current project and mapset." msgstr "" #: ../gui/wxpython/menustrings.py:240 @@ -6475,16 +6698,21 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:248 -msgid "Create new location" -msgstr "" +#, fuzzy +msgid "Create new project (location)" +msgstr "선택된 로케이션을 삭제합니다" #: ../gui/wxpython/menustrings.py:249 -msgid "Launches location wizard to create new GRASS location." +msgid "" +"Launches project wizard to create a new GRASS project (also known as " +"location)." msgstr "" #: ../gui/wxpython/menustrings.py:251 -msgid "Creates new mapset in the current location, changes current mapset." +#, fuzzy +msgid "Creates new mapset in the current project, changes current mapset." msgstr "" +"지도 세트 검색 경로에서 가능한 파일을 현재 사용자 지도 세트로 복사합니다." #: ../gui/wxpython/menustrings.py:252 msgid "Map projections" @@ -6507,8 +6735,7 @@ msgstr "" #: ../gui/wxpython/menustrings.py:256 msgid "" "Prints or modifies GRASS projection information files (in various co-" -"ordinate system descriptions). Can also be used to create new GRASS " -"locations." +"ordinate system descriptions). Can also be used to create new GRASS projects." msgstr "" #: ../gui/wxpython/menustrings.py:257 @@ -6539,7 +6766,7 @@ msgstr "" msgid "Updates or removes installed GRASS AddOns extension(s)." msgstr "설치된 GRASS 애드온 확장을 갱신하거나 제거합니다" -#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2073 +#: ../gui/wxpython/menustrings.py:264 ../gui/wxpython/menustrings.py:2078 msgid "Preferences" msgstr "" @@ -6547,51 +6774,51 @@ msgstr "" msgid "User GUI preferences (display font, commands, digitizer, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1229 +#: ../gui/wxpython/menustrings.py:266 ../gui/wxpython/menustrings.py:1231 msgid "&Raster" msgstr "래스터(&R)" -#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1230 +#: ../gui/wxpython/menustrings.py:267 ../gui/wxpython/menustrings.py:1232 msgid "Develop raster map" msgstr "래스터 지도 개발" -#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1231 +#: ../gui/wxpython/menustrings.py:268 ../gui/wxpython/menustrings.py:1233 msgid "Compress/decompress" msgstr "압축/해제" -#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1232 +#: ../gui/wxpython/menustrings.py:269 ../gui/wxpython/menustrings.py:1234 msgid "Compresses and decompresses raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1233 +#: ../gui/wxpython/menustrings.py:270 ../gui/wxpython/menustrings.py:1235 msgid "Region boundaries" msgstr "영역 경계" -#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1234 +#: ../gui/wxpython/menustrings.py:271 ../gui/wxpython/menustrings.py:1236 msgid "Sets the boundary definitions for a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1235 +#: ../gui/wxpython/menustrings.py:272 ../gui/wxpython/menustrings.py:1237 msgid "Manage NULL values" msgstr "널값 관리" -#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1236 +#: ../gui/wxpython/menustrings.py:273 ../gui/wxpython/menustrings.py:1238 msgid "Manages NULL-values of given raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1237 +#: ../gui/wxpython/menustrings.py:274 ../gui/wxpython/menustrings.py:1239 msgid "Quantization" msgstr "양자화" -#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1238 +#: ../gui/wxpython/menustrings.py:275 ../gui/wxpython/menustrings.py:1240 msgid "Produces the quantization file for a floating-point map." msgstr "" -#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1239 +#: ../gui/wxpython/menustrings.py:276 ../gui/wxpython/menustrings.py:1241 msgid "Timestamp" msgstr "타임스탬프" -#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1240 +#: ../gui/wxpython/menustrings.py:277 ../gui/wxpython/menustrings.py:1242 msgid "" "Modifies a timestamp for a raster map. Print/add/remove a timestamp for a " "raster map." @@ -6599,265 +6826,265 @@ msgstr "" "래스터 지도를 위한 타임스탬프를 수정합니다. 래스터 지도를 위한 타임스탬프를 " "출력/추가/제거합니다." -#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1241 +#: ../gui/wxpython/menustrings.py:278 ../gui/wxpython/menustrings.py:1243 msgid "Resample using aggregate statistics" msgstr "집계 통계를 이용한 재추출" -#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1242 +#: ../gui/wxpython/menustrings.py:279 ../gui/wxpython/menustrings.py:1244 msgid "Resamples raster map layers to a coarser grid using aggregation." msgstr "집계를 이용해서 래스터 지도 레이어를 더 큰 격자로 재추출합니다." -#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1243 +#: ../gui/wxpython/menustrings.py:280 ../gui/wxpython/menustrings.py:1245 msgid "Resample using multiple methods" msgstr "복수의 방법을 이용한 재추출" -#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1244 +#: ../gui/wxpython/menustrings.py:281 ../gui/wxpython/menustrings.py:1246 msgid "Resamples raster map to a finer grid using interpolation." msgstr "보간을 이용해서 래스터 지도를 더 작은 격자로 재추출합니다." -#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1245 +#: ../gui/wxpython/menustrings.py:282 ../gui/wxpython/menustrings.py:1247 msgid "Resample using nearest neighbor" msgstr "최근접 이웃을 이용한 재추출" -#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1246 +#: ../gui/wxpython/menustrings.py:283 ../gui/wxpython/menustrings.py:1248 msgid "GRASS raster map layer data resampling capability." msgstr "" -#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1247 +#: ../gui/wxpython/menustrings.py:284 ../gui/wxpython/menustrings.py:1249 msgid "Resample using spline tension" msgstr "스플라인 장력을 이용한 재추출" -#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1248 +#: ../gui/wxpython/menustrings.py:285 ../gui/wxpython/menustrings.py:1250 msgid "" "Reinterpolates and optionally computes topographic analysis from input " "raster map to a new raster map (possibly with different resolution) using " "regularized spline with tension and smoothing." msgstr "" -#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1249 +#: ../gui/wxpython/menustrings.py:286 ../gui/wxpython/menustrings.py:1251 msgid "Resample using bspline" msgstr "B-스플라인을 이용한 재추출" -#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1250 +#: ../gui/wxpython/menustrings.py:287 ../gui/wxpython/menustrings.py:1252 msgid "" "Performs bilinear or bicubic spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1251 +#: ../gui/wxpython/menustrings.py:288 ../gui/wxpython/menustrings.py:1253 msgid "Resample using analytic kernel" msgstr "분석적인 커널을 이용한 재추출" -#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1252 +#: ../gui/wxpython/menustrings.py:289 ../gui/wxpython/menustrings.py:1254 msgid "Resamples raster map layers using an analytic kernel." msgstr "분석적인 커널을 이용해서 래스터 지도 레이어를 재추출합니다." #: ../gui/wxpython/menustrings.py:290 ../gui/wxpython/menustrings.py:585 -#: ../gui/wxpython/menustrings.py:1253 ../gui/wxpython/menustrings.py:1548 +#: ../gui/wxpython/menustrings.py:1255 ../gui/wxpython/menustrings.py:1550 msgid "Support file maintenance" msgstr "지원 파일 유지 관리" -#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1254 +#: ../gui/wxpython/menustrings.py:291 ../gui/wxpython/menustrings.py:1256 msgid "Allows creation and/or modification of raster map layer support files." msgstr "" -#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1255 +#: ../gui/wxpython/menustrings.py:292 ../gui/wxpython/menustrings.py:1257 msgid "Update map statistics" msgstr "지도 통계 갱신" -#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1256 +#: ../gui/wxpython/menustrings.py:293 ../gui/wxpython/menustrings.py:1258 msgid "Update raster map statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1259 +#: ../gui/wxpython/menustrings.py:296 ../gui/wxpython/menustrings.py:1261 msgid "Tiling" msgstr "타일 생성" -#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1260 +#: ../gui/wxpython/menustrings.py:297 ../gui/wxpython/menustrings.py:1262 msgid "" "Produces tilings of the source projection for use in the destination region " "and projection." msgstr "" -#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1261 +#: ../gui/wxpython/menustrings.py:298 ../gui/wxpython/menustrings.py:1263 msgid "Build a VRT (Virtual Raster)" msgstr "" -#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1262 +#: ../gui/wxpython/menustrings.py:299 ../gui/wxpython/menustrings.py:1264 msgid "Build a VRT (Virtual Raster) from the list of input raster maps." msgstr "" #: ../gui/wxpython/menustrings.py:300 ../gui/wxpython/menustrings.py:606 -#: ../gui/wxpython/menustrings.py:1263 ../gui/wxpython/menustrings.py:1569 +#: ../gui/wxpython/menustrings.py:1265 ../gui/wxpython/menustrings.py:1571 msgid "Manage colors" msgstr "색상 관리" #: ../gui/wxpython/menustrings.py:301 ../gui/wxpython/menustrings.py:607 -#: ../gui/wxpython/menustrings.py:1264 ../gui/wxpython/menustrings.py:1570 +#: ../gui/wxpython/menustrings.py:1266 ../gui/wxpython/menustrings.py:1572 msgid "Color tables" msgstr "색상 테이블" -#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1265 +#: ../gui/wxpython/menustrings.py:302 ../gui/wxpython/menustrings.py:1267 msgid "Creates/modifies the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1266 +#: ../gui/wxpython/menustrings.py:303 ../gui/wxpython/menustrings.py:1268 msgid "Color tables (stddev)" msgstr "색상 테이블 (표준 편차)" -#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1267 +#: ../gui/wxpython/menustrings.py:304 ../gui/wxpython/menustrings.py:1269 msgid "Sets color rules based on stddev from a raster map's mean value." msgstr "" #: ../gui/wxpython/menustrings.py:305 ../gui/wxpython/menustrings.py:609 -#: ../gui/wxpython/menustrings.py:1268 ../gui/wxpython/menustrings.py:1572 +#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 msgid "Manage color rules interactively" msgstr "대화식 색상 규칙 관리" -#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1269 +#: ../gui/wxpython/menustrings.py:306 ../gui/wxpython/menustrings.py:1271 msgid "Interactive management of raster color tables." msgstr "" #: ../gui/wxpython/menustrings.py:307 ../gui/wxpython/menustrings.py:611 -#: ../gui/wxpython/menustrings.py:1270 ../gui/wxpython/menustrings.py:1574 +#: ../gui/wxpython/menustrings.py:1272 ../gui/wxpython/menustrings.py:1576 msgid "Export color table" msgstr "색상 테이블 내보내기" -#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1271 +#: ../gui/wxpython/menustrings.py:308 ../gui/wxpython/menustrings.py:1273 msgid "Exports the color table associated with a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1272 +#: ../gui/wxpython/menustrings.py:309 ../gui/wxpython/menustrings.py:1274 msgid "Blend 2 color rasters" msgstr "두 개의 색상 래스터 혼합" -#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1273 +#: ../gui/wxpython/menustrings.py:310 ../gui/wxpython/menustrings.py:1275 msgid "Blends color components of two raster maps by a given ratio." msgstr "" -#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1274 +#: ../gui/wxpython/menustrings.py:311 ../gui/wxpython/menustrings.py:1276 msgid "Create RGB" msgstr "RGB 생성" -#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1275 +#: ../gui/wxpython/menustrings.py:312 ../gui/wxpython/menustrings.py:1277 msgid "" "Combines red, green and blue raster maps into a single composite raster map." msgstr "" #: ../gui/wxpython/menustrings.py:313 ../gui/wxpython/menustrings.py:779 -#: ../gui/wxpython/menustrings.py:1276 ../gui/wxpython/menustrings.py:1742 +#: ../gui/wxpython/menustrings.py:1278 ../gui/wxpython/menustrings.py:1744 msgid "RGB to HIS" msgstr "RGB를 HIS로 변환" -#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1277 +#: ../gui/wxpython/menustrings.py:314 ../gui/wxpython/menustrings.py:1279 msgid "" "Generates red, green and blue (RGB) raster map layers combining hue, " "intensity and saturation (HIS) values from user-specified input raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1278 +#: ../gui/wxpython/menustrings.py:315 ../gui/wxpython/menustrings.py:1280 msgid "Query raster maps" msgstr "래스터 지도 질의" -#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1279 +#: ../gui/wxpython/menustrings.py:316 ../gui/wxpython/menustrings.py:1281 msgid "Query values by coordinates" msgstr "좌표로 값 질의" -#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1280 +#: ../gui/wxpython/menustrings.py:317 ../gui/wxpython/menustrings.py:1282 msgid "Queries raster maps on their category values and category labels." msgstr "" -#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1281 +#: ../gui/wxpython/menustrings.py:318 ../gui/wxpython/menustrings.py:1283 msgid "Query colors by value" msgstr "값으로 색상 질의" -#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1282 +#: ../gui/wxpython/menustrings.py:319 ../gui/wxpython/menustrings.py:1284 msgid "Queries colors for a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1290 +#: ../gui/wxpython/menustrings.py:327 ../gui/wxpython/menustrings.py:1292 msgid "Raster buffers and distance" msgstr "래스터 버퍼 및 거리" -#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1291 +#: ../gui/wxpython/menustrings.py:328 ../gui/wxpython/menustrings.py:1293 msgid "Buffer rasters" msgstr "래스터 버퍼" -#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1292 +#: ../gui/wxpython/menustrings.py:329 ../gui/wxpython/menustrings.py:1294 msgid "" "Creates a raster map showing buffer zones surrounding cells that contain non-" "NULL category values." msgstr "" -#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1293 +#: ../gui/wxpython/menustrings.py:330 ../gui/wxpython/menustrings.py:1295 msgid "Concentric circles" msgstr "동심원" -#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1294 +#: ../gui/wxpython/menustrings.py:331 ../gui/wxpython/menustrings.py:1296 msgid "Creates a raster map containing concentric rings around a given point." msgstr "" -#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1295 +#: ../gui/wxpython/menustrings.py:332 ../gui/wxpython/menustrings.py:1297 msgid "Closest points" msgstr "최근접 점" -#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1296 +#: ../gui/wxpython/menustrings.py:333 ../gui/wxpython/menustrings.py:1298 msgid "Locates the closest points between objects in two raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1297 +#: ../gui/wxpython/menustrings.py:334 ../gui/wxpython/menustrings.py:1299 msgid "Grow by one cell" msgstr "한 셀 키우기" #: ../gui/wxpython/menustrings.py:335 ../gui/wxpython/menustrings.py:405 -#: ../gui/wxpython/menustrings.py:1298 ../gui/wxpython/menustrings.py:1368 +#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1370 msgid "Generates a raster map layer with contiguous areas grown by one cell." msgstr "" #: ../gui/wxpython/menustrings.py:336 ../gui/wxpython/menustrings.py:397 -#: ../gui/wxpython/menustrings.py:1299 ../gui/wxpython/menustrings.py:1360 +#: ../gui/wxpython/menustrings.py:1301 ../gui/wxpython/menustrings.py:1362 msgid "Distance to features" msgstr "피처까지 거리" #: ../gui/wxpython/menustrings.py:337 ../gui/wxpython/menustrings.py:398 -#: ../gui/wxpython/menustrings.py:1300 ../gui/wxpython/menustrings.py:1361 +#: ../gui/wxpython/menustrings.py:1302 ../gui/wxpython/menustrings.py:1363 msgid "" "Generates a raster map containing distances to nearest raster features and/" "or the value of the nearest non-null cell." msgstr "" -#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1302 +#: ../gui/wxpython/menustrings.py:339 ../gui/wxpython/menustrings.py:1304 msgid "Creates a MASK for limiting raster operation." msgstr "" #: ../gui/wxpython/menustrings.py:340 ../gui/wxpython/menustrings.py:343 -#: ../gui/wxpython/menustrings.py:1303 ../gui/wxpython/menustrings.py:1306 +#: ../gui/wxpython/menustrings.py:1305 ../gui/wxpython/menustrings.py:1308 msgid "Raster map calculator" msgstr "래스터 지도 계산기" -#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1304 +#: ../gui/wxpython/menustrings.py:341 ../gui/wxpython/menustrings.py:1306 msgid "Simplified raster map calculator" msgstr "" -#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1305 +#: ../gui/wxpython/menustrings.py:342 ../gui/wxpython/menustrings.py:1307 msgid "Calculates a new raster map from a simple r.mapcalc expression." msgstr "" -#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1307 +#: ../gui/wxpython/menustrings.py:344 ../gui/wxpython/menustrings.py:1309 msgid "Raster map calculator." msgstr "" -#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1308 +#: ../gui/wxpython/menustrings.py:345 ../gui/wxpython/menustrings.py:1310 msgid "Neighborhood analysis" msgstr "이웃 분석" -#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1309 +#: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1311 #: ../gui/wxpython/rlisetup/wizard.py:985 msgid "Moving window" msgstr "이동 창" -#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1310 +#: ../gui/wxpython/menustrings.py:347 ../gui/wxpython/menustrings.py:1312 msgid "" "Makes each cell category value a function of the category values assigned to " "the cells around it, and stores new cell values in an output raster map " @@ -6866,46 +7093,46 @@ msgstr "" "각 셀의 범주 값은 그 주변 셀에 할당된 범주값들의 함수가 되며, 새 셀의 값은 출" "력 래스터 지도 레이어에 저장됩니다." -#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1311 +#: ../gui/wxpython/menustrings.py:348 ../gui/wxpython/menustrings.py:1313 msgid "Neighborhood points" msgstr "이웃 점" -#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1312 +#: ../gui/wxpython/menustrings.py:349 ../gui/wxpython/menustrings.py:1314 msgid "" "Neighborhood analysis tool for vector point maps. 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 in an output raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1313 +#: ../gui/wxpython/menustrings.py:350 ../gui/wxpython/menustrings.py:1315 msgid "Overlay rasters" msgstr "래스터 중첩" -#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1314 +#: ../gui/wxpython/menustrings.py:351 ../gui/wxpython/menustrings.py:1316 msgid "Cross product" msgstr "벡터곱" -#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1315 +#: ../gui/wxpython/menustrings.py:352 ../gui/wxpython/menustrings.py:1317 msgid "" "Creates a cross product of the category values from multiple raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1316 +#: ../gui/wxpython/menustrings.py:353 ../gui/wxpython/menustrings.py:1318 msgid "Patch raster maps" msgstr "래스터 지도 덧대기" -#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1317 +#: ../gui/wxpython/menustrings.py:354 ../gui/wxpython/menustrings.py:1319 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." msgstr "" -#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1318 +#: ../gui/wxpython/menustrings.py:355 ../gui/wxpython/menustrings.py:1320 msgid "Raster series aggregation" msgstr "래스터 계열 집계" -#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1319 +#: ../gui/wxpython/menustrings.py:356 ../gui/wxpython/menustrings.py:1321 msgid "" "Makes each output cell value a function of the values assigned to the " "corresponding cells in the input raster map layers." @@ -6913,11 +7140,11 @@ msgstr "" "각 출력 셀의 값은 입력 래스터 지도 레이어 안의 해당하는 셀에 할당된 값들의 함" "수가 됩니다." -#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1320 +#: ../gui/wxpython/menustrings.py:357 ../gui/wxpython/menustrings.py:1322 msgid "Raster series accumulation" msgstr "래스터 계열 누적" -#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1321 +#: ../gui/wxpython/menustrings.py:358 ../gui/wxpython/menustrings.py:1323 msgid "" "Makes each output cell value a accumulationfunction of the values assigned " "to the corresponding cells in the input raster map layers." @@ -6925,41 +7152,41 @@ msgstr "" "각 출력 셀의 값은 입력 래스터 지도 레이어 안의 해당하는 셀에 할당된 값들의 누" "적값이 됩니다." -#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1322 +#: ../gui/wxpython/menustrings.py:359 ../gui/wxpython/menustrings.py:1324 msgid "Statistical overlay" msgstr "통계적 중첩" -#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1323 +#: ../gui/wxpython/menustrings.py:360 ../gui/wxpython/menustrings.py:1325 msgid "" "Calculates category or object oriented statistics (accumulator-based " "statistics)." msgstr "" -#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1324 +#: ../gui/wxpython/menustrings.py:361 ../gui/wxpython/menustrings.py:1326 msgid "Quantiles overlay" msgstr "분위수 중첩" -#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1325 +#: ../gui/wxpython/menustrings.py:362 ../gui/wxpython/menustrings.py:1327 msgid "Compute category quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1326 +#: ../gui/wxpython/menustrings.py:363 ../gui/wxpython/menustrings.py:1328 msgid "Solar radiance and shadows" msgstr "태양 복사 및 그림자" -#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1327 +#: ../gui/wxpython/menustrings.py:364 ../gui/wxpython/menustrings.py:1329 msgid "LatLong map" msgstr "위경도 지도" -#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1328 +#: ../gui/wxpython/menustrings.py:365 ../gui/wxpython/menustrings.py:1330 msgid "Creates a latitude/longitude raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1329 +#: ../gui/wxpython/menustrings.py:366 ../gui/wxpython/menustrings.py:1331 msgid "Solar irradiance and irradiation" msgstr "태양 복사 조도 및 조사" -#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1330 +#: ../gui/wxpython/menustrings.py:367 ../gui/wxpython/menustrings.py:1332 msgid "" "Solar irradiance and irradiation model. Computes direct (beam), diffuse and " "reflected solar irradiation raster maps for given day, latitude, surface and " @@ -6970,22 +7197,22 @@ msgid "" "the topography is optionally incorporated." msgstr "" -#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1331 +#: ../gui/wxpython/menustrings.py:368 ../gui/wxpython/menustrings.py:1333 msgid "Shadows map" msgstr "" -#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1332 +#: ../gui/wxpython/menustrings.py:369 ../gui/wxpython/menustrings.py:1334 msgid "" "Calculates cast shadow areas from sun position and elevation raster map. " "Either exact sun position (A) is specified, or date/time to calculate the " "sun position (B) by r.sunmask itself." msgstr "" -#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1333 +#: ../gui/wxpython/menustrings.py:370 ../gui/wxpython/menustrings.py:1335 msgid "Sunshine hours and solar angles" msgstr "" -#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1334 +#: ../gui/wxpython/menustrings.py:371 ../gui/wxpython/menustrings.py:1336 msgid "" "Calculates solar elevation, solar azimuth, and sun hours. Solar elevation: " "the angle between the direction of the geometric center of the sun's " @@ -6993,127 +7220,127 @@ msgid "" "north in clockwise direction." msgstr "" -#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1335 +#: ../gui/wxpython/menustrings.py:372 ../gui/wxpython/menustrings.py:1337 msgid "Terrain analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1336 +#: ../gui/wxpython/menustrings.py:373 ../gui/wxpython/menustrings.py:1338 msgid "Generate contour lines" msgstr "" -#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1337 +#: ../gui/wxpython/menustrings.py:374 ../gui/wxpython/menustrings.py:1339 msgid "Produces a vector map of specified contours from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1338 +#: ../gui/wxpython/menustrings.py:375 ../gui/wxpython/menustrings.py:1340 msgid "Cost surface" msgstr "" -#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1339 +#: ../gui/wxpython/menustrings.py:376 ../gui/wxpython/menustrings.py:1341 msgid "" "Creates a raster map showing the cumulative cost of moving between different " "geographic locations on an input raster map whose cell category values " "represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1340 +#: ../gui/wxpython/menustrings.py:377 ../gui/wxpython/menustrings.py:1342 msgid "Trace a path" msgstr "" -#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1341 +#: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1343 msgid "Traces paths from starting points following input directions." msgstr "" -#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1342 +#: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1344 msgid "Cumulative movement costs" msgstr "" -#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1343 +#: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1345 msgid "" "Creates a raster map showing the anisotropic cumulative cost of moving " "between different geographic locations on an input raster map whose cell " "category values represent cost." msgstr "" -#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1344 +#: ../gui/wxpython/menustrings.py:381 ../gui/wxpython/menustrings.py:1346 msgid "Least cost route or flow" msgstr "" -#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1345 +#: ../gui/wxpython/menustrings.py:382 ../gui/wxpython/menustrings.py:1347 msgid "" "Traces a flow through an elevation model or cost surface on a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1346 +#: ../gui/wxpython/menustrings.py:383 ../gui/wxpython/menustrings.py:1348 msgid "Compute shaded relief" msgstr "" -#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1347 +#: ../gui/wxpython/menustrings.py:384 ../gui/wxpython/menustrings.py:1349 msgid "Creates shaded relief map from an elevation map (DEM). " msgstr "" -#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1348 +#: ../gui/wxpython/menustrings.py:385 ../gui/wxpython/menustrings.py:1350 msgid "Apply shade to raster" msgstr "" -#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1349 +#: ../gui/wxpython/menustrings.py:386 ../gui/wxpython/menustrings.py:1351 msgid "Drapes a color raster over an shaded relief or aspect map." msgstr "" -#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1350 +#: ../gui/wxpython/menustrings.py:387 ../gui/wxpython/menustrings.py:1352 msgid "Slope and aspect" msgstr "" -#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1351 +#: ../gui/wxpython/menustrings.py:388 ../gui/wxpython/menustrings.py:1353 msgid "" "Generates raster maps of slope, aspect, curvatures and partial derivatives " "from an elevation raster map. Aspect is calculated counterclockwise from " "east." msgstr "" -#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1352 +#: ../gui/wxpython/menustrings.py:389 ../gui/wxpython/menustrings.py:1354 msgid "Landforms" msgstr "" -#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1353 +#: ../gui/wxpython/menustrings.py:390 ../gui/wxpython/menustrings.py:1355 msgid "" "Calculates geomorphons (terrain forms) and associated geometry using machine " "vision approach." msgstr "" -#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1354 +#: ../gui/wxpython/menustrings.py:391 ../gui/wxpython/menustrings.py:1356 msgid "Terrain parameters" msgstr "" -#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1355 +#: ../gui/wxpython/menustrings.py:392 ../gui/wxpython/menustrings.py:1357 msgid "" "Extracts terrain parameters from a DEM. Uses a multi-scale approach by " "taking fitting quadratic parameters to any size window (via least squares)." msgstr "" -#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1356 +#: ../gui/wxpython/menustrings.py:393 ../gui/wxpython/menustrings.py:1358 msgid "Textural features" msgstr "" -#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1357 +#: ../gui/wxpython/menustrings.py:394 ../gui/wxpython/menustrings.py:1359 msgid "Generate images with textural features from a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1358 +#: ../gui/wxpython/menustrings.py:395 ../gui/wxpython/menustrings.py:1360 msgid "Visibility" msgstr "" -#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1359 +#: ../gui/wxpython/menustrings.py:396 ../gui/wxpython/menustrings.py:1361 msgid "" "Computes the viewshed of a point on an elevation raster map. Default format: " "NULL (invisible), vertical angle wrt viewpoint (visible)." msgstr "" -#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1362 +#: ../gui/wxpython/menustrings.py:399 ../gui/wxpython/menustrings.py:1364 msgid "Horizon angle" msgstr "" -#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1363 +#: ../gui/wxpython/menustrings.py:400 ../gui/wxpython/menustrings.py:1365 msgid "" "Computes horizon angle height from a digital elevation model. The module has " "two different modes of operation: 1. Computes the entire horizon around a " @@ -7124,323 +7351,323 @@ msgid "" "output is the horizon height in radians." msgstr "" -#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1364 +#: ../gui/wxpython/menustrings.py:401 ../gui/wxpython/menustrings.py:1366 msgid "Transform features" msgstr "" -#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1365 +#: ../gui/wxpython/menustrings.py:402 ../gui/wxpython/menustrings.py:1367 msgid "Clump" msgstr "" -#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1366 +#: ../gui/wxpython/menustrings.py:403 ../gui/wxpython/menustrings.py:1368 msgid "" "Recategorizes data in a raster map by grouping cells that form physically " "discrete areas into unique categories." msgstr "" -#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1367 +#: ../gui/wxpython/menustrings.py:404 ../gui/wxpython/menustrings.py:1369 msgid "Grow" msgstr "" -#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1369 +#: ../gui/wxpython/menustrings.py:406 ../gui/wxpython/menustrings.py:1371 msgid "Thin" msgstr "" -#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1370 +#: ../gui/wxpython/menustrings.py:407 ../gui/wxpython/menustrings.py:1372 msgid "Thins non-null cells that denote linear features in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1371 +#: ../gui/wxpython/menustrings.py:408 ../gui/wxpython/menustrings.py:1373 msgid "Hydrologic modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1372 +#: ../gui/wxpython/menustrings.py:409 ../gui/wxpython/menustrings.py:1374 msgid "Carve stream channels" msgstr "" -#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1373 +#: ../gui/wxpython/menustrings.py:410 ../gui/wxpython/menustrings.py:1375 msgid "" "Generates stream channels. Takes vector stream data, transforms it to raster " "and subtracts depth from the output DEM." msgstr "" -#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1374 +#: ../gui/wxpython/menustrings.py:411 ../gui/wxpython/menustrings.py:1376 msgid "Fill lake" msgstr "" -#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1375 +#: ../gui/wxpython/menustrings.py:412 ../gui/wxpython/menustrings.py:1377 msgid "Fills lake at given point to given level." msgstr "" -#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1376 +#: ../gui/wxpython/menustrings.py:413 ../gui/wxpython/menustrings.py:1378 msgid "Depressionless map and flowlines" msgstr "" -#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1377 +#: ../gui/wxpython/menustrings.py:414 ../gui/wxpython/menustrings.py:1379 msgid "" "Filters and generates a depressionless elevation map and a flow direction " "map from a given elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1378 +#: ../gui/wxpython/menustrings.py:415 ../gui/wxpython/menustrings.py:1380 msgid "Flow accumulation" msgstr "" -#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1379 +#: ../gui/wxpython/menustrings.py:416 ../gui/wxpython/menustrings.py:1381 msgid "Performs flow computation for massive grids." msgstr "" -#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1380 +#: ../gui/wxpython/menustrings.py:417 ../gui/wxpython/menustrings.py:1382 msgid "Flow lines" msgstr "" -#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1381 +#: ../gui/wxpython/menustrings.py:418 ../gui/wxpython/menustrings.py:1383 msgid "" "Constructs flowlines. Computes flowlines, flowpath lengths, and " "flowaccumulation (contributing areas) from a elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1382 +#: ../gui/wxpython/menustrings.py:419 ../gui/wxpython/menustrings.py:1384 msgid "Watershed analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1383 +#: ../gui/wxpython/menustrings.py:420 ../gui/wxpython/menustrings.py:1385 msgid "Calculates hydrological parameters and RUSLE factors." msgstr "" -#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1384 +#: ../gui/wxpython/menustrings.py:421 ../gui/wxpython/menustrings.py:1386 msgid "Watershed subbasins" msgstr "" -#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1385 +#: ../gui/wxpython/menustrings.py:422 ../gui/wxpython/menustrings.py:1387 msgid "Generates watershed subbasins raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1386 +#: ../gui/wxpython/menustrings.py:423 ../gui/wxpython/menustrings.py:1388 msgid "Watershed basin creation" msgstr "" -#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1387 +#: ../gui/wxpython/menustrings.py:424 ../gui/wxpython/menustrings.py:1389 msgid "Creates watershed basins from a drainage direction map." msgstr "" -#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1388 +#: ../gui/wxpython/menustrings.py:425 ../gui/wxpython/menustrings.py:1390 msgid "Extraction of stream networks" msgstr "" -#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1389 +#: ../gui/wxpython/menustrings.py:426 ../gui/wxpython/menustrings.py:1391 msgid "Performs stream network extraction." msgstr "" -#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1390 +#: ../gui/wxpython/menustrings.py:427 ../gui/wxpython/menustrings.py:1392 msgid "SIMWE Overland flow modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1391 +#: ../gui/wxpython/menustrings.py:428 ../gui/wxpython/menustrings.py:1393 msgid "Overland flow hydrologic simulation using path sampling method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1392 +#: ../gui/wxpython/menustrings.py:429 ../gui/wxpython/menustrings.py:1394 msgid "SIMWE Sediment flux modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1393 +#: ../gui/wxpython/menustrings.py:430 ../gui/wxpython/menustrings.py:1395 msgid "" "Sediment transport and erosion/deposition simulation using path sampling " "method (SIMWE)." msgstr "" -#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1394 +#: ../gui/wxpython/menustrings.py:431 ../gui/wxpython/menustrings.py:1396 msgid "Topographic index map" msgstr "지형지표 지도" -#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1395 +#: ../gui/wxpython/menustrings.py:432 ../gui/wxpython/menustrings.py:1397 msgid "" "Creates a topographic index (wetness index) raster map from an elevation " "raster map." msgstr "표고 래스터 지도로부터 지형지표(습윤지표) 래스터 지도를 생성합니다." -#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1396 +#: ../gui/wxpython/menustrings.py:433 ../gui/wxpython/menustrings.py:1398 msgid "TOPMODEL simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1397 +#: ../gui/wxpython/menustrings.py:434 ../gui/wxpython/menustrings.py:1399 msgid "Simulates TOPMODEL which is a physically based hydrologic model." msgstr "" -#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1398 +#: ../gui/wxpython/menustrings.py:435 ../gui/wxpython/menustrings.py:1400 msgid "USLE K-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1399 +#: ../gui/wxpython/menustrings.py:436 ../gui/wxpython/menustrings.py:1401 msgid "Computes USLE Soil Erodibility Factor (K)." msgstr "" -#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1400 +#: ../gui/wxpython/menustrings.py:437 ../gui/wxpython/menustrings.py:1402 msgid "USLE R-factor" msgstr "" -#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1401 +#: ../gui/wxpython/menustrings.py:438 ../gui/wxpython/menustrings.py:1403 msgid "Computes USLE R factor, Rainfall erosivity index." msgstr "" -#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:894 -#: ../gui/wxpython/menustrings.py:1402 ../gui/wxpython/menustrings.py:1857 +#: ../gui/wxpython/menustrings.py:439 ../gui/wxpython/menustrings.py:896 +#: ../gui/wxpython/menustrings.py:1404 ../gui/wxpython/menustrings.py:1861 msgid "Groundwater modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1403 +#: ../gui/wxpython/menustrings.py:440 ../gui/wxpython/menustrings.py:1405 msgid "Groundwater flow" msgstr "" -#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1404 +#: ../gui/wxpython/menustrings.py:441 ../gui/wxpython/menustrings.py:1406 msgid "" "Numerical calculation program for transient, confined and unconfined " "groundwater flow in two dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1405 +#: ../gui/wxpython/menustrings.py:442 ../gui/wxpython/menustrings.py:1407 msgid "Groundwater solute transport" msgstr "" -#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1406 +#: ../gui/wxpython/menustrings.py:443 ../gui/wxpython/menustrings.py:1408 msgid "" "Numerical calculation program for transient, confined and unconfined solute " "transport in two dimensions" msgstr "" -#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1407 +#: ../gui/wxpython/menustrings.py:444 ../gui/wxpython/menustrings.py:1409 msgid "Landscape patch analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1408 -#: ../gui/wxpython/menustrings.py:2043 +#: ../gui/wxpython/menustrings.py:445 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:2048 msgid "Set up sampling and analysis framework" msgstr "" -#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1409 -#: ../gui/wxpython/menustrings.py:2044 +#: ../gui/wxpython/menustrings.py:446 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:2049 msgid "Configuration editor for r.li.'index'" msgstr "" -#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1410 +#: ../gui/wxpython/menustrings.py:447 ../gui/wxpython/menustrings.py:1412 msgid "Edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1411 +#: ../gui/wxpython/menustrings.py:448 ../gui/wxpython/menustrings.py:1413 msgid "" "Calculates edge density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1412 +#: ../gui/wxpython/menustrings.py:449 ../gui/wxpython/menustrings.py:1414 msgid "Contrast weighted edge density" msgstr "" -#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1413 +#: ../gui/wxpython/menustrings.py:450 ../gui/wxpython/menustrings.py:1415 msgid "Calculates contrast weighted edge density index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1414 +#: ../gui/wxpython/menustrings.py:451 ../gui/wxpython/menustrings.py:1416 msgid "Patch area mean" msgstr "" -#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1415 +#: ../gui/wxpython/menustrings.py:452 ../gui/wxpython/menustrings.py:1417 msgid "" "Calculates mean patch size index on a raster map, using a 4 neighbour " "algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1416 +#: ../gui/wxpython/menustrings.py:453 ../gui/wxpython/menustrings.py:1418 msgid "Patch area range" msgstr "" -#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1417 +#: ../gui/wxpython/menustrings.py:454 ../gui/wxpython/menustrings.py:1419 msgid "Calculates range of patch area size on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1418 +#: ../gui/wxpython/menustrings.py:455 ../gui/wxpython/menustrings.py:1420 msgid "Patch area Std Dev" msgstr "" -#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1419 +#: ../gui/wxpython/menustrings.py:456 ../gui/wxpython/menustrings.py:1421 msgid "Calculates standard deviation of patch area a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1420 +#: ../gui/wxpython/menustrings.py:457 ../gui/wxpython/menustrings.py:1422 msgid "Patch area Coeff Var" msgstr "" -#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1421 +#: ../gui/wxpython/menustrings.py:458 ../gui/wxpython/menustrings.py:1423 msgid "Calculates coefficient of variation of patch area on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1422 +#: ../gui/wxpython/menustrings.py:459 ../gui/wxpython/menustrings.py:1424 msgid "Patch density" msgstr "" -#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1423 +#: ../gui/wxpython/menustrings.py:460 ../gui/wxpython/menustrings.py:1425 msgid "" "Calculates patch density index on a raster map, using a 4 neighbour algorithm" msgstr "" -#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1424 +#: ../gui/wxpython/menustrings.py:461 ../gui/wxpython/menustrings.py:1426 msgid "Patch number" msgstr "" -#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1425 +#: ../gui/wxpython/menustrings.py:462 ../gui/wxpython/menustrings.py:1427 msgid "" "Calculates patch number index on a raster map, using a 4 neighbour algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1426 +#: ../gui/wxpython/menustrings.py:463 ../gui/wxpython/menustrings.py:1428 msgid "Dominance's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1427 +#: ../gui/wxpython/menustrings.py:464 ../gui/wxpython/menustrings.py:1429 msgid "Calculates dominance's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1428 +#: ../gui/wxpython/menustrings.py:465 ../gui/wxpython/menustrings.py:1430 msgid "Shannon's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1429 +#: ../gui/wxpython/menustrings.py:466 ../gui/wxpython/menustrings.py:1431 msgid "Calculates Shannon's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1430 +#: ../gui/wxpython/menustrings.py:467 ../gui/wxpython/menustrings.py:1432 msgid "Simpson's diversity" msgstr "" -#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1431 +#: ../gui/wxpython/menustrings.py:468 ../gui/wxpython/menustrings.py:1433 msgid "Calculates Simpson's diversity index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1432 +#: ../gui/wxpython/menustrings.py:469 ../gui/wxpython/menustrings.py:1434 msgid "Richness" msgstr "" -#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1433 +#: ../gui/wxpython/menustrings.py:470 ../gui/wxpython/menustrings.py:1435 msgid "Calculates richness index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1434 +#: ../gui/wxpython/menustrings.py:471 ../gui/wxpython/menustrings.py:1436 msgid "Shape index" msgstr "" -#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1435 +#: ../gui/wxpython/menustrings.py:472 ../gui/wxpython/menustrings.py:1437 msgid "Calculates shape index on a raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1436 +#: ../gui/wxpython/menustrings.py:473 ../gui/wxpython/menustrings.py:1438 msgid "Wildfire modeling" msgstr "" -#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1437 +#: ../gui/wxpython/menustrings.py:474 ../gui/wxpython/menustrings.py:1439 msgid "Rate of spread" msgstr "" -#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1438 +#: ../gui/wxpython/menustrings.py:475 ../gui/wxpython/menustrings.py:1440 msgid "" "Generates rate of spread raster maps. Generates three, or four raster map " "layers showing the base (perpendicular) rate of spread (ROS), the maximum " @@ -7448,21 +7675,21 @@ msgid "" "potential spotting distance for fire spread simulation." msgstr "" -#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1439 +#: ../gui/wxpython/menustrings.py:476 ../gui/wxpython/menustrings.py:1441 msgid "Least-cost spread paths" msgstr "" -#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1440 +#: ../gui/wxpython/menustrings.py:477 ../gui/wxpython/menustrings.py:1442 msgid "" "Recursively traces the least cost path backwards to cells from which the " "cumulative cost was determined." msgstr "" -#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1441 +#: ../gui/wxpython/menustrings.py:478 ../gui/wxpython/menustrings.py:1443 msgid "Anisotropic spread simulation" msgstr "" -#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1442 +#: ../gui/wxpython/menustrings.py:479 ../gui/wxpython/menustrings.py:1444 msgid "" "Simulates elliptically anisotropic spread. Generates a raster map of the " "cumulative time of spread, given raster maps containing the rates of spread " @@ -7471,203 +7698,203 @@ msgid "" "Usable for fire spread simulations." msgstr "" -#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1443 +#: ../gui/wxpython/menustrings.py:480 ../gui/wxpython/menustrings.py:1445 msgid "Change category values and labels" msgstr "" #: ../gui/wxpython/menustrings.py:481 ../gui/wxpython/menustrings.py:533 -#: ../gui/wxpython/menustrings.py:1444 ../gui/wxpython/menustrings.py:1496 +#: ../gui/wxpython/menustrings.py:1446 ../gui/wxpython/menustrings.py:1498 msgid "Manage category information" msgstr "" #: ../gui/wxpython/menustrings.py:482 ../gui/wxpython/menustrings.py:534 -#: ../gui/wxpython/menustrings.py:1445 ../gui/wxpython/menustrings.py:1497 +#: ../gui/wxpython/menustrings.py:1447 ../gui/wxpython/menustrings.py:1499 msgid "" "Manages category values and labels associated with user-specified raster map " "layers." msgstr "" -#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1446 +#: ../gui/wxpython/menustrings.py:483 ../gui/wxpython/menustrings.py:1448 msgid "Interactively edit category values" msgstr "" -#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1447 +#: ../gui/wxpython/menustrings.py:484 ../gui/wxpython/menustrings.py:1449 msgid "Edits cell values in a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1448 +#: ../gui/wxpython/menustrings.py:485 ../gui/wxpython/menustrings.py:1450 msgid "Reclassify by size" msgstr "" -#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1449 +#: ../gui/wxpython/menustrings.py:486 ../gui/wxpython/menustrings.py:1451 msgid "" "Reclasses a raster map greater or less than user specified area size (in " "hectares)." msgstr "" #: ../gui/wxpython/menustrings.py:487 ../gui/wxpython/menustrings.py:710 -#: ../gui/wxpython/menustrings.py:1450 ../gui/wxpython/menustrings.py:1673 +#: ../gui/wxpython/menustrings.py:1452 ../gui/wxpython/menustrings.py:1675 msgid "Reclassify" msgstr "" -#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1451 +#: ../gui/wxpython/menustrings.py:488 ../gui/wxpython/menustrings.py:1453 msgid "" "Reclassify raster map based on category values. Creates a new raster map " "whose category values are based upon a reclassification of the categories in " "an existing raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1452 +#: ../gui/wxpython/menustrings.py:489 ../gui/wxpython/menustrings.py:1454 msgid "Recode" msgstr "" -#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1453 +#: ../gui/wxpython/menustrings.py:490 ../gui/wxpython/menustrings.py:1455 msgid "Recodes categorical raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1454 +#: ../gui/wxpython/menustrings.py:491 ../gui/wxpython/menustrings.py:1456 msgid "Rescale" msgstr "" -#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1455 +#: ../gui/wxpython/menustrings.py:492 ../gui/wxpython/menustrings.py:1457 msgid "Rescales the range of category values in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1456 +#: ../gui/wxpython/menustrings.py:493 ../gui/wxpython/menustrings.py:1458 msgid "Rescale with histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1457 +#: ../gui/wxpython/menustrings.py:494 ../gui/wxpython/menustrings.py:1459 msgid "" "Rescales histogram equalized the range of category values in a raster map " "layer." msgstr "" -#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1458 +#: ../gui/wxpython/menustrings.py:495 ../gui/wxpython/menustrings.py:1460 msgid "Generate random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1459 +#: ../gui/wxpython/menustrings.py:496 ../gui/wxpython/menustrings.py:1461 msgid "Random cells" msgstr "" -#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1460 +#: ../gui/wxpython/menustrings.py:497 ../gui/wxpython/menustrings.py:1462 msgid "Generates random cell values with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1461 +#: ../gui/wxpython/menustrings.py:498 ../gui/wxpython/menustrings.py:1463 msgid "Random cells and vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1462 +#: ../gui/wxpython/menustrings.py:499 ../gui/wxpython/menustrings.py:1464 msgid "" "Creates randomly placed raster cells or vector points Creates a raster map " "and vector point map containing randomly located cells and points." msgstr "" -#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1463 +#: ../gui/wxpython/menustrings.py:500 ../gui/wxpython/menustrings.py:1465 msgid "Generate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1464 +#: ../gui/wxpython/menustrings.py:501 ../gui/wxpython/menustrings.py:1466 msgid "Fractal surface" msgstr "" -#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1465 +#: ../gui/wxpython/menustrings.py:502 ../gui/wxpython/menustrings.py:1467 msgid "Creates a fractal surface of a given fractal dimension." msgstr "" -#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1466 +#: ../gui/wxpython/menustrings.py:503 ../gui/wxpython/menustrings.py:1468 msgid "Gaussian kernel density surface" msgstr "" -#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1467 +#: ../gui/wxpython/menustrings.py:504 ../gui/wxpython/menustrings.py:1469 msgid "" "Generates a raster density map from vector points map. Density is computed " "using a moving kernel. Optionally generates a vector density map on a vector " "network." msgstr "" -#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1468 +#: ../gui/wxpython/menustrings.py:505 ../gui/wxpython/menustrings.py:1470 msgid "Gaussian deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1469 +#: ../gui/wxpython/menustrings.py:506 ../gui/wxpython/menustrings.py:1471 msgid "" "Generates a raster map using gaussian random number generator. Mean and " "standard deviation of gaussian deviates can be expressed by the user." msgstr "" -#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1471 +#: ../gui/wxpython/menustrings.py:508 ../gui/wxpython/menustrings.py:1473 msgid "" "Creates raster plane map given dip (inclination), aspect (azimuth) and one " "point." msgstr "" -#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1472 +#: ../gui/wxpython/menustrings.py:509 ../gui/wxpython/menustrings.py:1474 msgid "Random deviates surface" msgstr "" -#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1473 +#: ../gui/wxpython/menustrings.py:510 ../gui/wxpython/menustrings.py:1475 msgid "" "Produces a raster surface map of uniform random deviates with defined range." msgstr "" -#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1474 +#: ../gui/wxpython/menustrings.py:511 ../gui/wxpython/menustrings.py:1476 msgid "Random surface with spatial dependence" msgstr "" -#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1475 +#: ../gui/wxpython/menustrings.py:512 ../gui/wxpython/menustrings.py:1477 msgid "Generates random surface(s) with spatial dependence." msgstr "" -#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476 +#: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478 msgid "Interpolate surfaces" msgstr "" -#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1477 +#: ../gui/wxpython/menustrings.py:514 ../gui/wxpython/menustrings.py:1479 msgid "Bilinear and bicubic from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1478 +#: ../gui/wxpython/menustrings.py:515 ../gui/wxpython/menustrings.py:1480 msgid "" "Performs bicubic or bilinear spline interpolation with Tykhonov " "regularization." msgstr "" -#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1479 +#: ../gui/wxpython/menustrings.py:516 ../gui/wxpython/menustrings.py:1481 msgid "IDW from raster points" msgstr "" -#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1480 +#: ../gui/wxpython/menustrings.py:517 ../gui/wxpython/menustrings.py:1482 msgid "" "Provides surface interpolation from raster point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1481 +#: ../gui/wxpython/menustrings.py:518 ../gui/wxpython/menustrings.py:1483 msgid "IDW from vector points" msgstr "" -#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1482 +#: ../gui/wxpython/menustrings.py:519 ../gui/wxpython/menustrings.py:1484 msgid "" "Provides surface interpolation from vector point data by Inverse Distance " "Squared Weighting." msgstr "" -#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1483 +#: ../gui/wxpython/menustrings.py:520 ../gui/wxpython/menustrings.py:1485 msgid "Raster contours" msgstr "" -#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1484 +#: ../gui/wxpython/menustrings.py:521 ../gui/wxpython/menustrings.py:1486 msgid "Generates surface raster map from rasterized contours." msgstr "" -#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1485 +#: ../gui/wxpython/menustrings.py:522 ../gui/wxpython/menustrings.py:1487 msgid "Regularized spline tension" msgstr "" -#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1486 +#: ../gui/wxpython/menustrings.py:523 ../gui/wxpython/menustrings.py:1488 msgid "" "Performs surface interpolation from vector points map by splines. Spatial " "approximation and topographic analysis from given point or isoline data in " @@ -7675,106 +7902,106 @@ msgid "" "tension." msgstr "" -#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1487 +#: ../gui/wxpython/menustrings.py:524 ../gui/wxpython/menustrings.py:1489 msgid "Raster series interpolation" msgstr "" -#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1488 +#: ../gui/wxpython/menustrings.py:525 ../gui/wxpython/menustrings.py:1490 msgid "" "Interpolates raster maps located (temporal or spatial) in between input " "raster maps at specific sampling positions." msgstr "" -#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1489 +#: ../gui/wxpython/menustrings.py:526 ../gui/wxpython/menustrings.py:1491 msgid "Fill NULL cells" msgstr "" -#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1490 +#: ../gui/wxpython/menustrings.py:527 ../gui/wxpython/menustrings.py:1492 msgid "Fills no-data areas in raster maps using spline interpolation." msgstr "" -#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1491 +#: ../gui/wxpython/menustrings.py:528 ../gui/wxpython/menustrings.py:1493 msgid "Fill NULL cells using IDW" msgstr "" -#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1492 +#: ../gui/wxpython/menustrings.py:529 ../gui/wxpython/menustrings.py:1494 msgid "" "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated " "values (IDW)." msgstr "" #: ../gui/wxpython/menustrings.py:530 ../gui/wxpython/menustrings.py:749 -#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:898 -#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:1493 -#: ../gui/wxpython/menustrings.py:1712 ../gui/wxpython/menustrings.py:1833 -#: ../gui/wxpython/menustrings.py:1861 ../gui/wxpython/menustrings.py:2005 +#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:900 +#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:1714 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:1865 ../gui/wxpython/menustrings.py:2009 msgid "Reports and statistics" msgstr "보고 및 통계" -#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1494 +#: ../gui/wxpython/menustrings.py:531 ../gui/wxpython/menustrings.py:1496 msgid "Basic raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1495 +#: ../gui/wxpython/menustrings.py:532 ../gui/wxpython/menustrings.py:1497 msgid "Outputs basic information about a raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1498 +#: ../gui/wxpython/menustrings.py:535 ../gui/wxpython/menustrings.py:1500 msgid "General statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1499 +#: ../gui/wxpython/menustrings.py:536 ../gui/wxpython/menustrings.py:1501 msgid "Generates area statistics for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1500 +#: ../gui/wxpython/menustrings.py:537 ../gui/wxpython/menustrings.py:1502 msgid "Quantiles for large data sets" msgstr "" -#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1501 +#: ../gui/wxpython/menustrings.py:538 ../gui/wxpython/menustrings.py:1503 msgid "Compute quantiles using two passes." msgstr "" -#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1502 +#: ../gui/wxpython/menustrings.py:539 ../gui/wxpython/menustrings.py:1504 msgid "Range of category values" msgstr "" -#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1503 +#: ../gui/wxpython/menustrings.py:540 ../gui/wxpython/menustrings.py:1505 msgid "Prints terse list of category values found in a raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1504 +#: ../gui/wxpython/menustrings.py:541 ../gui/wxpython/menustrings.py:1506 msgid "Sum area by raster map and category" msgstr "" -#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1505 +#: ../gui/wxpython/menustrings.py:542 ../gui/wxpython/menustrings.py:1507 msgid "Reports statistics for raster maps." msgstr "래스터 지도를 위한 통계를 보고합니다" -#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1506 +#: ../gui/wxpython/menustrings.py:543 ../gui/wxpython/menustrings.py:1508 msgid "Statistics for clumped cells" msgstr "" -#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1507 +#: ../gui/wxpython/menustrings.py:544 ../gui/wxpython/menustrings.py:1509 msgid "" "Calculates the volume of data \"clumps\". Optionally produces a GRASS vector " "points map containing the calculated centroids of these clumps." msgstr "" -#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1508 +#: ../gui/wxpython/menustrings.py:545 ../gui/wxpython/menustrings.py:1510 msgid "Total corrected area" msgstr "" -#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1509 +#: ../gui/wxpython/menustrings.py:546 ../gui/wxpython/menustrings.py:1511 msgid "Prints estimation of surface area for raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1510 -#: ../gui/wxpython/lmgr/layertree.py:794 ../gui/wxpython/lmgr/layertree.py:837 +#: ../gui/wxpython/menustrings.py:547 ../gui/wxpython/menustrings.py:1512 +#: ../gui/wxpython/lmgr/layertree.py:832 ../gui/wxpython/lmgr/layertree.py:875 msgid "Univariate raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1511 +#: ../gui/wxpython/menustrings.py:548 ../gui/wxpython/menustrings.py:1513 msgid "" "Calculates univariate statistics from the non-null cells of a raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -7783,474 +8010,474 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:549 ../gui/wxpython/menustrings.py:760 -#: ../gui/wxpython/menustrings.py:1512 ../gui/wxpython/menustrings.py:1723 +#: ../gui/wxpython/menustrings.py:1514 ../gui/wxpython/menustrings.py:1725 msgid "Sample transects" msgstr "" -#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1513 +#: ../gui/wxpython/menustrings.py:550 ../gui/wxpython/menustrings.py:1515 msgid "Outputs the raster map layer values lying on user-defined line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1514 +#: ../gui/wxpython/menustrings.py:551 ../gui/wxpython/menustrings.py:1516 msgid "Sample transects (bearing/distance)" msgstr "" -#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1515 +#: ../gui/wxpython/menustrings.py:552 ../gui/wxpython/menustrings.py:1517 msgid "" "Outputs raster map layer values lying along user defined transect line(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1516 +#: ../gui/wxpython/menustrings.py:553 ../gui/wxpython/menustrings.py:1518 msgid "Covariance/correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1517 +#: ../gui/wxpython/menustrings.py:554 ../gui/wxpython/menustrings.py:1519 msgid "" "Outputs a covariance/correlation matrix for user-specified raster map " "layer(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1518 +#: ../gui/wxpython/menustrings.py:555 ../gui/wxpython/menustrings.py:1520 msgid "Linear regression" msgstr "" -#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519 +#: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521 msgid "Calculates linear regression from two raster maps: y = a + b*x." msgstr "" -#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1520 +#: ../gui/wxpython/menustrings.py:557 ../gui/wxpython/menustrings.py:1522 msgid "Multiple regression" msgstr "" -#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1521 +#: ../gui/wxpython/menustrings.py:558 ../gui/wxpython/menustrings.py:1523 msgid "Calculates multiple linear regression from raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1522 +#: ../gui/wxpython/menustrings.py:559 ../gui/wxpython/menustrings.py:1524 msgid "Mutual category occurrences" msgstr "" -#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1523 +#: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1525 msgid "" "Tabulates the mutual occurrence (coincidence) of categories for two raster " "map layers." msgstr "" -#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1524 +#: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1526 msgid "&Vector" msgstr "벡터(&V)" -#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1525 +#: ../gui/wxpython/menustrings.py:562 ../gui/wxpython/menustrings.py:1527 msgid "Develop vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1526 -#: ../gui/wxpython/gui_core/dialogs.py:296 -#: ../gui/wxpython/gui_core/dialogs.py:449 +#: ../gui/wxpython/menustrings.py:563 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/gui_core/dialogs.py:297 +#: ../gui/wxpython/gui_core/dialogs.py:451 msgid "Create new vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1527 +#: ../gui/wxpython/menustrings.py:564 ../gui/wxpython/menustrings.py:1529 msgid "Create new empty vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1528 +#: ../gui/wxpython/menustrings.py:565 ../gui/wxpython/menustrings.py:1530 msgid "Edit vector map (non-interactively)" msgstr "" -#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1529 +#: ../gui/wxpython/menustrings.py:566 ../gui/wxpython/menustrings.py:1531 msgid "" "Edits a vector map, allows adding, deleting and modifying selected vector " "features." msgstr "" -#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1530 +#: ../gui/wxpython/menustrings.py:567 ../gui/wxpython/menustrings.py:1532 msgid "Convert object types" msgstr "" -#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1531 +#: ../gui/wxpython/menustrings.py:568 ../gui/wxpython/menustrings.py:1533 msgid "Changes type of vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1532 +#: ../gui/wxpython/menustrings.py:569 ../gui/wxpython/menustrings.py:1534 msgid "Parallel lines" msgstr "" -#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1533 +#: ../gui/wxpython/menustrings.py:570 ../gui/wxpython/menustrings.py:1535 msgid "Creates parallel line to input vector lines." msgstr "" -#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1534 +#: ../gui/wxpython/menustrings.py:571 ../gui/wxpython/menustrings.py:1536 msgid "Dissolve boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1535 +#: ../gui/wxpython/menustrings.py:572 ../gui/wxpython/menustrings.py:1537 msgid "" -"Dissolves boundaries between adjacent areas sharing a common category number " +"Dissolves adjacent or overlaping features sharing a common category number " "or attribute." msgstr "" -#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1536 +#: ../gui/wxpython/menustrings.py:573 ../gui/wxpython/menustrings.py:1538 msgid "Create 3D vector over raster" msgstr "" -#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1537 +#: ../gui/wxpython/menustrings.py:574 ../gui/wxpython/menustrings.py:1539 msgid "Converts 2D vector features to 3D by sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1538 +#: ../gui/wxpython/menustrings.py:575 ../gui/wxpython/menustrings.py:1540 msgid "Extrude 3D vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1539 +#: ../gui/wxpython/menustrings.py:576 ../gui/wxpython/menustrings.py:1541 msgid "" "Extrudes flat vector features to 3D vector features with defined height. " "Optionally the height can be derived from sampling of elevation raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1540 +#: ../gui/wxpython/menustrings.py:577 ../gui/wxpython/menustrings.py:1542 msgid "Create labels" msgstr "" -#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1541 +#: ../gui/wxpython/menustrings.py:578 ../gui/wxpython/menustrings.py:1543 msgid "Creates paint labels for a vector map from attached attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1542 +#: ../gui/wxpython/menustrings.py:579 ../gui/wxpython/menustrings.py:1544 msgid "Reposition vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1543 +#: ../gui/wxpython/menustrings.py:580 ../gui/wxpython/menustrings.py:1545 msgid "" "Performs an affine transformation (shift, scale and rotate) on vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1544 +#: ../gui/wxpython/menustrings.py:581 ../gui/wxpython/menustrings.py:1546 msgid "Rectify vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1545 +#: ../gui/wxpython/menustrings.py:582 ../gui/wxpython/menustrings.py:1547 msgid "" "Rectifies a vector by computing a coordinate transformation for each object " "in the vector based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1549 +#: ../gui/wxpython/menustrings.py:586 ../gui/wxpython/menustrings.py:1551 msgid "Updates vector map metadata." msgstr "" -#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1550 +#: ../gui/wxpython/menustrings.py:587 ../gui/wxpython/menustrings.py:1552 msgid "Topology maintenance" msgstr "" -#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1551 +#: ../gui/wxpython/menustrings.py:588 ../gui/wxpython/menustrings.py:1553 msgid "Create or rebuild topology" msgstr "" -#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1552 +#: ../gui/wxpython/menustrings.py:589 ../gui/wxpython/menustrings.py:1554 msgid "" "Creates topology for vector map. Optionally also checks for topological " "errors." msgstr "" -#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1553 +#: ../gui/wxpython/menustrings.py:590 ../gui/wxpython/menustrings.py:1555 msgid "Rebuild topology on all vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1554 +#: ../gui/wxpython/menustrings.py:591 ../gui/wxpython/menustrings.py:1556 msgid "Rebuilds topology on all vector maps in the current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1555 +#: ../gui/wxpython/menustrings.py:592 ../gui/wxpython/menustrings.py:1557 msgid "Build polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1556 +#: ../gui/wxpython/menustrings.py:593 ../gui/wxpython/menustrings.py:1558 msgid "Builds polylines from lines or boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1557 +#: ../gui/wxpython/menustrings.py:594 ../gui/wxpython/menustrings.py:1559 msgid "Split lines" msgstr "" -#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1558 +#: ../gui/wxpython/menustrings.py:595 ../gui/wxpython/menustrings.py:1560 msgid "Splits vector lines to shorter segments." msgstr "" -#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1559 +#: ../gui/wxpython/menustrings.py:596 ../gui/wxpython/menustrings.py:1561 msgid "Split polylines" msgstr "" -#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1560 +#: ../gui/wxpython/menustrings.py:597 ../gui/wxpython/menustrings.py:1562 msgid "Creates points/segments from input vector lines and positions." msgstr "" -#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1561 +#: ../gui/wxpython/menustrings.py:598 ../gui/wxpython/menustrings.py:1563 msgid "Clean vector map" msgstr "벡터 지도 정리" -#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1562 +#: ../gui/wxpython/menustrings.py:599 ../gui/wxpython/menustrings.py:1564 msgid "Toolset for cleaning topology of vector map." msgstr "벡터 지도의 위상 정리를 위한 도구세트" -#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563 +#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565 msgid "Fill holes in areas" msgstr "" -#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1564 +#: ../gui/wxpython/menustrings.py:601 ../gui/wxpython/menustrings.py:1566 msgid "Fill holes in areas by keeping only outer boundaries" msgstr "" -#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1565 +#: ../gui/wxpython/menustrings.py:602 ../gui/wxpython/menustrings.py:1567 msgid "Smooth or simplify" msgstr "" -#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1566 +#: ../gui/wxpython/menustrings.py:603 ../gui/wxpython/menustrings.py:1568 msgid "Performs vector based generalization." msgstr "" -#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1567 +#: ../gui/wxpython/menustrings.py:604 ../gui/wxpython/menustrings.py:1569 msgid "Add centroids" msgstr "" -#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1568 +#: ../gui/wxpython/menustrings.py:605 ../gui/wxpython/menustrings.py:1570 msgid "Adds missing centroids to closed boundaries." msgstr "" -#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1571 +#: ../gui/wxpython/menustrings.py:608 ../gui/wxpython/menustrings.py:1573 msgid "Creates/modifies the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1573 +#: ../gui/wxpython/menustrings.py:610 ../gui/wxpython/menustrings.py:1575 msgid "Interactive management of vector color tables." msgstr "" -#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1575 +#: ../gui/wxpython/menustrings.py:612 ../gui/wxpython/menustrings.py:1577 msgid "Exports the color table associated with a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1576 +#: ../gui/wxpython/menustrings.py:613 ../gui/wxpython/menustrings.py:1578 msgid "Query vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1577 +#: ../gui/wxpython/menustrings.py:614 ../gui/wxpython/menustrings.py:1579 msgid "Query with coordinate(s)" msgstr "" -#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1578 +#: ../gui/wxpython/menustrings.py:615 ../gui/wxpython/menustrings.py:1580 msgid "Queries a vector map at given locations." msgstr "" -#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:937 -#: ../gui/wxpython/menustrings.py:1579 ../gui/wxpython/menustrings.py:1900 +#: ../gui/wxpython/menustrings.py:616 ../gui/wxpython/menustrings.py:939 +#: ../gui/wxpython/menustrings.py:1581 ../gui/wxpython/menustrings.py:1904 msgid "Query vector attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:938 -#: ../gui/wxpython/menustrings.py:1580 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/menustrings.py:617 ../gui/wxpython/menustrings.py:940 +#: ../gui/wxpython/menustrings.py:1582 ../gui/wxpython/menustrings.py:1905 msgid "Prints vector map attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1581 +#: ../gui/wxpython/menustrings.py:618 ../gui/wxpython/menustrings.py:1583 msgid "Feature selection" msgstr "" -#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1582 +#: ../gui/wxpython/menustrings.py:619 ../gui/wxpython/menustrings.py:1584 msgid "Select by attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1583 +#: ../gui/wxpython/menustrings.py:620 ../gui/wxpython/menustrings.py:1585 msgid "" "Selects vector features from an existing vector map and creates a new vector " "map containing only the selected features." msgstr "" -#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1584 +#: ../gui/wxpython/menustrings.py:621 ../gui/wxpython/menustrings.py:1586 msgid "Select by another map" msgstr "" -#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1585 +#: ../gui/wxpython/menustrings.py:622 ../gui/wxpython/menustrings.py:1587 msgid "" "Selects features from vector map (A) by features from other vector map (B)." msgstr "" -#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1593 +#: ../gui/wxpython/menustrings.py:630 ../gui/wxpython/menustrings.py:1595 msgid "Buffer vectors" msgstr "" -#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1594 +#: ../gui/wxpython/menustrings.py:631 ../gui/wxpython/menustrings.py:1596 msgid "Creates a buffer around vector features of given type." msgstr "" -#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595 +#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597 msgid "Point analysis" msgstr "" #: ../gui/wxpython/menustrings.py:633 ../gui/wxpython/menustrings.py:646 -#: ../gui/wxpython/menustrings.py:1596 ../gui/wxpython/menustrings.py:1609 +#: ../gui/wxpython/menustrings.py:1598 ../gui/wxpython/menustrings.py:1611 msgid "Identify and remove outliers" msgstr "이상치 식별 및 제거" #: ../gui/wxpython/menustrings.py:634 ../gui/wxpython/menustrings.py:647 -#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1597 -#: ../gui/wxpython/menustrings.py:1610 ../gui/wxpython/menustrings.py:1709 +#: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:1612 ../gui/wxpython/menustrings.py:1711 msgid "Removes outliers from vector point data." msgstr "벡터 점 자료로부터 이상치를 제거합니다." -#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1598 +#: ../gui/wxpython/menustrings.py:635 ../gui/wxpython/menustrings.py:1600 msgid "Identify point clusters" msgstr "" -#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1599 +#: ../gui/wxpython/menustrings.py:636 ../gui/wxpython/menustrings.py:1601 msgid "Performs cluster identification." msgstr "" -#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1600 +#: ../gui/wxpython/menustrings.py:637 ../gui/wxpython/menustrings.py:1602 msgid "Indices for quadrat counts of vector point lists" msgstr "" #: ../gui/wxpython/menustrings.py:638 ../gui/wxpython/menustrings.py:763 -#: ../gui/wxpython/menustrings.py:1601 ../gui/wxpython/menustrings.py:1726 +#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1728 msgid "Indices for quadrat counts of vector point lists." msgstr "" #: ../gui/wxpython/menustrings.py:639 ../gui/wxpython/menustrings.py:743 -#: ../gui/wxpython/menustrings.py:1602 ../gui/wxpython/menustrings.py:1706 +#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1708 msgid "Perturb points" msgstr "" #: ../gui/wxpython/menustrings.py:640 ../gui/wxpython/menustrings.py:744 -#: ../gui/wxpython/menustrings.py:1603 ../gui/wxpython/menustrings.py:1707 +#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1709 msgid "Random location perturbations of vector points." msgstr "" #: ../gui/wxpython/menustrings.py:641 ../gui/wxpython/menustrings.py:747 -#: ../gui/wxpython/menustrings.py:1604 ../gui/wxpython/menustrings.py:1710 +#: ../gui/wxpython/menustrings.py:1606 ../gui/wxpython/menustrings.py:1712 msgid "Test/training point sets" msgstr "" #: ../gui/wxpython/menustrings.py:642 ../gui/wxpython/menustrings.py:748 -#: ../gui/wxpython/menustrings.py:1605 ../gui/wxpython/menustrings.py:1711 +#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1713 msgid "Randomly partition points into test/train sets." msgstr "" -#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1606 +#: ../gui/wxpython/menustrings.py:643 ../gui/wxpython/menustrings.py:1608 msgid "Tests for normality for vector points" msgstr "" #: ../gui/wxpython/menustrings.py:644 ../gui/wxpython/menustrings.py:765 -#: ../gui/wxpython/menustrings.py:1607 ../gui/wxpython/menustrings.py:1728 +#: ../gui/wxpython/menustrings.py:1609 ../gui/wxpython/menustrings.py:1730 msgid "Tests for normality for vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1608 +#: ../gui/wxpython/menustrings.py:645 ../gui/wxpython/menustrings.py:1610 msgid "Lidar analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1611 +#: ../gui/wxpython/menustrings.py:648 ../gui/wxpython/menustrings.py:1613 msgid "Detect edges" msgstr "" -#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1612 +#: ../gui/wxpython/menustrings.py:649 ../gui/wxpython/menustrings.py:1614 msgid "Detects the object's edges from a LIDAR data set." msgstr "" -#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1613 +#: ../gui/wxpython/menustrings.py:650 ../gui/wxpython/menustrings.py:1615 msgid "Detect interiors" msgstr "" -#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1614 +#: ../gui/wxpython/menustrings.py:651 ../gui/wxpython/menustrings.py:1616 msgid "" "Building contour determination and Region Growing algorithm for determining " "the building inside" msgstr "" -#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1615 +#: ../gui/wxpython/menustrings.py:652 ../gui/wxpython/menustrings.py:1617 msgid "Correct and reclassify objects" msgstr "" -#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1616 +#: ../gui/wxpython/menustrings.py:653 ../gui/wxpython/menustrings.py:1618 msgid "" "Corrects the v.lidar.growing output. It is the last of the three algorithms " "for LIDAR filtering." msgstr "" -#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1617 +#: ../gui/wxpython/menustrings.py:654 ../gui/wxpython/menustrings.py:1619 msgid "Linear referencing" msgstr "" -#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1618 +#: ../gui/wxpython/menustrings.py:655 ../gui/wxpython/menustrings.py:1620 msgid "Create LRS" msgstr "" -#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1619 +#: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1621 msgid "Creates a linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1620 +#: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1622 msgid "Create stationing" msgstr "" -#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1621 +#: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1623 msgid "Creates stationing from input lines, and linear reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1622 +#: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1624 msgid "Create points/segments" msgstr "" -#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1623 +#: ../gui/wxpython/menustrings.py:660 ../gui/wxpython/menustrings.py:1625 msgid "" "Creates points/segments from input lines, linear reference system and " "positions read from stdin or a file." msgstr "" -#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1624 +#: ../gui/wxpython/menustrings.py:661 ../gui/wxpython/menustrings.py:1626 msgid "Find line id and offset" msgstr "" -#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1625 +#: ../gui/wxpython/menustrings.py:662 ../gui/wxpython/menustrings.py:1627 msgid "" "Finds line id and real km+offset for given points in vector map using linear " "reference system." msgstr "" -#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1626 +#: ../gui/wxpython/menustrings.py:663 ../gui/wxpython/menustrings.py:1628 msgid "Nearest features" msgstr "최근접 피처" -#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1627 +#: ../gui/wxpython/menustrings.py:664 ../gui/wxpython/menustrings.py:1629 msgid "" "Finds the nearest element in vector map 'to' for elements in vector map " "'from'." msgstr "" -#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1628 +#: ../gui/wxpython/menustrings.py:665 ../gui/wxpython/menustrings.py:1630 msgid "Network analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1629 +#: ../gui/wxpython/menustrings.py:666 ../gui/wxpython/menustrings.py:1631 #: ../gui/wxpython/mapdisp/toolbars.py:57 msgid "Vector network analysis tool" msgstr "벡터 네트워크 분석 도구" -#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1630 +#: ../gui/wxpython/menustrings.py:667 ../gui/wxpython/menustrings.py:1632 msgid "Tool for interactive vector network analysis." msgstr "" -#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1631 +#: ../gui/wxpython/menustrings.py:668 ../gui/wxpython/menustrings.py:1633 msgid "Network preparation" msgstr "" -#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1632 +#: ../gui/wxpython/menustrings.py:669 ../gui/wxpython/menustrings.py:1634 msgid "Performs network maintenance." msgstr "" -#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1633 +#: ../gui/wxpython/menustrings.py:670 ../gui/wxpython/menustrings.py:1635 msgid "Allocate subnets" msgstr "서브넷 할당" -#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1634 +#: ../gui/wxpython/menustrings.py:671 ../gui/wxpython/menustrings.py:1636 msgid "" "Allocates subnets for nearest centers. Center node must be opened (costs >= " "0). Costs of center node are used in calculation." @@ -8258,30 +8485,30 @@ msgstr "" "최근접 중심을 위한 서브넷을 할당합니다. 중심 교점이 열려 있어야 합니다 (비용 " ">= 0). 중심 교점의 비용은 계산에 사용됩니다." -#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1635 +#: ../gui/wxpython/menustrings.py:672 ../gui/wxpython/menustrings.py:1637 msgid "Split net" msgstr "" -#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1636 +#: ../gui/wxpython/menustrings.py:673 ../gui/wxpython/menustrings.py:1638 msgid "" "Splits subnets for nearest centers by cost isolines. Splits net to bands " "between cost isolines (direction from center). Center node must be opened " "(costs >= 0). Costs of center node are used in calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1637 +#: ../gui/wxpython/menustrings.py:674 ../gui/wxpython/menustrings.py:1639 msgid "Shortest path" msgstr "" -#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1638 +#: ../gui/wxpython/menustrings.py:675 ../gui/wxpython/menustrings.py:1640 msgid "Finds shortest path on vector network." msgstr "" -#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1639 +#: ../gui/wxpython/menustrings.py:676 ../gui/wxpython/menustrings.py:1641 msgid "Shortest path for sets of features" msgstr "피처 세트의 최단 경로" -#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1640 +#: ../gui/wxpython/menustrings.py:677 ../gui/wxpython/menustrings.py:1642 msgid "" "Computes shortest distance via the network between the given sets of " "features. Finds the shortest paths from each 'from' point to the nearest " @@ -8289,96 +8516,96 @@ msgid "" "attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1641 +#: ../gui/wxpython/menustrings.py:678 ../gui/wxpython/menustrings.py:1643 msgid "Shortest path using timetables" msgstr "" -#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1642 +#: ../gui/wxpython/menustrings.py:679 ../gui/wxpython/menustrings.py:1644 msgid "Finds shortest path using timetables." msgstr "" -#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1643 +#: ../gui/wxpython/menustrings.py:680 ../gui/wxpython/menustrings.py:1645 msgid "Shortest path for all pairs" msgstr "" -#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1644 +#: ../gui/wxpython/menustrings.py:681 ../gui/wxpython/menustrings.py:1646 msgid "Computes the shortest path between all pairs of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1645 +#: ../gui/wxpython/menustrings.py:682 ../gui/wxpython/menustrings.py:1647 msgid "Visibility network" msgstr "" -#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1646 +#: ../gui/wxpython/menustrings.py:683 ../gui/wxpython/menustrings.py:1648 msgid "Performs visibility graph construction." msgstr "" -#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1647 +#: ../gui/wxpython/menustrings.py:684 ../gui/wxpython/menustrings.py:1649 msgid "Bridges and articulation points" msgstr "" -#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1648 +#: ../gui/wxpython/menustrings.py:685 ../gui/wxpython/menustrings.py:1650 msgid "Computes bridges and articulation points in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1649 +#: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1651 msgid "Maximum flow" msgstr "" -#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1650 +#: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1652 msgid "Computes the maximum flow between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1651 +#: ../gui/wxpython/menustrings.py:688 ../gui/wxpython/menustrings.py:1653 msgid "Vertex connectivity" msgstr "" -#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1652 +#: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1654 msgid "Computes vertex connectivity between two sets of nodes in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1653 +#: ../gui/wxpython/menustrings.py:690 ../gui/wxpython/menustrings.py:1655 msgid "Components" msgstr "" -#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1654 +#: ../gui/wxpython/menustrings.py:691 ../gui/wxpython/menustrings.py:1656 msgid "Computes strongly and weakly connected components in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1655 +#: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1657 msgid "Centrality" msgstr "" -#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1656 +#: ../gui/wxpython/menustrings.py:693 ../gui/wxpython/menustrings.py:1658 msgid "" "Computes degree, centrality, betweeness, closeness and eigenvector " "centrality measures in the network." msgstr "" -#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1657 +#: ../gui/wxpython/menustrings.py:694 ../gui/wxpython/menustrings.py:1659 msgid "Steiner tree" msgstr "" -#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1658 +#: ../gui/wxpython/menustrings.py:695 ../gui/wxpython/menustrings.py:1660 msgid "" "Creates Steiner tree for the network and given terminals. Note that 'Minimum " "Steiner Tree' problem is NP-hard and heuristic algorithm is used in this " "module so the result may be sub optimal." msgstr "" -#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1659 +#: ../gui/wxpython/menustrings.py:696 ../gui/wxpython/menustrings.py:1661 msgid "Minimum spanning tree" msgstr "" -#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1660 +#: ../gui/wxpython/menustrings.py:697 ../gui/wxpython/menustrings.py:1662 msgid "Computes minimum spanning tree for the network." msgstr "" -#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1661 +#: ../gui/wxpython/menustrings.py:698 ../gui/wxpython/menustrings.py:1663 msgid "Traveling salesman analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1662 +#: ../gui/wxpython/menustrings.py:699 ../gui/wxpython/menustrings.py:1664 msgid "" "Creates a cycle connecting given nodes (Traveling salesman problem). Note " "that TSP is NP-hard, heuristic algorithm is used by this module and created " @@ -8386,349 +8613,349 @@ msgid "" msgstr "" #: ../gui/wxpython/menustrings.py:700 ../gui/wxpython/menustrings.py:703 -#: ../gui/wxpython/menustrings.py:1663 ../gui/wxpython/menustrings.py:1666 +#: ../gui/wxpython/menustrings.py:1665 ../gui/wxpython/menustrings.py:1668 msgid "Overlay vector maps" msgstr "벡터 지도 중첩" -#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1664 +#: ../gui/wxpython/menustrings.py:701 ../gui/wxpython/menustrings.py:1666 msgid "Clip vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1665 +#: ../gui/wxpython/menustrings.py:702 ../gui/wxpython/menustrings.py:1667 msgid "Extracts features of input map which overlay features of clip map." msgstr "" -#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1667 +#: ../gui/wxpython/menustrings.py:704 ../gui/wxpython/menustrings.py:1669 msgid "" "Overlays two vector maps offering clip, intersection, difference, " "symmetrical difference, union operators." msgstr "" -#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1668 +#: ../gui/wxpython/menustrings.py:705 ../gui/wxpython/menustrings.py:1670 msgid "Patch vector maps" msgstr "" -#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1669 +#: ../gui/wxpython/menustrings.py:706 ../gui/wxpython/menustrings.py:1671 msgid "Creates a new vector map by combining other vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1670 +#: ../gui/wxpython/menustrings.py:707 ../gui/wxpython/menustrings.py:1672 msgid "Manage categories" msgstr "" -#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1671 +#: ../gui/wxpython/menustrings.py:708 ../gui/wxpython/menustrings.py:1673 msgid "Change or report categories" msgstr "범주 변경 또는 보고" -#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1672 +#: ../gui/wxpython/menustrings.py:709 ../gui/wxpython/menustrings.py:1674 msgid "Attaches, deletes or reports vector categories to/from/of map geometry." msgstr "" -#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1674 +#: ../gui/wxpython/menustrings.py:711 ../gui/wxpython/menustrings.py:1676 msgid "" "Changes vector category values for an existing vector map according to " "results of SQL queries or a value in attribute table column." msgstr "" -#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1675 -#: ../gui/wxpython/dbmgr/dialogs.py:125 +#: ../gui/wxpython/menustrings.py:712 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/dbmgr/dialogs.py:126 msgid "Update attributes" msgstr "" -#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1676 +#: ../gui/wxpython/menustrings.py:713 ../gui/wxpython/menustrings.py:1678 msgid "Update area attributes from raster" msgstr "" -#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1677 +#: ../gui/wxpython/menustrings.py:714 ../gui/wxpython/menustrings.py:1679 msgid "" "Calculates univariate statistics from a raster map based on a vector map and " "uploads statistics to new attribute columns." msgstr "" -#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1678 +#: ../gui/wxpython/menustrings.py:715 ../gui/wxpython/menustrings.py:1680 msgid "Update area attributes from vector" msgstr "" -#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1679 +#: ../gui/wxpython/menustrings.py:716 ../gui/wxpython/menustrings.py:1681 msgid "Count points in areas, calculate statistics from point attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1680 +#: ../gui/wxpython/menustrings.py:717 ../gui/wxpython/menustrings.py:1682 msgid "Update point attributes from areas" msgstr "" -#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1681 +#: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1683 msgid "Uploads vector values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1682 +#: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1684 msgid "Update database values from vector" msgstr "벡터로부터 데이터베이스값 갱신" -#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1683 +#: ../gui/wxpython/menustrings.py:720 ../gui/wxpython/menustrings.py:1685 msgid "Populates attribute values from vector features." msgstr "" -#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1684 +#: ../gui/wxpython/menustrings.py:721 ../gui/wxpython/menustrings.py:1686 msgid "Sample raster maps at point locations" msgstr "" -#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1685 +#: ../gui/wxpython/menustrings.py:722 ../gui/wxpython/menustrings.py:1687 msgid "Uploads raster values at positions of vector points to the table." msgstr "" -#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1686 +#: ../gui/wxpython/menustrings.py:723 ../gui/wxpython/menustrings.py:1688 msgid "Sample raster neighborhood around points" msgstr "" -#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1687 +#: ../gui/wxpython/menustrings.py:724 ../gui/wxpython/menustrings.py:1689 msgid "Samples a raster map at vector point locations." msgstr "" -#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1688 +#: ../gui/wxpython/menustrings.py:725 ../gui/wxpython/menustrings.py:1690 msgid "Generate area for current region" msgstr "" -#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1689 +#: ../gui/wxpython/menustrings.py:726 ../gui/wxpython/menustrings.py:1691 msgid "Creates a vector polygon from the current region extent." msgstr "" -#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1690 +#: ../gui/wxpython/menustrings.py:727 ../gui/wxpython/menustrings.py:1692 msgid "Generate areas from points" msgstr "" -#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1691 +#: ../gui/wxpython/menustrings.py:728 ../gui/wxpython/menustrings.py:1693 msgid "Convex hull" msgstr "" -#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1692 +#: ../gui/wxpython/menustrings.py:729 ../gui/wxpython/menustrings.py:1694 msgid "Produces a 2D/3D convex hull for a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1693 +#: ../gui/wxpython/menustrings.py:730 ../gui/wxpython/menustrings.py:1695 msgid "Delaunay triangles" msgstr "" -#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1694 +#: ../gui/wxpython/menustrings.py:731 ../gui/wxpython/menustrings.py:1696 msgid "" "Creates a Delaunay triangulation from an input vector map containing points " "or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1695 +#: ../gui/wxpython/menustrings.py:732 ../gui/wxpython/menustrings.py:1697 msgid "Voronoi diagram/Thiessen polygons" msgstr "" -#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1696 +#: ../gui/wxpython/menustrings.py:733 ../gui/wxpython/menustrings.py:1698 msgid "" "Creates a Voronoi diagram constrained to the extents of the current region " "from an input vector map containing points or centroids." msgstr "" -#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1697 +#: ../gui/wxpython/menustrings.py:734 ../gui/wxpython/menustrings.py:1699 msgid "Generate grid" msgstr "" -#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1698 +#: ../gui/wxpython/menustrings.py:735 ../gui/wxpython/menustrings.py:1700 msgid "Creates a vector map of a user-defined grid." msgstr "" -#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1699 +#: ../gui/wxpython/menustrings.py:736 ../gui/wxpython/menustrings.py:1701 msgid "Generate points" msgstr "" -#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1700 +#: ../gui/wxpython/menustrings.py:737 ../gui/wxpython/menustrings.py:1702 msgid "Generate from database" msgstr "데이터베이스로부터 생성" -#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1701 +#: ../gui/wxpython/menustrings.py:738 ../gui/wxpython/menustrings.py:1703 msgid "" "Creates new vector (points) map from database table containing coordinates." msgstr "" -#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1702 +#: ../gui/wxpython/menustrings.py:739 ../gui/wxpython/menustrings.py:1704 msgid "Generate points along lines" msgstr "" -#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1703 +#: ../gui/wxpython/menustrings.py:740 ../gui/wxpython/menustrings.py:1705 msgid "Creates points along input lines in new vector map with 2 layers." msgstr "" -#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1704 +#: ../gui/wxpython/menustrings.py:741 ../gui/wxpython/menustrings.py:1706 msgid "Generate random points" msgstr "" -#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1705 +#: ../gui/wxpython/menustrings.py:742 ../gui/wxpython/menustrings.py:1707 msgid "Generates random 2D/3D vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1708 +#: ../gui/wxpython/menustrings.py:745 ../gui/wxpython/menustrings.py:1710 msgid "Remove outliers in point sets" msgstr "점 세트 내 이상치 제거" -#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1713 +#: ../gui/wxpython/menustrings.py:750 ../gui/wxpython/menustrings.py:1715 msgid "Basic vector metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1714 +#: ../gui/wxpython/menustrings.py:751 ../gui/wxpython/menustrings.py:1716 msgid "Outputs basic information about a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1715 +#: ../gui/wxpython/menustrings.py:752 ../gui/wxpython/menustrings.py:1717 msgid "Classify attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1716 +#: ../gui/wxpython/menustrings.py:753 ../gui/wxpython/menustrings.py:1718 msgid "Classifies attribute data, e.g. for thematic mapping" msgstr "" -#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1717 +#: ../gui/wxpython/menustrings.py:754 ../gui/wxpython/menustrings.py:1719 msgid "Report topology by category" msgstr "범주별 위상 보고" -#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1718 +#: ../gui/wxpython/menustrings.py:755 ../gui/wxpython/menustrings.py:1720 msgid "Reports geometry statistics for vector maps." msgstr "벡터 지도를 위한 지형 통계를 보고합니다." -#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1719 +#: ../gui/wxpython/menustrings.py:756 ../gui/wxpython/menustrings.py:1721 msgid "Univariate attribute statistics for points" msgstr "" -#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1720 +#: ../gui/wxpython/menustrings.py:757 ../gui/wxpython/menustrings.py:1722 msgid "" "Calculates univariate statistics of vector map features. Variance and " "standard deviation is calculated only for points if specified." msgstr "" -#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1721 +#: ../gui/wxpython/menustrings.py:758 ../gui/wxpython/menustrings.py:1723 msgid "Univariate statistics for attribute columns" msgstr "" -#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1722 +#: ../gui/wxpython/menustrings.py:759 ../gui/wxpython/menustrings.py:1724 msgid "" "Calculates univariate statistics on selected table column for a GRASS vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1724 +#: ../gui/wxpython/menustrings.py:761 ../gui/wxpython/menustrings.py:1726 msgid "Vector map profiling tool" msgstr "" -#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1725 +#: ../gui/wxpython/menustrings.py:762 ../gui/wxpython/menustrings.py:1727 msgid "Quadrat indices" msgstr "" -#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1727 +#: ../gui/wxpython/menustrings.py:764 ../gui/wxpython/menustrings.py:1729 msgid "Test normality" msgstr "" -#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1729 +#: ../gui/wxpython/menustrings.py:766 ../gui/wxpython/menustrings.py:1731 msgid "&Imagery" msgstr "영상(&I)" -#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1730 +#: ../gui/wxpython/menustrings.py:767 ../gui/wxpython/menustrings.py:1732 msgid "Develop images and groups" msgstr "" -#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1731 +#: ../gui/wxpython/menustrings.py:768 ../gui/wxpython/menustrings.py:1733 msgid "Create/edit group" msgstr "" -#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1732 +#: ../gui/wxpython/menustrings.py:769 ../gui/wxpython/menustrings.py:1734 msgid "Creates, edits, and lists groups of imagery files." msgstr "" -#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1733 +#: ../gui/wxpython/menustrings.py:770 ../gui/wxpython/menustrings.py:1735 msgid "Target group" msgstr "" -#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1734 +#: ../gui/wxpython/menustrings.py:771 ../gui/wxpython/menustrings.py:1736 msgid "Targets an imagery group to a GRASS location and mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1735 +#: ../gui/wxpython/menustrings.py:772 ../gui/wxpython/menustrings.py:1737 msgid "Mosaic images" msgstr "" -#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1736 +#: ../gui/wxpython/menustrings.py:773 ../gui/wxpython/menustrings.py:1738 msgid "Mosaics several images and extends colormap." msgstr "" -#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1737 +#: ../gui/wxpython/menustrings.py:774 ../gui/wxpython/menustrings.py:1739 msgid "Manage image colors" msgstr "" -#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1738 +#: ../gui/wxpython/menustrings.py:775 ../gui/wxpython/menustrings.py:1740 msgid "Color balance for RGB" msgstr "" -#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1739 +#: ../gui/wxpython/menustrings.py:776 ../gui/wxpython/menustrings.py:1741 msgid "Performs auto-balancing of colors for RGB images." msgstr "" -#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1740 +#: ../gui/wxpython/menustrings.py:777 ../gui/wxpython/menustrings.py:1742 msgid "HIS to RGB" msgstr "HIS를 RGB로 변환" -#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1741 +#: ../gui/wxpython/menustrings.py:778 ../gui/wxpython/menustrings.py:1743 msgid "" "Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to " "RGB (Red-Green-Blue) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1743 +#: ../gui/wxpython/menustrings.py:780 ../gui/wxpython/menustrings.py:1745 msgid "" "Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-" "Intensity-Saturation) color space." msgstr "" -#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1744 +#: ../gui/wxpython/menustrings.py:781 ../gui/wxpython/menustrings.py:1746 msgid "Rectify image or raster" msgstr "" -#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1745 +#: ../gui/wxpython/menustrings.py:782 ../gui/wxpython/menustrings.py:1747 msgid "" "Rectifies an image by computing a coordinate transformation for each pixel " "in the image based on the control points." msgstr "" -#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1746 -#: ../gui/wxpython/lmgr/layertree.py:783 +#: ../gui/wxpython/menustrings.py:783 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/lmgr/layertree.py:821 msgid "Histogram" msgstr "" -#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1747 +#: ../gui/wxpython/menustrings.py:784 ../gui/wxpython/menustrings.py:1749 msgid "Generate histogram of image" msgstr "" -#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1748 +#: ../gui/wxpython/menustrings.py:785 ../gui/wxpython/menustrings.py:1750 msgid "Spectral response" msgstr "" -#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1749 +#: ../gui/wxpython/menustrings.py:786 ../gui/wxpython/menustrings.py:1751 msgid "" "Displays spectral response at user specified locations in group or images." msgstr "" -#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1750 +#: ../gui/wxpython/menustrings.py:787 ../gui/wxpython/menustrings.py:1752 msgid "Pan sharpening" msgstr "" -#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1751 +#: ../gui/wxpython/menustrings.py:788 ../gui/wxpython/menustrings.py:1753 msgid "" "Image fusion algorithms to sharpen multispectral with high-res panchromatic " "channels" msgstr "" -#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1752 +#: ../gui/wxpython/menustrings.py:789 ../gui/wxpython/menustrings.py:1754 msgid "Classify image" msgstr "" -#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1753 +#: ../gui/wxpython/menustrings.py:790 ../gui/wxpython/menustrings.py:1755 msgid "Clustering input for unsupervised classification" msgstr "무감독 분류를 위한 군집 입력" -#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1754 +#: ../gui/wxpython/menustrings.py:791 ../gui/wxpython/menustrings.py:1756 msgid "" "Generates spectral signatures for land cover types in an image using a " "clustering algorithm. The resulting signature file is used as input for i." @@ -8738,385 +8965,385 @@ msgstr "" "니다. 만들어질 서명 파일은 무감독 영상 분류를 생성하기 위해 i.maxlik를 위한 " "입력으로 쓰입니다." -#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1755 +#: ../gui/wxpython/menustrings.py:792 ../gui/wxpython/menustrings.py:1757 msgid "Input for supervised MLC" msgstr "감독 MLC를 위한 입력" -#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1756 +#: ../gui/wxpython/menustrings.py:793 ../gui/wxpython/menustrings.py:1758 msgid "Generates statistics for i.maxlik from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1757 +#: ../gui/wxpython/menustrings.py:794 ../gui/wxpython/menustrings.py:1759 msgid "Maximum likelihood classification (MLC)" msgstr "" -#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1758 +#: ../gui/wxpython/menustrings.py:795 ../gui/wxpython/menustrings.py:1760 msgid "" "Classifies the cell spectral reflectances in imagery data. Classification is " "based on the spectral signature information generated by either i.cluster, g." "gui.iclass, or i.gensig." msgstr "" -#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1759 -#: ../gui/wxpython/menustrings.py:2037 +#: ../gui/wxpython/menustrings.py:796 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:2042 msgid "Interactive input for supervised classification" msgstr "감독 분류를 위한 대화식 입력" -#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1760 -#: ../gui/wxpython/menustrings.py:2038 +#: ../gui/wxpython/menustrings.py:797 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:2043 msgid "" "Generates spectral signatures by allowing the user to outline training areas." msgstr "" -#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1761 +#: ../gui/wxpython/menustrings.py:798 ../gui/wxpython/menustrings.py:1763 msgid "Input for supervised SMAP" msgstr "감독 SMAP을 위한 입력" -#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1762 +#: ../gui/wxpython/menustrings.py:799 ../gui/wxpython/menustrings.py:1764 msgid "Generates statistics for i.smap from raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1763 +#: ../gui/wxpython/menustrings.py:800 ../gui/wxpython/menustrings.py:1765 msgid "Sequential maximum a posteriori classification (SMAP)" msgstr "" -#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1764 +#: ../gui/wxpython/menustrings.py:801 ../gui/wxpython/menustrings.py:1766 msgid "" "Performs contextual image classification using sequential maximum a " "posteriori (SMAP) estimation." msgstr "" -#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1765 +#: ../gui/wxpython/menustrings.py:802 ../gui/wxpython/menustrings.py:1767 #, fuzzy msgid "Input for supervised SVM" msgstr "감독 SMAP을 위한 입력" -#: ../gui/wxpython/menustrings.py:803 ../gui/wxpython/menustrings.py:1766 +#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769 msgid "Support Vector Machines classification (SVM)" msgstr "" -#: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1767 +#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1771 msgid "Manage signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:805 ../gui/wxpython/menustrings.py:1768 +#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1772 msgid "Manage imagery classification signature files" msgstr "" -#: ../gui/wxpython/menustrings.py:806 ../gui/wxpython/menustrings.py:1769 +#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1773 msgid "Object segmentation" msgstr "" -#: ../gui/wxpython/menustrings.py:807 ../gui/wxpython/menustrings.py:1770 +#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1774 msgid "Identifies segments (objects) from imagery data." msgstr "" -#: ../gui/wxpython/menustrings.py:808 ../gui/wxpython/menustrings.py:1771 +#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1775 msgid "Filter image" msgstr "" -#: ../gui/wxpython/menustrings.py:809 ../gui/wxpython/menustrings.py:1772 +#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1776 msgid "Edge detection" msgstr "" -#: ../gui/wxpython/menustrings.py:810 ../gui/wxpython/menustrings.py:1773 +#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1777 msgid "Zero-crossing \"edge detection\" raster function for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:811 ../gui/wxpython/menustrings.py:1774 +#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1778 msgid "Matrix/convolving filter" msgstr "" -#: ../gui/wxpython/menustrings.py:812 ../gui/wxpython/menustrings.py:1775 +#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1779 msgid "Performs raster map matrix filter." msgstr "" -#: ../gui/wxpython/menustrings.py:813 ../gui/wxpython/menustrings.py:1776 +#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1780 msgid "Transform image" msgstr "" -#: ../gui/wxpython/menustrings.py:814 ../gui/wxpython/menustrings.py:1777 +#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1781 msgid "Canonical correlation" msgstr "" -#: ../gui/wxpython/menustrings.py:815 ../gui/wxpython/menustrings.py:1778 +#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1782 msgid "Canonical components analysis (CCA) program for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1779 +#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1783 msgid "Principal components" msgstr "" -#: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1780 +#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1784 msgid "Principal components analysis (PCA) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1781 +#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1785 msgid "Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1782 +#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1786 msgid "Fast Fourier Transform (FFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1783 +#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1787 msgid "Inverse Fast Fourier" msgstr "" -#: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1784 +#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1788 msgid "Inverse Fast Fourier Transform (IFFT) for image processing." msgstr "" -#: ../gui/wxpython/menustrings.py:822 ../gui/wxpython/menustrings.py:1785 +#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1789 msgid "Satellite images tools" msgstr "" -#: ../gui/wxpython/menustrings.py:823 ../gui/wxpython/menustrings.py:1786 +#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1790 msgid "Aster DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:824 ../gui/wxpython/menustrings.py:1787 +#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1791 msgid "" "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature " "from ASTER DN." msgstr "" -#: ../gui/wxpython/menustrings.py:825 ../gui/wxpython/menustrings.py:1788 +#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1792 msgid "Landsat DN to radiance/reflectance" msgstr "" -#: ../gui/wxpython/menustrings.py:826 ../gui/wxpython/menustrings.py:1789 +#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1793 msgid "" "Calculates top-of-atmosphere radiance or reflectance and temperature for " "Landsat MSS/TM/ETM+/OLI" msgstr "" -#: ../gui/wxpython/menustrings.py:827 ../gui/wxpython/menustrings.py:1790 +#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1794 msgid "Landsat cloud cover assessment" msgstr "" -#: ../gui/wxpython/menustrings.py:828 ../gui/wxpython/menustrings.py:1791 +#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1795 msgid "Performs Landsat TM/ETM+ Automatic Cloud Cover Assessment (ACCA)." msgstr "" -#: ../gui/wxpython/menustrings.py:829 ../gui/wxpython/menustrings.py:1792 +#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1796 msgid "Modis quality control" msgstr "" -#: ../gui/wxpython/menustrings.py:830 ../gui/wxpython/menustrings.py:1793 +#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1797 msgid "Extracts quality control parameters from MODIS QC layers." msgstr "" -#: ../gui/wxpython/menustrings.py:831 ../gui/wxpython/menustrings.py:1794 +#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1798 msgid "Atmospheric correction" msgstr "" -#: ../gui/wxpython/menustrings.py:832 ../gui/wxpython/menustrings.py:1795 +#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1799 msgid "" "Performs atmospheric correction using the 6S algorithm. 6S - Second " "Simulation of Satellite Signal in the Solar Spectrum." msgstr "" -#: ../gui/wxpython/menustrings.py:833 ../gui/wxpython/menustrings.py:1796 +#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1800 msgid "Topographic correction" msgstr "지형 보정" -#: ../gui/wxpython/menustrings.py:834 ../gui/wxpython/menustrings.py:1797 +#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1801 msgid "Computes topographic correction of reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:835 ../gui/wxpython/menustrings.py:1798 +#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1802 msgid "Orthophoto tools" msgstr "" -#: ../gui/wxpython/menustrings.py:836 ../gui/wxpython/menustrings.py:1799 +#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1803 msgid "Manage GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:837 ../gui/wxpython/menustrings.py:1800 -#: ../gui/wxpython/menustrings.py:2040 +#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:2045 msgid "Georectifies a map and allows managing GCP for 3D correction." msgstr "" -#: ../gui/wxpython/menustrings.py:838 ../gui/wxpython/menustrings.py:1801 -#: ../gui/wxpython/menustrings.py:2029 +#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:2034 msgid "Corrects scanning distortions" msgstr "" -#: ../gui/wxpython/menustrings.py:839 ../gui/wxpython/menustrings.py:1802 -#: ../gui/wxpython/menustrings.py:2030 +#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:2035 msgid "Corrects scanning distortions of a scanned aerial photo." msgstr "" -#: ../gui/wxpython/menustrings.py:840 ../gui/wxpython/menustrings.py:1803 +#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1807 msgid "Satellite images products" msgstr "" -#: ../gui/wxpython/menustrings.py:841 ../gui/wxpython/menustrings.py:1804 +#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1808 msgid "Vegetation indices" msgstr "" -#: ../gui/wxpython/menustrings.py:842 ../gui/wxpython/menustrings.py:1805 +#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1809 msgid "" "Calculates different types of vegetation indices. Uses red and nir bands " "mostly, and some indices require additional bands." msgstr "" -#: ../gui/wxpython/menustrings.py:843 ../gui/wxpython/menustrings.py:1806 +#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1810 msgid "Tasseled cap vegetation index" msgstr "" -#: ../gui/wxpython/menustrings.py:844 ../gui/wxpython/menustrings.py:1807 +#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1811 msgid "Performs Tasseled Cap (Kauth Thomas) transformation." msgstr "" -#: ../gui/wxpython/menustrings.py:845 ../gui/wxpython/menustrings.py:1808 +#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1812 msgid "Albedo" msgstr "" -#: ../gui/wxpython/menustrings.py:846 ../gui/wxpython/menustrings.py:1809 +#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1813 msgid "Computes broad band albedo from surface reflectance." msgstr "" -#: ../gui/wxpython/menustrings.py:847 ../gui/wxpython/menustrings.py:1810 +#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1814 msgid "Emissivity" msgstr "" -#: ../gui/wxpython/menustrings.py:848 ../gui/wxpython/menustrings.py:1811 +#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1815 msgid "Computes emissivity from NDVI, generic method for sparse land." msgstr "" -#: ../gui/wxpython/menustrings.py:849 ../gui/wxpython/menustrings.py:1812 +#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1816 msgid "Biomass growth" msgstr "" -#: ../gui/wxpython/menustrings.py:850 ../gui/wxpython/menustrings.py:1813 +#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1817 msgid "Computes biomass growth, precursor of crop yield calculation." msgstr "" -#: ../gui/wxpython/menustrings.py:851 ../gui/wxpython/menustrings.py:1814 +#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1818 msgid "Evapotranspiration calculation" msgstr "" -#: ../gui/wxpython/menustrings.py:852 ../gui/wxpython/menustrings.py:1815 +#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1819 msgid "Instantaneaous Net Radiation" msgstr "" -#: ../gui/wxpython/menustrings.py:853 ../gui/wxpython/menustrings.py:1816 +#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1820 msgid "Net radiation approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:854 ../gui/wxpython/menustrings.py:1817 +#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1821 msgid "Soil heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:855 ../gui/wxpython/menustrings.py:1818 +#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1822 msgid "Soil heat flux approximation (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:856 ../gui/wxpython/menustrings.py:1819 +#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1823 msgid "Sensible heat flux" msgstr "" -#: ../gui/wxpython/menustrings.py:857 ../gui/wxpython/menustrings.py:1820 +#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1824 msgid "Computes sensible heat flux iteration SEBAL 01." msgstr "" -#: ../gui/wxpython/menustrings.py:858 ../gui/wxpython/menustrings.py:1821 +#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1825 msgid "Evaporative fraction" msgstr "" -#: ../gui/wxpython/menustrings.py:859 ../gui/wxpython/menustrings.py:1822 +#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1826 msgid "Computes evaporative fraction and root zone soil moisture." msgstr "" -#: ../gui/wxpython/menustrings.py:860 ../gui/wxpython/menustrings.py:1823 +#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1827 msgid "Actual Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:861 ../gui/wxpython/menustrings.py:1824 +#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1828 msgid "Actual evapotranspiration for diurnal period (Bastiaanssen, 1995)." msgstr "" -#: ../gui/wxpython/menustrings.py:862 ../gui/wxpython/menustrings.py:1825 +#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1829 msgid "Temporal integration of ETa" msgstr "" -#: ../gui/wxpython/menustrings.py:863 ../gui/wxpython/menustrings.py:1826 +#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1830 msgid "" "Computes temporal integration of satellite ET actual (ETa) following the " "daily ET reference (ETo) from meteorological station(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:864 ../gui/wxpython/menustrings.py:1827 +#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1831 msgid "Hargreaves methods Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:865 ../gui/wxpython/menustrings.py:1828 +#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1832 msgid "" "Computes evapotranspiration calculation modified or original Hargreaves " "formulation, 2001." msgstr "" -#: ../gui/wxpython/menustrings.py:866 ../gui/wxpython/menustrings.py:1829 +#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1833 msgid "Penman-Monteith Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:867 ../gui/wxpython/menustrings.py:1830 +#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1834 msgid "" "Computes potential evapotranspiration calculation with hourly Penman-" "Monteith." msgstr "" -#: ../gui/wxpython/menustrings.py:868 ../gui/wxpython/menustrings.py:1831 +#: ../gui/wxpython/menustrings.py:870 ../gui/wxpython/menustrings.py:1835 msgid "Priestley-Taylor Evapotranspiration" msgstr "" -#: ../gui/wxpython/menustrings.py:869 ../gui/wxpython/menustrings.py:1832 +#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1836 msgid "" "Computes evapotranspiration calculation Priestley and Taylor formulation, " "1972." msgstr "" -#: ../gui/wxpython/menustrings.py:871 ../gui/wxpython/menustrings.py:1834 +#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1838 msgid "Kappa analysis" msgstr "" -#: ../gui/wxpython/menustrings.py:872 ../gui/wxpython/menustrings.py:1835 +#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1839 msgid "" "Calculates error matrix and kappa parameter for accuracy assessment of " "classification result." msgstr "" -#: ../gui/wxpython/menustrings.py:873 ../gui/wxpython/menustrings.py:1836 +#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1840 msgid "OIF for LandSat TM" msgstr "" -#: ../gui/wxpython/menustrings.py:874 ../gui/wxpython/menustrings.py:1837 +#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1841 msgid "Calculates Optimum-Index-Factor table for spectral bands" msgstr "" -#: ../gui/wxpython/menustrings.py:875 ../gui/wxpython/menustrings.py:1838 +#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1842 msgid "3D r&aster" msgstr "3차원 래스터(&a)" -#: ../gui/wxpython/menustrings.py:876 ../gui/wxpython/menustrings.py:1839 +#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1843 msgid "Develop 3D raster map" msgstr "3차원 래스터 지도 개발" -#: ../gui/wxpython/menustrings.py:877 ../gui/wxpython/menustrings.py:1840 +#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1844 msgid "Manage 3D NULL values" msgstr "3차원 널값 관리" -#: ../gui/wxpython/menustrings.py:878 ../gui/wxpython/menustrings.py:1841 +#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1845 msgid "Explicitly create the 3D NULL-value bitmap file." msgstr "" -#: ../gui/wxpython/menustrings.py:879 ../gui/wxpython/menustrings.py:1842 +#: ../gui/wxpython/menustrings.py:881 ../gui/wxpython/menustrings.py:1846 msgid "Manage timestamp" msgstr "" -#: ../gui/wxpython/menustrings.py:880 ../gui/wxpython/menustrings.py:1843 +#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1847 msgid "" "Modifies a timestamp for a 3D raster map. Print/add/remove a timestamp for a " "3D raster map." @@ -9124,86 +9351,86 @@ msgstr "" "3차원 래스터 지도를 위한 타임스탬프를 수정합니다. 3차원 래스터 지도를 위한 타" "임스탬프를 출력/추가/제거합니다." -#: ../gui/wxpython/menustrings.py:882 ../gui/wxpython/menustrings.py:1845 +#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1849 msgid "3D rasters to raster series" msgstr "" -#: ../gui/wxpython/menustrings.py:884 ../gui/wxpython/menustrings.py:1847 +#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1851 msgid "3D color tables" msgstr "" -#: ../gui/wxpython/menustrings.py:885 ../gui/wxpython/menustrings.py:1848 +#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1852 msgid "Creates/modifies the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:886 ../gui/wxpython/menustrings.py:1849 +#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1853 msgid "Export 3D color table" msgstr "" -#: ../gui/wxpython/menustrings.py:887 ../gui/wxpython/menustrings.py:1850 +#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1854 msgid "Exports the color table associated with a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:888 ../gui/wxpython/menustrings.py:1851 +#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:1855 msgid "3D mask" msgstr "" -#: ../gui/wxpython/menustrings.py:889 ../gui/wxpython/menustrings.py:1852 +#: ../gui/wxpython/menustrings.py:891 ../gui/wxpython/menustrings.py:1856 msgid "Establishes the current working 3D raster mask." msgstr "" -#: ../gui/wxpython/menustrings.py:890 ../gui/wxpython/menustrings.py:891 -#: ../gui/wxpython/menustrings.py:1853 ../gui/wxpython/menustrings.py:1854 +#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:893 +#: ../gui/wxpython/menustrings.py:1857 ../gui/wxpython/menustrings.py:1858 msgid "3D raster map calculator" msgstr "3차원 래스터 지도 계산기" -#: ../gui/wxpython/menustrings.py:892 ../gui/wxpython/menustrings.py:1855 +#: ../gui/wxpython/menustrings.py:894 ../gui/wxpython/menustrings.py:1859 msgid "Cross section" msgstr "" -#: ../gui/wxpython/menustrings.py:893 ../gui/wxpython/menustrings.py:1856 +#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1860 msgid "" "Creates cross section 2D raster map from 3D raster map based on 2D elevation " "map" msgstr "" -#: ../gui/wxpython/menustrings.py:895 ../gui/wxpython/menustrings.py:1858 +#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1862 msgid "" "Numerical calculation program for transient, confined groundwater flow in " "three dimensions." msgstr "" -#: ../gui/wxpython/menustrings.py:896 ../gui/wxpython/menustrings.py:1859 +#: ../gui/wxpython/menustrings.py:898 ../gui/wxpython/menustrings.py:1863 msgid "Interpolate 3D raster from points" msgstr "" -#: ../gui/wxpython/menustrings.py:897 ../gui/wxpython/menustrings.py:1860 +#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1864 msgid "" "Interpolates point data to a 3D raster map using regularized spline with " "tension (RST) algorithm." msgstr "" -#: ../gui/wxpython/menustrings.py:899 ../gui/wxpython/menustrings.py:1862 +#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1866 msgid "Basic 3D raster metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:900 ../gui/wxpython/menustrings.py:1863 +#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1867 msgid "Outputs basic information about a user-specified 3D raster map layer." msgstr "" -#: ../gui/wxpython/menustrings.py:901 ../gui/wxpython/menustrings.py:1864 +#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1868 msgid "3D raster statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:902 ../gui/wxpython/menustrings.py:1865 +#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1869 msgid "Generates volume statistics for 3D raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:903 ../gui/wxpython/menustrings.py:1866 +#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1870 msgid "Univariate statistics for 3D rasters" msgstr "" -#: ../gui/wxpython/menustrings.py:904 ../gui/wxpython/menustrings.py:1867 +#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1871 msgid "" "Calculates univariate statistics from the non-null cells of a 3D raster map. " "Statistics include number of cells counted, minimum and maximum cell values, " @@ -9211,314 +9438,314 @@ msgid "" "of variation, and sum." msgstr "" -#: ../gui/wxpython/menustrings.py:905 ../gui/wxpython/menustrings.py:1868 +#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1872 msgid "&Database" msgstr "데이터베이스(&D)" -#: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1869 +#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1873 msgid "Database information" msgstr "" -#: ../gui/wxpython/menustrings.py:907 ../gui/wxpython/menustrings.py:1870 +#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1874 msgid "List databases" msgstr "데이터베이스 나열" -#: ../gui/wxpython/menustrings.py:908 ../gui/wxpython/menustrings.py:1871 +#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1875 msgid "Lists all databases for a given driver and location." msgstr "" -#: ../gui/wxpython/menustrings.py:909 ../gui/wxpython/menustrings.py:1872 +#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1876 msgid "List drivers" msgstr "" -#: ../gui/wxpython/menustrings.py:910 ../gui/wxpython/menustrings.py:1873 +#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1877 msgid "Lists all database drivers." msgstr "" -#: ../gui/wxpython/menustrings.py:911 ../gui/wxpython/menustrings.py:1874 +#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1878 msgid "List tables" msgstr "" -#: ../gui/wxpython/menustrings.py:912 ../gui/wxpython/menustrings.py:1875 +#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1879 msgid "Lists all tables for a given database." msgstr "" -#: ../gui/wxpython/menustrings.py:913 ../gui/wxpython/menustrings.py:1876 +#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1880 msgid "Describe table" msgstr "" -#: ../gui/wxpython/menustrings.py:914 ../gui/wxpython/menustrings.py:1877 +#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1881 msgid "Describes a table in detail." msgstr "" -#: ../gui/wxpython/menustrings.py:915 ../gui/wxpython/menustrings.py:1878 +#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1882 msgid "List columns" msgstr "" -#: ../gui/wxpython/menustrings.py:916 ../gui/wxpython/menustrings.py:1879 +#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1883 msgid "List all columns for a given table." msgstr "" -#: ../gui/wxpython/menustrings.py:917 ../gui/wxpython/menustrings.py:1880 +#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1884 msgid "Manage databases" msgstr "" -#: ../gui/wxpython/menustrings.py:918 ../gui/wxpython/menustrings.py:1881 +#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1885 msgid "Connect" msgstr "" -#: ../gui/wxpython/menustrings.py:919 ../gui/wxpython/menustrings.py:1882 +#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1886 msgid "Prints/sets general DB connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:920 ../gui/wxpython/menustrings.py:1883 +#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1887 msgid "Login" msgstr "" -#: ../gui/wxpython/menustrings.py:921 ../gui/wxpython/menustrings.py:1884 +#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1888 msgid "Sets user/password for DB driver/database." msgstr "" -#: ../gui/wxpython/menustrings.py:922 ../gui/wxpython/menustrings.py:1885 +#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1889 msgid "Create database" msgstr "데이터베이스 생성" -#: ../gui/wxpython/menustrings.py:923 ../gui/wxpython/menustrings.py:1886 +#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1890 msgid "Creates an empty database." msgstr "빈 데이터베이스를 생성합니다." -#: ../gui/wxpython/menustrings.py:924 ../gui/wxpython/menustrings.py:1887 +#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1891 msgid "Drop database" msgstr "데이터베이스 삭제" -#: ../gui/wxpython/menustrings.py:925 ../gui/wxpython/menustrings.py:1888 +#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1892 msgid "Removes an existing database." msgstr "기존 데이터베이스를 제거합니다" -#: ../gui/wxpython/menustrings.py:926 ../gui/wxpython/menustrings.py:1889 +#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1893 msgid "Drop table" msgstr "테이블 삭제" -#: ../gui/wxpython/menustrings.py:927 ../gui/wxpython/menustrings.py:1890 +#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1894 msgid "Drops an attribute table." msgstr "속성 테이블을 삭제합니다." -#: ../gui/wxpython/menustrings.py:928 ../gui/wxpython/menustrings.py:1891 +#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:1895 msgid "Copy table" msgstr "" -#: ../gui/wxpython/menustrings.py:929 ../gui/wxpython/menustrings.py:1892 +#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1896 msgid "" "Copy a table. Either 'from_table' (optionally with 'where') can be used or " "'select' option, but not 'from_table' and 'select' at the same time." msgstr "" -#: ../gui/wxpython/menustrings.py:930 ../gui/wxpython/menustrings.py:950 -#: ../gui/wxpython/menustrings.py:1893 ../gui/wxpython/menustrings.py:1913 +#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:952 +#: ../gui/wxpython/menustrings.py:1897 ../gui/wxpython/menustrings.py:1917 msgid "Drop column" msgstr "열 삭제" -#: ../gui/wxpython/menustrings.py:931 ../gui/wxpython/menustrings.py:1894 +#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1898 msgid "Drops a column from selected attribute table." msgstr "선택된 속성 테이블로부터 열을 삭제합니다." -#: ../gui/wxpython/menustrings.py:932 ../gui/wxpython/menustrings.py:1895 +#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1899 msgid "Test" msgstr "검정" -#: ../gui/wxpython/menustrings.py:933 ../gui/wxpython/menustrings.py:1896 +#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1900 msgid "Test database driver, database must exist and set by db.connect." msgstr "" -#: ../gui/wxpython/menustrings.py:934 ../gui/wxpython/menustrings.py:1897 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:120 +#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1901 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:121 msgid "Query" msgstr "" -#: ../gui/wxpython/menustrings.py:935 ../gui/wxpython/menustrings.py:1898 +#: ../gui/wxpython/menustrings.py:937 ../gui/wxpython/menustrings.py:1902 msgid "Query any table" msgstr "" -#: ../gui/wxpython/menustrings.py:936 ../gui/wxpython/menustrings.py:1899 +#: ../gui/wxpython/menustrings.py:938 ../gui/wxpython/menustrings.py:1903 msgid "Selects data from attribute table. Performs SQL query statement(s)." msgstr "" -#: ../gui/wxpython/menustrings.py:939 ../gui/wxpython/menustrings.py:1902 +#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1906 msgid "SQL statement" msgstr "" -#: ../gui/wxpython/menustrings.py:940 ../gui/wxpython/menustrings.py:1903 +#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1907 msgid "Executes any SQL statement. For SELECT statements use 'db.select'." msgstr "" -#: ../gui/wxpython/menustrings.py:941 ../gui/wxpython/menustrings.py:1904 +#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1908 msgid "Vector database connections" msgstr "벡터 데이터베이스 연결" -#: ../gui/wxpython/menustrings.py:942 ../gui/wxpython/menustrings.py:1905 +#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1909 msgid "New table" msgstr "" -#: ../gui/wxpython/menustrings.py:943 ../gui/wxpython/menustrings.py:1906 +#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1910 msgid "" "Creates and connects a new attribute table to a given layer of an existing " "vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:944 ../gui/wxpython/menustrings.py:1907 +#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1911 msgid "Remove table" msgstr "테이블 제거" -#: ../gui/wxpython/menustrings.py:945 ../gui/wxpython/menustrings.py:1908 +#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1912 msgid "Removes existing attribute table of a vector map." msgstr "벡터 지도의 기존 속성 테이블을 제거합니다." -#: ../gui/wxpython/menustrings.py:946 ../gui/wxpython/menustrings.py:1909 +#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1913 msgid "Join table" msgstr "" -#: ../gui/wxpython/menustrings.py:947 ../gui/wxpython/menustrings.py:1910 +#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1914 msgid "Joins a database table to a vector map table." msgstr "" -#: ../gui/wxpython/menustrings.py:948 ../gui/wxpython/menustrings.py:1911 +#: ../gui/wxpython/menustrings.py:950 ../gui/wxpython/menustrings.py:1915 msgid "Add columns" msgstr "" -#: ../gui/wxpython/menustrings.py:949 ../gui/wxpython/menustrings.py:1912 +#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1916 msgid "" "Adds one or more columns to the attribute table connected to a given vector " "map." msgstr "" -#: ../gui/wxpython/menustrings.py:951 ../gui/wxpython/menustrings.py:1914 +#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1918 msgid "" "Drops a column from the attribute table connected to a given vector map." msgstr "주어진 벡터 지도에 연결된 속성 테이블로부터 열을 삭제합니다." -#: ../gui/wxpython/menustrings.py:952 ../gui/wxpython/menustrings.py:1915 -#: ../gui/wxpython/dbmgr/base.py:2441 +#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/dbmgr/base.py:2452 msgid "Rename column" msgstr "" -#: ../gui/wxpython/menustrings.py:953 ../gui/wxpython/menustrings.py:1916 +#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1920 msgid "" "Renames a column in the attribute table connected to a given vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:954 ../gui/wxpython/menustrings.py:1917 +#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1921 msgid "Change values" msgstr "" -#: ../gui/wxpython/menustrings.py:955 ../gui/wxpython/menustrings.py:1918 +#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1922 msgid "Updates a column in the attribute table connected to a vector map." msgstr "" -#: ../gui/wxpython/menustrings.py:956 ../gui/wxpython/menustrings.py:1919 +#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1923 msgid "Drop row" msgstr "행 삭제" -#: ../gui/wxpython/menustrings.py:957 ../gui/wxpython/menustrings.py:1920 +#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1924 msgid "Removes a vector feature from a vector map through attribute selection." msgstr "속성 선택을 이용해서 벡터 지도로부터 벡터 피처를 제거합니다" -#: ../gui/wxpython/menustrings.py:958 ../gui/wxpython/menustrings.py:1921 +#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1925 msgid "Reconnect vectors to database" msgstr "벡터를 데이터베이스로 재연결" -#: ../gui/wxpython/menustrings.py:959 ../gui/wxpython/menustrings.py:1922 +#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1926 msgid "" "Reconnects attribute tables for all vector maps from the current mapset to a " "new database." msgstr "" -#: ../gui/wxpython/menustrings.py:960 ../gui/wxpython/menustrings.py:1923 +#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1927 msgid "Set vector map - database connection" msgstr "" -#: ../gui/wxpython/menustrings.py:961 ../gui/wxpython/menustrings.py:1924 +#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1928 msgid "Prints/sets DB connection for a vector map to attribute table." msgstr "" -#: ../gui/wxpython/menustrings.py:962 ../gui/wxpython/menustrings.py:1925 +#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1929 msgid "&Temporal" msgstr "시간(&T)" -#: ../gui/wxpython/menustrings.py:963 ../gui/wxpython/menustrings.py:1926 +#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1930 msgid "Manage datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:964 ../gui/wxpython/menustrings.py:1927 +#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1931 msgid "Connect temporal database" msgstr "시간 데이터베이스 연결" -#: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1928 +#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1932 msgid "" "Prints/sets general temporal GIS database connection for current mapset." msgstr "" -#: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1929 +#: ../gui/wxpython/menustrings.py:968 ../gui/wxpython/menustrings.py:1933 #: ../gui/wxpython/rlisetup/frame.py:161 msgid "Create" msgstr "" -#: ../gui/wxpython/menustrings.py:967 ../gui/wxpython/menustrings.py:1930 +#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1934 msgid "Creates a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:969 ../gui/wxpython/menustrings.py:1932 +#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1936 msgid "Renames a space time dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:971 ../gui/wxpython/menustrings.py:1934 +#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1938 msgid "Removes space time datasets from temporal database." msgstr "시간 데이터베이스로부터 시공간 자료세트를 제거합니다" -#: ../gui/wxpython/menustrings.py:972 ../gui/wxpython/menustrings.py:1935 +#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1939 msgid "Update metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:973 ../gui/wxpython/menustrings.py:1936 +#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1940 msgid "Modifies the metadata of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:974 ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1941 msgid "Merge" msgstr "" -#: ../gui/wxpython/menustrings.py:975 ../gui/wxpython/menustrings.py:1938 +#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1942 msgid "Merges several space time datasets into a single space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:976 ../gui/wxpython/menustrings.py:1939 +#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1943 msgid "Temporally shift" msgstr "" -#: ../gui/wxpython/menustrings.py:977 ../gui/wxpython/menustrings.py:1940 +#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1944 msgid "Shifts temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:978 ../gui/wxpython/menustrings.py:1941 +#: ../gui/wxpython/menustrings.py:980 ../gui/wxpython/menustrings.py:1945 msgid "Snap maps of dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:979 ../gui/wxpython/menustrings.py:1942 +#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1946 msgid "Snaps temporally the maps of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:981 ../gui/wxpython/menustrings.py:1944 +#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1948 msgid "Lists space time datasets and maps registered in the temporal database." msgstr "" -#: ../gui/wxpython/menustrings.py:982 ../gui/wxpython/menustrings.py:1945 +#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1949 msgid "Manage maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:983 ../gui/wxpython/menustrings.py:1946 +#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1950 msgid "Register maps in datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:984 ../gui/wxpython/menustrings.py:1947 +#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1951 msgid "" "Assigns timestamps and registers raster, vector and raster3d maps in a space " "time dataset." @@ -9526,686 +9753,678 @@ msgstr "" "타임스탬프를 할당하고 시공간 자료세트 안에 래스터, 벡터, 그리고 3차원 래스터 " "지도를 등록합니다." -#: ../gui/wxpython/menustrings.py:985 ../gui/wxpython/menustrings.py:1948 +#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1952 msgid "Unregister maps from datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:986 ../gui/wxpython/menustrings.py:1949 +#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1953 msgid "" "Unregisters raster, vector and raster3d maps from the temporal database or a " "specific space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:987 ../gui/wxpython/menustrings.py:1950 +#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1954 msgid "List raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:988 ../gui/wxpython/menustrings.py:1951 +#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1955 msgid "Lists registered maps of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:989 ../gui/wxpython/menustrings.py:1952 +#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1956 msgid "List vector dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:990 ../gui/wxpython/menustrings.py:1953 +#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1957 msgid "Lists registered maps of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:991 ../gui/wxpython/menustrings.py:1954 +#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1958 msgid "List 3D raster dataset maps" msgstr "" -#: ../gui/wxpython/menustrings.py:992 ../gui/wxpython/menustrings.py:1955 +#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1959 msgid "Lists registered maps of a space time raster3d dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:993 ../gui/wxpython/menustrings.py:1956 +#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1960 msgid "Import" msgstr "" -#: ../gui/wxpython/menustrings.py:994 ../gui/wxpython/menustrings.py:1957 +#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1961 msgid "Import raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:995 ../gui/wxpython/menustrings.py:1958 +#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1962 msgid "Imports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:996 ../gui/wxpython/menustrings.py:1959 +#: ../gui/wxpython/menustrings.py:998 ../gui/wxpython/menustrings.py:1963 msgid "Import vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:997 ../gui/wxpython/menustrings.py:1960 +#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1964 msgid "" "Imports a space time vector dataset from a GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:999 ../gui/wxpython/menustrings.py:1962 +#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1966 msgid "Export raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1000 ../gui/wxpython/menustrings.py:1963 +#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1967 msgid "Exports space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1001 ../gui/wxpython/menustrings.py:1964 +#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1968 msgid "Export raster dataset as VTK time series" msgstr "" -#: ../gui/wxpython/menustrings.py:1002 ../gui/wxpython/menustrings.py:1965 +#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1969 msgid "Exports space time raster dataset as VTK time series." msgstr "" -#: ../gui/wxpython/menustrings.py:1003 ../gui/wxpython/menustrings.py:1966 +#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1970 msgid "Export vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1004 ../gui/wxpython/menustrings.py:1967 +#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1971 msgid "Exports a space time vector dataset as GRASS GIS specific archive file." msgstr "" -#: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1968 +#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1972 msgid "Convert raster dataset to 3D raster" msgstr "" -#: ../gui/wxpython/menustrings.py:1006 ../gui/wxpython/menustrings.py:1969 +#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1973 msgid "Converts a space time raster dataset into a 3D raster map." msgstr "" -#: ../gui/wxpython/menustrings.py:1007 ../gui/wxpython/menustrings.py:1970 +#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1974 msgid "Extraction" msgstr "" -#: ../gui/wxpython/menustrings.py:1008 ../gui/wxpython/menustrings.py:1971 +#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1975 msgid "Extract subset of raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1009 ../gui/wxpython/menustrings.py:1972 +#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1976 msgid "Extracts a subset of a space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1010 ../gui/wxpython/menustrings.py:1973 +#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1977 msgid "Extract subset of vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1011 ../gui/wxpython/menustrings.py:1974 +#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1978 msgid "Extracts a subset of a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1012 ../gui/wxpython/menustrings.py:1975 +#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1979 msgid "Extract subset of 3D raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1013 ../gui/wxpython/menustrings.py:1976 +#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1980 msgid "Extracts a subset of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1014 ../gui/wxpython/menustrings.py:1977 +#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1981 msgid "Query vector dataset attribute data" msgstr "" -#: ../gui/wxpython/menustrings.py:1015 ../gui/wxpython/menustrings.py:1978 +#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1982 msgid "" "Prints attributes of vector maps registered in a space time vector dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1016 ../gui/wxpython/menustrings.py:1979 +#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1983 msgid "Raster dataset color table" msgstr "" -#: ../gui/wxpython/menustrings.py:1017 ../gui/wxpython/menustrings.py:1980 +#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1984 msgid "" "Creates/modifies the color table associated with each raster map of the " "space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1018 ../gui/wxpython/menustrings.py:1981 +#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1985 msgid "Raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1019 ../gui/wxpython/menustrings.py:1982 +#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1986 msgid "" "Performs spatio-temporal mapcalc expressions on temporally sampled maps of " "space time raster datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1020 ../gui/wxpython/menustrings.py:1983 +#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1987 msgid "3D raster calculations" msgstr "" -#: ../gui/wxpython/menustrings.py:1021 ../gui/wxpython/menustrings.py:1984 +#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1988 msgid "" "Performs r3.mapcalc expressions on maps of sampled space time 3D raster " "datasets." msgstr "" -#: ../gui/wxpython/menustrings.py:1022 ../gui/wxpython/menustrings.py:1985 +#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1989 msgid "Interpolate gaps in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1023 ../gui/wxpython/menustrings.py:1986 +#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1990 msgid "" "Replaces gaps in a space time raster dataset with interpolated raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1024 ../gui/wxpython/menustrings.py:1987 +#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1991 msgid "Aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1025 ../gui/wxpython/menustrings.py:1988 +#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1992 msgid "Neighborhood analysis in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1026 ../gui/wxpython/menustrings.py:1989 +#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1993 msgid "" "Performs a neighborhood analysis for each map in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1027 ../gui/wxpython/menustrings.py:1990 +#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1994 msgid "Aggregation in raster datasets" msgstr "" -#: ../gui/wxpython/menustrings.py:1028 ../gui/wxpython/menustrings.py:1991 +#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1995 msgid "" "Performs different aggregation algorithms from r.series on all or a subset " "of raster maps in a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1029 ../gui/wxpython/menustrings.py:1992 +#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1996 msgid "Temporal aggregation" msgstr "" -#: ../gui/wxpython/menustrings.py:1030 ../gui/wxpython/menustrings.py:1993 +#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1997 msgid "" "Aggregates temporally the maps of a space time raster dataset by a user " "defined granularity." msgstr "" -#: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1994 +#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1998 msgid "Temporal aggregation by dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1032 ../gui/wxpython/menustrings.py:1995 +#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1999 msgid "" "Aggregates data of an existing space time raster dataset using the time " "intervals of a second space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1033 ../gui/wxpython/menustrings.py:1996 +#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:2000 msgid "Sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1034 ../gui/wxpython/menustrings.py:1997 +#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:2001 msgid "Sample a space time raster dataset at point coordinates" msgstr "" -#: ../gui/wxpython/menustrings.py:1035 ../gui/wxpython/menustrings.py:1998 +#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2002 msgid "" "Sample a space time raster dataset at specific vector point coordinates and " "write the output to stdout using different layouts" msgstr "" -#: ../gui/wxpython/menustrings.py:1036 ../gui/wxpython/menustrings.py:1999 +#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2003 msgid "Query raster dataset by vector points dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1037 ../gui/wxpython/menustrings.py:2000 +#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2004 msgid "" "Stores raster map values at spatial and temporal positions of vector points " "as vector attributes." msgstr "" -#: ../gui/wxpython/menustrings.py:1038 ../gui/wxpython/menustrings.py:2001 +#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2005 msgid "Observe specific locations in raster dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1039 ../gui/wxpython/menustrings.py:2002 +#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2006 msgid "" "Observes specific locations in a space time raster dataset over a period of " "time using vector points." msgstr "" -#: ../gui/wxpython/menustrings.py:1040 ../gui/wxpython/menustrings.py:2003 +#: ../gui/wxpython/menustrings.py:1042 ../gui/wxpython/menustrings.py:2007 msgid "Temporal sampling" msgstr "" -#: ../gui/wxpython/menustrings.py:1041 ../gui/wxpython/menustrings.py:2004 +#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2008 msgid "" "Samples the input space time dataset(s) with a sample space time dataset and " "print the result to stdout." msgstr "" -#: ../gui/wxpython/menustrings.py:1043 ../gui/wxpython/menustrings.py:2006 +#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2010 msgid "Space time datasets metadata" msgstr "" -#: ../gui/wxpython/menustrings.py:1044 ../gui/wxpython/menustrings.py:2007 +#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2011 msgid "Lists information about space time datasets and maps." msgstr "" -#: ../gui/wxpython/menustrings.py:1045 ../gui/wxpython/menustrings.py:2008 +#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2012 msgid "Univariate raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1046 ../gui/wxpython/menustrings.py:2009 +#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2013 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "raster map of a space time raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1047 ../gui/wxpython/menustrings.py:2010 +#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2014 msgid "Univariate vector dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1048 ../gui/wxpython/menustrings.py:2011 +#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2015 msgid "" "Calculates univariate statistics of attributes for each registered vector " "map of a space time vector dataset" msgstr "" -#: ../gui/wxpython/menustrings.py:1049 ../gui/wxpython/menustrings.py:2012 +#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2016 msgid "Univariate 3D raster dataset statistics" msgstr "" -#: ../gui/wxpython/menustrings.py:1050 ../gui/wxpython/menustrings.py:2013 +#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2017 msgid "" "Calculates univariate statistics from the non-null cells for each registered " "3D raster map of a space time 3D raster dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1051 ../gui/wxpython/menustrings.py:2014 +#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2018 msgid "Report temporal topology" msgstr "시간 위상 보고" -#: ../gui/wxpython/menustrings.py:1052 ../gui/wxpython/menustrings.py:2015 +#: ../gui/wxpython/menustrings.py:1054 ../gui/wxpython/menustrings.py:2019 msgid "Lists temporal topology of a space time dataset." msgstr "" -#: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:2016 -#: ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:2020 +#: ../gui/wxpython/menustrings.py:2027 msgid "GUI tools" msgstr "GUI 도구" -#: ../gui/wxpython/menustrings.py:1056 ../gui/wxpython/menustrings.py:2019 -#: ../gui/wxpython/menustrings.py:2047 +#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2023 +#: ../gui/wxpython/menustrings.py:2052 msgid "Timeline tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1057 ../gui/wxpython/menustrings.py:2020 -#: ../gui/wxpython/menustrings.py:2048 +#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2024 +#: ../gui/wxpython/menustrings.py:2053 msgid "Plot temporal extents." msgstr "" -#: ../gui/wxpython/menustrings.py:1058 ../gui/wxpython/menustrings.py:2021 -#: ../gui/wxpython/menustrings.py:2045 +#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2025 +#: ../gui/wxpython/menustrings.py:2050 msgid "Temporal plot tool" msgstr "" -#: ../gui/wxpython/menustrings.py:1059 ../gui/wxpython/menustrings.py:2022 -#: ../gui/wxpython/menustrings.py:2046 +#: ../gui/wxpython/menustrings.py:1061 ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2051 msgid "Plot temporal values." msgstr "" -#: ../gui/wxpython/menustrings.py:1060 ../gui/wxpython/menustrings.py:2098 -#: ../gui/wxpython/menustrings.py:2141 +#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:2103 +#: ../gui/wxpython/menustrings.py:2146 msgid "&Help" msgstr "도움말(&H)" -#: ../gui/wxpython/menustrings.py:1061 +#: ../gui/wxpython/menustrings.py:1063 msgid "GRASS help" msgstr "GRASS 도움말" -#: ../gui/wxpython/menustrings.py:1062 ../gui/wxpython/menustrings.py:1064 +#: ../gui/wxpython/menustrings.py:1064 ../gui/wxpython/menustrings.py:1066 msgid "Display the HTML man pages of GRASS GIS" msgstr "GRASS GIS의 HTML 설명서를 보여 줍니다" -#: ../gui/wxpython/menustrings.py:1063 +#: ../gui/wxpython/menustrings.py:1065 msgid "GUI help" msgstr "" -#: ../gui/wxpython/menustrings.py:1065 +#: ../gui/wxpython/menustrings.py:1067 msgid "About system" msgstr "" -#: ../gui/wxpython/menustrings.py:1066 +#: ../gui/wxpython/menustrings.py:1068 msgid "Prints system information" msgstr "" -#: ../gui/wxpython/menustrings.py:1067 ../gui/wxpython/menustrings.py:1068 +#: ../gui/wxpython/menustrings.py:1069 ../gui/wxpython/menustrings.py:1070 #: ../gui/wxpython/gui_core/ghelp.py:60 msgid "About GRASS GIS" msgstr "GRASS GIS에 관해" -#: ../gui/wxpython/menustrings.py:1071 +#: ../gui/wxpython/menustrings.py:1073 msgid "Import, export and link data" msgstr "가져오기, 내보내기, 자료 연결" -#: ../gui/wxpython/menustrings.py:2026 +#: ../gui/wxpython/menustrings.py:2030 msgid "Attribute table manager" msgstr "" -#: ../gui/wxpython/menustrings.py:2032 +#: ../gui/wxpython/menustrings.py:2037 msgid "Launch Data Catalog." msgstr "" -#: ../gui/wxpython/menustrings.py:2039 +#: ../gui/wxpython/menustrings.py:2044 msgid "Managing GCPs for 3D correction" msgstr "" -#: ../gui/wxpython/menustrings.py:2049 ../gui/wxpython/vdigit/toolbars.py:1153 -#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:644 +#: ../gui/wxpython/menustrings.py:2054 ../gui/wxpython/vdigit/toolbars.py:1156 +#: ../gui/wxpython/mapdisp/toolbars.py:113 ../gui/wxpython/mapdisp/frame.py:629 msgid "Vector digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2050 +#: ../gui/wxpython/menustrings.py:2055 msgid "Interactive editing and digitization of vector maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2051 ../gui/wxpython/mapdisp/toolbars.py:132 -#: ../gui/wxpython/mapdisp/frame.py:649 +#: ../gui/wxpython/menustrings.py:2056 ../gui/wxpython/mapdisp/toolbars.py:133 +#: ../gui/wxpython/mapdisp/frame.py:634 msgid "Raster digitizer" msgstr "" -#: ../gui/wxpython/menustrings.py:2052 -msgid "Interactive editing and digitization of raster maps." -msgstr "" - #: ../gui/wxpython/menustrings.py:2057 -msgid "Create new model" -msgstr "" - -#: ../gui/wxpython/menustrings.py:2059 -msgid "Load model from file" +msgid "Interactive editing and digitization of raster maps." msgstr "" -#: ../gui/wxpython/menustrings.py:2063 +#: ../gui/wxpython/menustrings.py:2068 msgid "Save model to file" msgstr "" -#: ../gui/wxpython/menustrings.py:2065 +#: ../gui/wxpython/menustrings.py:2070 msgid "Close model file" msgstr "" -#: ../gui/wxpython/menustrings.py:2066 +#: ../gui/wxpython/menustrings.py:2071 msgid "Export to image" msgstr "" -#: ../gui/wxpython/menustrings.py:2068 +#: ../gui/wxpython/menustrings.py:2073 msgid "Export to Python" msgstr "" -#: ../gui/wxpython/menustrings.py:2070 +#: ../gui/wxpython/menustrings.py:2075 msgid "Quit modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2071 +#: ../gui/wxpython/menustrings.py:2076 msgid "Close modeler window" msgstr "" -#: ../gui/wxpython/menustrings.py:2075 +#: ../gui/wxpython/menustrings.py:2080 msgid "&Model" msgstr "" -#: ../gui/wxpython/menustrings.py:2076 +#: ../gui/wxpython/menustrings.py:2081 msgid "Add command" msgstr "" -#: ../gui/wxpython/menustrings.py:2077 +#: ../gui/wxpython/menustrings.py:2082 msgid "Add action (GRASS command) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2078 +#: ../gui/wxpython/menustrings.py:2083 msgid "Add data" msgstr "" -#: ../gui/wxpython/menustrings.py:2079 +#: ../gui/wxpython/menustrings.py:2084 msgid "Add data item to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2080 +#: ../gui/wxpython/menustrings.py:2085 msgid "Define relation" msgstr "" -#: ../gui/wxpython/menustrings.py:2081 +#: ../gui/wxpython/menustrings.py:2086 msgid "Define relation between data and action items" msgstr "" -#: ../gui/wxpython/menustrings.py:2082 +#: ../gui/wxpython/menustrings.py:2087 msgid "Add loop / series" msgstr "" -#: ../gui/wxpython/menustrings.py:2083 +#: ../gui/wxpython/menustrings.py:2088 msgid "Adds loop (series) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2084 +#: ../gui/wxpython/menustrings.py:2089 msgid "Add condition" msgstr "" -#: ../gui/wxpython/menustrings.py:2085 +#: ../gui/wxpython/menustrings.py:2090 msgid "Adds condition (if/else) to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2087 +#: ../gui/wxpython/menustrings.py:2092 msgid "Adds comment to model" msgstr "" -#: ../gui/wxpython/menustrings.py:2088 +#: ../gui/wxpython/menustrings.py:2093 msgid "Remove item" msgstr "항목을 제거합니다" -#: ../gui/wxpython/menustrings.py:2089 +#: ../gui/wxpython/menustrings.py:2094 msgid "Remove action/data from model" msgstr "모델에서 작업/자료를 제거합니다" -#: ../gui/wxpython/menustrings.py:2091 +#: ../gui/wxpython/menustrings.py:2096 msgid "Model properties (name, purpose, etc.)" msgstr "" -#: ../gui/wxpython/menustrings.py:2092 +#: ../gui/wxpython/menustrings.py:2097 msgid "Delete intermediate data" msgstr "중간 자료를 삭제합니다" -#: ../gui/wxpython/menustrings.py:2093 +#: ../gui/wxpython/menustrings.py:2098 msgid "Delete intermediate data defined in the model" msgstr "모델 안에 정의된 중간 자료를 삭제합니다" -#: ../gui/wxpython/menustrings.py:2095 +#: ../gui/wxpython/menustrings.py:2100 msgid "Run entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2097 +#: ../gui/wxpython/menustrings.py:2102 msgid "Validate entire model" msgstr "" -#: ../gui/wxpython/menustrings.py:2100 +#: ../gui/wxpython/menustrings.py:2105 msgid "Display the HTML man pages of Graphical modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2101 +#: ../gui/wxpython/menustrings.py:2106 msgid "About Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2102 +#: ../gui/wxpython/menustrings.py:2107 msgid "Display information about Graphical Modeler" msgstr "" -#: ../gui/wxpython/menustrings.py:2107 ../gui/wxpython/psmap/toolbars.py:83 +#: ../gui/wxpython/menustrings.py:2112 ../gui/wxpython/psmap/toolbars.py:83 msgid "Specify paper size, margins and orientation" msgstr "" -#: ../gui/wxpython/menustrings.py:2108 +#: ../gui/wxpython/menustrings.py:2113 msgid "Load instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2109 ../gui/wxpython/psmap/toolbars.py:74 +#: ../gui/wxpython/menustrings.py:2114 ../gui/wxpython/psmap/toolbars.py:74 msgid "Load text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2110 +#: ../gui/wxpython/menustrings.py:2115 msgid "Export instruction file" msgstr "" -#: ../gui/wxpython/menustrings.py:2111 ../gui/wxpython/psmap/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/psmap/toolbars.py:71 msgid "Generate text file with mapping instructions" msgstr "" -#: ../gui/wxpython/menustrings.py:2112 +#: ../gui/wxpython/menustrings.py:2117 msgid "Export to PostScript" msgstr "" -#: ../gui/wxpython/menustrings.py:2113 ../gui/wxpython/psmap/toolbars.py:77 +#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/psmap/toolbars.py:77 msgid "Generate PostScript output" msgstr "" -#: ../gui/wxpython/menustrings.py:2114 +#: ../gui/wxpython/menustrings.py:2119 msgid "Export to PDF" msgstr "" -#: ../gui/wxpython/menustrings.py:2115 ../gui/wxpython/psmap/toolbars.py:79 +#: ../gui/wxpython/menustrings.py:2120 ../gui/wxpython/psmap/toolbars.py:79 msgid "Generate PDF output" msgstr "" -#: ../gui/wxpython/menustrings.py:2116 ../gui/wxpython/menustrings.py:2117 +#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/menustrings.py:2122 msgid "Launch ps.map dialog" msgstr "" -#: ../gui/wxpython/menustrings.py:2118 ../gui/wxpython/gui_core/toolbars.py:71 +#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/gui_core/toolbars.py:71 #: ../gui/wxpython/lmgr/layertree.py:56 msgid "Quit" msgstr "종료" -#: ../gui/wxpython/menustrings.py:2119 +#: ../gui/wxpython/menustrings.py:2124 msgid "Close Cartographic Composer" msgstr "지도 작성자를 닫습니다" -#: ../gui/wxpython/menustrings.py:2120 +#: ../gui/wxpython/menustrings.py:2125 msgid "&Insert" msgstr "" -#: ../gui/wxpython/menustrings.py:2121 ../gui/wxpython/psmap/toolbars.py:90 -#: ../gui/wxpython/psmap/dialogs.py:889 ../gui/wxpython/psmap/dialogs.py:938 +#: ../gui/wxpython/menustrings.py:2126 ../gui/wxpython/psmap/toolbars.py:90 +#: ../gui/wxpython/psmap/dialogs.py:915 ../gui/wxpython/psmap/dialogs.py:964 msgid "Map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2122 +#: ../gui/wxpython/menustrings.py:2127 msgid "Add or edit map frame" msgstr "" -#: ../gui/wxpython/menustrings.py:2124 +#: ../gui/wxpython/menustrings.py:2129 msgid "Add or edit raster map" msgstr "" -#: ../gui/wxpython/menustrings.py:2126 +#: ../gui/wxpython/menustrings.py:2131 msgid "Add or edit vector map" msgstr "" -#: ../gui/wxpython/menustrings.py:2127 +#: ../gui/wxpython/menustrings.py:2132 msgid "Map legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2128 +#: ../gui/wxpython/menustrings.py:2133 msgid "Add or edit raster and vector legend" msgstr "" -#: ../gui/wxpython/menustrings.py:2129 ../gui/wxpython/psmap/toolbars.py:98 +#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/psmap/toolbars.py:98 msgid "Map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/menustrings.py:2135 msgid "Add or edit map info" msgstr "" -#: ../gui/wxpython/menustrings.py:2132 +#: ../gui/wxpython/menustrings.py:2137 msgid "Add or edit scale bar" msgstr "" -#: ../gui/wxpython/menustrings.py:2133 +#: ../gui/wxpython/menustrings.py:2138 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5162 -#: ../gui/wxpython/psmap/dialogs.py:5167 +#: ../gui/wxpython/psmap/toolbars.py:97 ../gui/wxpython/psmap/dialogs.py:5215 +#: ../gui/wxpython/psmap/dialogs.py:5220 msgid "Text" msgstr "" -#: ../gui/wxpython/menustrings.py:2134 ../gui/wxpython/mapdisp/toolbars.py:53 +#: ../gui/wxpython/menustrings.py:2139 ../gui/wxpython/mapdisp/toolbars.py:53 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add text" msgstr "" -#: ../gui/wxpython/menustrings.py:2135 +#: ../gui/wxpython/menustrings.py:2140 #: ../gui/wxpython/animation/dialogs.py:1520 -#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5670 -#: ../gui/wxpython/psmap/dialogs.py:5733 +#: ../gui/wxpython/psmap/toolbars.py:101 ../gui/wxpython/psmap/dialogs.py:5723 +#: ../gui/wxpython/psmap/dialogs.py:5786 msgid "Image" msgstr "" -#: ../gui/wxpython/menustrings.py:2136 +#: ../gui/wxpython/menustrings.py:2141 #: ../gui/wxpython/animation/dialogs.py:1016 msgid "Add image" msgstr "" -#: ../gui/wxpython/menustrings.py:2138 ../gui/wxpython/mapdisp/toolbars.py:40 +#: ../gui/wxpython/menustrings.py:2143 ../gui/wxpython/mapdisp/toolbars.py:40 msgid "Add north arrow" msgstr "" -#: ../gui/wxpython/menustrings.py:2140 ../gui/wxpython/psmap/toolbars.py:94 +#: ../gui/wxpython/menustrings.py:2145 ../gui/wxpython/psmap/toolbars.py:94 msgid "Delete selected object" msgstr "선택된 객체를 삭제합니다" -#: ../gui/wxpython/menustrings.py:2143 +#: ../gui/wxpython/menustrings.py:2148 msgid "Display the HTML man pages of Cartographic Composer" msgstr "지도 작성자의 HTML 설명서를 보여 줍니다" -#: ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/menustrings.py:2149 msgid "About Cartographic Composer" msgstr "지도 작성자에 대해" -#: ../gui/wxpython/menustrings.py:2145 +#: ../gui/wxpython/menustrings.py:2150 msgid "Display information about Cartographic Composer" msgstr "지도 작성자에 관한 정보를 보여 줍니다" -#: ../gui/wxpython/wxplot/scatter.py:50 +#: ../gui/wxpython/wxplot/scatter.py:51 msgid "GRASS Bivariate Scatterplot Tool" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:57 +#: ../gui/wxpython/wxplot/scatter.py:58 msgid "Bivariate Scatterplot" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:58 ../gui/wxpython/wxplot/scatter.py:59 +#: ../gui/wxpython/wxplot/scatter.py:59 ../gui/wxpython/wxplot/scatter.py:60 #: ../gui/wxpython/wxplot/histogram.py:59 #: ../gui/wxpython/wxplot/histogram.py:161 msgid "Raster cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:109 ../gui/wxpython/wxplot/scatter.py:264 +#: ../gui/wxpython/wxplot/scatter.py:110 ../gui/wxpython/wxplot/scatter.py:265 msgid "Nothing to plot." msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:118 +#: ../gui/wxpython/wxplot/scatter.py:119 msgid "At least 2 raster maps must be specified" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:140 +#: ../gui/wxpython/wxplot/scatter.py:141 msgid "Bivariate Scatterplot of " msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:162 ../gui/wxpython/wxplot/scatter.py:163 +#: ../gui/wxpython/wxplot/scatter.py:163 ../gui/wxpython/wxplot/scatter.py:164 #, python-format msgid "Raster <%s> cell values" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:167 ../gui/wxpython/wxplot/scatter.py:171 +#: ../gui/wxpython/wxplot/scatter.py:168 ../gui/wxpython/wxplot/scatter.py:172 #, python-format msgid ": %s" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:269 +#: ../gui/wxpython/wxplot/scatter.py:270 msgid "Regression Statistics for Scatterplot(s)" msgstr "" -#: ../gui/wxpython/wxplot/scatter.py:286 +#: ../gui/wxpython/wxplot/scatter.py:287 #, python-format msgid "" "Regression equation for raster map <%(rast1)s> vs. <%(rast2)s>:\n" @@ -10238,7 +10457,7 @@ msgid "Text settings" msgstr "" #: ../gui/wxpython/wxplot/base.py:520 ../gui/wxpython/wxplot/base.py:601 -#: ../gui/wxpython/wxplot/dialogs.py:963 +#: ../gui/wxpython/wxplot/dialogs.py:964 msgid "Plot settings" msgstr "" @@ -10299,56 +10518,56 @@ msgstr "" msgid "Statistics for raster map <%s>" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:56 +#: ../gui/wxpython/wxplot/profile.py:63 msgid "GRASS Profile Analysis Tool" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:72 ../gui/wxpython/wxplot/profile.py:182 +#: ../gui/wxpython/wxplot/profile.py:80 ../gui/wxpython/wxplot/profile.py:192 msgid "Profile of" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:103 +#: ../gui/wxpython/wxplot/profile.py:111 #, python-format msgid "Distance (%s)" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:105 +#: ../gui/wxpython/wxplot/profile.py:113 msgid "Distance along transect" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:106 +#: ../gui/wxpython/wxplot/profile.py:114 msgid "Cell values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:174 +#: ../gui/wxpython/wxplot/profile.py:184 msgid "Not all points of profile lie inside computational region." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:248 +#: ../gui/wxpython/wxplot/profile.py:277 msgid "Raster values" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:312 +#: ../gui/wxpython/wxplot/profile.py:341 msgid "You must draw a transect to profile in the map display window." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:314 +#: ../gui/wxpython/wxplot/profile.py:343 msgid "Nothing to profile" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:385 +#: ../gui/wxpython/wxplot/profile.py:414 msgid "Choose prefix for file(s) where to save profile values..." msgstr "" -#: ../gui/wxpython/wxplot/profile.py:387 +#: ../gui/wxpython/wxplot/profile.py:416 msgid "Comma separated value (*.csv)|*.csv" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:403 +#: ../gui/wxpython/wxplot/profile.py:432 msgid "Overwrite file?" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:417 +#: ../gui/wxpython/wxplot/profile.py:446 #, python-format msgid "" "Unable to open file <%s> for writing.\n" @@ -10357,18 +10576,18 @@ msgstr "" "파일 <%s>를 쓰기 위해 열 수 없습니다.\n" "이유: %s" -#: ../gui/wxpython/wxplot/profile.py:431 +#: ../gui/wxpython/wxplot/profile.py:460 #, python-format msgid "" "%d files created:\n" "%s" msgstr "" -#: ../gui/wxpython/wxplot/profile.py:433 +#: ../gui/wxpython/wxplot/profile.py:462 msgid "No files generated." msgstr "파일이 생성되지 않았습니다." -#: ../gui/wxpython/wxplot/profile.py:440 +#: ../gui/wxpython/wxplot/profile.py:469 msgid "Statistics for Profile(s)" msgstr "" @@ -10392,7 +10611,7 @@ msgstr "" msgid "Number of bins (for FP maps)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:503 +#: ../gui/wxpython/wxplot/dialogs.py:295 ../gui/wxpython/dbmgr/base.py:510 msgid "Statistics" msgstr "" @@ -10438,11 +10657,11 @@ msgid "Selected group must be in current mapset" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:576 -#: ../gui/wxpython/animation/controller.py:308 +#: ../gui/wxpython/animation/controller.py:309 #: ../gui/wxpython/animation/dialogs.py:753 -#: ../gui/wxpython/psmap/dialogs.py:655 ../gui/wxpython/psmap/dialogs.py:1449 -#: ../gui/wxpython/psmap/dialogs.py:1481 ../gui/wxpython/psmap/dialogs.py:1540 -#: ../gui/wxpython/psmap/dialogs.py:5075 +#: ../gui/wxpython/psmap/dialogs.py:681 ../gui/wxpython/psmap/dialogs.py:1476 +#: ../gui/wxpython/psmap/dialogs.py:1508 ../gui/wxpython/psmap/dialogs.py:1567 +#: ../gui/wxpython/psmap/dialogs.py:5128 msgid "Invalid input" msgstr "무효한 입력" @@ -10467,11 +10686,11 @@ msgid "Label font size (pts):" msgstr "" #: ../gui/wxpython/wxplot/dialogs.py:729 -#: ../gui/wxpython/gui_core/preferences.py:535 -#: ../gui/wxpython/gui_core/preferences.py:828 -#: ../gui/wxpython/gui_core/dialogs.py:2452 -#: ../gui/wxpython/psmap/dialogs.py:3876 ../gui/wxpython/psmap/dialogs.py:4523 -#: ../gui/wxpython/psmap/dialogs.py:5187 +#: ../gui/wxpython/gui_core/preferences.py:582 +#: ../gui/wxpython/gui_core/preferences.py:875 +#: ../gui/wxpython/gui_core/dialogs.py:2454 +#: ../gui/wxpython/psmap/dialogs.py:3923 ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:5240 msgid "Font settings" msgstr "" @@ -10487,402 +10706,401 @@ msgstr "" msgid "Weight:" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1323 +#: ../gui/wxpython/wxplot/dialogs.py:812 ../gui/wxpython/wxplot/dialogs.py:1325 msgid "Apply changes for the current session and close dialog" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:875 +#: ../gui/wxpython/wxplot/dialogs.py:876 #, python-format msgid "Plot text sizes saved to file '%s'." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:941 -msgid "No map or image group selected to plot." -msgstr "" - #: ../gui/wxpython/wxplot/dialogs.py:942 -#: ../gui/wxpython/mapwin/buffered.py:2159 ../gui/wxpython/core/gcmd.py:119 -#: ../gui/wxpython/core/workspace.py:1775 -msgid "Warning" +msgid "No map or image group selected to plot." msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:983 +#: ../gui/wxpython/wxplot/dialogs.py:984 msgid "Map/image plotted" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:996 +#: ../gui/wxpython/wxplot/dialogs.py:997 msgid "Settings for selected map" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1012 +#: ../gui/wxpython/wxplot/dialogs.py:1013 msgid "Line color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1021 +#: ../gui/wxpython/wxplot/dialogs.py:1022 #: ../gui/wxpython/vdigit/preferences.py:141 msgid "Line width" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1036 ../gui/wxpython/psmap/dialogs.py:2937 -#: ../gui/wxpython/psmap/dialogs.py:6609 +#: ../gui/wxpython/wxplot/dialogs.py:1037 ../gui/wxpython/psmap/dialogs.py:2968 +#: ../gui/wxpython/psmap/dialogs.py:6662 msgid "Line style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1049 -#: ../gui/wxpython/wxplot/dialogs.py:1106 -#: ../gui/wxpython/wxplot/dialogs.py:1168 ../gui/wxpython/psmap/toolbars.py:99 +#: ../gui/wxpython/wxplot/dialogs.py:1050 +#: ../gui/wxpython/wxplot/dialogs.py:1107 +#: ../gui/wxpython/wxplot/dialogs.py:1169 ../gui/wxpython/psmap/toolbars.py:99 msgid "Legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1066 +#: ../gui/wxpython/wxplot/dialogs.py:1067 msgid "Transect segment marker settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1080 -#: ../gui/wxpython/wxplot/dialogs.py:1142 ../gui/wxpython/psmap/dialogs.py:2748 -#: ../gui/wxpython/psmap/dialogs.py:3713 ../gui/wxpython/psmap/dialogs.py:4833 +#: ../gui/wxpython/wxplot/dialogs.py:1081 +#: ../gui/wxpython/wxplot/dialogs.py:1143 ../gui/wxpython/psmap/dialogs.py:2779 +#: ../gui/wxpython/psmap/dialogs.py:3752 ../gui/wxpython/psmap/dialogs.py:4882 msgid "Size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1094 -#: ../gui/wxpython/wxplot/dialogs.py:1156 ../gui/wxpython/psmap/dialogs.py:2454 -#: ../gui/wxpython/psmap/dialogs.py:2605 +#: ../gui/wxpython/wxplot/dialogs.py:1095 +#: ../gui/wxpython/wxplot/dialogs.py:1157 ../gui/wxpython/psmap/dialogs.py:2485 +#: ../gui/wxpython/psmap/dialogs.py:2636 msgid "Fill" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1113 -#: ../gui/wxpython/wxplot/dialogs.py:1175 ../gui/wxpython/psmap/dialogs.py:4915 +#: ../gui/wxpython/wxplot/dialogs.py:1114 +#: ../gui/wxpython/wxplot/dialogs.py:1176 ../gui/wxpython/psmap/dialogs.py:4964 msgid "Style" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1128 +#: ../gui/wxpython/wxplot/dialogs.py:1129 msgid "Scatterplot points" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1190 +#: ../gui/wxpython/wxplot/dialogs.py:1191 msgid "Axis settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "X-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1196 +#: ../gui/wxpython/wxplot/dialogs.py:1197 msgid "Y-Axis" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1204 +#: ../gui/wxpython/wxplot/dialogs.py:1205 msgid "Scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1212 +#: ../gui/wxpython/wxplot/dialogs.py:1213 msgid "" "Automatic axis scaling, custom max and min, or scale matches data range (min)" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1219 +#: ../gui/wxpython/wxplot/dialogs.py:1221 msgid "Custom min" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1227 +#: ../gui/wxpython/wxplot/dialogs.py:1229 msgid "Custom max" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1235 +#: ../gui/wxpython/wxplot/dialogs.py:1237 msgid "Log scale" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1259 +#: ../gui/wxpython/wxplot/dialogs.py:1261 msgid "Grid and Legend settings" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1265 +#: ../gui/wxpython/wxplot/dialogs.py:1267 msgid "Grid color" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1274 +#: ../gui/wxpython/wxplot/dialogs.py:1276 msgid "Show grid" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1280 +#: ../gui/wxpython/wxplot/dialogs.py:1282 msgid "Legend font size" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1291 +#: ../gui/wxpython/wxplot/dialogs.py:1293 msgid "Show legend" msgstr "" -#: ../gui/wxpython/wxplot/dialogs.py:1492 +#: ../gui/wxpython/wxplot/dialogs.py:1495 #, python-format msgid "Plot settings saved to file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:167 +#: ../gui/wxpython/gui_core/menu.py:207 msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:170 +#: ../gui/wxpython/gui_core/menu.py:210 #, python-format msgid "Do advanced search using %s tool" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:177 +#: ../gui/wxpython/gui_core/menu.py:217 msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/menu.py:178 +#: ../gui/wxpython/gui_core/menu.py:218 msgid "Run selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:179 +#: ../gui/wxpython/gui_core/menu.py:219 msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:180 +#: ../gui/wxpython/gui_core/menu.py:220 msgid "Show manual for selected tool from the tree" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:285 +#: ../gui/wxpython/gui_core/menu.py:325 #, python-format msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/menu.py:367 +#: ../gui/wxpython/gui_core/menu.py:407 msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:522 +#: ../gui/wxpython/gui_core/gselect.py:523 msgid "Not selectable element" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:558 -#: ../gui/wxpython/gui_core/preferences.py:2357 +#: ../gui/wxpython/gui_core/gselect.py:559 +#: ../gui/wxpython/gui_core/preferences.py:2422 msgid "Mapset" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:571 +#: ../gui/wxpython/gui_core/gselect.py:572 msgid "Type: " msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:595 +#: ../gui/wxpython/gui_core/gselect.py:596 #, python-format msgid "GSelect: invalid item: %s" msgstr "GSelect: 무효한 아이템입니다: %s" -#: ../gui/wxpython/gui_core/gselect.py:788 +#: ../gui/wxpython/gui_core/gselect.py:789 #, python-format msgid "" "Temporal GIS error:\n" "%s" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:794 +#: ../gui/wxpython/gui_core/gselect.py:795 #, python-format msgid "" "Unable to import pyGRASS: %s\n" "Some functionality will be not accessible" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:925 +#: ../gui/wxpython/gui_core/gselect.py:926 msgid "No table linked to layer <{}>." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1233 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1024 +#: ../gui/wxpython/gui_core/gselect.py:1234 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1025 msgid "Choose GIS Data Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1459 +#: ../gui/wxpython/gui_core/gselect.py:1460 msgid "Output settings" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1461 +#: ../gui/wxpython/gui_core/gselect.py:1462 msgid "Source input" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1468 +#: ../gui/wxpython/gui_core/gselect.py:1469 msgid "Native" msgstr "고유" -#: ../gui/wxpython/gui_core/gselect.py:1474 +#: ../gui/wxpython/gui_core/gselect.py:1475 #: ../gui/wxpython/lmgr/workspace.py:518 msgid "File" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1478 -#: ../gui/wxpython/gui_core/forms.py:2129 +#: ../gui/wxpython/gui_core/gselect.py:1479 +#: ../gui/wxpython/gui_core/forms.py:2150 msgid "Directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1482 ../gui/wxpython/dbmgr/base.py:3052 -#: ../gui/wxpython/dbmgr/base.py:3203 ../gui/wxpython/dbmgr/base.py:3474 +#: ../gui/wxpython/gui_core/gselect.py:1483 ../gui/wxpython/dbmgr/base.py:3064 +#: ../gui/wxpython/dbmgr/base.py:3216 ../gui/wxpython/dbmgr/base.py:3487 msgid "Database" msgstr "데이터베이스" -#: ../gui/wxpython/gui_core/gselect.py:1486 +#: ../gui/wxpython/gui_core/gselect.py:1487 msgid "Protocol" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1497 +#: ../gui/wxpython/gui_core/gselect.py:1498 msgid "Output type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1499 +#: ../gui/wxpython/gui_core/gselect.py:1500 msgid "Source type" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1520 +#: ../gui/wxpython/gui_core/gselect.py:1521 msgid "All files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1550 +#: ../gui/wxpython/gui_core/gselect.py:1551 msgid "ZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1551 +#: ../gui/wxpython/gui_core/gselect.py:1552 msgid "GZIP files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1552 +#: ../gui/wxpython/gui_core/gselect.py:1553 msgid "TAR files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1556 +#: ../gui/wxpython/gui_core/gselect.py:1557 msgid "TARGZ files" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1565 +#: ../gui/wxpython/gui_core/gselect.py:1566 msgid "File:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1566 +#: ../gui/wxpython/gui_core/gselect.py:1567 msgid "Choose file to import" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1582 -#: ../gui/wxpython/gui_core/gselect.py:1670 +#: ../gui/wxpython/gui_core/gselect.py:1583 +#: ../gui/wxpython/gui_core/gselect.py:1671 #: ../gui/wxpython/animation/dialogs.py:1192 msgid "Directory:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1583 -#: ../gui/wxpython/gui_core/gselect.py:1671 +#: ../gui/wxpython/gui_core/gselect.py:1584 +#: ../gui/wxpython/gui_core/gselect.py:1672 msgid "Choose input directory" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1604 +#: ../gui/wxpython/gui_core/gselect.py:1605 msgid "Extension:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1636 +#: ../gui/wxpython/gui_core/gselect.py:1637 msgid "Choose file" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1657 -#: ../gui/wxpython/gui_core/gselect.py:2774 +#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:2807 msgid "Feature type:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "simple features" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1658 +#: ../gui/wxpython/gui_core/gselect.py:1659 msgid "topological" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1775 -#: ../gui/wxpython/gui_core/gselect.py:1815 -#: ../gui/wxpython/gui_core/gselect.py:1877 -#: ../gui/wxpython/gui_core/gselect.py:1922 +#: ../gui/wxpython/gui_core/gselect.py:1776 +#: ../gui/wxpython/gui_core/gselect.py:1816 +#: ../gui/wxpython/gui_core/gselect.py:1878 +#: ../gui/wxpython/gui_core/gselect.py:1923 msgid "Creation options:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1792 -#: ../gui/wxpython/gui_core/gselect.py:1838 -#: ../gui/wxpython/gui_core/gselect.py:1903 +#: ../gui/wxpython/gui_core/gselect.py:1793 +#: ../gui/wxpython/gui_core/gselect.py:1839 +#: ../gui/wxpython/gui_core/gselect.py:1904 msgid "Format:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1911 +#: ../gui/wxpython/gui_core/gselect.py:1912 msgid "Protocol:" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:1940 +#: ../gui/wxpython/gui_core/gselect.py:1941 msgid "No settings available" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2074 +#: ../gui/wxpython/gui_core/gselect.py:2075 #: ../gui/wxpython/web_services/dialogs.py:301 msgid "No data source defined, settings are not saved." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2106 +#: ../gui/wxpython/gui_core/gselect.py:2107 msgid "" "PostgreSQL/PostGIS login was not set. Set it via module, please." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2261 +#: ../gui/wxpython/gui_core/gselect.py:2262 #, python-brace-format msgid "" "Getting raster <{table}> SRID from PostgreSQL DB <{db}>, host <{host}> " "failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2525 +#: ../gui/wxpython/gui_core/gselect.py:2537 #, python-brace-format msgid "" "Getting list of tables from PostgreSQL DB <{db}>, host <{host}> failed. " "{error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2616 +#: ../gui/wxpython/gui_core/gselect.py:2628 #, python-brace-format msgid "" "Getting list of tables columns data types from PostGIS DB <{db}>, host " "<{host}> failed. {error}." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2647 +#: ../gui/wxpython/gui_core/gselect.py:2659 #, python-brace-format msgid "PostgreSQL DB <{psql}> program was not found. Please, install it." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 -#: ../gui/wxpython/vdigit/preferences.py:734 -#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6186 +#: ../gui/wxpython/gui_core/gselect.py:2678 +#: ../gui/wxpython/modules/import_export.py:483 +msgid "The Python GDAL package is missing. Please install it." +msgstr "" + +#: ../gui/wxpython/gui_core/gselect.py:2799 +#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/psmap/toolbars.py:103 ../gui/wxpython/psmap/dialogs.py:6239 msgid "Point" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "LineString" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2766 +#: ../gui/wxpython/gui_core/gselect.py:2799 msgid "Polygon" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2980 +#: ../gui/wxpython/gui_core/gselect.py:3013 msgid "No vector map selected in layer manager. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:2996 +#: ../gui/wxpython/gui_core/gselect.py:3030 msgid "Input vector map is not selected" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3000 +#: ../gui/wxpython/gui_core/gselect.py:3034 #, python-format msgid "" "Input vector map <%s> and selected map <%s> in layer manager are different. " "Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3129 +#: ../gui/wxpython/gui_core/gselect.py:3163 #, python-format msgid "Unable to import C imagery library functions: %s\n" msgstr "" -#: ../gui/wxpython/gui_core/gselect.py:3207 +#: ../gui/wxpython/gui_core/gselect.py:3241 msgid "No vector map selected" msgstr "" @@ -10922,13 +11140,13 @@ msgstr "" msgid "Translation status" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:967 -#: ../gui/wxpython/main_window/frame.py:1591 ../gui/wxpython/lmgr/frame.py:1467 +#: ../gui/wxpython/gui_core/ghelp.py:116 ../gui/wxpython/gui_core/ghelp.py:978 +#: ../gui/wxpython/main_window/frame.py:1627 ../gui/wxpython/lmgr/frame.py:1476 msgid "Unable to get GRASS version\n" msgstr "" #: ../gui/wxpython/gui_core/ghelp.py:130 -#: ../gui/wxpython/main_window/frame.py:1618 ../gui/wxpython/lmgr/frame.py:1494 +#: ../gui/wxpython/main_window/frame.py:1654 ../gui/wxpython/lmgr/frame.py:1503 msgid "unknown version" msgstr "알려지지 않은 버전" @@ -10944,105 +11162,105 @@ msgstr "" msgid "Build Date" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:234 ../gui/wxpython/gui_core/ghelp.py:514 +#: ../gui/wxpython/gui_core/ghelp.py:244 ../gui/wxpython/gui_core/ghelp.py:524 msgid "Language" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:270 ../gui/wxpython/gui_core/ghelp.py:299 -#: ../gui/wxpython/gui_core/ghelp.py:355 ../gui/wxpython/gui_core/ghelp.py:425 -#: ../gui/wxpython/gui_core/ghelp.py:500 ../gui/wxpython/gui_core/ghelp.py:658 +#: ../gui/wxpython/gui_core/ghelp.py:280 ../gui/wxpython/gui_core/ghelp.py:309 +#: ../gui/wxpython/gui_core/ghelp.py:365 ../gui/wxpython/gui_core/ghelp.py:435 +#: ../gui/wxpython/gui_core/ghelp.py:510 ../gui/wxpython/gui_core/ghelp.py:668 #, python-format msgid "%s file missing" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:328 +#: ../gui/wxpython/gui_core/ghelp.py:338 #, python-brace-format msgid "" "Unable to provide citation suggestion, see GRASS GIS website instead. The " "error was: {0}" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:410 ../gui/wxpython/gui_core/ghelp.py:483 +#: ../gui/wxpython/gui_core/ghelp.py:420 ../gui/wxpython/gui_core/ghelp.py:493 #, python-format msgid "Error when reading file '%s'." msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:412 ../gui/wxpython/gui_core/ghelp.py:485 +#: ../gui/wxpython/gui_core/ghelp.py:422 ../gui/wxpython/gui_core/ghelp.py:495 msgid "Lines:" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:436 -#: ../gui/wxpython/gui_core/ghelp.py:511 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:446 +#: ../gui/wxpython/gui_core/ghelp.py:521 msgid "E-mail" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:432 ../gui/wxpython/gui_core/ghelp.py:437 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:447 msgid "Country" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:438 +#: ../gui/wxpython/gui_core/ghelp.py:448 msgid "OSGeo_ID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:439 +#: ../gui/wxpython/gui_core/ghelp.py:449 msgid "ORCID" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:517 +#: ../gui/wxpython/gui_core/ghelp.py:527 msgid "Nation" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:560 +#: ../gui/wxpython/gui_core/ghelp.py:570 #, python-format msgid " %d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:564 ../gui/wxpython/gui_core/ghelp.py:589 +#: ../gui/wxpython/gui_core/ghelp.py:574 ../gui/wxpython/gui_core/ghelp.py:599 #, python-format msgid " %d fuzzy" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:568 ../gui/wxpython/gui_core/ghelp.py:598 +#: ../gui/wxpython/gui_core/ghelp.py:578 ../gui/wxpython/gui_core/ghelp.py:608 #, python-format msgid " %d untranslated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:580 +#: ../gui/wxpython/gui_core/ghelp.py:590 #, python-format msgid "%d translated" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:655 +#: ../gui/wxpython/gui_core/ghelp.py:665 #, python-format msgid "File <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:851 +#: ../gui/wxpython/gui_core/ghelp.py:862 msgid "&Next" msgstr "" -#: ../gui/wxpython/gui_core/ghelp.py:853 +#: ../gui/wxpython/gui_core/ghelp.py:864 msgid "&Previous" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:161 +#: ../gui/wxpython/gui_core/goutput.py:141 msgid "Clear prompt and output window" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:163 +#: ../gui/wxpython/gui_core/goutput.py:143 msgid "Save output to a file" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:165 +#: ../gui/wxpython/gui_core/goutput.py:145 msgid "Abort running command" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:374 +#: ../gui/wxpython/gui_core/goutput.py:343 #, python-format msgid "%(txt)s (*.txt)|*.txt|%(files)s (*)|*" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:389 +#: ../gui/wxpython/gui_core/goutput.py:358 #, python-format msgid "" "Unable to write file '%(path)s'.\n" @@ -11050,7 +11268,7 @@ msgid "" "Details: %(error)s" msgstr "" -#: ../gui/wxpython/gui_core/goutput.py:394 +#: ../gui/wxpython/gui_core/goutput.py:363 #, python-format msgid "Command output saved into '%s'" msgstr "" @@ -11133,7 +11351,7 @@ msgstr "" msgid "category" msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/gui_core/vselect.py:46 ../gui/wxpython/vnet/vnet_data.py:254 msgid "type" msgstr "" @@ -11154,8 +11372,8 @@ msgstr "" msgid "No vector map layer selected. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:729 -#: ../gui/wxpython/main_window/frame.py:2390 ../gui/wxpython/lmgr/frame.py:2318 +#: ../gui/wxpython/gui_core/vselect.py:290 ../gui/wxpython/mapdisp/frame.py:698 +#: ../gui/wxpython/main_window/frame.py:2426 ../gui/wxpython/lmgr/frame.py:2332 msgid "No map layer selected. Operation canceled." msgstr "" @@ -11181,359 +11399,374 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:75 +#: ../gui/wxpython/gui_core/preferences.py:76 msgid "User settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:98 +#: ../gui/wxpython/gui_core/preferences.py:99 msgid "Set to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:106 +#: ../gui/wxpython/gui_core/preferences.py:107 msgid "Revert settings to default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:109 +#: ../gui/wxpython/gui_core/preferences.py:110 msgid "Apply changes for the current session only and close" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:111 +#: ../gui/wxpython/gui_core/preferences.py:112 msgid "Save for this session only" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:179 +#: ../gui/wxpython/gui_core/preferences.py:181 msgid "Settings applied to current session but not saved" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:231 +#: ../gui/wxpython/gui_core/preferences.py:233 msgid "Key column cannot be empty string." msgstr "키 열은 빈 문자열일 수 없습니다" -#: ../gui/wxpython/gui_core/preferences.py:250 +#: ../gui/wxpython/gui_core/preferences.py:252 msgid "GUI Settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:278 +#: ../gui/wxpython/gui_core/preferences.py:280 msgid "Layer Manager settings" msgstr "레이어 관리자 설정" -#: ../gui/wxpython/gui_core/preferences.py:291 +#: ../gui/wxpython/gui_core/preferences.py:293 msgid "Ask when removing map layer from layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:305 +#: ../gui/wxpython/gui_core/preferences.py:307 msgid "Ask when quitting wxGUI or closing display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/gui_core/preferences.py:347 -#, python-format -msgid "Hide '%s' tab (requires GUI restart)" +#: ../gui/wxpython/gui_core/preferences.py:325 +msgid "Automatically copy selected text to clipboard (in the Console tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:333 -#: ../gui/wxpython/main_window/frame.py:705 ../gui/wxpython/lmgr/frame.py:645 -msgid "History" +#: ../gui/wxpython/gui_core/preferences.py:348 +#, fuzzy +msgid "Layout settings" +msgstr "레이어 관리자 설정" + +#: ../gui/wxpython/gui_core/preferences.py:357 +msgid "Save current window layout as default" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:365 -msgid "Automatically copy selected text to clipboard (in the Console tab)" +#: ../gui/wxpython/gui_core/preferences.py:366 +msgid "" +"Save current position and size of Layer Manager window and opened Map " +"Display window(s) and use as default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:387 -msgid "Data Catalog settings" +#: ../gui/wxpython/gui_core/preferences.py:379 +msgid "Save current single window panes layout as default" msgstr "" #: ../gui/wxpython/gui_core/preferences.py:392 -msgid "At startup load maps from current mapset only (in the Data tab)" +msgid "" +"Save current position and size of single-window mode panes and use as " +"default for next sessions." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:407 -msgid "Workspace settings" +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/gui_core/preferences.py:441 +msgid "Hide '{}' tab (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:417 -msgid "Suppress positioning Map Display Window(s)" +#: ../gui/wxpython/gui_core/preferences.py:427 +#: ../gui/wxpython/main_window/frame.py:702 ../gui/wxpython/lmgr/frame.py:646 +msgid "History" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:434 -msgid "Suppress positioning Layer Manager window" +#: ../gui/wxpython/gui_core/preferences.py:457 +msgid "Data Catalog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:450 -msgid "Save current window layout as default" +#: ../gui/wxpython/gui_core/preferences.py:462 +msgid "At startup load maps from current mapset only (in the Data tab)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:459 -msgid "" -"Save current position and size of Layer Manager window and opened Map " -"Display window(s) and use as default for next sessions." +#: ../gui/wxpython/gui_core/preferences.py:477 +msgid "Workspace settings" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:487 +msgid "Suppress positioning Map Display Window(s)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:475 +#: ../gui/wxpython/gui_core/preferences.py:503 +msgid "Suppress positioning Layer Manager window" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:522 msgid "Region settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:484 +#: ../gui/wxpython/gui_core/preferences.py:531 msgid "Align region to resolution" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:516 +#: ../gui/wxpython/gui_core/preferences.py:563 msgid "Window layout settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:522 +#: ../gui/wxpython/gui_core/preferences.py:569 msgid "Use single-window mode (requires GUI restart)" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:526 +#: ../gui/wxpython/gui_core/preferences.py:573 msgid "Use single-window mode instead of multi-window mode" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:548 +#: ../gui/wxpython/gui_core/preferences.py:595 msgid "Font for command output:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:552 -#: ../gui/wxpython/gui_core/preferences.py:564 -#: ../gui/wxpython/gui_core/preferences.py:844 +#: ../gui/wxpython/gui_core/preferences.py:599 +#: ../gui/wxpython/gui_core/preferences.py:611 +#: ../gui/wxpython/gui_core/preferences.py:891 #: ../gui/wxpython/animation/dialogs.py:1076 msgid "Set font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:560 +#: ../gui/wxpython/gui_core/preferences.py:607 msgid "Font for manual pages:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:576 +#: ../gui/wxpython/gui_core/preferences.py:623 msgid "Language settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:589 +#: ../gui/wxpython/gui_core/preferences.py:636 msgid "Choose language (requires to save and GRASS restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:622 +#: ../gui/wxpython/gui_core/preferences.py:669 msgid "Appearance settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:633 +#: ../gui/wxpython/gui_core/preferences.py:680 msgid "Element list:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:668 +#: ../gui/wxpython/gui_core/preferences.py:715 msgid "Menu style (requires to save and GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:704 +#: ../gui/wxpython/gui_core/preferences.py:751 msgid "Height of map selection popup window (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:741 +#: ../gui/wxpython/gui_core/preferences.py:788 msgid "Icon theme (requires GUI restart):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:771 +#: ../gui/wxpython/gui_core/preferences.py:818 msgid "Tool dialog style:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:824 -#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:74 +#: ../gui/wxpython/gui_core/preferences.py:871 +#: ../gui/wxpython/gui_core/forms.py:1528 ../gui/wxpython/mapdisp/frame.py:75 msgid "Map Display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:839 +#: ../gui/wxpython/gui_core/preferences.py:886 msgid "Default font for GRASS displays:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:857 +#: ../gui/wxpython/gui_core/preferences.py:904 msgid "Default display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:868 +#: ../gui/wxpython/gui_core/preferences.py:915 msgid "Display driver:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:894 +#: ../gui/wxpython/gui_core/preferences.py:941 msgid "Statusbar mode:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:945 +#: ../gui/wxpython/gui_core/preferences.py:992 #: ../gui/wxpython/mapdisp/properties.py:114 msgid "Align region extent based on display size" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:962 +#: ../gui/wxpython/gui_core/preferences.py:1009 #: ../gui/wxpython/mapdisp/properties.py:152 msgid "Constrain display resolution to computational settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:979 +#: ../gui/wxpython/gui_core/preferences.py:1026 #: ../gui/wxpython/mapdisp/properties.py:81 msgid "Enable auto-rendering" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:996 +#: ../gui/wxpython/gui_core/preferences.py:1043 msgid "Enable auto-zooming to selected map layer" msgstr "선택한 레이어의 자동 확대 기능을 사용합니다" -#: ../gui/wxpython/gui_core/preferences.py:1013 +#: ../gui/wxpython/gui_core/preferences.py:1060 msgid "Show computational region extent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1028 +#: ../gui/wxpython/gui_core/preferences.py:1075 msgid "Mouse wheel action:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1053 +#: ../gui/wxpython/gui_core/preferences.py:1100 msgid "Mouse scrolling direction:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1100 +#: ../gui/wxpython/gui_core/preferences.py:1147 msgid "Advanced display settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1110 +#: ../gui/wxpython/gui_core/preferences.py:1157 msgid "3D view depth buffer (possible values are 16, 24, 32):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1153 +#: ../gui/wxpython/gui_core/preferences.py:1200 msgid "Tool dialog settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1181 +#: ../gui/wxpython/gui_core/preferences.py:1228 msgid "Close dialog when completed successfully" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1193 -#: ../gui/wxpython/gui_core/dialogs.py:341 +#: ../gui/wxpython/gui_core/preferences.py:1240 +#: ../gui/wxpython/gui_core/dialogs.py:343 msgid "Add created map into layer tree" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1208 +#: ../gui/wxpython/gui_core/preferences.py:1255 msgid "Allow interactive input" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1220 +#: ../gui/wxpython/gui_core/preferences.py:1267 msgid "Verbosity level:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1247 +#: ../gui/wxpython/gui_core/preferences.py:1294 msgid "Number of threads for parallel computing (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1272 +#: ../gui/wxpython/gui_core/preferences.py:1319 msgid "Maximum memory in MB to be used (supported tools only):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1302 -#: ../gui/wxpython/main_window/frame.py:661 ../gui/wxpython/lmgr/frame.py:631 +#: ../gui/wxpython/gui_core/preferences.py:1349 +#: ../gui/wxpython/main_window/frame.py:658 ../gui/wxpython/lmgr/frame.py:632 msgid "Layers" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1309 +#: ../gui/wxpython/gui_core/preferences.py:1356 msgid "Default raster settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1322 +#: ../gui/wxpython/gui_core/preferences.py:1369 msgid "Make null cells opaque" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1335 +#: ../gui/wxpython/gui_core/preferences.py:1382 msgid "Default color table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1373 +#: ../gui/wxpython/gui_core/preferences.py:1420 msgid "Default vector settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1380 +#: ../gui/wxpython/gui_core/preferences.py:1427 msgid "Display:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1400 +#: ../gui/wxpython/gui_core/preferences.py:1447 msgid "Feature color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1417 -#: ../gui/wxpython/gui_core/preferences.py:1451 -#: ../gui/wxpython/gui_core/forms.py:1977 +#: ../gui/wxpython/gui_core/preferences.py:1464 +#: ../gui/wxpython/gui_core/preferences.py:1498 +#: ../gui/wxpython/gui_core/forms.py:1997 msgid "Transparent" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1434 +#: ../gui/wxpython/gui_core/preferences.py:1481 msgid "Area fill color:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1487 +#: ../gui/wxpython/gui_core/preferences.py:1534 msgid "Random colors according to category number " msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1517 +#: ../gui/wxpython/gui_core/preferences.py:1564 msgid "Symbol:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1560 -#: ../gui/wxpython/vdigit/preferences.py:504 +#: ../gui/wxpython/gui_core/preferences.py:1607 +#: ../gui/wxpython/vdigit/preferences.py:505 msgid "Attributes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1568 -#: ../gui/wxpython/dbmgr/base.py:1457 +#: ../gui/wxpython/gui_core/preferences.py:1615 +#: ../gui/wxpython/dbmgr/base.py:1466 msgid "Highlight selected features" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1591 +#: ../gui/wxpython/gui_core/preferences.py:1638 msgid "Line width (in pixels):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1610 +#: ../gui/wxpython/gui_core/preferences.py:1657 msgid "Automatically highlight selected features in map display" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1627 +#: ../gui/wxpython/gui_core/preferences.py:1674 msgid "Data browser" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1634 +#: ../gui/wxpython/gui_core/preferences.py:1681 msgid "Left mouse double click:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1659 +#: ../gui/wxpython/gui_core/preferences.py:1706 msgid "Encoding (e.g. utf-8, ascii, iso8859-1, koi8-r):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1677 +#: ../gui/wxpython/gui_core/preferences.py:1724 msgid "Ask when deleting data record(s) from table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1700 +#: ../gui/wxpython/gui_core/preferences.py:1747 msgid "Create table" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1707 -#: ../gui/wxpython/gui_core/dialogs.py:395 +#: ../gui/wxpython/gui_core/preferences.py:1754 +#: ../gui/wxpython/gui_core/dialogs.py:397 msgid "Key column:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1734 +#: ../gui/wxpython/gui_core/preferences.py:1781 msgid "Projection" msgstr "투영" -#: ../gui/wxpython/gui_core/preferences.py:1744 +#: ../gui/wxpython/gui_core/preferences.py:1791 msgid "Projection statusbar settings" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1756 +#: ../gui/wxpython/gui_core/preferences.py:1803 +#, fuzzy msgid "" "\n" "Note: This only controls the coordinates displayed in the lower-left of the " "Map Display\n" "window's status bar. It is purely cosmetic and does not affect the working " -"location's\n" -"projection in any way. You will need to enable the Projection check box in " -"the drop-down\n" +"project's\n" +"coordinate reference system in any way. You will need to enable the " +"Projection check box in the drop-down\n" "menu located at the bottom of the Map Display window.\n" msgstr "" "\n" @@ -11542,68 +11775,68 @@ msgstr "" "니다. 이를 위해서는 지도 디스플레이 창 하단에 있는 드롭다운 메뉴에서 투영 체" "크박스를 활성화해야 합니다.\n" -#: ../gui/wxpython/gui_core/preferences.py:1770 +#: ../gui/wxpython/gui_core/preferences.py:1817 msgid "EPSG code:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1786 +#: ../gui/wxpython/gui_core/preferences.py:1833 msgid "PROJ string (required):" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1806 +#: ../gui/wxpython/gui_core/preferences.py:1853 msgid "EPSG file:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1826 +#: ../gui/wxpython/gui_core/preferences.py:1873 msgid "" "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1833 +#: ../gui/wxpython/gui_core/preferences.py:1880 msgid "&Load EPSG codes" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1844 +#: ../gui/wxpython/gui_core/preferences.py:1891 msgid "Coordinates format" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1855 +#: ../gui/wxpython/gui_core/preferences.py:1902 msgid "Lat/long projections" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1874 +#: ../gui/wxpython/gui_core/preferences.py:1921 msgid "Precision:" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:1978 +#: ../gui/wxpython/gui_core/preferences.py:2043 #, python-format msgid "Unable to read EPSG codes: %s" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2010 -#: ../gui/wxpython/gui_core/preferences.py:2022 -#: ../gui/wxpython/gui_core/preferences.py:2034 +#: ../gui/wxpython/gui_core/preferences.py:2075 +#: ../gui/wxpython/gui_core/preferences.py:2087 +#: ../gui/wxpython/gui_core/preferences.py:2099 #, python-format msgid "EPSG code %s not found" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2045 +#: ../gui/wxpython/gui_core/preferences.py:2110 msgid "Select default display font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2062 +#: ../gui/wxpython/gui_core/preferences.py:2127 msgid "Failed to set default display font. Try different font." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2084 +#: ../gui/wxpython/gui_core/preferences.py:2149 msgid "Select default output font" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2267 +#: ../gui/wxpython/gui_core/preferences.py:2332 msgid "Manage access to mapsets" msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2286 +#: ../gui/wxpython/gui_core/preferences.py:2351 msgid "" "Check a mapset to make it accessible, uncheck it to hide it.\n" " Notes:\n" @@ -11612,7 +11845,7 @@ msgid "" " - You may only write to mapsets which you own." msgstr "" -#: ../gui/wxpython/gui_core/preferences.py:2358 +#: ../gui/wxpython/gui_core/preferences.py:2423 msgid "Owner" msgstr "" @@ -11629,7 +11862,7 @@ msgid "Copy map names to clipboard (bottom to top)" msgstr "" #: ../gui/wxpython/gui_core/simplelmgr.py:303 -#: ../gui/wxpython/lmgr/layertree.py:1203 +#: ../gui/wxpython/lmgr/layertree.py:1284 #, python-format msgid "Set opacity of <%s>" msgstr "" @@ -11751,7 +11984,7 @@ msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:69 #: ../gui/wxpython/gui_core/forms.py:1399 -#: ../gui/wxpython/gui_core/forms.py:2976 +#: ../gui/wxpython/gui_core/forms.py:2997 msgid "Select font" msgstr "" @@ -11785,7 +12018,7 @@ msgid "Map Display Settings" msgstr "" #: ../gui/wxpython/gui_core/toolbars.py:86 -msgid "(Un)dock Map Display" +msgid "(Un)dock" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:258 @@ -11809,7 +12042,7 @@ msgid "Apply" msgstr "" #: ../gui/wxpython/gui_core/wrap.py:299 -#: ../gui/wxpython/web_services/dialogs.py:692 +#: ../gui/wxpython/web_services/dialogs.py:694 msgid "&Apply" msgstr "" @@ -11865,7 +12098,7 @@ msgid "Optional" msgstr "" #: ../gui/wxpython/gui_core/forms.py:1101 -#: ../gui/wxpython/gui_core/forms.py:2322 +#: ../gui/wxpython/gui_core/forms.py:2343 msgid "Parameterized in model" msgstr "" @@ -11877,42 +12110,42 @@ msgstr "" msgid "valid range" msgstr "유효 범위" -#: ../gui/wxpython/gui_core/forms.py:1663 -msgid "Show graphical representation of temporal extent of dataset(s) ." +#: ../gui/wxpython/gui_core/forms.py:1682 +msgid "Show graphical representation of temporal extent of dataset(s)." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:1925 ../gui/wxpython/core/utils.py:959 +#: ../gui/wxpython/gui_core/forms.py:1945 ../gui/wxpython/core/utils.py:959 msgid "Select Color" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2018 -#: ../gui/wxpython/gui_core/forms.py:2128 +#: ../gui/wxpython/gui_core/forms.py:2038 +#: ../gui/wxpython/gui_core/forms.py:2149 #, python-format msgid "Choose %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2073 +#: ../gui/wxpython/gui_core/forms.py:2094 #: ../gui/wxpython/modules/mcalc_builder.py:174 msgid "&Load" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2075 +#: ../gui/wxpython/gui_core/forms.py:2096 msgid "Load and edit content of a file" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2078 +#: ../gui/wxpython/gui_core/forms.py:2099 msgid "&Save as" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2080 +#: ../gui/wxpython/gui_core/forms.py:2101 msgid "Save content to a file for further use" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2086 +#: ../gui/wxpython/gui_core/forms.py:2107 msgid "or enter values directly:" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2090 +#: ../gui/wxpython/gui_core/forms.py:2111 msgid "" "Enter file content directly instead of specifying a file. Temporary file " "will be automatically created." @@ -11920,38 +12153,38 @@ msgstr "" "파일을 지정하는 대신 파일 내용을 직접 입력하세요. 임시 파일이 자동으로 생성됩" "니다." -#: ../gui/wxpython/gui_core/forms.py:2265 +#: ../gui/wxpython/gui_core/forms.py:2286 #: ../gui/wxpython/modules/import_export.py:80 -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Layer id" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2266 +#: ../gui/wxpython/gui_core/forms.py:2287 #: ../gui/wxpython/modules/import_export.py:81 msgid "Layer name" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2267 +#: ../gui/wxpython/gui_core/forms.py:2288 #: ../gui/wxpython/modules/import_export.py:85 -#: ../gui/wxpython/psmap/dialogs.py:2226 +#: ../gui/wxpython/psmap/dialogs.py:2257 msgid "Feature type" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2268 +#: ../gui/wxpython/gui_core/forms.py:2289 #: ../gui/wxpython/modules/import_export.py:86 #: ../gui/wxpython/modules/import_export.py:88 msgid "Projection match" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2528 +#: ../gui/wxpython/gui_core/forms.py:2549 msgid "Manual" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2568 +#: ../gui/wxpython/gui_core/forms.py:2589 msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2578 +#: ../gui/wxpython/gui_core/forms.py:2599 #, python-format msgid "" "Unable to load file.\n" @@ -11959,94 +12192,94 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2604 +#: ../gui/wxpython/gui_core/forms.py:2625 #: ../gui/wxpython/modules/colorrules.py:686 msgid "Nothing to save." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2609 +#: ../gui/wxpython/gui_core/forms.py:2630 msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:2960 +#: ../gui/wxpython/gui_core/forms.py:2981 msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3015 ../gui/wxpython/core/gcmd.py:749 +#: ../gui/wxpython/gui_core/forms.py:3036 ../gui/wxpython/core/gcmd.py:750 #, python-format msgid "Error in %s" msgstr "%s 내에 오류" -#: ../gui/wxpython/gui_core/forms.py:3128 -#: ../gui/wxpython/gui_core/forms.py:3145 +#: ../gui/wxpython/gui_core/forms.py:3149 +#: ../gui/wxpython/gui_core/forms.py:3166 #, python-format msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3153 +#: ../gui/wxpython/gui_core/forms.py:3174 #, python-format msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/forms.py:3239 +#: ../gui/wxpython/gui_core/forms.py:3260 msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/query.py:31 +#: ../gui/wxpython/gui_core/query.py:32 msgid "Query results" msgstr "" -#: ../gui/wxpython/gui_core/query.py:46 +#: ../gui/wxpython/gui_core/query.py:47 msgid "Right click to copy selected values to clipboard." msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Feature" msgstr "" -#: ../gui/wxpython/gui_core/query.py:53 +#: ../gui/wxpython/gui_core/query.py:54 msgid "Value" msgstr "" -#: ../gui/wxpython/gui_core/query.py:74 +#: ../gui/wxpython/gui_core/query.py:75 msgid "Copy all to clipboard" msgstr "" -#: ../gui/wxpython/gui_core/query.py:77 +#: ../gui/wxpython/gui_core/query.py:78 msgid "Redirect to console" msgstr "" -#: ../gui/wxpython/gui_core/query.py:129 ../gui/wxpython/gui_core/query.py:130 +#: ../gui/wxpython/gui_core/query.py:130 ../gui/wxpython/gui_core/query.py:131 #, python-format msgid "Copy from '%s' column" msgstr "" -#: ../gui/wxpython/gui_core/query.py:131 +#: ../gui/wxpython/gui_core/query.py:132 msgid "Copy selected lines" msgstr "" -#: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138 +#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139 #, python-format msgid "Copy '%s'" msgstr "" -#: ../gui/wxpython/gui_core/query.py:139 +#: ../gui/wxpython/gui_core/query.py:140 msgid "Copy line" msgstr "" -#: ../gui/wxpython/gui_core/query.py:163 +#: ../gui/wxpython/gui_core/query.py:164 msgid "Query results:" msgstr "" -#: ../gui/wxpython/gui_core/query.py:166 +#: ../gui/wxpython/gui_core/query.py:167 msgid " " msgstr "" -#: ../gui/wxpython/gui_core/query.py:250 +#: ../gui/wxpython/gui_core/query.py:251 msgid "east, north" msgstr "" -#: ../gui/wxpython/gui_core/query.py:261 +#: ../gui/wxpython/gui_core/query.py:262 msgid "Nothing found" msgstr "" @@ -12054,60 +12287,62 @@ msgstr "" msgid "Required item is not set." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:122 -msgid "Select GRASS location and mapset" +#: ../gui/wxpython/gui_core/dialogs.py:123 +#, fuzzy +msgid "Select GRASS project and mapset" msgstr "GRASS 로케이션과 지도 세트를 선택하세요" -#: ../gui/wxpython/gui_core/dialogs.py:142 -msgid "Location or mapset is not defined." +#: ../gui/wxpython/gui_core/dialogs.py:143 +msgid "Project or mapset is not defined." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:150 -msgid "Name of GRASS location:" +#: ../gui/wxpython/gui_core/dialogs.py:151 +msgid "Name of GRASS project:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:161 -#: ../gui/wxpython/gui_core/dialogs.py:219 +#: ../gui/wxpython/gui_core/dialogs.py:162 +#: ../gui/wxpython/gui_core/dialogs.py:220 msgid "Name of mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:193 -msgid "Select mapset in GRASS location" +#: ../gui/wxpython/gui_core/dialogs.py:194 +#, fuzzy +msgid "Select mapset in GRASS project" msgstr "GRASS 로케이션 내의 지도 세트를 선택하세요" -#: ../gui/wxpython/gui_core/dialogs.py:211 +#: ../gui/wxpython/gui_core/dialogs.py:212 msgid "Name of mapset is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:235 -#: ../gui/wxpython/vdigit/toolbars.py:1021 -#: ../gui/wxpython/vdigit/toolbars.py:1196 -#: ../gui/wxpython/vdigit/toolbars.py:1299 +#: ../gui/wxpython/gui_core/dialogs.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:1024 +#: ../gui/wxpython/vdigit/toolbars.py:1199 +#: ../gui/wxpython/vdigit/toolbars.py:1302 msgid "Select vector map" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:249 +#: ../gui/wxpython/gui_core/dialogs.py:250 msgid "Name of vector map is missing." msgstr "벡터 지도의 이름이 누락됐습니다." -#: ../gui/wxpython/gui_core/dialogs.py:321 +#: ../gui/wxpython/gui_core/dialogs.py:323 msgid "Create attribute table" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:354 +#: ../gui/wxpython/gui_core/dialogs.py:356 msgid "Name of new vector map is missing." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:375 +#: ../gui/wxpython/gui_core/dialogs.py:377 msgid "Name for new vector map:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:488 +#: ../gui/wxpython/gui_core/dialogs.py:490 #, python-format msgid "Unable to create vector map <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:495 +#: ../gui/wxpython/gui_core/dialogs.py:497 #, python-format msgid "" "Invalid or empty key column.\n" @@ -12116,22 +12351,22 @@ msgstr "" "무효하거나 빈 키 열.\n" "벡터 지도 <%s>를 생성할 수 없습니다." -#: ../gui/wxpython/gui_core/dialogs.py:532 +#: ../gui/wxpython/gui_core/dialogs.py:534 #, python-format msgid "" "Vector map <%s> already exists in the current mapset. Do you want to " "overwrite it?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:616 +#: ../gui/wxpython/gui_core/dialogs.py:618 msgid "Load region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:621 +#: ../gui/wxpython/gui_core/dialogs.py:623 msgid "Save region:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:675 +#: ../gui/wxpython/gui_core/dialogs.py:677 msgid "" "Name cannot begin with '.' and must not contain space, quotes, '/', ''', " "'@', ',', '=', '*', and all other non-alphanumeric characters." @@ -12139,300 +12374,300 @@ msgstr "" "이름은 '.'로 시작할 수 없고 공백, 따옴표, '/', ''', '@', ',', '=', '*', 그리" "고 모든 알파벳이나 숫자가 아닌 문자를 포함할 수 없습니다." -#: ../gui/wxpython/gui_core/dialogs.py:697 +#: ../gui/wxpython/gui_core/dialogs.py:699 msgid "Create or edit imagery groups" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:732 +#: ../gui/wxpython/gui_core/dialogs.py:734 msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:733 +#: ../gui/wxpython/gui_core/dialogs.py:735 msgid "Apply changes to selected group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 +#: ../gui/wxpython/gui_core/dialogs.py:736 msgid "Close dialog, changes are not applied" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:784 -#: ../gui/wxpython/gui_core/dialogs.py:1562 +#: ../gui/wxpython/gui_core/dialogs.py:786 +#: ../gui/wxpython/gui_core/dialogs.py:1564 msgid "" "Put here a regular expression. Characters '.*' stand for anything, character " "'^' stands for the beginning and '$' for the end." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:795 +#: ../gui/wxpython/gui_core/dialogs.py:797 msgid "Select existing group or enter name of new group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:811 +#: ../gui/wxpython/gui_core/dialogs.py:813 msgid "Edit/create subgroup" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:823 +#: ../gui/wxpython/gui_core/dialogs.py:825 msgid "Select existing subgroup or enter name of new subgroup:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:845 -#: ../gui/wxpython/gui_core/dialogs.py:903 -#: ../gui/wxpython/gui_core/dialogs.py:1627 -#: ../gui/wxpython/gui_core/widgets.py:1134 ../gui/wxpython/dbmgr/base.py:1454 +#: ../gui/wxpython/gui_core/dialogs.py:847 +#: ../gui/wxpython/gui_core/dialogs.py:905 +#: ../gui/wxpython/gui_core/dialogs.py:1629 +#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1463 msgid "Select all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:851 -#: ../gui/wxpython/gui_core/dialogs.py:909 -#: ../gui/wxpython/gui_core/dialogs.py:1550 +#: ../gui/wxpython/gui_core/dialogs.py:853 +#: ../gui/wxpython/gui_core/dialogs.py:911 +#: ../gui/wxpython/gui_core/dialogs.py:1552 msgid "Pattern:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:864 -#: ../gui/wxpython/gui_core/dialogs.py:922 -#: ../gui/wxpython/gui_core/dialogs.py:1571 +#: ../gui/wxpython/gui_core/dialogs.py:866 +#: ../gui/wxpython/gui_core/dialogs.py:924 +#: ../gui/wxpython/gui_core/dialogs.py:1573 msgid "List of maps:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:881 +#: ../gui/wxpython/gui_core/dialogs.py:883 msgid "Select map layers and add them to the list." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:885 +#: ../gui/wxpython/gui_core/dialogs.py:887 msgid "Remove selected layer(s) from list." msgstr "목록으로부터 선택된 레이어를 제거합니다" -#: ../gui/wxpython/gui_core/dialogs.py:932 +#: ../gui/wxpython/gui_core/dialogs.py:934 msgid "Check maps from group to be included into subgroup." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1091 +#: ../gui/wxpython/gui_core/dialogs.py:1093 msgid "Add selected map layers into group" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1233 +#: ../gui/wxpython/gui_core/dialogs.py:1235 #, python-format msgid "Group <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1235 -#: ../gui/wxpython/gui_core/dialogs.py:1250 +#: ../gui/wxpython/gui_core/dialogs.py:1237 +#: ../gui/wxpython/gui_core/dialogs.py:1252 msgid "Unapplied changes" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1248 +#: ../gui/wxpython/gui_core/dialogs.py:1250 #, python-format msgid "Subgroup <%s> was changed, do you want to apply changes?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1304 +#: ../gui/wxpython/gui_core/dialogs.py:1306 msgid "No raster maps selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1328 +#: ../gui/wxpython/gui_core/dialogs.py:1330 #, python-format msgid "No changes to apply in group <%s>." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1331 +#: ../gui/wxpython/gui_core/dialogs.py:1333 #, python-format msgid "Group <%s> was successfully created." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1333 +#: ../gui/wxpython/gui_core/dialogs.py:1335 #, python-format msgid "Group <%s> was successfully changed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1336 +#: ../gui/wxpython/gui_core/dialogs.py:1338 #, python-format msgid "Creating of new group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1338 +#: ../gui/wxpython/gui_core/dialogs.py:1340 #, python-format msgid "Changing of group <%s> failed." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1373 +#: ../gui/wxpython/gui_core/dialogs.py:1375 msgid "No group selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1377 +#: ../gui/wxpython/gui_core/dialogs.py:1379 msgid "No subgroup selected." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1486 +#: ../gui/wxpython/gui_core/dialogs.py:1488 msgid "Use fully-qualified map names" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1518 +#: ../gui/wxpython/gui_core/dialogs.py:1520 msgid "Map type:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1533 +#: ../gui/wxpython/gui_core/dialogs.py:1535 msgid "Select toggle" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1539 +#: ../gui/wxpython/gui_core/dialogs.py:1541 msgid "Mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1628 +#: ../gui/wxpython/gui_core/dialogs.py:1630 msgid "Invert selection" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1629 -#: ../gui/wxpython/gui_core/widgets.py:1135 ../gui/wxpython/dbmgr/base.py:1455 +#: ../gui/wxpython/gui_core/dialogs.py:1631 +#: ../gui/wxpython/gui_core/widgets.py:1136 ../gui/wxpython/dbmgr/base.py:1464 msgid "Deselect all" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1770 +#: ../gui/wxpython/gui_core/dialogs.py:1772 #, python-format msgid "Dynamic series (%s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1803 +#: ../gui/wxpython/gui_core/dialogs.py:1805 msgid "Set Map Layer Opacity" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1832 -#: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6304 -#: ../gui/wxpython/psmap/dialogs.py:6568 ../gui/wxpython/psmap/dialogs.py:6589 +#: ../gui/wxpython/gui_core/dialogs.py:1834 +#: ../gui/wxpython/psmap/dialogs.py:6342 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:6621 ../gui/wxpython/psmap/dialogs.py:6642 msgid "transparent" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1835 +#: ../gui/wxpython/gui_core/dialogs.py:1837 msgid "opaque" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1932 +#: ../gui/wxpython/gui_core/dialogs.py:1934 msgid "Set image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1944 +#: ../gui/wxpython/gui_core/dialogs.py:1946 msgid "Image size" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1997 +#: ../gui/wxpython/gui_core/dialogs.py:1999 msgid "Template:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2033 +#: ../gui/wxpython/gui_core/dialogs.py:2035 msgid "SQL Query Utility" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2046 +#: ../gui/wxpython/gui_core/dialogs.py:2048 msgid " SQL statement " msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2094 +#: ../gui/wxpython/gui_core/dialogs.py:2096 msgid "Symbols" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2124 +#: ../gui/wxpython/gui_core/dialogs.py:2126 msgid "Symbol directory:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2133 +#: ../gui/wxpython/gui_core/dialogs.py:2135 msgid "Symbol name:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2380 +#: ../gui/wxpython/gui_core/dialogs.py:2382 msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2384 +#: ../gui/wxpython/gui_core/dialogs.py:2386 msgid "Do you want to quit GRASS GIS?" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2457 +#: ../gui/wxpython/gui_core/dialogs.py:2459 msgid "Select font:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2489 +#: ../gui/wxpython/gui_core/dialogs.py:2491 msgid "Character encoding:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2505 -#: ../gui/wxpython/psmap/dialogs.py:455 ../gui/wxpython/psmap/dialogs.py:4947 +#: ../gui/wxpython/gui_core/dialogs.py:2507 +#: ../gui/wxpython/psmap/dialogs.py:464 ../gui/wxpython/psmap/dialogs.py:5000 msgid "Font size:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2549 +#: ../gui/wxpython/gui_core/dialogs.py:2551 msgid "Example" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:127 +#: ../gui/wxpython/gui_core/widgets.py:128 msgid " (...)" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:890 +#: ../gui/wxpython/gui_core/widgets.py:891 #, python-format msgid "" "Name <%(name)s> is not a valid name for GRASS map. Please use only ASCII " "characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1243 +#: ../gui/wxpython/gui_core/widgets.py:1244 msgid "Fulltext search" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1245 +#: ../gui/wxpython/gui_core/widgets.py:1246 msgid "Type to search in all tools. Press Enter for next match." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1307 +#: ../gui/wxpython/gui_core/widgets.py:1308 msgid "Searching, please type more characters." msgstr "검색에 보다 더 긴 문자열이 필요합니다." -#: ../gui/wxpython/gui_core/widgets.py:1318 +#: ../gui/wxpython/gui_core/widgets.py:1319 msgid "{} tools matched" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1389 +#: ../gui/wxpython/gui_core/widgets.py:1390 msgid "Profiles" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1396 +#: ../gui/wxpython/gui_core/widgets.py:1397 msgid "Save current settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1399 +#: ../gui/wxpython/gui_core/widgets.py:1400 msgid "Delete currently selected settings" msgstr "현재 선택된 설정을 삭제합니다" -#: ../gui/wxpython/gui_core/widgets.py:1418 +#: ../gui/wxpython/gui_core/widgets.py:1419 msgid "Load:" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1434 +#: ../gui/wxpython/gui_core/widgets.py:1435 #, python-format msgid "Settings <%s> not found" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/gui_core/widgets.py:1470 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/gui_core/widgets.py:1471 msgid "Save settings" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1453 +#: ../gui/wxpython/gui_core/widgets.py:1454 msgid "Name not given, settings is not saved." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1466 +#: ../gui/wxpython/gui_core/widgets.py:1467 #, python-format msgid "Settings <%s> already exists. Do you want to overwrite the settings?" msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1518 +#: ../gui/wxpython/gui_core/widgets.py:1519 msgid "No settings is defined. Operation canceled." msgstr "" -#: ../gui/wxpython/gui_core/widgets.py:1554 +#: ../gui/wxpython/gui_core/widgets.py:1555 msgid "Unable to save settings" msgstr "" -#: ../gui/wxpython/gui_core/prompt.py:272 +#: ../gui/wxpython/gui_core/prompt.py:284 msgid "Type command here and press Enter" msgstr "" @@ -12512,9 +12747,9 @@ msgid "Snap also to vertex" msgstr "" #: ../gui/wxpython/vdigit/preferences.py:225 -#: ../gui/wxpython/vdigit/preferences.py:827 -#: ../gui/wxpython/vdigit/preferences.py:841 -#: ../gui/wxpython/vdigit/preferences.py:846 +#: ../gui/wxpython/vdigit/preferences.py:829 +#: ../gui/wxpython/vdigit/preferences.py:843 +#: ../gui/wxpython/vdigit/preferences.py:848 #, python-format msgid "Snapping threshold is %(value).1f %(units)s" msgstr "" @@ -12536,226 +12771,226 @@ msgid "" "By default are selected all features overlapping selection bounding box " msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:310 +#: ../gui/wxpython/vdigit/preferences.py:311 msgid "Check for duplicates" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:330 +#: ../gui/wxpython/vdigit/preferences.py:331 msgid "Digitize lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:334 +#: ../gui/wxpython/vdigit/preferences.py:335 msgid "Break lines at intersection" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:351 +#: ../gui/wxpython/vdigit/preferences.py:352 msgid "Digitize areas" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:355 +#: ../gui/wxpython/vdigit/preferences.py:356 msgid "Close boundary (snap to the start node)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:373 +#: ../gui/wxpython/vdigit/preferences.py:374 msgid "Save changes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:376 +#: ../gui/wxpython/vdigit/preferences.py:377 msgid "Save changes on exit" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:395 +#: ../gui/wxpython/vdigit/preferences.py:396 msgid "Query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:403 +#: ../gui/wxpython/vdigit/preferences.py:404 msgid "Choose query tool" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:409 +#: ../gui/wxpython/vdigit/preferences.py:410 msgid "Select by box" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:420 -#: ../gui/wxpython/vdigit/preferences.py:611 +#: ../gui/wxpython/vdigit/preferences.py:421 +#: ../gui/wxpython/vdigit/preferences.py:612 msgid "length" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:425 +#: ../gui/wxpython/vdigit/preferences.py:426 msgid "Select lines" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "shorter than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:427 -#: ../gui/wxpython/vdigit/preferences.py:465 +#: ../gui/wxpython/vdigit/preferences.py:428 +#: ../gui/wxpython/vdigit/preferences.py:466 msgid "longer than" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:458 +#: ../gui/wxpython/vdigit/preferences.py:459 msgid "dangle" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:463 +#: ../gui/wxpython/vdigit/preferences.py:464 msgid "Select dangles" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:512 +#: ../gui/wxpython/vdigit/preferences.py:513 msgid "Digitize new feature" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:518 +#: ../gui/wxpython/vdigit/preferences.py:519 msgid "Add new record into table" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:529 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:530 #: ../gui/wxpython/vdigit/dialogs.py:131 ../gui/wxpython/vdigit/dialogs.py:580 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3179 -#: ../gui/wxpython/dbmgr/base.py:3451 ../gui/wxpython/dbmgr/dialogs.py:517 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3192 +#: ../gui/wxpython/dbmgr/base.py:3464 ../gui/wxpython/dbmgr/dialogs.py:519 msgid "Layer" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 #: ../gui/wxpython/vdigit/dialogs.py:138 ../gui/wxpython/vdigit/dialogs.py:581 -#: ../gui/wxpython/dbmgr/dialogs.py:517 ../gui/wxpython/dbmgr/dialogs.py:654 +#: ../gui/wxpython/dbmgr/dialogs.py:519 ../gui/wxpython/dbmgr/dialogs.py:656 msgid "Category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 +#: ../gui/wxpython/vdigit/preferences.py:528 msgid "Mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:527 -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:528 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Next to use" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:539 +#: ../gui/wxpython/vdigit/preferences.py:540 msgid "Category number" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:559 +#: ../gui/wxpython/vdigit/preferences.py:560 msgid "Category mode" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "Manual entry" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:564 +#: ../gui/wxpython/vdigit/preferences.py:565 msgid "No category" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:583 +#: ../gui/wxpython/vdigit/preferences.py:584 msgid "Delete existing feature(s)" msgstr "기존 피처를 삭제합니다" -#: ../gui/wxpython/vdigit/preferences.py:589 +#: ../gui/wxpython/vdigit/preferences.py:590 msgid "Delete record from table" msgstr "테이블로부터 레코드를 삭제합니다" -#: ../gui/wxpython/vdigit/preferences.py:606 +#: ../gui/wxpython/vdigit/preferences.py:607 msgid "Geometry attributes" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:612 +#: ../gui/wxpython/vdigit/preferences.py:613 msgid "area" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:613 +#: ../gui/wxpython/vdigit/preferences.py:614 msgid "perimeter" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:694 +#: ../gui/wxpython/vdigit/preferences.py:696 msgid "" "Note: These settings are stored in the workspace not in the vector digitizer " "preferences." msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:730 +#: ../gui/wxpython/vdigit/preferences.py:732 msgid "Digitize new line segment" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:731 +#: ../gui/wxpython/vdigit/preferences.py:733 msgid "Digitize new line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:732 +#: ../gui/wxpython/vdigit/preferences.py:734 msgid "Highlight" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:733 +#: ../gui/wxpython/vdigit/preferences.py:735 msgid "Highlight (duplicates)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:735 +#: ../gui/wxpython/vdigit/preferences.py:737 #: ../gui/wxpython/psmap/toolbars.py:104 msgid "Line" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:736 +#: ../gui/wxpython/vdigit/preferences.py:738 msgid "Boundary (no area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:737 +#: ../gui/wxpython/vdigit/preferences.py:739 msgid "Boundary (one area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:738 +#: ../gui/wxpython/vdigit/preferences.py:740 msgid "Boundary (two areas)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:739 +#: ../gui/wxpython/vdigit/preferences.py:741 msgid "Centroid (in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:740 +#: ../gui/wxpython/vdigit/preferences.py:742 msgid "Centroid (outside area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:741 +#: ../gui/wxpython/vdigit/preferences.py:743 msgid "Centroid (duplicate in area)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:742 +#: ../gui/wxpython/vdigit/preferences.py:744 msgid "Node (one line)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:743 +#: ../gui/wxpython/vdigit/preferences.py:745 msgid "Node (two lines)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:744 +#: ../gui/wxpython/vdigit/preferences.py:746 msgid "Vertex" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:745 +#: ../gui/wxpython/vdigit/preferences.py:747 msgid "Area (closed boundary + centroid)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:746 +#: ../gui/wxpython/vdigit/preferences.py:748 msgid "Direction" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:816 +#: ../gui/wxpython/vdigit/preferences.py:818 msgid "Snapping disabled" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:820 +#: ../gui/wxpython/vdigit/preferences.py:822 #, python-format msgid "Snapping threshold is %(value).1f %(units)s (based on comp. resolution)" msgstr "" -#: ../gui/wxpython/vdigit/preferences.py:878 +#: ../gui/wxpython/vdigit/preferences.py:880 #, python-format msgid "Vector digitizer settings saved to file <%s>." msgstr "" -#: ../gui/wxpython/vdigit/wxdisplay.py:361 +#: ../gui/wxpython/vdigit/wxdisplay.py:360 msgid "" "WARNING: Zero-length line or boundary drawing skipped. Use v.clean to remove " "it." @@ -12773,203 +13008,203 @@ msgstr "" msgid "Topology missing" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:123 +#: ../gui/wxpython/vdigit/toolbars.py:124 msgid "Select area/boundary/centroid tool" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:150 +#: ../gui/wxpython/vdigit/toolbars.py:151 msgid "Digitize new point (Ctrl+P)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:151 -#: ../gui/wxpython/vdigit/toolbars.py:170 -#: ../gui/wxpython/vdigit/toolbars.py:175 +#: ../gui/wxpython/vdigit/toolbars.py:152 +#: ../gui/wxpython/vdigit/toolbars.py:171 +#: ../gui/wxpython/vdigit/toolbars.py:176 msgid "Left: new point" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:155 +#: ../gui/wxpython/vdigit/toolbars.py:156 msgid "Digitize new line (Ctrl+L)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:157 -#: ../gui/wxpython/vdigit/toolbars.py:164 -#: ../gui/wxpython/vdigit/toolbars.py:208 +#: ../gui/wxpython/vdigit/toolbars.py:158 +#: ../gui/wxpython/vdigit/toolbars.py:165 +#: ../gui/wxpython/vdigit/toolbars.py:210 msgid "Left: new point; Ctrl+Left: undo last point; Right: close line" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:162 +#: ../gui/wxpython/vdigit/toolbars.py:163 msgid "Digitize new boundary (Ctrl+B)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:169 +#: ../gui/wxpython/vdigit/toolbars.py:170 msgid "Digitize new centroid (Ctrl+C)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:174 +#: ../gui/wxpython/vdigit/toolbars.py:175 msgid "Digitize new area (boundary without category) (Ctrl+A)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:179 +#: ../gui/wxpython/vdigit/toolbars.py:180 msgid "Add new vertex to line or boundary (Ctrl+V)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:180 -#: ../gui/wxpython/vdigit/toolbars.py:187 -#: ../gui/wxpython/vdigit/toolbars.py:192 -#: ../gui/wxpython/vdigit/toolbars.py:216 -#: ../gui/wxpython/vdigit/toolbars.py:221 -#: ../gui/wxpython/vdigit/toolbars.py:226 -#: ../gui/wxpython/vdigit/toolbars.py:242 +#: ../gui/wxpython/vdigit/toolbars.py:181 +#: ../gui/wxpython/vdigit/toolbars.py:189 +#: ../gui/wxpython/vdigit/toolbars.py:194 +#: ../gui/wxpython/vdigit/toolbars.py:219 +#: ../gui/wxpython/vdigit/toolbars.py:224 +#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:245 msgid "Left: Select; Ctrl+Left: Unselect; Right: Confirm" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:185 +#: ../gui/wxpython/vdigit/toolbars.py:186 #, fuzzy msgid "" "Delete selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+D)" msgstr "선택된 점, 선, 경계, 또는 도심을 삭제합니다" -#: ../gui/wxpython/vdigit/toolbars.py:191 +#: ../gui/wxpython/vdigit/toolbars.py:193 #, fuzzy msgid "Delete selected area(s) (Ctrl+F)" msgstr "선택된 면을 삭제합니다" -#: ../gui/wxpython/vdigit/toolbars.py:196 +#: ../gui/wxpython/vdigit/toolbars.py:198 msgid "Display/update attributes (Ctrl+K)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:197 -#: ../gui/wxpython/vdigit/toolbars.py:202 +#: ../gui/wxpython/vdigit/toolbars.py:199 +#: ../gui/wxpython/vdigit/toolbars.py:204 msgid "Left: Select" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:201 +#: ../gui/wxpython/vdigit/toolbars.py:203 msgid "Display/update categories (Ctrl+J)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:206 +#: ../gui/wxpython/vdigit/toolbars.py:208 msgid "Edit selected line/boundary (Ctrl+E)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:214 +#: ../gui/wxpython/vdigit/toolbars.py:216 #, fuzzy msgid "Move selected point(s), line(s), boundary(ies) or centroid(s) (Ctrl+M)" msgstr "선택된 점, 선, 경계, 또는 도심을 삭제합니다" -#: ../gui/wxpython/vdigit/toolbars.py:220 +#: ../gui/wxpython/vdigit/toolbars.py:223 #, fuzzy msgid "Move selected vertex (Ctrl+G)" msgstr "선택된 정점을 제거합니다" -#: ../gui/wxpython/vdigit/toolbars.py:225 +#: ../gui/wxpython/vdigit/toolbars.py:228 #, fuzzy msgid "Remove selected vertex (Ctrl+X)" msgstr "선택된 정점을 제거합니다" -#: ../gui/wxpython/vdigit/toolbars.py:229 +#: ../gui/wxpython/vdigit/toolbars.py:232 #, fuzzy msgid "Settings (Ctrl+T)" msgstr "설정(&S)" -#: ../gui/wxpython/vdigit/toolbars.py:232 +#: ../gui/wxpython/vdigit/toolbars.py:235 msgid "Quit (Ctrl+Q)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:233 +#: ../gui/wxpython/vdigit/toolbars.py:236 msgid "Quit digitizer and save changes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:236 +#: ../gui/wxpython/vdigit/toolbars.py:239 msgid "Show manual (Ctrl+H)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:237 +#: ../gui/wxpython/vdigit/toolbars.py:240 msgid "Show Vector Digitizer manual" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:241 +#: ../gui/wxpython/vdigit/toolbars.py:244 msgid "Additional tools (copy, flip, connect, etc.)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:246 +#: ../gui/wxpython/vdigit/toolbars.py:249 msgid "Undo (Ctrl+Z)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:247 +#: ../gui/wxpython/vdigit/toolbars.py:250 msgid "Undo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:251 +#: ../gui/wxpython/vdigit/toolbars.py:254 msgid "Redo (Ctrl+Y)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:252 +#: ../gui/wxpython/vdigit/toolbars.py:255 msgid "Redo previous change" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:438 +#: ../gui/wxpython/vdigit/toolbars.py:441 msgid "" "No vector map is open for editing. Please select firsta vector map from the " "combo box." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:714 +#: ../gui/wxpython/vdigit/toolbars.py:717 msgid "Break selected lines/boundaries at intersection" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:720 +#: ../gui/wxpython/vdigit/toolbars.py:723 msgid "Connect selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:725 +#: ../gui/wxpython/vdigit/toolbars.py:728 msgid "Copy categories" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:727 +#: ../gui/wxpython/vdigit/toolbars.py:730 msgid "Copy features from (background) vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:732 +#: ../gui/wxpython/vdigit/toolbars.py:735 msgid "Copy attributes" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:734 +#: ../gui/wxpython/vdigit/toolbars.py:737 msgid "Feature type conversion" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:740 +#: ../gui/wxpython/vdigit/toolbars.py:743 msgid "Flip selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:746 +#: ../gui/wxpython/vdigit/toolbars.py:749 msgid "Merge selected lines/boundaries" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:752 +#: ../gui/wxpython/vdigit/toolbars.py:755 msgid "Snap selected lines/boundaries (only to nodes)" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:757 +#: ../gui/wxpython/vdigit/toolbars.py:760 msgid "Split line/boundary" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:758 +#: ../gui/wxpython/vdigit/toolbars.py:761 msgid "Query features" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:760 +#: ../gui/wxpython/vdigit/toolbars.py:763 msgid "Z bulk-labeling of 3D lines" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:791 +#: ../gui/wxpython/vdigit/toolbars.py:794 msgid "Select background vector map" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:949 +#: ../gui/wxpython/vdigit/toolbars.py:952 msgid "Vector map is not 3D. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1055 +#: ../gui/wxpython/vdigit/toolbars.py:1058 #, python-format msgid "" "Topology for vector map <%s> is not available. Topology is required by " @@ -12978,42 +13213,42 @@ msgid "" "for editing?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1061 +#: ../gui/wxpython/vdigit/toolbars.py:1064 msgid "Digitizer error" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1095 +#: ../gui/wxpython/vdigit/toolbars.py:1098 #, python-format msgid "Please wait, opening vector map <%s> for editing..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1139 +#: ../gui/wxpython/vdigit/toolbars.py:1142 #, python-format msgid "" "Unsupported feature type '%(type)s'. Unable to edit OGR layer <%(layer)s>." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1210 +#: ../gui/wxpython/vdigit/toolbars.py:1213 #, python-format msgid "Do you want to save changes in vector map <%s>?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1212 +#: ../gui/wxpython/vdigit/toolbars.py:1215 msgid "Save changes?" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1222 +#: ../gui/wxpython/vdigit/toolbars.py:1225 #, python-format msgid "Please wait, closing and rebuilding topology of vector map <%s>..." msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1241 +#: ../gui/wxpython/vdigit/toolbars.py:1244 #, python-format msgid "Editing of vector map <%s> successfully finished" msgstr "" -#: ../gui/wxpython/vdigit/toolbars.py:1310 -#: ../gui/wxpython/vdigit/toolbars.py:1321 +#: ../gui/wxpython/vdigit/toolbars.py:1313 +#: ../gui/wxpython/vdigit/toolbars.py:1324 msgid "New vector map" msgstr "" @@ -13026,8 +13261,8 @@ msgid "Add new category" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:172 -#: ../gui/wxpython/web_services/dialogs.py:693 -#: ../gui/wxpython/psmap/dialogs.py:539 +#: ../gui/wxpython/web_services/dialogs.py:695 +#: ../gui/wxpython/psmap/dialogs.py:565 msgid "Apply changes" msgstr "" @@ -13036,11 +13271,11 @@ msgid "Ignore changes and close dialog" msgstr "" #: ../gui/wxpython/vdigit/dialogs.py:176 -#: ../gui/wxpython/web_services/dialogs.py:698 +#: ../gui/wxpython/web_services/dialogs.py:700 msgid "Apply changes and close dialog" msgstr "" -#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:150 +#: ../gui/wxpython/vdigit/dialogs.py:198 ../gui/wxpython/dbmgr/dialogs.py:151 msgid "Feature id:" msgstr "" @@ -13085,24 +13320,24 @@ msgstr "" msgid "Layer (Categories)" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:55 +#: ../gui/wxpython/vdigit/wxdigit.py:54 msgid "Digitization Error" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:60 +#: ../gui/wxpython/vdigit/wxdigit.py:59 #, python-format msgid "Unable to open vector map <%s>." msgstr "벡터 지도 <%s>를 열 수 없습니다." -#: ../gui/wxpython/vdigit/wxdigit.py:62 +#: ../gui/wxpython/vdigit/wxdigit.py:61 msgid "No vector map open for editing." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:64 +#: ../gui/wxpython/vdigit/wxdigit.py:63 msgid "Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:73 +#: ../gui/wxpython/vdigit/wxdigit.py:72 #, python-format msgid "" "Writing new feature failed. Operation canceled.\n" @@ -13110,22 +13345,22 @@ msgid "" "Reason: %s" msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:83 +#: ../gui/wxpython/vdigit/wxdigit.py:82 #, python-format msgid "Reading feature id %d failed. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:91 +#: ../gui/wxpython/vdigit/wxdigit.py:90 #, python-format msgid "Database link %d not available. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:100 +#: ../gui/wxpython/vdigit/wxdigit.py:99 #, python-format msgid "Unable to start database driver <%s>. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:110 +#: ../gui/wxpython/vdigit/wxdigit.py:109 #, python-format msgid "" "Unable to open database <%(db)s> by driver <%(driver)s>. Operation canceled." @@ -13133,76 +13368,76 @@ msgstr "" "데이터베이스 <%(db)s>를 드라이버 <%(driver)s>로 열 수 없습니다. 조작이 취소되" "었습니다." -#: ../gui/wxpython/vdigit/wxdigit.py:121 +#: ../gui/wxpython/vdigit/wxdigit.py:120 #, python-format msgid "Unable to execute SQL query '%s'. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:129 +#: ../gui/wxpython/vdigit/wxdigit.py:128 #, python-format msgid "Feature id %d is marked as dead. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:137 +#: ../gui/wxpython/vdigit/wxdigit.py:136 #, python-format msgid "Unsupported feature type %d. Operation canceled." msgstr "" -#: ../gui/wxpython/vdigit/wxdigit.py:503 +#: ../gui/wxpython/vdigit/wxdigit.py:508 #, python-format msgid "Unknown feature type '%s'" msgstr "알려지지 않은 피처 유형 '%s'" -#: ../gui/wxpython/vdigit/wxdigit.py:508 +#: ../gui/wxpython/vdigit/wxdigit.py:513 msgid "Not enough points for line" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:184 -#: ../gui/wxpython/mapwin/decorations.py:295 +#: ../gui/wxpython/mapwin/decorations.py:183 +#: ../gui/wxpython/mapwin/decorations.py:294 msgid "" "Please install Python Imaging Library (PIL)\n" "for better control of legend and other decorations." msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:204 +#: ../gui/wxpython/mapwin/decorations.py:203 msgid "Remove text" msgstr "문자를 제거합니다" -#: ../gui/wxpython/mapwin/decorations.py:205 +#: ../gui/wxpython/mapwin/decorations.py:204 msgid "Text properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:227 +#: ../gui/wxpython/mapwin/decorations.py:226 msgid "Remove scale bar" msgstr "축척 표시줄을 제거합니다" -#: ../gui/wxpython/mapwin/decorations.py:228 +#: ../gui/wxpython/mapwin/decorations.py:227 msgid "Scale bar properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:239 +#: ../gui/wxpython/mapwin/decorations.py:238 msgid "Remove north arrow" msgstr "방위표를 제거합니다" -#: ../gui/wxpython/mapwin/decorations.py:240 +#: ../gui/wxpython/mapwin/decorations.py:239 msgid "North arrow properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:251 -#: ../gui/wxpython/mapwin/decorations.py:263 +#: ../gui/wxpython/mapwin/decorations.py:250 +#: ../gui/wxpython/mapwin/decorations.py:262 msgid "Remove legend" msgstr "범례를 제거합니다" -#: ../gui/wxpython/mapwin/decorations.py:252 +#: ../gui/wxpython/mapwin/decorations.py:251 msgid "Vector legend properties" msgstr "" -#: ../gui/wxpython/mapwin/decorations.py:264 +#: ../gui/wxpython/mapwin/decorations.py:263 msgid "Raster legend properties" msgstr "" -#: ../gui/wxpython/mapwin/graphics.py:293 -#: ../gui/wxpython/mapwin/graphics.py:468 +#: ../gui/wxpython/mapwin/graphics.py:292 +#: ../gui/wxpython/mapwin/graphics.py:467 #, python-format msgid "Property does not exist: %s" msgstr "" @@ -13214,19 +13449,19 @@ msgid "" "Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:313 +#: ../gui/wxpython/mapwin/base.py:316 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" " Handler was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/base.py:346 +#: ../gui/wxpython/mapwin/base.py:349 #, python-format msgid "Handler: %s was not registered" msgstr "" -#: ../gui/wxpython/mapwin/base.py:352 +#: ../gui/wxpython/mapwin/base.py:355 #, python-format msgid "" "Error occurred during unregistration of handler: %s \n" @@ -13245,32 +13480,32 @@ msgstr "" msgid "Please wait, exporting image..." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:1035 +#: ../gui/wxpython/mapwin/buffered.py:1036 msgid "Unable to draw registered graphics. The graphics was unregistered." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2100 +#: ../gui/wxpython/mapwin/buffered.py:2101 msgid "Zoom to saved region extents" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2102 +#: ../gui/wxpython/mapwin/buffered.py:2103 msgid "Set compulational region from named region" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2113 +#: ../gui/wxpython/mapwin/buffered.py:2114 #, python-format msgid "Region <%s> not found. Operation canceled." msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2142 +#: ../gui/wxpython/mapwin/buffered.py:2143 msgid "Save display extents to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2144 +#: ../gui/wxpython/mapwin/buffered.py:2145 msgid "Save computational region to region file" msgstr "" -#: ../gui/wxpython/mapwin/buffered.py:2156 +#: ../gui/wxpython/mapwin/buffered.py:2157 #, python-format msgid "Region file <%s> already exists. Do you want to overwrite it?" msgstr "" @@ -13380,100 +13615,100 @@ msgstr "" msgid "Connecting to <%s>..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:450 +#: ../gui/wxpython/web_services/dialogs.py:452 msgid "Available web services" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:465 +#: ../gui/wxpython/web_services/dialogs.py:467 #, python-format msgid "Connected to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:472 +#: ../gui/wxpython/web_services/dialogs.py:474 #, python-format msgid "Unable to connect to <%s>" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:536 -#: ../gui/wxpython/dbmgr/base.py:3305 +#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/dbmgr/base.py:3318 msgid "&Add layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:538 +#: ../gui/wxpython/web_services/dialogs.py:540 msgid "Add selected web service layers as map layer into layer tree" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:648 +#: ../gui/wxpython/web_services/dialogs.py:650 msgid "Web service layer properties" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:697 +#: ../gui/wxpython/web_services/dialogs.py:699 msgid "&OK" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:860 +#: ../gui/wxpython/web_services/dialogs.py:862 msgid "Name for output raster map:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:871 +#: ../gui/wxpython/web_services/dialogs.py:873 msgid "Export region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:882 +#: ../gui/wxpython/web_services/dialogs.py:884 msgid "Named region" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:884 +#: ../gui/wxpython/web_services/dialogs.py:886 msgid "Extent and resolution are based on Map Display geometry." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:887 +#: ../gui/wxpython/web_services/dialogs.py:889 msgid "Extent and resolution are based on computational region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:890 +#: ../gui/wxpython/web_services/dialogs.py:892 msgid "Extent and resolution are based on named region." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:895 +#: ../gui/wxpython/web_services/dialogs.py:897 msgid "Overwrite existing raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:900 +#: ../gui/wxpython/web_services/dialogs.py:902 msgid "Choose named region:" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/web_services/dialogs.py:916 msgid "&Save layer" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:915 +#: ../gui/wxpython/web_services/dialogs.py:917 msgid "Save web service layer as raster map" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1021 +#: ../gui/wxpython/web_services/dialogs.py:1023 msgid "Missing output raster." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1024 +#: ../gui/wxpython/web_services/dialogs.py:1026 msgid "Output map can be added only to current mapset." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1030 +#: ../gui/wxpython/web_services/dialogs.py:1032 #, python-format msgid "Output map <%s> already exists" msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1049 +#: ../gui/wxpython/web_services/dialogs.py:1051 #, python-format msgid "Region <%s> does not exist." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1077 +#: ../gui/wxpython/web_services/dialogs.py:1079 msgid "Downloading data..." msgstr "" -#: ../gui/wxpython/web_services/dialogs.py:1098 +#: ../gui/wxpython/web_services/dialogs.py:1100 msgid "Unable to fetch data.\n" msgstr "" @@ -13502,12 +13737,12 @@ msgid "Order of layers in raster" msgstr "" #: ../gui/wxpython/web_services/widgets.py:267 -#: ../gui/wxpython/psmap/dialogs.py:1810 ../gui/wxpython/psmap/dialogs.py:3611 +#: ../gui/wxpython/psmap/dialogs.py:1837 ../gui/wxpython/psmap/dialogs.py:3650 msgid "Up" msgstr "" #: ../gui/wxpython/web_services/widgets.py:268 -#: ../gui/wxpython/psmap/dialogs.py:1811 ../gui/wxpython/psmap/dialogs.py:3612 +#: ../gui/wxpython/psmap/dialogs.py:1838 ../gui/wxpython/psmap/dialogs.py:3651 msgid "Down" msgstr "" @@ -13581,11 +13816,11 @@ msgstr "" msgid "Choose output layer name.\n" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1153 +#: ../gui/wxpython/web_services/widgets.py:1154 msgid "Add default" msgstr "" -#: ../gui/wxpython/web_services/widgets.py:1170 +#: ../gui/wxpython/web_services/widgets.py:1171 #, python-format msgid "" "User defined server with same name as default server <%s> already exists.\n" @@ -13596,24 +13831,24 @@ msgstr "" msgid "GRASS GIS Manage Ground Control Points" msgstr "GRASS GIS 지상 제어점 관리" -#: ../gui/wxpython/image2target/ii2t_manager.py:573 +#: ../gui/wxpython/image2target/ii2t_manager.py:586 msgid "Select group:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1592 +#: ../gui/wxpython/image2target/ii2t_manager.py:1605 msgid "Writing CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1606 +#: ../gui/wxpython/image2target/ii2t_manager.py:1619 #, python-format msgid "CONTROL_POINTS file saved for group <%s>" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:1654 +#: ../gui/wxpython/image2target/ii2t_manager.py:1667 msgid "Reading CONTROL_POINTS file failed" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2007 +#: ../gui/wxpython/image2target/ii2t_manager.py:2024 msgid "" "Could not calculate RMS Error.\n" "Possible error with i.ortho.transform." @@ -13621,7 +13856,7 @@ msgstr "" "RMS 오류를 계산할 수 없었습니다.\n" "i.ortho.transform에 오류가 있을 수 있습니다." -#: ../gui/wxpython/image2target/ii2t_manager.py:2141 +#: ../gui/wxpython/image2target/ii2t_manager.py:2158 msgid "" "Could not calculate new extends.\n" "Possible error with i.ortho.transform." @@ -13629,21 +13864,21 @@ msgstr "" "새 범위를 계산할 수 없었습니다.\n" "i.ortho.transform에 오류가 있을 수 있습니다." -#: ../gui/wxpython/image2target/ii2t_manager.py:2397 -#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2414 +#: ../gui/wxpython/image2target/ii2t_manager.py:2435 msgid "source Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2400 -#: ../gui/wxpython/image2target/ii2t_manager.py:2421 +#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/image2target/ii2t_manager.py:2438 msgid "target Z" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2795 +#: ../gui/wxpython/image2target/ii2t_manager.py:2812 msgid "source Z:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_manager.py:2796 +#: ../gui/wxpython/image2target/ii2t_manager.py:2813 msgid "target Z:" msgstr "" @@ -13659,11 +13894,11 @@ msgstr "2. GRASS 로케이션을 선택하세요" msgid "3. Select GRASS Mapset" msgstr "3. GRASS 지도 세트를 선택하세요" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:149 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:150 msgid "GRASS GIS database directory contains Locations." msgstr "GRASS GIS 데이터베이스 디렉토리는 로케이션을 포함합니다." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:156 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:157 msgid "" "All data in one Location is in the same coordinate reference system " "(projection). One Location can be one project. Location contains Mapsets." @@ -13671,7 +13906,7 @@ msgstr "" "한 로케이션 내의 모든 자료는 같은 투영을 공유합니다. 로케이션 하나가 프로젝" "트 하나가 될 수 있습니다. 로케이션은 지도 세트를 포함합니다." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:168 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:169 msgid "" "Mapset contains GIS data related to one project, task within one project, " "subregion or user." @@ -13679,92 +13914,104 @@ msgstr "" "지도 세트는 프로젝트, 작업, 부영역 또는 사용자와 관련된 GIS 자료를 포함합니" "다." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:186 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:187 msgid "Start &GRASS session" msgstr "&GRASS 세션 시작" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:193 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:194 msgid "&Browse" msgstr "찾아보기(&B)" #. GTC New mapset -#: ../gui/wxpython/image2target/ii2t_gis_set.py:199 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:200 msgid "&New" msgstr "새로 만들기(&N)" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:201 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:202 msgid "Create a new Mapset in selected Location" msgstr "" #. GTC New location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:206 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:207 msgid "N&ew" msgstr "새로 만들기(&e)" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:210 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:211 msgid "" "Create a new location using location wizard. After location is created " "successfully, GRASS session is started." msgstr "" #. GTC Rename location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:219 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:220 msgid "Ren&ame" msgstr "이름 변경하기(&a)" +#: ../gui/wxpython/image2target/ii2t_gis_set.py:222 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:753 +msgid "Rename selected location" +msgstr "" + #. GTC Delete location -#: ../gui/wxpython/image2target/ii2t_gis_set.py:226 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:227 msgid "De&lete" msgstr "삭제(&l)" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:228 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:847 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:229 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:848 msgid "Delete selected location" msgstr "선택된 로케이션을 삭제합니다" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:242 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:817 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:243 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:818 msgid "Delete selected mapset" msgstr "선택된 지도 세트를 삭제합니다" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:297 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:298 #, python-format msgid "GRASS GIS %s startup%s" msgstr "GRASS GIS %s 시작 %s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:302 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:303 msgid "Enter GRASS session" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:325 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:326 msgid "Unable to set GRASS database. Check your locale settings." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:346 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:347 #, python-format msgid "ERROR: Location <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:365 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:366 #, python-format msgid "ERROR: Mapset <%s> not found\n" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:551 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:552 #, python-format msgid "Invalid line in GISRC file (%s):%s\n" msgstr "GISRC 파일(%s) 내에 무효한 줄: %s\n" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:615 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:616 #, python-format msgid "Do you want to import <%(name)s> to the newly created location?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:636 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:637 msgid "New mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:697 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:682 +#, python-format +msgid "" +"Data file <%(name)s> imported successfully. The location's default region " +"was set from this imported map." +msgstr "" + +#: ../gui/wxpython/image2target/ii2t_gis_set.py:698 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13774,8 +14021,8 @@ msgstr "" "\n" "이 지도 세트의 이름은 바꿀 수 없습니다." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:705 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:751 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 #, python-format msgid "" "Current name: %s\n" @@ -13783,14 +14030,14 @@ msgid "" "Enter new name:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:719 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:765 -#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2391 -#: ../gui/wxpython/lmgr/frame.py:2319 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:720 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:766 +#: ../gui/wxpython/core/gcmd.py:126 ../gui/wxpython/main_window/frame.py:2427 +#: ../gui/wxpython/lmgr/frame.py:2333 msgid "Message" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:721 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:722 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13798,7 +14045,7 @@ msgid "" "Mapset <%s> already exists in location." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:740 #, python-format msgid "" "Unable to rename mapset.\n" @@ -13806,7 +14053,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:767 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:768 #, python-format msgid "" "Unable to rename location.\n" @@ -13814,7 +14061,7 @@ msgid "" "Location <%s> already exists in GRASS database." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:789 #, python-format msgid "" "Unable to rename location.\n" @@ -13822,7 +14069,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:802 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:803 msgid "" "Mapset is required for valid GRASS location.\n" "\n" @@ -13832,11 +14079,11 @@ msgstr "" "\n" "이 지도 세트는 삭제할 수 없습니다." -#: ../gui/wxpython/image2target/ii2t_gis_set.py:811 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:812 #, python-format msgid "" -"Do you want to continue with deleting mapset <%(mapset)s> from location <" -"%(location)s>?\n" +"Do you want to continue with deleting mapset <%(mapset)s> from location " +"<%(location)s>?\n" "\n" "ALL MAPS included in this mapset will be PERMANENTLY DELETED!" msgstr "" @@ -13844,11 +14091,11 @@ msgstr "" "\n" "이 지도 세트에 포함된 모든 지도들이 영구히 삭제될 것입니다!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:827 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:828 msgid "Unable to delete mapset" msgstr "지도 세트를 삭제할 수 없습니다" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:841 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:842 #, python-format msgid "" "Do you want to continue with deleting location <%s>?\n" @@ -13859,37 +14106,37 @@ msgstr "" "\n" "이 로케이션에 포함된 모든 지도들이 영구히 삭제될 것입니다!" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:859 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:860 msgid "Unable to delete location" msgstr "로케이션을 삭제할 수 없습니다" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:871 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:872 #, python-brace-format msgid "Unicode error detected. Check your locale settings. Details: {0}" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:887 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:888 #, python-format msgid "" "No GRASS Location found in '%s'. Create a new Location or choose different " "GRASS database directory." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1007 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1008 #, python-format msgid "Path '%s' doesn't exist." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1040 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1041 msgid "Enter name for new mapset:" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1053 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1054 #, python-format msgid "Mapset <%s> already exists." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1060 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1061 #, python-format msgid "" "Mapset <%s> is reserved for direct read access to OGR layers. Please " @@ -13898,16 +14145,16 @@ msgid "" "Are you really sure that you want to create this mapset?" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1066 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1067 msgid "Reserved mapset name" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1094 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1095 #, python-format msgid "Unable to create new mapset: %s" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1110 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1111 #, python-format msgid "" "GRASS is already running in selected mapset <%(mapset)s>\n" @@ -13925,12 +14172,12 @@ msgstr "" "\n" ".gislock 제거를 시도하고 (이 조작을 위한 허가가 필요합니다) 계속하시겠습니까?" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1117 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1132 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1118 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1133 msgid "Lock file found" msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1127 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1128 msgid "" "ARE YOU REALLY SURE?\n" "\n" @@ -13938,7 +14185,7 @@ msgid "" "your data. Have another look in the processor manager just to be sure..." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1144 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1145 #, python-format msgid "" "Unable to remove '%(lock)s'.\n" @@ -13949,164 +14196,164 @@ msgstr "" "\n" "세부 사항: %(reason)s" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1192 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1193 #, python-format msgid "" "Name <%(name)s> is not a valid name for location or mapset. Please use only " "ASCII characters excluding %(chars)s and space." msgstr "" -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1269 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1270 msgid "" "GRASS needs a directory (GRASS database) in which to store its data. Create " "one now if you have not already done so. A popular choice is \"grassdata\", " "located in your home directory. Press Browse button to select the directory." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:155 +#: ../gui/wxpython/vnet/vnet_data.py:157 #, python-format msgid "Module <%s> does not support turns costs." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:162 +#: ../gui/wxpython/vnet/vnet_data.py:164 #, python-format msgid "Vector map '%s' does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:164 +#: ../gui/wxpython/vnet/vnet_data.py:166 msgid "Vector map was not chosen." msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:172 +#: ../gui/wxpython/vnet/vnet_data.py:174 msgid "arc layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:173 +#: ../gui/wxpython/vnet/vnet_data.py:175 msgid "node layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:174 +#: ../gui/wxpython/vnet/vnet_data.py:176 msgid "turntable layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:175 +#: ../gui/wxpython/vnet/vnet_data.py:177 msgid "unique categories layer" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:183 +#: ../gui/wxpython/vnet/vnet_data.py:185 #, python-format msgid "Chosen %s '%s' does not exist in vector map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:186 +#: ../gui/wxpython/vnet/vnet_data.py:188 #, python-format msgid "Choose existing %s.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:195 +#: ../gui/wxpython/vnet/vnet_data.py:197 #, python-format msgid "" "Chosen column '%s' does not exist in attribute table of layer '%s' of vector " "map '%s'.\n" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:251 +#: ../gui/wxpython/vnet/vnet_data.py:254 msgid "topology" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:256 ../gui/wxpython/vnet/vnet_data.py:738 msgid "Start point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:253 +#: ../gui/wxpython/vnet/vnet_data.py:256 msgid "End Point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:534 ../gui/wxpython/vnet/vnet_data.py:543 -#: ../gui/wxpython/vnet/vnet_data.py:546 +#: ../gui/wxpython/vnet/vnet_data.py:538 ../gui/wxpython/vnet/vnet_data.py:547 +#: ../gui/wxpython/vnet/vnet_data.py:550 msgid "new point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:715 +#: ../gui/wxpython/vnet/vnet_data.py:719 msgid "Arc forward/both direction(s) cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:716 +#: ../gui/wxpython/vnet/vnet_data.py:720 msgid "arc forward/both" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:719 +#: ../gui/wxpython/vnet/vnet_data.py:723 msgid "Arc backward direction cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:720 +#: ../gui/wxpython/vnet/vnet_data.py:724 msgid "arc backward" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:723 +#: ../gui/wxpython/vnet/vnet_data.py:727 msgid "Arcs' cost column (for both directions):" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:724 +#: ../gui/wxpython/vnet/vnet_data.py:728 msgid "arc" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "Node cost column:" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:727 +#: ../gui/wxpython/vnet/vnet_data.py:731 msgid "node" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:732 +#: ../gui/wxpython/vnet/vnet_data.py:736 #, python-format msgid "Shortest path %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:734 +#: ../gui/wxpython/vnet/vnet_data.py:738 msgid "End point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:744 +#: ../gui/wxpython/vnet/vnet_data.py:749 #, python-format msgid "Traveling salesman %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:753 +#: ../gui/wxpython/vnet/vnet_data.py:758 #, python-format msgid "Maximum flow %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:756 +#: ../gui/wxpython/vnet/vnet_data.py:761 msgid "Source point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:757 +#: ../gui/wxpython/vnet/vnet_data.py:762 msgid "Sink point" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:765 +#: ../gui/wxpython/vnet/vnet_data.py:770 #, python-format msgid "Subnets for nearest centers %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:774 +#: ../gui/wxpython/vnet/vnet_data.py:779 #, python-format msgid "Steiner tree for the network and given terminals %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:786 +#: ../gui/wxpython/vnet/vnet_data.py:791 #, python-format msgid "Shortest distance via the network %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:795 +#: ../gui/wxpython/vnet/vnet_data.py:800 #, python-format msgid "Cost isolines %s" msgstr "" -#: ../gui/wxpython/vnet/vnet_data.py:876 +#: ../gui/wxpython/vnet/vnet_data.py:881 msgid "Overwrite map layer" msgstr "" @@ -14114,7 +14361,7 @@ msgstr "" msgid "Unable to perform analysis." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:226 +#: ../gui/wxpython/vnet/vnet_core.py:227 #, python-format msgid "" "Temporary map '%s' with result was changed outside vector network analysis " @@ -14122,45 +14369,45 @@ msgid "" "Showed result may not correspond original analysis result." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:232 +#: ../gui/wxpython/vnet/vnet_core.py:233 msgid "Result changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:270 +#: ../gui/wxpython/vnet/vnet_core.py:271 msgid "Map can be created only in current mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:280 ../gui/wxpython/vnet/vnet_core.py:357 +#: ../gui/wxpython/vnet/vnet_core.py:281 ../gui/wxpython/vnet/vnet_core.py:358 #, python-format msgid "Vector map %s already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:283 ../gui/wxpython/vnet/vnet_core.py:360 +#: ../gui/wxpython/vnet/vnet_core.py:284 ../gui/wxpython/vnet/vnet_core.py:361 msgid "Overwrite vector map" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:307 +#: ../gui/wxpython/vnet/vnet_core.py:308 msgid "Creation of turntable failed." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:327 +#: ../gui/wxpython/vnet/vnet_core.py:328 msgid "Vector map with analysis result does not exist." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:347 +#: ../gui/wxpython/vnet/vnet_core.py:348 msgid "Map can be saved only to currently set mapset" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:431 ../gui/wxpython/vnet/vnet_core.py:652 +#: ../gui/wxpython/vnet/vnet_core.py:432 ../gui/wxpython/vnet/vnet_core.py:654 #, python-format msgid "Please choose '%s' and '%s' point." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:660 +#: ../gui/wxpython/vnet/vnet_core.py:662 msgid "Please choose at least two points." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:949 +#: ../gui/wxpython/vnet/vnet_core.py:952 #, python-format msgid "" "Input map '%s' for analysis was changed outside vector network analysis " @@ -14168,38 +14415,38 @@ msgid "" "Topology column may not correspond to changed situation." msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:955 +#: ../gui/wxpython/vnet/vnet_core.py:958 msgid "Input changed outside" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1024 +#: ../gui/wxpython/vnet/vnet_core.py:1027 #, python-format msgid "" "Temporary map %s already exists.\n" "Do you want to continue in analysis and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1050 +#: ../gui/wxpython/vnet/vnet_core.py:1053 msgid "Unable to use ctypes. \n" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1051 -#: ../gui/wxpython/vnet/vnet_core.py:1074 +#: ../gui/wxpython/vnet/vnet_core.py:1054 +#: ../gui/wxpython/vnet/vnet_core.py:1077 msgid "Snapping mode can not be activated." msgstr "끌어 붙이기 모드를 활성화할 수 없습니다" -#: ../gui/wxpython/vnet/vnet_core.py:1084 +#: ../gui/wxpython/vnet/vnet_core.py:1087 msgid "Do you really want to activate snapping and overwrite it?" msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1093 +#: ../gui/wxpython/vnet/vnet_core.py:1096 #, python-format msgid "" "Temporary map '%s' was changed outside vector analysis tool.\n" "Do you really want to activate snapping and overwrite it? " msgstr "" -#: ../gui/wxpython/vnet/vnet_core.py:1098 +#: ../gui/wxpython/vnet/vnet_core.py:1101 msgid "Overwrite map" msgstr "" @@ -14296,117 +14543,117 @@ msgstr "" msgid "Output" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:422 +#: ../gui/wxpython/vnet/dialogs.py:423 msgid "Add vector map into layer tree" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:543 +#: ../gui/wxpython/vnet/dialogs.py:544 msgid "Input tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:572 +#: ../gui/wxpython/vnet/dialogs.py:573 msgid "Result tables" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:588 +#: ../gui/wxpython/vnet/dialogs.py:589 msgid "Loading tables..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:723 +#: ../gui/wxpython/vnet/dialogs.py:724 msgid "Creating turntable..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:896 +#: ../gui/wxpython/vnet/dialogs.py:900 msgid "Input vector map does not exist." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:920 +#: ../gui/wxpython/vnet/dialogs.py:927 msgid "Analysing..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1040 +#: ../gui/wxpython/vnet/dialogs.py:1047 msgid "Computing nodes..." msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1244 +#: ../gui/wxpython/vnet/dialogs.py:1251 msgid "Other settings" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1248 +#: ../gui/wxpython/vnet/dialogs.py:1255 msgid "Point style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1252 +#: ../gui/wxpython/vnet/dialogs.py:1259 msgid "Analysis result style:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1261 +#: ../gui/wxpython/vnet/dialogs.py:1268 #, python-format msgid "Color table style %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1277 +#: ../gui/wxpython/vnet/dialogs.py:1284 #, python-format msgid "Invert colors %s:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1285 +#: ../gui/wxpython/vnet/dialogs.py:1292 msgid "Line color:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1286 +#: ../gui/wxpython/vnet/dialogs.py:1293 msgid "Color for unused point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1287 +#: ../gui/wxpython/vnet/dialogs.py:1294 msgid "Color for Start/From/Source/Used point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1288 +#: ../gui/wxpython/vnet/dialogs.py:1295 msgid "Color for End/To/Sink point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1289 +#: ../gui/wxpython/vnet/dialogs.py:1296 msgid "Color for selected point:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1301 +#: ../gui/wxpython/vnet/dialogs.py:1308 msgid "Point size:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1302 +#: ../gui/wxpython/vnet/dialogs.py:1309 msgid "Point width:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1303 ../gui/wxpython/iscatt/dialogs.py:387 +#: ../gui/wxpython/vnet/dialogs.py:1310 ../gui/wxpython/iscatt/dialogs.py:387 msgid "Snapping threshold in pixels:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1304 +#: ../gui/wxpython/vnet/dialogs.py:1311 msgid "Maximum number of results in history:" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1505 +#: ../gui/wxpython/vnet/dialogs.py:1513 msgid "New vector map with turntable" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1661 +#: ../gui/wxpython/vnet/dialogs.py:1670 msgid "Save analysis result" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1775 +#: ../gui/wxpython/vnet/dialogs.py:1785 msgid "Edit intersection turns costs" msgstr "" -#: ../gui/wxpython/vnet/dialogs.py:1815 +#: ../gui/wxpython/vnet/dialogs.py:1825 msgid "Define Global Turn Costs" msgstr "" -#: ../gui/wxpython/vnet/widgets.py:399 +#: ../gui/wxpython/vnet/widgets.py:402 msgid "Invalid value inserted. Operation canceled." msgstr "무효한 값이 삽입됐습니다. 조작이 취소됐습니다." -#: ../gui/wxpython/vnet/widgets.py:555 +#: ../gui/wxpython/vnet/widgets.py:559 msgid "Edit point" msgstr "" @@ -14422,41 +14669,41 @@ msgstr "" msgid "Raster Digitizer - GRASS GIS" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:121 +#: ../gui/wxpython/rdigit/controller.py:122 msgid "Please select first the raster map" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:154 +#: ../gui/wxpython/rdigit/controller.py:155 msgid "Right click to finish area" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:159 +#: ../gui/wxpython/rdigit/controller.py:160 msgid "Right click to finish line" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:293 +#: ../gui/wxpython/rdigit/controller.py:294 msgid "Do you want to save changes?" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:294 +#: ../gui/wxpython/rdigit/controller.py:295 msgid "Save raster map changes" msgstr "" -#: ../gui/wxpython/rdigit/controller.py:382 +#: ../gui/wxpython/rdigit/controller.py:383 msgid "Failed to create backup copy of edited raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:419 -#: ../gui/wxpython/rdigit/controller.py:436 +#: ../gui/wxpython/rdigit/controller.py:420 +#: ../gui/wxpython/rdigit/controller.py:437 msgid "Failed to create new raster map." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:537 -#: ../gui/wxpython/rdigit/controller.py:570 +#: ../gui/wxpython/rdigit/controller.py:538 +#: ../gui/wxpython/rdigit/controller.py:571 msgid "Rasterizing..." msgstr "" -#: ../gui/wxpython/rdigit/controller.py:618 +#: ../gui/wxpython/rdigit/controller.py:619 msgid "Failed to set default color table for edited raster map" msgstr "" @@ -14498,7 +14745,7 @@ msgid "" "units." msgstr "" -#: ../gui/wxpython/rdigit/toolbars.py:167 +#: ../gui/wxpython/rdigit/toolbars.py:168 msgid "New raster map" msgstr "" @@ -14529,19 +14776,19 @@ msgid "" "overwrite it?" msgstr "" -#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:106 +#: ../gui/wxpython/core/units.py:35 ../gui/wxpython/psmap/utils.py:107 msgid "meters" msgstr "" -#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:107 +#: ../gui/wxpython/core/units.py:36 ../gui/wxpython/psmap/utils.py:108 msgid "kilometers" msgstr "" -#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:109 +#: ../gui/wxpython/core/units.py:37 ../gui/wxpython/psmap/utils.py:110 msgid "miles" msgstr "" -#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:108 +#: ../gui/wxpython/core/units.py:38 ../gui/wxpython/psmap/utils.py:109 msgid "feet" msgstr "" @@ -14565,26 +14812,26 @@ msgstr "" msgid "hectares" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:185 +#: ../gui/wxpython/core/toolboxes.py:199 msgid "Unable to parse user toolboxes XML files. Default files will be loaded." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:234 +#: ../gui/wxpython/core/toolboxes.py:251 msgid "Unable to create toolboxes directory." msgstr "" -#: ../gui/wxpython/core/toolboxes.py:448 +#: ../gui/wxpython/core/toolboxes.py:469 msgid "Custom toolboxes" msgstr "" -#: ../gui/wxpython/core/toolboxes.py:474 +#: ../gui/wxpython/core/toolboxes.py:497 #, python-format msgid "" "List of addons cannot be obtained because g.extension failed. Details: %s" msgstr "" "g.extension이 실패했기 때문에 애드온의 목록을 얻을 수 없습니다. 세부 사항: %s" -#: ../gui/wxpython/core/toolboxes.py:534 +#: ../gui/wxpython/core/toolboxes.py:557 msgid "Addons" msgstr "" @@ -14596,8 +14843,8 @@ msgstr "" msgid "Execution failed:" msgstr "" -#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1113 -#: ../gui/wxpython/core/render.py:1120 ../gui/wxpython/core/render.py:1127 +#: ../gui/wxpython/core/gcmd.py:416 ../gui/wxpython/core/render.py:1114 +#: ../gui/wxpython/core/render.py:1121 ../gui/wxpython/core/render.py:1128 msgid "Details:" msgstr "" @@ -14647,7 +14894,7 @@ msgstr "" msgid "Unable to create file '%s'\n" msgstr "" -#: ../gui/wxpython/core/gconsole.py:550 +#: ../gui/wxpython/core/gconsole.py:578 #, python-format msgid "" "Unable to run command:\n" @@ -14656,21 +14903,21 @@ msgid "" "Option <%(opt)s>: read from standard input is not supported by wxGUI" msgstr "" -#: ../gui/wxpython/core/gconsole.py:574 +#: ../gui/wxpython/core/gconsole.py:602 #, python-format msgid "Module <%s> not found." msgstr "" -#: ../gui/wxpython/core/gconsole.py:727 +#: ../gui/wxpython/core/gconsole.py:757 msgid "" "Please note that the data are left in inconsistent state and may be corrupted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:731 +#: ../gui/wxpython/core/gconsole.py:761 msgid "Command aborted" msgstr "" -#: ../gui/wxpython/core/gconsole.py:733 +#: ../gui/wxpython/core/gconsole.py:764 #, python-brace-format msgid "Command ended with non-zero return code {returncode}" msgstr "" @@ -14691,147 +14938,147 @@ msgid "" "WARNING: Ignoring unsupported wx debug level (must be >=0 and <=5). {0}\n" msgstr "" -#: ../gui/wxpython/core/settings.py:434 +#: ../gui/wxpython/core/settings.py:438 msgid "Segment break" msgstr "" -#: ../gui/wxpython/core/settings.py:500 +#: ../gui/wxpython/core/settings.py:504 msgid "Data point" msgstr "" -#: ../gui/wxpython/core/settings.py:577 +#: ../gui/wxpython/core/settings.py:581 msgid "animation" msgstr "애니메이션" -#: ../gui/wxpython/core/settings.py:781 +#: ../gui/wxpython/core/settings.py:785 msgid "Collapse all except PERMANENT and current" msgstr "" -#: ../gui/wxpython/core/settings.py:782 +#: ../gui/wxpython/core/settings.py:786 msgid "Collapse all except PERMANENT" msgstr "" -#: ../gui/wxpython/core/settings.py:783 +#: ../gui/wxpython/core/settings.py:787 msgid "Collapse all except current" msgstr "" -#: ../gui/wxpython/core/settings.py:784 +#: ../gui/wxpython/core/settings.py:788 msgid "Collapse all" msgstr "" -#: ../gui/wxpython/core/settings.py:785 +#: ../gui/wxpython/core/settings.py:789 msgid "Expand all" msgstr "" -#: ../gui/wxpython/core/settings.py:790 ../gui/wxpython/dbmgr/base.py:1438 +#: ../gui/wxpython/core/settings.py:794 ../gui/wxpython/dbmgr/base.py:1447 msgid "Edit selected record" msgstr "" -#: ../gui/wxpython/core/settings.py:791 +#: ../gui/wxpython/core/settings.py:795 msgid "Display selected" msgstr "" -#: ../gui/wxpython/core/settings.py:802 +#: ../gui/wxpython/core/settings.py:806 msgid "Classic (labels only)" msgstr "" -#: ../gui/wxpython/core/settings.py:803 +#: ../gui/wxpython/core/settings.py:807 msgid "Combined (labels and tool names)" msgstr "" -#: ../gui/wxpython/core/settings.py:804 +#: ../gui/wxpython/core/settings.py:808 msgid "Expert (tool names only)" msgstr "" -#: ../gui/wxpython/core/settings.py:810 +#: ../gui/wxpython/core/settings.py:814 msgid "Basic top" msgstr "" -#: ../gui/wxpython/core/settings.py:811 +#: ../gui/wxpython/core/settings.py:815 msgid "Basic left" msgstr "" -#: ../gui/wxpython/core/settings.py:812 +#: ../gui/wxpython/core/settings.py:816 msgid "List left" msgstr "" -#: ../gui/wxpython/core/settings.py:820 +#: ../gui/wxpython/core/settings.py:824 msgid "Zoom and recenter" msgstr "" -#: ../gui/wxpython/core/settings.py:821 +#: ../gui/wxpython/core/settings.py:825 msgid "Zoom to mouse cursor" msgstr "" -#: ../gui/wxpython/core/settings.py:822 +#: ../gui/wxpython/core/settings.py:826 msgid "Nothing" msgstr "" -#: ../gui/wxpython/core/settings.py:825 +#: ../gui/wxpython/core/settings.py:829 msgid "Scroll forward to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:826 +#: ../gui/wxpython/core/settings.py:830 msgid "Scroll back to zoom in" msgstr "" -#: ../gui/wxpython/core/settings.py:861 ../gui/wxpython/core/settings.py:875 +#: ../gui/wxpython/core/settings.py:865 ../gui/wxpython/core/settings.py:879 msgid "box" msgstr "" -#: ../gui/wxpython/core/settings.py:862 +#: ../gui/wxpython/core/settings.py:866 msgid "sphere" msgstr "" -#: ../gui/wxpython/core/settings.py:863 +#: ../gui/wxpython/core/settings.py:867 msgid "cube" msgstr "" -#: ../gui/wxpython/core/settings.py:864 +#: ../gui/wxpython/core/settings.py:868 msgid "diamond" msgstr "" -#: ../gui/wxpython/core/settings.py:865 +#: ../gui/wxpython/core/settings.py:869 msgid "aster" msgstr "" -#: ../gui/wxpython/core/settings.py:866 +#: ../gui/wxpython/core/settings.py:870 msgid "gyro" msgstr "" -#: ../gui/wxpython/core/settings.py:867 +#: ../gui/wxpython/core/settings.py:871 msgid "histogram" msgstr "" -#: ../gui/wxpython/core/settings.py:874 +#: ../gui/wxpython/core/settings.py:878 msgid "cross" msgstr "" -#: ../gui/wxpython/core/settings.py:876 +#: ../gui/wxpython/core/settings.py:880 msgid "circle" msgstr "" -#: ../gui/wxpython/core/settings.py:880 +#: ../gui/wxpython/core/settings.py:884 msgid "Script package" msgstr "" -#: ../gui/wxpython/core/settings.py:881 +#: ../gui/wxpython/core/settings.py:885 msgid "PyGRASS" msgstr "" -#: ../gui/wxpython/core/settings.py:926 +#: ../gui/wxpython/core/settings.py:930 #, python-brace-format msgid "" "Unable to read settings file <{path}>:\n" "{err}" msgstr "" -#: ../gui/wxpython/core/settings.py:944 +#: ../gui/wxpython/core/settings.py:948 #, python-format msgid "Unable to read settings file <%s>\n" msgstr "" -#: ../gui/wxpython/core/settings.py:971 +#: ../gui/wxpython/core/settings.py:975 #, python-format msgid "" "Error: Reading settings from file <%(file)s> failed.\n" @@ -14839,11 +15086,11 @@ msgid "" "\t\tLine: '%(line)s'\n" msgstr "" -#: ../gui/wxpython/core/settings.py:992 +#: ../gui/wxpython/core/settings.py:996 msgid "Unable to create settings directory" msgstr "" -#: ../gui/wxpython/core/settings.py:1002 +#: ../gui/wxpython/core/settings.py:1006 #, python-format msgid "" "Writing settings to file <%(file)s> failed.\n" @@ -14851,11 +15098,11 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/core/settings.py:1111 +#: ../gui/wxpython/core/settings.py:1115 msgid "Unable to set " msgstr "" -#: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170 +#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174 #, python-format msgid "Unable to parse settings '%s'" msgstr "" @@ -14923,22 +15170,22 @@ msgid "" "ERROR: Unable to read WIND file: %s\n" msgstr "" -#: ../gui/wxpython/core/render.py:1111 +#: ../gui/wxpython/core/render.py:1112 #, python-format msgid "Unable to zoom to raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1118 +#: ../gui/wxpython/core/render.py:1119 #, python-format msgid "Unable to zoom to vector map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1125 +#: ../gui/wxpython/core/render.py:1126 #, python-format msgid "Unable to zoom to 3d raster map <%s>." msgstr "" -#: ../gui/wxpython/core/render.py:1132 +#: ../gui/wxpython/core/render.py:1133 msgid "" "Unable to get current geographic extent. Force quitting wxGUI. Please " "manually run g.region to fix the problem." @@ -14968,22 +15215,22 @@ msgstr "" msgid "Unsupported command %s." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:288 +#: ../gui/wxpython/mapdisp/main.py:289 #, python-format msgid "Unable to read cmdfile '%(cmd)s'. Details: %(det)s" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:654 +#: ../gui/wxpython/mapdisp/main.py:655 #, python-format msgid "Starting map display <%s>..." msgstr "" -#: ../gui/wxpython/mapdisp/main.py:660 +#: ../gui/wxpython/mapdisp/main.py:661 #, python-format msgid "Unable to create file <%s>" msgstr "" -#: ../gui/wxpython/mapdisp/main.py:674 +#: ../gui/wxpython/mapdisp/main.py:675 #, python-format msgid "Stopping map display <%s>..." msgstr "" @@ -14992,33 +15239,33 @@ msgstr "" msgid "Map window test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:167 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:169 msgid "Map display test" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:176 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:178 msgid "Map window API test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:202 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:204 msgid "Map window distance measurement test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:236 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:238 msgid "Map window profile tool test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:289 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:291 msgid "Map window rlisetup test frame" msgstr "" -#: ../gui/wxpython/mapdisp/test_mapdisp.py:359 +#: ../gui/wxpython/mapdisp/test_mapdisp.py:361 #, python-format msgid "Unknown value %s of test parameter." msgstr "알려지지 않은 검정 매개변수의 값 %s" #: ../gui/wxpython/mapdisp/properties.py:84 -#: ../gui/wxpython/mapdisp/statusbar.py:404 +#: ../gui/wxpython/mapdisp/statusbar.py:406 msgid "Enable/disable auto-rendering" msgstr "" @@ -15064,22 +15311,29 @@ msgstr "" msgid "Status bar" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:399 +#: ../gui/wxpython/mapdisp/statusbar.py:401 msgid "Render" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:437 +#: ../gui/wxpython/mapdisp/statusbar.py:439 msgid "Map scale" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:461 +#: ../gui/wxpython/mapdisp/statusbar.py:463 msgid "" "As everyone's monitors and resolutions are set differently these values are " "not true map scales, but should get you into the right neighborhood." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/mapdisp/statusbar.py:518 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/mapdisp/statusbar.py:516 +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) #, fuzzy msgid "Go to XY coordinates" ======= @@ -18098,28 +18352,28 @@ msgid "Invalid input coordinates" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) msgstr "무효한 입력 좌표" -#: ../gui/wxpython/mapdisp/statusbar.py:543 -#: ../gui/wxpython/mapdisp/statusbar.py:621 -#: ../gui/wxpython/mapdisp/statusbar.py:798 -#: ../gui/wxpython/mapdisp/statusbar.py:878 +#: ../gui/wxpython/mapdisp/statusbar.py:546 +#: ../gui/wxpython/mapdisp/statusbar.py:624 +#: ../gui/wxpython/mapdisp/statusbar.py:802 +#: ../gui/wxpython/mapdisp/statusbar.py:883 msgid "Projection not defined (check the settings)" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:636 -#: ../gui/wxpython/mapdisp/statusbar.py:811 -#: ../gui/wxpython/mapdisp/statusbar.py:926 +#: ../gui/wxpython/mapdisp/statusbar.py:639 +#: ../gui/wxpython/mapdisp/statusbar.py:815 +#: ../gui/wxpython/mapdisp/statusbar.py:931 msgid "Error in projection (check the settings)" msgstr "투영 내에 오류 (설정을 확인하세요)" -#: ../gui/wxpython/mapdisp/statusbar.py:706 +#: ../gui/wxpython/mapdisp/statusbar.py:709 msgid "Display geometry" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:735 +#: ../gui/wxpython/mapdisp/statusbar.py:738 msgid "Coordinates" msgstr "" -#: ../gui/wxpython/mapdisp/statusbar.py:825 +#: ../gui/wxpython/mapdisp/statusbar.py:829 msgid "Display extent" msgstr "" @@ -18193,14 +18447,14 @@ msgid "Click mouse to unzoom" msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:96 -#: ../gui/wxpython/mapdisp/toolbars.py:363 ../gui/wxpython/mapdisp/frame.py:320 -#: ../gui/wxpython/mapdisp/frame.py:423 ../gui/wxpython/lmgr/layertree.py:1141 -#: ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:364 ../gui/wxpython/mapdisp/frame.py:305 +#: ../gui/wxpython/mapdisp/frame.py:408 ../gui/wxpython/lmgr/layertree.py:1179 +#: ../gui/wxpython/animation/data.py:47 msgid "2D view" msgstr "" -#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:639 -#: ../gui/wxpython/lmgr/frame.py:714 ../gui/wxpython/animation/data.py:46 +#: ../gui/wxpython/mapdisp/toolbars.py:101 ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/lmgr/frame.py:715 ../gui/wxpython/animation/data.py:47 msgid "3D view" msgstr "" @@ -18220,13 +18474,19 @@ msgstr "" #: ../gui/wxpython/mapdisp/toolbars.py:123 msgid "" -"Note that the wxGUI's vector digitizer is disabled in this installation. " +"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 " "can use \"v.edit\" for non-interactive editing from the Develop vector map " "menu." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/mapdisp/frame.py:163 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/mapdisp/frame.py:178 ======= #: ../gui/wxpython/tplot/frame.py:848 @@ -18606,40 +18866,44 @@ msgstr "" #: ../gui/wxpython/nviz/mapwindow.py:2214 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Failed to run command '%(command)s'. Details:\n" "%(error)s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Hide toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:283 +#: ../gui/wxpython/mapdisp/frame.py:268 msgid "Show toolbars" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Hide statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:297 +#: ../gui/wxpython/mapdisp/frame.py:282 msgid "Show statusbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144 +#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182 #, python-format msgid "" "Unable to start wxGUI vector digitizer.\n" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:394 +#: ../gui/wxpython/mapdisp/frame.py:379 msgid "Vector Digitizer Toolbar" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:427 +#: ../gui/wxpython/mapdisp/frame.py:412 #, python-format msgid "" "Unable to switch to 3D display mode.\n" @@ -18649,37 +18913,43 @@ msgid "" "Details: %s" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:473 +#: ../gui/wxpython/mapdisp/frame.py:458 msgid "Starting 3D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:475 +#: ../gui/wxpython/mapdisp/frame.py:460 msgid "Please wait, loading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:564 +#: ../gui/wxpython/mapdisp/frame.py:549 msgid "Please wait, unloading data..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:572 +#: ../gui/wxpython/mapdisp/frame.py:557 msgid "Switching back to 2D view mode..." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870 -#: ../gui/wxpython/mapdisp/frame.py:892 +#: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839 +#: ../gui/wxpython/mapdisp/frame.py:861 msgid "Failed to run d.to.rast:\n" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:913 +#: ../gui/wxpython/mapdisp/frame.py:882 msgid "d.to.rast can be used only in 2D mode." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1059 +#: ../gui/wxpython/mapdisp/frame.py:1026 #, python-format msgid "Vector map <%s> opened for editing - skipped." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/mapdisp/frame.py:1103 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/mapdisp/frame.py:1136 ======= #: ../gui/wxpython/nviz/tools.py:2799 @@ -19726,28 +19996,32 @@ msgstr "" #: ../gui/wxpython/lmgr/frame.py:1393 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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." msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1556 +#: ../gui/wxpython/mapdisp/frame.py:1524 msgid "Set computational region extent from display" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1560 +#: ../gui/wxpython/mapdisp/frame.py:1528 msgid "Set computational region extent interactively" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1563 +#: ../gui/wxpython/mapdisp/frame.py:1531 msgid "Set computational region from named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1566 +#: ../gui/wxpython/mapdisp/frame.py:1534 msgid "Save computational region to named region" msgstr "" -#: ../gui/wxpython/mapdisp/frame.py:1677 +#: ../gui/wxpython/mapdisp/frame.py:1645 msgid "Raster Digitizer Toolbar" msgstr "" @@ -20701,7 +20975,7 @@ msgstr "" #: ../gui/wxpython/modules/colorrules.py:983 #: ../gui/wxpython/modules/colorrules.py:1685 #: ../gui/wxpython/modules/colorrules.py:1691 -#: ../gui/wxpython/psmap/dialogs.py:3508 +#: ../gui/wxpython/psmap/dialogs.py:3547 msgid "range" msgstr "" @@ -20768,8 +21042,8 @@ msgstr "" msgid "Use color column instead of color table:" msgstr "" -#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:508 -#: ../gui/wxpython/dbmgr/base.py:2379 +#: ../gui/wxpython/modules/colorrules.py:1147 ../gui/wxpython/dbmgr/base.py:515 +#: ../gui/wxpython/dbmgr/base.py:2390 msgid "Add column" msgstr "" @@ -20853,6 +21127,10 @@ msgid "Multiple import" msgid "3D Raster Map Calculator" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -20875,7 +21153,7 @@ msgid "List of %s layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:75 -#: ../gui/wxpython/modules/import_export.py:968 +#: ../gui/wxpython/modules/import_export.py:985 msgid "right click to (un)select all" msgstr "" @@ -20889,13 +21167,13 @@ msgstr "" #: ../gui/wxpython/modules/import_export.py:127 #: ../gui/wxpython/modules/import_export.py:435 -#: ../gui/wxpython/modules/import_export.py:581 +#: ../gui/wxpython/modules/import_export.py:597 msgid "&Import" msgstr "가져오기(&I)" #: ../gui/wxpython/modules/import_export.py:128 #: ../gui/wxpython/modules/import_export.py:436 -#: ../gui/wxpython/modules/import_export.py:582 +#: ../gui/wxpython/modules/import_export.py:598 msgid "Import selected layers" msgstr "" @@ -20918,82 +21196,82 @@ msgid "Output map name <%(name)s> exist. " msgstr "" #: ../gui/wxpython/modules/import_export.py:423 -#: ../gui/wxpython/modules/import_export.py:569 +#: ../gui/wxpython/modules/import_export.py:585 msgid "Add linked layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:425 -#: ../gui/wxpython/modules/import_export.py:571 -#: ../gui/wxpython/modules/import_export.py:832 +#: ../gui/wxpython/modules/import_export.py:587 +#: ../gui/wxpython/modules/import_export.py:848 msgid "Add imported layers into layer tree" msgstr "" #: ../gui/wxpython/modules/import_export.py:432 -#: ../gui/wxpython/modules/import_export.py:578 +#: ../gui/wxpython/modules/import_export.py:594 msgid "&Link" msgstr "" #: ../gui/wxpython/modules/import_export.py:433 -#: ../gui/wxpython/modules/import_export.py:579 +#: ../gui/wxpython/modules/import_export.py:595 msgid "Link selected layers" msgstr "" #: ../gui/wxpython/modules/import_export.py:456 -#: ../gui/wxpython/modules/import_export.py:602 +#: ../gui/wxpython/modules/import_export.py:618 msgid "No layers selected. Operation canceled." msgstr "" -#: ../gui/wxpython/modules/import_export.py:487 +#: ../gui/wxpython/modules/import_export.py:503 msgid "Unable to determine number of raster bands" msgstr "" -#: ../gui/wxpython/modules/import_export.py:717 +#: ../gui/wxpython/modules/import_export.py:733 msgid "Define output format for vector data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:719 +#: ../gui/wxpython/modules/import_export.py:735 msgid "Define output format for raster data" msgstr "" -#: ../gui/wxpython/modules/import_export.py:727 +#: ../gui/wxpython/modules/import_export.py:743 msgid "Set external format and close dialog" msgstr "" -#: ../gui/wxpython/modules/import_export.py:787 +#: ../gui/wxpython/modules/import_export.py:803 msgid "No data source selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:811 +#: ../gui/wxpython/modules/import_export.py:827 msgid "Import DXF layers" msgstr "" -#: ../gui/wxpython/modules/import_export.py:824 +#: ../gui/wxpython/modules/import_export.py:840 msgid "Choose DXF file to import" msgstr "" -#: ../gui/wxpython/modules/import_export.py:844 +#: ../gui/wxpython/modules/import_export.py:860 msgid "No layers selected." msgstr "" -#: ../gui/wxpython/modules/import_export.py:940 +#: ../gui/wxpython/modules/import_export.py:956 msgid "Name for output GRASS map" msgstr "" -#: ../gui/wxpython/modules/import_export.py:962 +#: ../gui/wxpython/modules/import_export.py:978 msgid "" "Projection of following layers do not match with projection of current " "location. " msgstr "" -#: ../gui/wxpython/modules/import_export.py:966 +#: ../gui/wxpython/modules/import_export.py:983 msgid "Layers to be reprojected" msgstr "" -#: ../gui/wxpython/modules/import_export.py:979 +#: ../gui/wxpython/modules/import_export.py:996 msgid "&Import && reproject" msgstr "" -#: ../gui/wxpython/modules/import_export.py:981 +#: ../gui/wxpython/modules/import_export.py:998 msgid "Reproject selected layers" msgstr "" @@ -21300,14 +21578,14 @@ msgstr "" msgid "'{cmd}' copied to clipboard" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:44 +#: ../gui/wxpython/iscatt/plots.py:45 #, python-brace-format msgid "" "The Scatterplot Tool needs the \"matplotlib\" (python-matplotlib) package to " "be installed. {0}" msgstr "" -#: ../gui/wxpython/iscatt/plots.py:605 +#: ../gui/wxpython/iscatt/plots.py:616 msgid "Zoom to scatter plot extend" msgstr "" @@ -21315,15 +21593,15 @@ msgstr "" msgid "Loading ctypes libs failed" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:145 ../gui/wxpython/dbmgr/base.py:175 +#: ../gui/wxpython/iscatt/controllers.py:146 ../gui/wxpython/dbmgr/base.py:176 msgid "Loading data..." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:213 +#: ../gui/wxpython/iscatt/controllers.py:214 msgid "No data set." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:232 +#: ../gui/wxpython/iscatt/controllers.py:233 #, python-format msgid "" "Interactive Scatter Plot Tool can not be used.\n" @@ -21337,7 +21615,7 @@ msgstr "" "\n" " 명령을 이용해서 현재 영역 내 셀의 개수를 줄일 수 있습니다." -#: ../gui/wxpython/iscatt/controllers.py:245 +#: ../gui/wxpython/iscatt/controllers.py:246 #, python-format msgid "" "Number of cells (rows*cols) <%d> in current region is higher than " @@ -21349,32 +21627,32 @@ msgid "" "Do you want to continue using Interactive Scatter Plot Tool with this region?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:305 +#: ../gui/wxpython/iscatt/controllers.py:306 msgid "" "Scatter plot with same band combination (regardless x y order) is already " "displayed." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:320 +#: ../gui/wxpython/iscatt/controllers.py:321 #, python-format msgid "Band <%s> is not CELL (integer) type.\n" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:324 +#: ../gui/wxpython/iscatt/controllers.py:325 msgid "Scatter plot cannot be added.\n" msgstr "산점도를 추가할 수 없습니다.\n" -#: ../gui/wxpython/iscatt/controllers.py:333 +#: ../gui/wxpython/iscatt/controllers.py:334 #, python-format msgid "" "Scatter plot cannot be added.\n" -"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit <" -"%d>.\n" +"Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than maximum limit " +"<%d>.\n" msgstr "" "산점도를 추가할 수 없습니다.\n" "복수의 밴드 범위 <%s:%d * %s:%d = %d>가 최대 한도 <%d>보다 큽니다.\n" -#: ../gui/wxpython/iscatt/controllers.py:351 +#: ../gui/wxpython/iscatt/controllers.py:352 #, python-format msgid "" "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " @@ -21385,114 +21663,114 @@ msgid "" "Do you really want to add this scatter plot?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:450 +#: ../gui/wxpython/iscatt/controllers.py:451 msgid "" "In order to select arrea in scatter plot, you have to select class first.\n" "\n" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:490 +#: ../gui/wxpython/iscatt/controllers.py:491 #, python-format msgid "" "Error occurred during computation of scatter plot category:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:792 +#: ../gui/wxpython/iscatt/controllers.py:793 #, python-format msgid "Export scatter plot raster of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:812 +#: ../gui/wxpython/iscatt/controllers.py:813 #, python-format msgid "Scatter plot raster of class <%s> exported to raster map <%s>." msgstr "" -#: ../gui/wxpython/iscatt/controllers.py:817 +#: ../gui/wxpython/iscatt/controllers.py:818 #, python-format msgid "" "Export of scatter plot raster of class <%s> to map <%s> failed.\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:60 +#: ../gui/wxpython/iscatt/toolbars.py:61 msgid "Add scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:62 +#: ../gui/wxpython/iscatt/toolbars.py:63 msgid "Select area with polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:63 +#: ../gui/wxpython/iscatt/toolbars.py:64 msgid "Pan mode for scatter plots" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:66 +#: ../gui/wxpython/iscatt/toolbars.py:67 msgid "Zoom mode for scatter plots (left mouse button, wheel)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:71 +#: ../gui/wxpython/iscatt/toolbars.py:72 msgid "" "Zoom to scatter plot data extend mode (click on scatter plot for zooming to " "extend)" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:75 +#: ../gui/wxpython/iscatt/toolbars.py:77 msgid "Show/hide class manager" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:211 -#: ../gui/wxpython/iscatt/toolbars.py:212 +#: ../gui/wxpython/iscatt/toolbars.py:213 +#: ../gui/wxpython/iscatt/toolbars.py:214 msgid "Include selected area to class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:216 -#: ../gui/wxpython/iscatt/toolbars.py:217 +#: ../gui/wxpython/iscatt/toolbars.py:218 +#: ../gui/wxpython/iscatt/toolbars.py:219 msgid "Exclude selected area from class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:221 +#: ../gui/wxpython/iscatt/toolbars.py:223 msgid "Add new vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:222 +#: ../gui/wxpython/iscatt/toolbars.py:224 msgid "Add new vertex to polygon boundary scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:226 +#: ../gui/wxpython/iscatt/toolbars.py:228 msgid "Create selection polygon" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:227 +#: ../gui/wxpython/iscatt/toolbars.py:229 msgid "Add new vertex between last and first points of the boundary" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:231 +#: ../gui/wxpython/iscatt/toolbars.py:233 msgid "Move vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:232 +#: ../gui/wxpython/iscatt/toolbars.py:234 msgid "Move boundary vertex" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:236 +#: ../gui/wxpython/iscatt/toolbars.py:238 msgid "Remove vertex" msgstr "정점을 제거합니다" -#: ../gui/wxpython/iscatt/toolbars.py:237 +#: ../gui/wxpython/iscatt/toolbars.py:239 msgid "Remove boundary vertex" msgstr "경계 정점을 제거합니다" -#: ../gui/wxpython/iscatt/toolbars.py:242 +#: ../gui/wxpython/iscatt/toolbars.py:244 msgid "Remove polygon (click on scatter plot for removing it's polygon)" msgstr "다각형을 제거합니다 (산점도를 클릭하세요)" -#: ../gui/wxpython/iscatt/toolbars.py:342 +#: ../gui/wxpython/iscatt/toolbars.py:344 msgid "Add class" msgstr "" -#: ../gui/wxpython/iscatt/toolbars.py:344 +#: ../gui/wxpython/iscatt/toolbars.py:346 msgid "Remove selected class" msgstr "선택된 계층을 제거합니다" @@ -21560,99 +21838,100 @@ msgstr "" msgid "Selected area opacity:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:423 +#: ../gui/wxpython/iscatt/dialogs.py:424 msgid "Selection style:" msgstr "" -#: ../gui/wxpython/iscatt/dialogs.py:458 +#: ../gui/wxpython/iscatt/dialogs.py:459 msgid "Ellipses settings:" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:99 -#: ../gui/wxpython/iscatt/iscatt_core.py:148 +#: ../gui/wxpython/iscatt/iscatt_core.py:100 +#: ../gui/wxpython/iscatt/iscatt_core.py:149 msgid "Select category for editing." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:141 +#: ../gui/wxpython/iscatt/iscatt_core.py:142 msgid "Computing of scatter plots failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:275 +#: ../gui/wxpython/iscatt/iscatt_core.py:276 msgid "Patching category raster conditions file failed." msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:297 +#: ../gui/wxpython/iscatt/iscatt_core.py:298 #, python-format msgid "" "v.build failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/iscatt_core.py:317 +#: ../gui/wxpython/iscatt/iscatt_core.py:318 #, python-format msgid "" "v.to.rast failed:\n" "%s" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:161 +#: ../gui/wxpython/iscatt/frame.py:160 msgid "Interactive Scatter Plot Tool" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:391 +#: ../gui/wxpython/iscatt/frame.py:390 msgid "scatter plot" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:471 +#: ../gui/wxpython/iscatt/frame.py:470 msgid "Maximum limit of categories number was reached." msgstr "" -#: ../gui/wxpython/iscatt/frame.py:567 +#: ../gui/wxpython/iscatt/frame.py:566 msgid "Rename class" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:570 +#: ../gui/wxpython/iscatt/frame.py:569 msgid "Set color" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:573 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/iscatt/frame.py:572 ../gui/wxpython/lmgr/layertree.py:501 +#: ../gui/wxpython/lmgr/layertree.py:599 msgid "Change opacity level" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:577 +#: ../gui/wxpython/iscatt/frame.py:576 msgid "Hide" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:579 +#: ../gui/wxpython/iscatt/frame.py:578 msgid "Show" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:590 +#: ../gui/wxpython/iscatt/frame.py:589 msgid "Move to top" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:595 +#: ../gui/wxpython/iscatt/frame.py:594 msgid "Move to bottom" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:602 +#: ../gui/wxpython/iscatt/frame.py:601 msgid "Move category up" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:607 +#: ../gui/wxpython/iscatt/frame.py:606 msgid "Move category down" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:614 +#: ../gui/wxpython/iscatt/frame.py:613 msgid "Export class raster" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:686 +#: ../gui/wxpython/iscatt/frame.py:685 #, python-format msgid "Change opacity of class <%s>" msgstr "" -#: ../gui/wxpython/iscatt/frame.py:710 +#: ../gui/wxpython/iscatt/frame.py:709 msgid "Empty name was inserted." msgstr "" @@ -22006,7 +22285,7 @@ msgid "Select sample area {areas_count} of {area_num}" msgstr "" #: ../gui/wxpython/rlisetup/wizard.py:1865 -#: ../gui/wxpython/rlisetup/functions.py:155 +#: ../gui/wxpython/rlisetup/functions.py:156 #, python-format msgid "" "The raster map <%s> already exists. Please remove or rename the maps with " @@ -22016,7 +22295,7 @@ msgstr "" "름을 바꾸세요. 아니면 기존 지도를 덮어쓰는 옵션을 선택하세요" #: ../gui/wxpython/rlisetup/wizard.py:1920 -#: ../gui/wxpython/rlisetup/functions.py:139 +#: ../gui/wxpython/rlisetup/functions.py:140 msgid "The polygon seems to have 0 areas" msgstr "" @@ -22166,6 +22445,7 @@ msgstr "" #: ../gui/wxpython/rlisetup/frame.py:114 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22177,6 +22457,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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 "" @@ -22229,7 +22514,7 @@ msgstr "" msgid "Rename configuration file" msgstr "" -#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:108 +#: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109 msgid "GRASS GIS" msgstr "" @@ -22237,46 +22522,52 @@ msgstr "" msgid "There were some issues when loading menu or Tools:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:359 +#: ../gui/wxpython/main_window/frame.py:304 ../gui/wxpython/lmgr/frame.py:360 msgid "Rename current Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483 +#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484 #, python-brace-format msgid "Map Display {number}" msgstr "" #: ../gui/wxpython/main_window/frame.py:526 -#: ../gui/wxpython/main_window/frame.py:1005 ../gui/wxpython/lmgr/frame.py:582 -#: ../gui/wxpython/lmgr/frame.py:906 +#: ../gui/wxpython/main_window/frame.py:1026 ../gui/wxpython/lmgr/frame.py:583 +#: ../gui/wxpython/lmgr/frame.py:907 msgid "Close Map Display {}" msgstr "" -#: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180 +#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181 msgid "Workspace Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184 +#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185 msgid "Tools Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187 msgid "3D view Toolbar" msgstr "" -#: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638 +#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639 msgid "Console" msgstr "" -#: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797 +#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798 msgid "Map Swipe Tool" msgstr "" -#: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849 +#: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850 msgid "Choose model to run" msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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 @@ -22430,144 +22721,149 @@ msgstr "" #: ../gui/wxpython/wxplot/profile.py:389 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 " "layer instead." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1305 -#: ../gui/wxpython/main_window/frame.py:1985 ../gui/wxpython/lmgr/frame.py:1181 -#: ../gui/wxpython/lmgr/frame.py:1862 +#: ../gui/wxpython/main_window/frame.py:1341 +#: ../gui/wxpython/main_window/frame.py:2021 ../gui/wxpython/lmgr/frame.py:1190 +#: ../gui/wxpython/lmgr/frame.py:1871 msgid "Selected map layer is not vector." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1312 ../gui/wxpython/lmgr/frame.py:1188 +#: ../gui/wxpython/main_window/frame.py:1348 ../gui/wxpython/lmgr/frame.py:1197 msgid "Editing is allowed only for vector maps from the current mapset." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1340 ../gui/wxpython/lmgr/frame.py:1216 +#: ../gui/wxpython/main_window/frame.py:1376 ../gui/wxpython/lmgr/frame.py:1225 msgid "Choose script file to run" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1342 ../gui/wxpython/lmgr/frame.py:1218 +#: ../gui/wxpython/main_window/frame.py:1378 ../gui/wxpython/lmgr/frame.py:1227 msgid "Python script (*.py)|*.py|Bash script (*.sh)|*.sh" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1355 ../gui/wxpython/lmgr/frame.py:1231 +#: ../gui/wxpython/main_window/frame.py:1391 ../gui/wxpython/lmgr/frame.py:1240 #, python-format msgid "Script file '%s' doesn't exist. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1365 ../gui/wxpython/lmgr/frame.py:1241 +#: ../gui/wxpython/main_window/frame.py:1401 ../gui/wxpython/lmgr/frame.py:1250 #, python-format msgid "" "Script <%s> is not executable. Do you want to set the permissions that " "allows you to run this script (note that you must be the owner of the file)?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1371 ../gui/wxpython/lmgr/frame.py:1247 +#: ../gui/wxpython/main_window/frame.py:1407 ../gui/wxpython/lmgr/frame.py:1256 msgid "Set permission?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1381 ../gui/wxpython/lmgr/frame.py:1257 +#: ../gui/wxpython/main_window/frame.py:1417 ../gui/wxpython/lmgr/frame.py:1266 msgid "Unable to set permission. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270 +#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279 #, python-format msgid "" "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this " "directory to GRASS_ADDON_PATH?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1398 ../gui/wxpython/lmgr/frame.py:1274 +#: ../gui/wxpython/main_window/frame.py:1434 ../gui/wxpython/lmgr/frame.py:1283 msgid "Update Addons path?" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1405 ../gui/wxpython/lmgr/frame.py:1281 +#: ../gui/wxpython/main_window/frame.py:1441 ../gui/wxpython/lmgr/frame.py:1290 #, python-format msgid "Launching script '%s'..." msgstr "'%s' 스크립트를 시작합니다..." -#: ../gui/wxpython/main_window/frame.py:1420 ../gui/wxpython/lmgr/frame.py:1296 -msgid "No location/mapset provided. Operation canceled." -msgstr "" +#: ../gui/wxpython/main_window/frame.py:1456 +#, fuzzy +msgid "No project provided. Operation canceled." +msgstr "무효한 값이 삽입됐습니다. 조작이 취소됐습니다." -#: ../gui/wxpython/main_window/frame.py:1460 ../gui/wxpython/lmgr/frame.py:1336 +#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1345 msgid "No mapset provided. Operation canceled." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372 +#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381 #, python-format msgid "" "Working directory changed to:\n" "\"%s\"" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1504 ../gui/wxpython/lmgr/frame.py:1380 +#: ../gui/wxpython/main_window/frame.py:1540 ../gui/wxpython/lmgr/frame.py:1389 msgid "Changes current working directory for this GUI." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1506 ../gui/wxpython/lmgr/frame.py:1382 +#: ../gui/wxpython/main_window/frame.py:1542 ../gui/wxpython/lmgr/frame.py:1391 msgid "Usage: cd [directory]" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1507 ../gui/wxpython/lmgr/frame.py:1383 +#: ../gui/wxpython/main_window/frame.py:1543 ../gui/wxpython/lmgr/frame.py:1392 msgid "Without parameters it opens a dialog." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1513 ../gui/wxpython/lmgr/frame.py:1389 +#: ../gui/wxpython/main_window/frame.py:1549 ../gui/wxpython/lmgr/frame.py:1398 msgid "" "If ~ (tilde) is present as the first directory on the path, it is replaced " "by user's home directory." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1531 ../gui/wxpython/lmgr/frame.py:1407 +#: ../gui/wxpython/main_window/frame.py:1567 ../gui/wxpython/lmgr/frame.py:1416 msgid "More than one parameter provided." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428 +#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437 msgid "Choose a working directory" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477 +#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486 msgid "System Info" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1617 ../gui/wxpython/lmgr/frame.py:1493 +#: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502 msgid "GRASS version" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1619 ../gui/wxpython/lmgr/frame.py:1495 +#: ../gui/wxpython/main_window/frame.py:1655 ../gui/wxpython/lmgr/frame.py:1504 msgid "Code revision" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1621 ../gui/wxpython/lmgr/frame.py:1497 +#: ../gui/wxpython/main_window/frame.py:1657 ../gui/wxpython/lmgr/frame.py:1506 msgid "Build date" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499 +#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508 msgid "Build platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1635 ../gui/wxpython/lmgr/frame.py:1511 +#: ../gui/wxpython/main_window/frame.py:1671 ../gui/wxpython/lmgr/frame.py:1520 msgid "Platform" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571 +#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580 msgid "Close all Map Displays" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589 +#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598 msgid "Enter new name:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590 +#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599 msgid "Rename Map Display" msgstr "" -#: ../gui/wxpython/main_window/frame.py:1807 ../gui/wxpython/lmgr/frame.py:1684 +#: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693 #, python-format msgid "" "Unable to launch \"Supervised Classification Tool\".\n" @@ -22578,37 +22874,37 @@ msgstr "" "\n" "이유: %s" -#: ../gui/wxpython/main_window/frame.py:1853 ../gui/wxpython/lmgr/frame.py:1730 +#: ../gui/wxpython/main_window/frame.py:1889 ../gui/wxpython/lmgr/frame.py:1739 msgid "Unable to start Timeline Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740 +#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749 msgid "Unable to start Temporal Plot Tool." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2031 ../gui/wxpython/lmgr/frame.py:1910 +#: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919 msgid "Add selected map layers into layer tree" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2063 -#: ../gui/wxpython/main_window/frame.py:2101 ../gui/wxpython/lmgr/frame.py:1942 -#: ../gui/wxpython/lmgr/frame.py:1980 +#: ../gui/wxpython/main_window/frame.py:2099 +#: ../gui/wxpython/main_window/frame.py:2137 ../gui/wxpython/lmgr/frame.py:1951 +#: ../gui/wxpython/lmgr/frame.py:1989 #, python-format msgid "Unsupported map layer type <%s>." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123 +#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132 msgid "" "Note that cell values can only be displayed for regions of less than 10,000 " "cells." msgstr "" -#: ../gui/wxpython/main_window/frame.py:2302 -#: ../gui/wxpython/lmgr/layertree.py:2067 ../gui/wxpython/lmgr/frame.py:2214 +#: ../gui/wxpython/main_window/frame.py:2338 +#: ../gui/wxpython/lmgr/layertree.py:2150 ../gui/wxpython/lmgr/frame.py:2228 msgid "opacity:" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223 +#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237 #, python-format msgid "" "Do you want to remove map layer(s)\n" @@ -22619,25 +22915,26 @@ msgstr "" "%s\n" "지도 레이어를 제거하길 원하십니까?" -#: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228 +#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242 msgid "Do you want to remove selected map layer(s) from layer tree?" msgstr "레이어 계도로부터 선택된 지도 레이어를 제거하길 원하십니까?" -#: ../gui/wxpython/main_window/frame.py:2322 ../gui/wxpython/lmgr/frame.py:2234 +#: ../gui/wxpython/main_window/frame.py:2358 ../gui/wxpython/lmgr/frame.py:2248 msgid "Remove map layer" msgstr "지도 레이어를 제거합니다" -#: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292 +#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306 msgid "Quit GRASS GUI" msgstr "" -#: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330 +#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344 msgid "" "Display resolution is currently not constrained to computational settings. " "It's suggested to constrain map to region geometry. Do you want to constrain " "the resolution?" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/wxplot/histogram.py:43 @@ -22646,7 +22943,13 @@ 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?" msgstr "" @@ -22674,55 +22977,55 @@ msgstr "" msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:308 msgid "Manage Location of Fiducial Points on a Scanned Photo" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:429 +#: ../gui/wxpython/photo2image/ip2i_manager.py:430 msgid "A POINTS file exists, renaming it to POINTS_BAK" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:457 +#: ../gui/wxpython/photo2image/ip2i_manager.py:458 msgid "Opening CAMERA file failed" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1137 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1139 msgid "Writing output image to group, please wait..." msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1689 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1708 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 msgid "source X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1690 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1709 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1695 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1714 msgid "source Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1691 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1710 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1696 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1715 msgid "target X" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1692 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1711 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1697 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1716 msgid "target Y" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1929 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1934 msgid "source X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1930 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1935 msgid "target X:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1931 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1936 msgid "source Y:" msgstr "" -#: ../gui/wxpython/photo2image/ip2i_manager.py:1932 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1937 msgid "target Y:" msgstr "" @@ -22795,7 +23098,7 @@ msgstr "" msgid "Background vector map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1592 +#: ../gui/wxpython/lmgr/layertree.py:161 ../gui/wxpython/lmgr/layertree.py:1673 msgid "Map Layers" msgstr "" @@ -22827,112 +23130,116 @@ msgstr "" msgid "Align computational region to selected map" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:588 +#: ../gui/wxpython/lmgr/layertree.py:615 msgid "Export common formats" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:602 +#: ../gui/wxpython/lmgr/layertree.py:629 msgid "Export PostGIS" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:627 ../gui/wxpython/lmgr/layertree.py:750 +#: ../gui/wxpython/lmgr/layertree.py:654 ../gui/wxpython/lmgr/layertree.py:788 msgid "Create pack" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:641 ../gui/wxpython/lmgr/layertree.py:766 +#: ../gui/wxpython/lmgr/layertree.py:668 ../gui/wxpython/lmgr/layertree.py:804 msgid "Make a copy in the current mapset" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:647 ../gui/wxpython/lmgr/layertree.py:772 -#: ../gui/wxpython/lmgr/layertree.py:829 +#: ../gui/wxpython/lmgr/layertree.py:674 ../gui/wxpython/lmgr/layertree.py:810 +#: ../gui/wxpython/lmgr/layertree.py:867 msgid "Set color table" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:651 ../gui/wxpython/lmgr/layertree.py:776 +#: ../gui/wxpython/lmgr/layertree.py:678 ../gui/wxpython/lmgr/layertree.py:814 msgid "Set color table interactively" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:656 +#: ../gui/wxpython/lmgr/layertree.py:683 msgid "Show attribute data" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:672 +#: ../gui/wxpython/lmgr/layertree.py:699 msgid "Start editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:677 +#: ../gui/wxpython/lmgr/layertree.py:704 msgid "Stop editing" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:694 +#: ../gui/wxpython/lmgr/layertree.py:727 msgid "Rebuild topology" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:803 +#: ../gui/wxpython/lmgr/layertree.py:841 msgid "Report raster statistics" msgstr "래스터 통계를 보고합니다" -#: ../gui/wxpython/lmgr/layertree.py:811 +#: ../gui/wxpython/lmgr/layertree.py:849 msgid "Profile" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:854 +#: ../gui/wxpython/lmgr/layertree.py:892 msgid "Save web service layer" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:969 +#: ../gui/wxpython/lmgr/layertree.py:1007 msgid "Unable to create profile of raster map." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1021 +#: ../gui/wxpython/lmgr/layertree.py:1059 #, python-format msgid "Unsupported map type <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1027 +#: ../gui/wxpython/lmgr/layertree.py:1065 #, python-format msgid "Enter name for the new %s in the current mapset:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1029 +#: ../gui/wxpython/lmgr/layertree.py:1067 #, python-format msgid "Make a copy of %s <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1047 +#: ../gui/wxpython/lmgr/layertree.py:1085 #, python-format msgid "" "%s <%s> already exists in the current mapset. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1060 +#: ../gui/wxpython/lmgr/layertree.py:1098 #, python-format msgid "Unable to make copy of <%s>" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1067 +#: ../gui/wxpython/lmgr/layertree.py:1105 #, python-format msgid "Unable to make copy of <%s>. Mapset <%s> is not current mapset." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1088 +#: ../gui/wxpython/lmgr/layertree.py:1126 msgid "Unable to display histogram of raster map. No map name defined." msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1404 +#: ../gui/wxpython/lmgr/layertree.py:1246 +msgid "Set opacity of <{}>" +msgstr "" + +#: ../gui/wxpython/lmgr/layertree.py:1485 msgid "Layer group:" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1409 -#: ../gui/wxpython/lmgr/layertree.py:1981 +#: ../gui/wxpython/lmgr/layertree.py:1490 +#: ../gui/wxpython/lmgr/layertree.py:2064 msgid "Click to edit layer settings" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1475 +#: ../gui/wxpython/lmgr/layertree.py:1556 msgid "(double click to set properties)" msgstr "" -#: ../gui/wxpython/lmgr/layertree.py:1757 +#: ../gui/wxpython/lmgr/layertree.py:1838 msgid "Please wait, updating data..." msgstr "" @@ -22954,6 +23261,9 @@ msgid "Histogram Tool" <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23133,6 +23443,7 @@ msgstr "" msgid "Show attribute data for selected vector map" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -23140,6 +23451,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #: ../gui/wxpython/lmgr/toolbars.py:128 #, fuzzy msgid "Add multiple map layers" @@ -23153,6 +23466,9 @@ msgstr "다양한 중첩 추가" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23309,6 +23625,9 @@ msgid "Supervised Classification Tool - GRASS GIS" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -23942,6 +24261,7 @@ msgid "Creates copies of maps and other elements Copies available data files in msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23953,6 +24273,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -24452,6 +24777,9 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -27100,6 +27428,7 @@ msgstr "" msgid "Open a simple Python code editor" msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/menustrings.py:1053 ../gui/wxpython/menustrings.py:1054 @@ -27121,6 +27450,8 @@ msgid "Launch Data Catalog." <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #: ../gui/wxpython/lmgr/toolbars.py:222 #, fuzzy msgid "New display" @@ -27131,6 +27462,9 @@ msgid "Launch Data Catalog." <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -27259,6 +27593,7 @@ msgid "Location Download" msgstr "" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27270,6 +27605,11 @@ msgstr "" ======= >>>>>>> 8422103f4c (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" @@ -27359,6 +27699,13 @@ msgstr "" msgid "Proceed with opening of the workspace?" msgstr "" +#: ../gui/wxpython/lmgr/workspace.py:159 +#, python-format +msgid "" +"Current location is <%(loc)s>.\n" +"Current mapset is <%(mapset)s>." +msgstr "" + #: ../gui/wxpython/lmgr/workspace.py:179 #: ../gui/wxpython/animation/nviztask.py:40 ======= @@ -27593,57 +27940,61 @@ msgstr "" msgid "File <{}> doesn't exist. It was probably moved or deleted." msgstr "" -#: ../gui/wxpython/lmgr/frame.py:140 +#: ../gui/wxpython/lmgr/frame.py:141 msgid "There were some issues when loading menu or Tools tab:" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:91 +#: ../gui/wxpython/lmgr/frame.py:1305 +msgid "No location/mapset provided. Operation canceled." +msgstr "" + +#: ../gui/wxpython/dbmgr/manager.py:92 msgid "Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:94 +#: ../gui/wxpython/dbmgr/manager.py:95 #, python-brace-format msgid "{document} (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:113 +#: ../gui/wxpython/dbmgr/manager.py:114 #, python-format msgid "" "Database connection for vector map <%s> is not defined in DB file. You can " "define new connection in 'Manage layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:122 +#: ../gui/wxpython/dbmgr/manager.py:123 msgid "Please wait, loading attribute data..." msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:132 +#: ../gui/wxpython/dbmgr/manager.py:133 msgid "Browse data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:138 +#: ../gui/wxpython/dbmgr/manager.py:139 msgid "Manage tables" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:143 +#: ../gui/wxpython/dbmgr/manager.py:144 msgid "Manage layers" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:154 +#: ../gui/wxpython/dbmgr/manager.py:155 msgid "Close Attribute Table Manager" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:156 +#: ../gui/wxpython/dbmgr/manager.py:157 msgid "Reload currently selected attribute data" msgstr "" -#: ../gui/wxpython/dbmgr/manager.py:159 +#: ../gui/wxpython/dbmgr/manager.py:160 msgid "Reload all attribute data (drop current selection)" msgstr "모든 속성 자료를 다시 읽어 들입니다 (현재 선택은 삭제합니다)" -#: ../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 +#: ../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 #, python-format msgid "Number of loaded records: %d" msgstr "" @@ -27657,93 +28008,93 @@ msgstr "" msgid "Attribute Table Manager - GRASS GIS" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362 msgid "Database connection" msgstr "데이터베이스 연결" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:140 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:141 msgid "Set SQL statement to default" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:142 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:143 msgid "Apply SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:144 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:145 msgid "Close the dialog" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:220 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:221 msgid "Columns" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:237 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:238 msgid "Interactive insertion" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:251 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:252 msgid "Values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:264 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:265 msgid "Get all values" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:268 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:269 msgid "Get sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:270 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:271 msgid "Get first 256 unique values as sample" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:285 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:286 msgid "Go to:" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:297 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:298 msgid "Close dialog on apply" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:478 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:635 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:885 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:480 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:637 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:887 #, python-format msgid "GRASS SQL Builder (%(type)s) - <%(map)s>" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:484 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:486 msgid "Column to show (SELECT clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:485 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:642 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:487 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:644 msgid "Constraint for query (WHERE clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248 -#: ../gui/wxpython/dbmgr/base.py:1274 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257 +#: ../gui/wxpython/dbmgr/base.py:1283 #, python-format msgid "Example: %s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:509 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:511 msgid "Verify" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:510 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:512 msgid "Verify SQL statement" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:518 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:520 msgid "SQL statement not verified" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:564 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:566 msgid "SQL statement is not valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:565 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 #, python-format msgid "" "SQL statement is not valid.\n" @@ -27751,35 +28102,41 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:567 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:569 msgid "SQL statement is valid" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:641 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 msgid "Column to set (SET clause)" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:643 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:645 msgid "Calculate column value to set" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:731 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:733 msgid "Functions" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:768 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 msgid "SQL statement was not applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:770 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:772 msgid "SQL statement applied" msgstr "" -#: ../gui/wxpython/dbmgr/sqlbuilder.py:803 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:805 msgid "Dbf driver does not support usage of SQL functions." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/dbmgr/base.py:185 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/dbmgr/base.py:184 ======= #: ../gui/wxpython/dbmgr/manager.py:78 @@ -27793,29 +28150,33 @@ msgstr "" #: ../gui/wxpython/dbmgr/manager.py:100 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #, python-format msgid "" "Attribute table <%s> not found. For creating the table switch to 'Manage " "layers' tab." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:200 +#: ../gui/wxpython/dbmgr/base.py:201 #, python-format msgid "Column <%(column)s> not found in in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:275 +#: ../gui/wxpython/dbmgr/base.py:279 msgid "Can display only 256 columns." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:304 +#: ../gui/wxpython/dbmgr/base.py:308 #, python-brace-format msgid "" "Incorrect encoding {enc} used. Set encoding in GUI Settings or set " "GRASS_DB_ENCODING variable." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:323 +#: ../gui/wxpython/dbmgr/base.py:328 #, python-brace-format msgid "" "Unable to read the table <{table}> from the database due to seemingly " @@ -27824,19 +28185,19 @@ msgid "" "'{value}' Use the v.db.select module to investigate." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:337 +#: ../gui/wxpython/dbmgr/base.py:344 msgid "Viewing limit: 100000 records." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:385 +#: ../gui/wxpython/dbmgr/base.py:392 msgid "Unknown value" msgstr "알려지지 않은 값" -#: ../gui/wxpython/dbmgr/base.py:393 +#: ../gui/wxpython/dbmgr/base.py:400 msgid "Unable to decode value. Set encoding in GUI preferences ('Attributes')." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:406 +#: ../gui/wxpython/dbmgr/base.py:413 #, python-format msgid "" "Error loading attribute data. Record number: %(rec)d. Unable to convert " @@ -27845,164 +28206,164 @@ msgid "" "Details: %(detail)s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:493 +#: ../gui/wxpython/dbmgr/base.py:500 msgid "Sort ascending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:494 +#: ../gui/wxpython/dbmgr/base.py:501 msgid "Sort descending" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:499 +#: ../gui/wxpython/dbmgr/base.py:506 msgid "Calculate (only numeric columns)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:501 +#: ../gui/wxpython/dbmgr/base.py:508 msgid "Field calculator" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:520 +#: ../gui/wxpython/dbmgr/base.py:527 msgid "Area size" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:521 +#: ../gui/wxpython/dbmgr/base.py:528 msgid "Line length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:522 +#: ../gui/wxpython/dbmgr/base.py:529 msgid "Compactness of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:525 +#: ../gui/wxpython/dbmgr/base.py:532 msgid "Fractal dimension of boundary defining a polygon" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:527 +#: ../gui/wxpython/dbmgr/base.py:534 msgid "Perimeter length of an area" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:528 +#: ../gui/wxpython/dbmgr/base.py:535 msgid "Number of features for each category" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:529 +#: ../gui/wxpython/dbmgr/base.py:536 msgid "Slope steepness of 3D line" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:530 +#: ../gui/wxpython/dbmgr/base.py:537 msgid "Line sinuousity" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:531 +#: ../gui/wxpython/dbmgr/base.py:538 msgid "Line azimuth" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:658 +#: ../gui/wxpython/dbmgr/base.py:665 #, python-format msgid "Add column to table <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1053 +#: ../gui/wxpython/dbmgr/base.py:1062 msgid "Unable to add column to the table. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1068 +#: ../gui/wxpython/dbmgr/base.py:1077 #, python-format msgid "Column <%(column)s> already exists in table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1157 +#: ../gui/wxpython/dbmgr/base.py:1166 msgid "Attribute data - right-click to edit/manage records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1172 ../gui/wxpython/dbmgr/base.py:2332 -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3214 -#: ../gui/wxpython/dbmgr/base.py:3486 +#: ../gui/wxpython/dbmgr/base.py:1181 ../gui/wxpython/dbmgr/base.py:2343 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3227 +#: ../gui/wxpython/dbmgr/base.py:3499 msgid "Table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1174 ../gui/wxpython/dbmgr/base.py:2334 +#: ../gui/wxpython/dbmgr/base.py:1183 ../gui/wxpython/dbmgr/base.py:2345 msgid " (read-only)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1191 +#: ../gui/wxpython/dbmgr/base.py:1200 msgid "SQL Query" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1215 +#: ../gui/wxpython/dbmgr/base.py:1224 msgid "Simple" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1218 +#: ../gui/wxpython/dbmgr/base.py:1227 msgid "Apply SELECT statement and reload data records" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1259 +#: ../gui/wxpython/dbmgr/base.py:1268 msgid "Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1262 +#: ../gui/wxpython/dbmgr/base.py:1271 msgid "SQL Builder" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1446 ../gui/wxpython/dbmgr/base.py:1631 +#: ../gui/wxpython/dbmgr/base.py:1455 ../gui/wxpython/dbmgr/base.py:1640 msgid "Insert new record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1447 +#: ../gui/wxpython/dbmgr/base.py:1456 msgid "Delete selected record(s)" msgstr "선택된 레코드를 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:1448 +#: ../gui/wxpython/dbmgr/base.py:1457 msgid "Delete all records" msgstr "모든 레코드를 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:1458 +#: ../gui/wxpython/dbmgr/base.py:1467 msgid "Highlight selected features and zoom" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1462 ../gui/wxpython/dbmgr/base.py:2001 +#: ../gui/wxpython/dbmgr/base.py:1471 ../gui/wxpython/dbmgr/base.py:2010 msgid "Extract selected features" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1463 +#: ../gui/wxpython/dbmgr/base.py:1472 msgid "Delete selected features" msgstr "선택된 피처를 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:1524 +#: ../gui/wxpython/dbmgr/base.py:1533 msgid "Update existing record" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1555 ../gui/wxpython/dbmgr/base.py:1674 +#: ../gui/wxpython/dbmgr/base.py:1564 ../gui/wxpython/dbmgr/base.py:1683 #, python-format msgid "Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1570 +#: ../gui/wxpython/dbmgr/base.py:1579 #, python-format msgid "" "Unable to update existing record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1646 +#: ../gui/wxpython/dbmgr/base.py:1655 #, python-format msgid "Record with category number %d already exists in the table." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1660 +#: ../gui/wxpython/dbmgr/base.py:1669 #, python-format msgid "Category number (column %s) is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1690 +#: ../gui/wxpython/dbmgr/base.py:1699 #, python-format msgid "" "Unable to insert new record.\n" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:1744 +#: ../gui/wxpython/dbmgr/base.py:1753 #, python-format msgid "" "Selected data records (%d) will be permanently deleted from table. Do you " @@ -28011,11 +28372,11 @@ msgstr "" "테이블로부터 %d개의 선택된 자료 레코드가 영구히 삭제될 것입니다. 삭제하길 원" "하십니까?" -#: ../gui/wxpython/dbmgr/base.py:1748 ../gui/wxpython/dbmgr/base.py:1798 +#: ../gui/wxpython/dbmgr/base.py:1757 ../gui/wxpython/dbmgr/base.py:1807 msgid "Delete records" msgstr "레코드를 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:1794 +#: ../gui/wxpython/dbmgr/base.py:1803 #, python-format msgid "" "All data records (%d) will be permanently deleted from table. Do you want to " @@ -28024,15 +28385,15 @@ msgstr "" "테이블로부터 %d개의 모든 자료 레코드가 영구히 삭제될 것입니다. 삭제하길 원하" "십니까?" -#: ../gui/wxpython/dbmgr/base.py:1995 +#: ../gui/wxpython/dbmgr/base.py:2004 msgid "Nothing to extract." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2036 +#: ../gui/wxpython/dbmgr/base.py:2045 msgid "Nothing to delete." msgstr "삭제할 것이 없습니다" -#: ../gui/wxpython/dbmgr/base.py:2114 ../gui/wxpython/dbmgr/base.py:2150 +#: ../gui/wxpython/dbmgr/base.py:2124 ../gui/wxpython/dbmgr/base.py:2160 #, python-format msgid "" "Loading attribute data failed.\n" @@ -28040,7 +28401,7 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2130 +#: ../gui/wxpython/dbmgr/base.py:2140 #, python-format msgid "" "Loading attribute data failed.\n" @@ -28049,52 +28410,52 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2368 +#: ../gui/wxpython/dbmgr/base.py:2379 #, python-format msgid "Table <%s> - right-click to delete column(s)" msgstr "테이블 <%s> - 열을 삭제하려면 오른쪽 클릭" -#: ../gui/wxpython/dbmgr/base.py:2393 ../gui/wxpython/dbmgr/base.py:2455 -#: ../gui/wxpython/dbmgr/dialogs.py:806 +#: ../gui/wxpython/dbmgr/base.py:2404 ../gui/wxpython/dbmgr/base.py:2466 +#: ../gui/wxpython/dbmgr/dialogs.py:808 msgid "Column" msgstr "열" -#: ../gui/wxpython/dbmgr/base.py:2425 ../gui/wxpython/dbmgr/dialogs.py:829 +#: ../gui/wxpython/dbmgr/base.py:2436 ../gui/wxpython/dbmgr/dialogs.py:831 msgid "Length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2433 ../gui/wxpython/animation/dialogs.py:784 -#: ../gui/wxpython/psmap/dialogs.py:1778 +#: ../gui/wxpython/dbmgr/base.py:2444 ../gui/wxpython/animation/dialogs.py:784 +#: ../gui/wxpython/psmap/dialogs.py:1805 msgid "Add" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2595 +#: ../gui/wxpython/dbmgr/base.py:2606 msgid "Unable to rename column. No column name defined." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2605 +#: ../gui/wxpython/dbmgr/base.py:2616 #, python-format msgid "" "Unable to rename column <%(column)s> to <%(columnTo)s>. Column already " "exists in the table <%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2629 +#: ../gui/wxpython/dbmgr/base.py:2640 #, python-format msgid "" -"Unable to rename column. Column <%(column)s> doesn't exist in the table <" -"%(table)s>." +"Unable to rename column. Column <%(column)s> doesn't exist in the table " +"<%(table)s>." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2661 +#: ../gui/wxpython/dbmgr/base.py:2672 msgid "Drop selected column" msgstr "선택된 열을 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:2669 +#: ../gui/wxpython/dbmgr/base.py:2680 msgid "Drop all columns" msgstr "모든 열을 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:2700 +#: ../gui/wxpython/dbmgr/base.py:2711 #, python-format msgid "" "Selected %s will PERMANENTLY removed from table. Do you want to drop the " @@ -28102,11 +28463,11 @@ msgid "" msgstr "" "선택된 %s이 테이블로부터 영구히 제거될 것입니다. 이 열을 삭제하길 원하십니까?" -#: ../gui/wxpython/dbmgr/base.py:2704 ../gui/wxpython/dbmgr/base.py:2753 +#: ../gui/wxpython/dbmgr/base.py:2715 ../gui/wxpython/dbmgr/base.py:2764 msgid "Drop column(s)" msgstr "열을 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:2749 +#: ../gui/wxpython/dbmgr/base.py:2760 #, python-format msgid "" "Selected columns\n" @@ -28117,144 +28478,144 @@ msgstr "" "%s\n" "테이블로부터 영구히 제거될 것입니다. 이 열들을 삭제하길 원하십니까?" -#: ../gui/wxpython/dbmgr/base.py:2870 +#: ../gui/wxpython/dbmgr/base.py:2882 msgid "List of layers" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2949 ../gui/wxpython/dbmgr/base.py:3406 -#: ../gui/wxpython/dbmgr/base.py:3871 +#: ../gui/wxpython/dbmgr/base.py:2961 ../gui/wxpython/dbmgr/base.py:3419 +#: ../gui/wxpython/dbmgr/base.py:3886 #, python-format msgid "Drop also linked attribute table (%s)" msgstr "연결된 속성 테이블(%s)도 같이 삭제합니다" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Column name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:2994 +#: ../gui/wxpython/dbmgr/base.py:3006 msgid "Data length" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 ../gui/wxpython/dbmgr/base.py:3192 -#: ../gui/wxpython/dbmgr/base.py:3463 +#: ../gui/wxpython/dbmgr/base.py:3064 ../gui/wxpython/dbmgr/base.py:3205 +#: ../gui/wxpython/dbmgr/base.py:3476 msgid "Driver" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3052 +#: ../gui/wxpython/dbmgr/base.py:3064 msgid "Key" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3159 +#: ../gui/wxpython/dbmgr/base.py:3172 msgid "Add layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3169 +#: ../gui/wxpython/dbmgr/base.py:3182 msgid "Layer description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3225 ../gui/wxpython/dbmgr/base.py:3288 -#: ../gui/wxpython/dbmgr/base.py:3497 +#: ../gui/wxpython/dbmgr/base.py:3238 ../gui/wxpython/dbmgr/base.py:3301 +#: ../gui/wxpython/dbmgr/base.py:3510 msgid "Key column" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3238 +#: ../gui/wxpython/dbmgr/base.py:3251 msgid "Insert record for each category into table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3261 +#: ../gui/wxpython/dbmgr/base.py:3274 msgid "You need to add categories by v.category module." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3266 +#: ../gui/wxpython/dbmgr/base.py:3279 msgid "Table description" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3277 +#: ../gui/wxpython/dbmgr/base.py:3290 msgid "Table name" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3302 +#: ../gui/wxpython/dbmgr/base.py:3315 msgid "&Create table" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3308 +#: ../gui/wxpython/dbmgr/base.py:3321 msgid "&Set default" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3380 +#: ../gui/wxpython/dbmgr/base.py:3393 msgid "Remove layer" msgstr "레이어를 제거합니다" -#: ../gui/wxpython/dbmgr/base.py:3383 +#: ../gui/wxpython/dbmgr/base.py:3396 msgid "Layer to remove" msgstr "제거할 레이어" -#: ../gui/wxpython/dbmgr/base.py:3414 +#: ../gui/wxpython/dbmgr/base.py:3427 msgid "&Remove layer" msgstr "레이어 제거(&R)" -#: ../gui/wxpython/dbmgr/base.py:3443 +#: ../gui/wxpython/dbmgr/base.py:3456 msgid "Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3544 +#: ../gui/wxpython/dbmgr/base.py:3559 msgid "&Modify layer" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3587 +#: ../gui/wxpython/dbmgr/base.py:3602 msgid "" "Unable to get list of tables.\n" "Please use db.connect to set database parameters." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3693 +#: ../gui/wxpython/dbmgr/base.py:3708 msgid "Unable to create new table. Table name or key column name is missing." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3703 +#: ../gui/wxpython/dbmgr/base.py:3718 #, python-format msgid "Unable to create new table. Table <%s> already exists in the database." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3748 +#: ../gui/wxpython/dbmgr/base.py:3763 #, python-format msgid "" "Unable to add new layer to vector map <%(vector)s>. Layer %(layer)d already " "exists." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3936 +#: ../gui/wxpython/dbmgr/base.py:3951 msgid "Field statistics" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:3959 +#: ../gui/wxpython/dbmgr/base.py:3974 msgid "Copy statistics the clipboard (Ctrl+C)" msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4020 +#: ../gui/wxpython/dbmgr/base.py:4035 msgid "Statistics is not support for DBF tables." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4047 +#: ../gui/wxpython/dbmgr/base.py:4062 msgid "Unable to calculte statistics." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4056 +#: ../gui/wxpython/dbmgr/base.py:4071 #, python-format msgid "" "Unable to calculte statistics. Invalid number of lines %d (should be %d)." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4083 +#: ../gui/wxpython/dbmgr/base.py:4098 msgid "Unable to calculte standard deviation." msgstr "" -#: ../gui/wxpython/dbmgr/base.py:4091 +#: ../gui/wxpython/dbmgr/base.py:4106 #, python-format msgid "Field statistics <%s>" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:79 +#: ../gui/wxpython/dbmgr/dialogs.py:80 #, python-format msgid "" "No attribute table found.\n" @@ -28263,40 +28624,40 @@ msgid "" "<%s>?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:84 +#: ../gui/wxpython/dbmgr/dialogs.py:85 msgid "Create table?" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:106 +#: ../gui/wxpython/dbmgr/dialogs.py:107 msgid "Close dialog on submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:118 +#: ../gui/wxpython/dbmgr/dialogs.py:119 msgid "No attributes found" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:127 +#: ../gui/wxpython/dbmgr/dialogs.py:128 msgid "Define attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:129 +#: ../gui/wxpython/dbmgr/dialogs.py:130 msgid "Display attributes" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:133 +#: ../gui/wxpython/dbmgr/dialogs.py:134 msgid "&Reload" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:134 ../gui/wxpython/dbmgr/dialogs.py:639 +#: ../gui/wxpython/dbmgr/dialogs.py:135 ../gui/wxpython/dbmgr/dialogs.py:641 msgid "&Submit" msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:240 +#: ../gui/wxpython/dbmgr/dialogs.py:241 #, python-format msgid "Column <%(col)s>: Value '%(value)s' needs to be entered as %(type)s." msgstr "" -#: ../gui/wxpython/dbmgr/dialogs.py:452 +#: ../gui/wxpython/dbmgr/dialogs.py:454 msgid "Unknown" msgstr "알려지지 않은" @@ -28408,7 +28769,7 @@ msgid "" "avoid confusion." msgstr "" -#: ../gui/wxpython/animation/temporal_manager.py:347 +#: ../gui/wxpython/animation/temporal_manager.py:350 #, python-format msgid "Topology of Space time dataset %s is invalid." msgstr "시공간 자료세트 %s의 위상이 무효합니다" @@ -28426,13 +28787,13 @@ msgstr "" msgid "No map series nor space-time dataset is added." msgstr "" -#: ../gui/wxpython/animation/controller.py:243 +#: ../gui/wxpython/animation/controller.py:244 #: ../gui/wxpython/animation/dialogs.py:856 #, python-format msgid "Maximum number of animations is %d." msgstr "애니메이션의 최대 개수는 %d입니다" -#: ../gui/wxpython/animation/controller.py:269 +#: ../gui/wxpython/animation/controller.py:270 #: ../gui/wxpython/animation/dialogs.py:909 msgid "" "More animations are using one window. Please select different window for " @@ -28441,71 +28802,77 @@ msgstr "" "여러 개의 애니메이션이 하나의 창을 사용하고 있습니다. 각 애니메이션에 다른 창" "을 선택하세요." -#: ../gui/wxpython/animation/controller.py:449 +#: ../gui/wxpython/animation/controller.py:450 msgid "Failed to display legend." msgstr "" -#: ../gui/wxpython/animation/controller.py:481 +#: ../gui/wxpython/animation/controller.py:482 msgid "Inconsistent number of maps, please check input data." msgstr "" -#: ../gui/wxpython/animation/controller.py:506 +#: ../gui/wxpython/animation/controller.py:507 msgid "No animation to export." msgstr "내보내기할 애니메이션이 없습니다." -#: ../gui/wxpython/animation/controller.py:542 +#: ../gui/wxpython/animation/controller.py:543 msgid "Preparing export, please wait..." msgstr "" -#: ../gui/wxpython/animation/controller.py:592 -#: ../gui/wxpython/animation/frame.py:637 +#: ../gui/wxpython/animation/controller.py:593 +#: ../gui/wxpython/animation/frame.py:638 #, python-format msgid "%(from)s %(dash)s %(to)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:604 +#: ../gui/wxpython/animation/controller.py:605 #, python-format msgid "%(start)s %(unit)s" msgstr "" -#: ../gui/wxpython/animation/controller.py:626 +#: ../gui/wxpython/animation/controller.py:627 msgid "Exporting animation, please wait..." msgstr "애니메이션을 내보내는 중입니다, 기다리세요..." -#: ../gui/wxpython/animation/data.py:66 +#: ../gui/wxpython/animation/data.py:67 msgid "No animation name selected." msgstr "애니메이션 이름을 선택하지 않았습니다." -#: ../gui/wxpython/animation/data.py:133 +#: ../gui/wxpython/animation/data.py:134 msgid "No workspace file selected." msgstr "" -#: ../gui/wxpython/animation/data.py:136 +#: ../gui/wxpython/animation/data.py:137 #, python-format msgid "File %s not found" msgstr "" -#: ../gui/wxpython/animation/data.py:145 +#: ../gui/wxpython/animation/data.py:146 #, python-format msgid "Animation %d" msgstr "애니메이션 %d" -#: ../gui/wxpython/animation/utils.py:187 +#: ../gui/wxpython/animation/utils.py:188 msgid "The number of maps in space-time datasets has to be the same." msgstr "" -#: ../gui/wxpython/animation/utils.py:193 +#: ../gui/wxpython/animation/utils.py:194 msgid "" "The temporal type (absolute/relative) of space-time datasets has to be the " "same." msgstr "" -#: ../gui/wxpython/animation/utils.py:201 +#: ../gui/wxpython/animation/utils.py:202 msgid "" "The map type (point/interval) of space-time datasets has to be the same." msgstr "" <<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../gui/wxpython/animation/utils.py:210 +======= +<<<<<<< HEAD +>>>>>>> osgeo-main #: ../gui/wxpython/animation/utils.py:209 ======= #: ../gui/wxpython/gui_core/gselect.py:886 @@ -28779,60 +29146,64 @@ msgstr "" #: ../gui/wxpython/gui_core/goutput.py:388 #, python-format >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +======= +>>>>>>> 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 "" -#: ../gui/wxpython/animation/utils.py:221 +#: ../gui/wxpython/animation/utils.py:222 msgid "The number of maps to animate has to be the same for each map series." msgstr "" -#: ../gui/wxpython/animation/utils.py:229 +#: ../gui/wxpython/animation/utils.py:230 msgid "" "The number of maps to animate has to be the same as the number of maps in " "temporal dataset." msgstr "" -#: ../gui/wxpython/animation/toolbars.py:27 +#: ../gui/wxpython/animation/toolbars.py:28 msgid "Change animation speed" msgstr "애니메이션 속도 변경" -#: ../gui/wxpython/animation/toolbars.py:28 +#: ../gui/wxpython/animation/toolbars.py:29 msgid "Play forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:29 +#: ../gui/wxpython/animation/toolbars.py:30 msgid "Play back" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:32 +#: ../gui/wxpython/animation/toolbars.py:33 msgid "Repeat" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:34 +#: ../gui/wxpython/animation/toolbars.py:35 msgid "Play back and forward" msgstr "" -#: ../gui/wxpython/animation/toolbars.py:37 +#: ../gui/wxpython/animation/toolbars.py:38 #: ../gui/wxpython/animation/dialogs.py:347 msgid "Add new animation" msgstr "새 애니메이션 추가" -#: ../gui/wxpython/animation/toolbars.py:41 #: ../gui/wxpython/animation/toolbars.py:42 +#: ../gui/wxpython/animation/toolbars.py:43 msgid "Add, edit or remove animation" msgstr "애니메이션 추가, 편집, 제거" -#: ../gui/wxpython/animation/toolbars.py:45 +#: ../gui/wxpython/animation/toolbars.py:46 #: ../gui/wxpython/animation/dialogs.py:930 msgid "Export animation" msgstr "애니메이션 내보내기" -#: ../gui/wxpython/animation/toolbars.py:55 +#: ../gui/wxpython/animation/toolbars.py:56 msgid "Add space-time dataset or series of map layers" msgstr "시공간 자료세트 또는 지도 레이어 계열 추가" -#: ../gui/wxpython/animation/toolbars.py:56 +#: ../gui/wxpython/animation/toolbars.py:57 msgid "Add space-time dataset or series of map layers for animation" msgstr "애니메이션을 위해서 시공간 자료세트 또는 지도 레이어 계열을 추가하세요" @@ -28947,7 +29318,7 @@ msgstr "" "세요." #: ../gui/wxpython/animation/dialogs.py:460 -#: ../gui/wxpython/psmap/dialogs.py:3396 +#: ../gui/wxpython/psmap/dialogs.py:3435 msgid "Show raster legend" msgstr "" @@ -29025,7 +29396,7 @@ msgid "Edit" msgstr "" #: ../gui/wxpython/animation/dialogs.py:948 -#: ../gui/wxpython/psmap/dialogs.py:577 +#: ../gui/wxpython/psmap/dialogs.py:603 msgid "Format" msgstr "" @@ -29271,6 +29642,7 @@ msgstr "무효합니다" #: ../gui/wxpython/gui_core/preferences.py:1721 msgid "EPSG code:" msgstr "" +<<<<<<< HEAD #: ../gui/wxpython/gui_core/preferences.py:1739 msgid "PROJ string (required):" @@ -29432,183 +29804,845 @@ msgstr "" msgid "Apply changes to selected group and close dialog" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:685 -msgid "Apply changes to selected group" +#: ../gui/wxpython/gui_core/dialogs.py:685 +msgid "Apply changes to selected group" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:686 +msgid "Close dialog, changes are not applied" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:727 +#: ../gui/wxpython/gui_core/dialogs.py:1524 +msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Select existing group or enter name of new group:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:745 +msgid "Edit/create subgroup" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:758 +msgid "Select existing subgroup or enter name of new subgroup:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:791 +#: ../gui/wxpython/gui_core/dialogs.py:859 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +msgid "Pattern:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:809 +#: ../gui/wxpython/gui_core/dialogs.py:877 +#: ../gui/wxpython/gui_core/dialogs.py:1533 +msgid "List of maps:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select map layers and add them to the list." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:830 +msgid "Remove selected layer(s) from list." +msgstr "목록으로부터 선택된 레이어를 제거합니다" + +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Check maps from group to be included into subgroup." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1051 +msgid "Add selected map layers into group" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1188 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1191 +#: ../gui/wxpython/gui_core/dialogs.py:1207 +msgid "Unapplied changes" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1204 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1261 +msgid "No raster maps selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1290 +#, python-format +msgid "No changes to apply in group <%s>." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1293 +#, python-format +msgid "Group <%s> was successfully created." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1295 +#, python-format +msgid "Group <%s> was successfully changed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1298 +#, python-format +msgid "Creating of new group <%s> failed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1300 +#, python-format +msgid "Changing of group <%s> failed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1339 +msgid "No group selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1344 +msgid "No subgroup selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1451 +msgid "Use fully-qualified map names" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1477 +msgid "Map type:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1492 +msgid "Select toggle" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1499 +msgid "Mapset:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1593 +msgid "Invert selection" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1736 +#, python-format +msgid "Dynamic series (%s)" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1763 +msgid "Set Map Layer Opacity" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1794 +#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 +#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 +msgid "transparent" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1797 +msgid "opaque" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1898 +msgid "Set image size" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1913 +msgid "Image size" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1960 +msgid "Template:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2000 +msgid "SQL Query Utility" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2016 +msgid " SQL statement " +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main + +#: ../gui/wxpython/gui_core/preferences.py:1739 +msgid "PROJ string (required):" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1756 +msgid "EPSG file:" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1773 +msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1781 +msgid "&Load EPSG codes" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1801 +msgid "Coordinates format" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1809 +msgid "Lat/long projections" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1830 +msgid "Precision:" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1916 +#, python-format +msgid "Unable to read EPSG codes: %s" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1949 +#: ../gui/wxpython/gui_core/preferences.py:1961 +#: ../gui/wxpython/gui_core/preferences.py:1973 +#, python-format +msgid "EPSG code %s not found" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1983 +msgid "Select default display font" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:1997 +msgid "Failed to set default display font. Try different font." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:2016 +msgid "Select default output font" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:2105 +msgid "Manage access to mapsets" +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:2120 +msgid "" +"Check a mapset to make it accessible, uncheck it to hide it.\n" +" Notes:\n" +" - The current mapset is always accessible.\n" +" - You may only write to the current mapset.\n" +" - You may only write to mapsets which you own." +msgstr "" + +#: ../gui/wxpython/gui_core/preferences.py:2197 +msgid "Owner" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:74 +msgid "Required item is not set." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:105 +msgid "Select GRASS location and mapset" +msgstr "GRASS 로케이션과 지도 세트를 선택하세요" + +#: ../gui/wxpython/gui_core/dialogs.py:125 +msgid "Location or mapset is not defined." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:135 +msgid "Name of GRASS location:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:146 +#: ../gui/wxpython/gui_core/dialogs.py:203 +msgid "Name of mapset:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:175 +msgid "Select mapset in GRASS location" +msgstr "GRASS 로케이션 내의 지도 세트를 선택하세요" + +#: ../gui/wxpython/gui_core/dialogs.py:195 +msgid "Name of mapset is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:216 +#: ../gui/wxpython/vdigit/toolbars.py:840 +#: ../gui/wxpython/vdigit/toolbars.py:997 +#: ../gui/wxpython/vdigit/toolbars.py:1095 +msgid "Select vector map" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:230 +msgid "Name of vector map is missing." +msgstr "벡터 지도의 이름이 누락됐습니다." + +#: ../gui/wxpython/gui_core/dialogs.py:292 +msgid "Create attribute table" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:326 +msgid "Name of new vector map is missing." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:348 +msgid "Name for new vector map:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:450 +#, python-format +msgid "Unable to create vector map <%s>." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:455 +#, python-format +msgid "" +"Invalid or empty key column.\n" +"Unable to create vector map <%s>." +msgstr "" +"무효하거나 빈 키 열.\n" +"벡터 지도 <%s>를 생성할 수 없습니다." + +#: ../gui/wxpython/gui_core/dialogs.py:486 +#, python-format +msgid "Vector map <%s> already exists in the current mapset. Do you want to overwrite it?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:576 +msgid "Load region:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:582 +msgid "Save region:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:634 +msgid "Name cannot begin with '.' and must not contain space, quotes, '/', ''', '@', ',', '=', '*', and all other non-alphanumeric characters." +msgstr "이름은 '.'로 시작할 수 없고 공백, 따옴표, '/', ''', '@', ',', '=', '*', 그리고 모든 알파벳이나 숫자가 아닌 문자를 포함할 수 없습니다." + +#: ../gui/wxpython/gui_core/dialogs.py:650 +msgid "Create or edit imagery groups" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:684 +msgid "Apply changes to selected group and close dialog" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:685 +msgid "Apply changes to selected group" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:686 +msgid "Close dialog, changes are not applied" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:727 +#: ../gui/wxpython/gui_core/dialogs.py:1524 +msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:734 +msgid "Select existing group or enter name of new group:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:745 +msgid "Edit/create subgroup" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:758 +msgid "Select existing subgroup or enter name of new subgroup:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:791 +#: ../gui/wxpython/gui_core/dialogs.py:859 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +msgid "Pattern:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:809 +#: ../gui/wxpython/gui_core/dialogs.py:877 +#: ../gui/wxpython/gui_core/dialogs.py:1533 +msgid "List of maps:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:825 +msgid "Select map layers and add them to the list." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:830 +msgid "Remove selected layer(s) from list." +msgstr "목록으로부터 선택된 레이어를 제거합니다" + +#: ../gui/wxpython/gui_core/dialogs.py:887 +msgid "Check maps from group to be included into subgroup." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1051 +msgid "Add selected map layers into group" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1188 +#, python-format +msgid "Group <%s> was changed, do you want to apply changes?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1191 +#: ../gui/wxpython/gui_core/dialogs.py:1207 +msgid "Unapplied changes" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1204 +#, python-format +msgid "Subgroup <%s> was changed, do you want to apply changes?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1261 +msgid "No raster maps selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1290 +#, python-format +msgid "No changes to apply in group <%s>." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1293 +#, python-format +msgid "Group <%s> was successfully created." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1295 +#, python-format +msgid "Group <%s> was successfully changed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1298 +#, python-format +msgid "Creating of new group <%s> failed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1300 +#, python-format +msgid "Changing of group <%s> failed." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1339 +msgid "No group selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1344 +msgid "No subgroup selected." +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1451 +msgid "Use fully-qualified map names" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1477 +msgid "Map type:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1492 +msgid "Select toggle" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1499 +msgid "Mapset:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1593 +msgid "Invert selection" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1736 +#, python-format +msgid "Dynamic series (%s)" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1763 +msgid "Set Map Layer Opacity" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1794 +#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 +#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 +msgid "transparent" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1797 +msgid "opaque" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1898 +msgid "Set image size" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1913 +msgid "Image size" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:1960 +msgid "Template:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2000 +msgid "SQL Query Utility" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2016 +msgid " SQL statement " +msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) + +#: ../gui/wxpython/animation/provider.py:444 +msgid "Rendering map layers" +msgstr "" + +<<<<<<< HEAD +<<<<<<< HEAD +======= +#: ../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" +msgstr "지도 레이어 중첩" +======= +#: ../gui/wxpython/gui_core/dialogs.py:2099 +msgid "Symbol directory:" +msgstr "" +<<<<<<< HEAD + +#: ../gui/wxpython/gui_core/dialogs.py:2111 +msgid "Symbol name:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2364 +msgid "Do you want to quit GRASS GIS including shell or just close the GUI?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2369 +msgid "Do you want to quit GRASS GIS?" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2448 +msgid "Select font:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2479 +msgid "Character encoding:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2497 +#: ../gui/wxpython/psmap/dialogs.py:397 ../gui/wxpython/psmap/dialogs.py:4980 +msgid "Font size:" +msgstr "" + +#: ../gui/wxpython/gui_core/dialogs.py:2549 +msgid "Example" +msgstr "" + +#: ../gui/wxpython/gui_core/wrap.py:208 +msgid "Clear" +msgstr "" + +#: ../gui/wxpython/gui_core/wrap.py:210 +msgid "&Clear" +msgstr "" + +#: ../gui/wxpython/gui_core/wrap.py:223 +msgid "&Cancel" +msgstr "" + +#: ../gui/wxpython/gui_core/wrap.py:235 +msgid "&Close" +msgstr "" + +#: ../gui/wxpython/gui_core/wrap.py:245 +msgid "Apply" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:564 +msgid "Enter parameters for '" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:576 +msgid "Close this window without executing the command (Ctrl+Q)" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:607 +msgid "Run the command (Ctrl+R)" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:631 +msgid "Show manual page of the command (Ctrl+H)" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:670 +msgid "Add created map(s) into layer tree" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:700 +msgid "Close dialog when command is successfully finished. Change this settings in Preferences dialog ('Command' tab)." +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:885 +#, python-format +msgid "'%s' copied to clipboard" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:975 ../gui/wxpython/gui_core/forms.py:989 +msgid "Required" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:978 ../gui/wxpython/gui_core/forms.py:990 +msgid "Optional" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1073 +#: ../gui/wxpython/gui_core/forms.py:2105 +msgid "Parameterized in model" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1163 +msgid "[multiple]" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1221 +msgid "valid range" +msgstr "유효 범위" + +#: ../gui/wxpython/gui_core/forms.py:1578 +msgid "Show graphical representation of temporal extent of dataset(s) ." +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1845 +#: ../gui/wxpython/gui_core/forms.py:1936 +#, python-format +msgid "Choose %s" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1890 +msgid "Load and edit content of a file" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1893 +msgid "&Save as" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1895 +msgid "Save content to a file for further use" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1900 +msgid "or enter values directly:" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:1902 +msgid "Enter file content directly instead of specifying a file. Temporary file will be automatically created." +msgstr "파일을 지정하는 대신 파일 내용을 직접 입력하세요. 임시 파일이 자동으로 생성됩니다." + +#: ../gui/wxpython/gui_core/forms.py:2318 +msgid "Manual" +msgstr "" + +#: ../gui/wxpython/gui_core/forms.py:2362 +msgid "Nothing to load." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:686 -msgid "Close dialog, changes are not applied" +#: ../gui/wxpython/gui_core/forms.py:2370 +#, python-format +msgid "" +"Unable to load file.\n" +"\n" +"Reason: %s" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:727 -#: ../gui/wxpython/gui_core/dialogs.py:1524 -msgid "Put here a regular expression. Characters '.*' stand for anything, character '^' stands for the beginning and '$' for the end." +#: ../gui/wxpython/gui_core/forms.py:2400 +msgid "Save input as..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:734 -msgid "Select existing group or enter name of new group:" +#: ../gui/wxpython/gui_core/forms.py:2733 +msgid "No dataset given." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:745 -msgid "Edit/create subgroup" +#: ../gui/wxpython/gui_core/forms.py:2902 +#: ../gui/wxpython/gui_core/forms.py:2919 +#, python-format +msgid "Unable to parse command '%s'" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:758 -msgid "Select existing subgroup or enter name of new subgroup:" +#: ../gui/wxpython/gui_core/forms.py:2926 +#, python-format +msgid "%(cmd)s: parameter '%(key)s' not available" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:791 -#: ../gui/wxpython/gui_core/dialogs.py:859 -#: ../gui/wxpython/gui_core/dialogs.py:1509 -msgid "Pattern:" +#: ../gui/wxpython/gui_core/forms.py:3008 +msgid "Try to set up GRASS_ADDON_PATH or GRASS_ADDON_BASE variable." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:809 -#: ../gui/wxpython/gui_core/dialogs.py:877 -#: ../gui/wxpython/gui_core/dialogs.py:1533 -msgid "List of maps:" +#: ../gui/wxpython/gui_core/menu.py:155 +msgid "Adva&nced search..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:825 -msgid "Select map layers and add them to the list." +#: ../gui/wxpython/gui_core/menu.py:157 +#, python-format +msgid "Do advanced search using %s module" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:830 -msgid "Remove selected layer(s) from list." -msgstr "목록으로부터 선택된 레이어를 제거합니다" +#: ../gui/wxpython/gui_core/menu.py:161 +msgid "Double-click to run selected module" +msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:887 -msgid "Check maps from group to be included into subgroup." +#: ../gui/wxpython/gui_core/menu.py:164 +msgid "&Run..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1051 -msgid "Add selected map layers into group" +#: ../gui/wxpython/gui_core/menu.py:165 +msgid "Run selected module from the tree" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1188 -#, python-format -msgid "Group <%s> was changed, do you want to apply changes?" +#: ../gui/wxpython/gui_core/menu.py:166 +msgid "H&elp" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1191 -#: ../gui/wxpython/gui_core/dialogs.py:1207 -msgid "Unapplied changes" +#: ../gui/wxpython/gui_core/menu.py:168 +msgid "Show manual for selected module from the tree" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1204 +#: ../gui/wxpython/gui_core/menu.py:278 #, python-format -msgid "Subgroup <%s> was changed, do you want to apply changes?" +msgid "Documentation for %s is now open in the web browser" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1261 -msgid "No raster maps selected." +#: ../gui/wxpython/gui_core/menu.py:356 +msgid "&Recent Files" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1290 +#: ../gui/wxpython/icons/icon.py:39 #, python-format -msgid "No changes to apply in group <%s>." -msgstr "" +msgid "Unknown iconset '%s', using default 'grass'...\n" +msgstr "알려지지 않은 아이콘 세트 '%s', 기본 'grass'를 사용합니다...\n" -#: ../gui/wxpython/gui_core/dialogs.py:1293 +#: ../gui/wxpython/icons/icon.py:57 #, python-format -msgid "Group <%s> was successfully created." +msgid "Unable to load icon theme. Reason: %s. Quiting wxGUI..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1295 -#, python-format -msgid "Group <%s> was successfully changed." +#: ../gui/wxpython/gcp/mapdisplay.py:48 ../gui/wxpython/gcp/manager.py:994 +#: ../gui/wxpython/image2target/ii2t_manager.py:952 +msgid "Manage Ground Control Points" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1298 -#, python-format -msgid "Creating of new group <%s> failed." +#: ../gui/wxpython/gcp/manager.py:150 +#: ../gui/wxpython/image2target/ii2t_manager.py:179 +msgid "Setup for georectification" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1300 -#, python-format -msgid "Changing of group <%s> failed." +#: ../gui/wxpython/gcp/manager.py:183 ../gui/wxpython/gcp/manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:212 +#: ../gui/wxpython/image2target/ii2t_manager.py:216 +msgid "Georectifying setup canceled." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1339 -msgid "No group selected." +#: ../gui/wxpython/gcp/manager.py:374 +#: ../gui/wxpython/image2target/ii2t_manager.py:381 +msgid "Select map type and location/mapset" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1344 -msgid "No subgroup selected." +#: ../gui/wxpython/gcp/manager.py:388 +#: ../gui/wxpython/image2target/ii2t_manager.py:395 +msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1451 -msgid "Use fully-qualified map names" +#: ../gui/wxpython/gcp/manager.py:399 +#: ../gui/wxpython/image2target/ii2t_manager.py:406 +msgid "Select source location:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1477 -msgid "Map type:" +#: ../gui/wxpython/gcp/manager.py:420 +#: ../gui/wxpython/image2target/ii2t_manager.py:427 +msgid "Select source mapset:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1492 -msgid "Select toggle" +#: ../gui/wxpython/gcp/manager.py:476 +#: ../gui/wxpython/image2target/ii2t_manager.py:483 +msgid "You must select a valid location before selecting a mapset" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1499 -msgid "Mapset:" +#: ../gui/wxpython/gcp/manager.py:489 +#: ../gui/wxpython/image2target/ii2t_manager.py:496 +msgid "You must select a valid location and mapset in order to continue" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1593 -msgid "Invert selection" +#: ../gui/wxpython/gcp/manager.py:511 +#: ../gui/wxpython/image2target/ii2t_manager.py:518 +msgid "Select image/map group to georectify" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1736 -#, python-format -msgid "Dynamic series (%s)" +#: ../gui/wxpython/gcp/manager.py:533 +msgid "Select/create group:" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1763 -msgid "Set Map Layer Opacity" +#: ../gui/wxpython/gcp/manager.py:550 +#: ../gui/wxpython/image2target/ii2t_manager.py:557 +msgid "Create group if none exists" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1794 -#: ../gui/wxpython/psmap/dialogs.py:6379 ../gui/wxpython/psmap/dialogs.py:6406 -#: ../gui/wxpython/psmap/dialogs.py:6732 ../gui/wxpython/psmap/dialogs.py:6762 -msgid "transparent" +#: ../gui/wxpython/gcp/manager.py:564 +#: ../gui/wxpython/image2target/ii2t_manager.py:571 +msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1797 -msgid "opaque" +#: ../gui/wxpython/gcp/manager.py:655 +msgid "No vector maps." msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1898 -msgid "Set image size" +#: ../gui/wxpython/gcp/manager.py:662 +#: ../gui/wxpython/image2target/ii2t_manager.py:655 +msgid "You must select a valid image/map group in order to continue" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1913 -msgid "Image size" +#: ../gui/wxpython/gcp/manager.py:669 +#: ../gui/wxpython/image2target/ii2t_manager.py:662 +msgid "You must enter an map name extension in order to continue" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:1960 -msgid "Template:" +#: ../gui/wxpython/gcp/manager.py:738 +#: ../gui/wxpython/image2target/ii2t_manager.py:731 +msgid "Select maps to display for ground control point (GCP) creation" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2000 -msgid "SQL Query Utility" +#: ../gui/wxpython/gcp/manager.py:743 +msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gui_core/dialogs.py:2016 -msgid " SQL statement " +#: ../gui/wxpython/gcp/manager.py:802 ../gui/wxpython/gcp/manager.py:3060 +#: ../gui/wxpython/image2target/ii2t_manager.py:792 +#: ../gui/wxpython/image2target/ii2t_manager.py:2982 +msgid "Select target vector map to display:" msgstr "" ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/animation/provider.py:443 -msgid "Rendering map layers" +#: ../gui/wxpython/gcp/manager.py:874 +#: ../gui/wxpython/image2target/ii2t_manager.py:864 +msgid "You must select a source map in order to continue" msgstr "" -<<<<<<< HEAD -#: ../gui/wxpython/animation/provider.py:559 -msgid "Overlaying map layers" -msgstr "지도 레이어 중첩" -======= -#: ../gui/wxpython/gui_core/dialogs.py:2099 -msgid "Symbol directory:" +#: ../gui/wxpython/gcp/manager.py:901 ../gui/wxpython/gcp/manager.py:920 +#: ../gui/wxpython/image2target/ii2t_manager.py:891 +#: ../gui/wxpython/image2target/ii2t_manager.py:922 +#, python-format +msgid "" +"No maps in selected group <%s>.\n" +"Please edit group or select another group." msgstr "" +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main #: ../gui/wxpython/gui_core/dialogs.py:2111 msgid "Symbol name:" @@ -29935,29 +30969,29 @@ msgid "" msgstr "" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -#: ../gui/wxpython/animation/provider.py:789 +#: ../gui/wxpython/animation/provider.py:792 #, python-brace-format msgid "Directory {t} not removed." msgstr "디렉토리 {t}가 제거되지 않았습니다." -#: ../gui/wxpython/animation/frame.py:49 +#: ../gui/wxpython/animation/frame.py:50 msgid "Animation Tool" msgstr "" -#: ../gui/wxpython/animation/frame.py:192 +#: ../gui/wxpython/animation/frame.py:193 msgid "Animation Toolbar" msgstr "애니메이션 도구 모음" -#: ../gui/wxpython/animation/frame.py:321 +#: ../gui/wxpython/animation/frame.py:322 msgid "Loading data" msgstr "" -#: ../gui/wxpython/animation/frame.py:330 +#: ../gui/wxpython/animation/frame.py:331 #, python-brace-format msgid " ({c} out of {p})" msgstr "" -#: ../gui/wxpython/animation/frame.py:643 +#: ../gui/wxpython/animation/frame.py:644 #, python-format msgid "to %(to)s" msgstr "" @@ -29986,17 +31020,17 @@ msgstr "" "%s" #: ../gui/wxpython/psmap/instructions.py:706 -#: ../gui/wxpython/psmap/instructions.py:920 -#: ../gui/wxpython/psmap/instructions.py:1048 -#: ../gui/wxpython/psmap/instructions.py:1123 -#: ../gui/wxpython/psmap/instructions.py:1308 -#: ../gui/wxpython/psmap/instructions.py:1383 -#: ../gui/wxpython/psmap/instructions.py:1461 -#: ../gui/wxpython/psmap/instructions.py:1567 -#: ../gui/wxpython/psmap/instructions.py:1711 -#: ../gui/wxpython/psmap/instructions.py:1864 -#: ../gui/wxpython/psmap/instructions.py:1920 -#: ../gui/wxpython/psmap/instructions.py:2275 +#: ../gui/wxpython/psmap/instructions.py:929 +#: ../gui/wxpython/psmap/instructions.py:1057 +#: ../gui/wxpython/psmap/instructions.py:1132 +#: ../gui/wxpython/psmap/instructions.py:1317 +#: ../gui/wxpython/psmap/instructions.py:1392 +#: ../gui/wxpython/psmap/instructions.py:1470 +#: ../gui/wxpython/psmap/instructions.py:1576 +#: ../gui/wxpython/psmap/instructions.py:1720 +#: ../gui/wxpython/psmap/instructions.py:1873 +#: ../gui/wxpython/psmap/instructions.py:1929 +#: ../gui/wxpython/psmap/instructions.py:2284 #, python-format msgid "Failed to read instruction %s" msgstr "" @@ -30022,14 +31056,14 @@ msgid "" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:759 +#: ../gui/wxpython/psmap/instructions.py:765 #, python-format msgid "" "Map frame size changed, old value: %(old1)s %(old2)s\n" "new value: %(new1)s %(new2)s" msgstr "" -#: ../gui/wxpython/psmap/instructions.py:832 +#: ../gui/wxpython/psmap/instructions.py:840 #, python-format msgid "" "Failed to read instruction %(file)s.\n" @@ -30038,12 +31072,12 @@ msgstr "" "지시 %(file)s를 읽는데 실패했습니다.\n" "알려지지 않은 포맷입니다 %(for)s" -#: ../gui/wxpython/psmap/instructions.py:847 +#: ../gui/wxpython/psmap/instructions.py:856 #, python-format msgid "Failed to read instruction %s." msgstr "" -#: ../gui/wxpython/psmap/instructions.py:1127 +#: ../gui/wxpython/psmap/instructions.py:1136 #, python-format msgid "Failed to read instruction %(inst)s: file %(file)s not found." msgstr "" @@ -30052,39 +31086,39 @@ msgstr "" msgid "Cartographic Composer - GRASS GIS" msgstr "" -#: ../gui/wxpython/psmap/utils.py:100 +#: ../gui/wxpython/psmap/utils.py:101 msgid "inch" msgstr "" -#: ../gui/wxpython/psmap/utils.py:101 +#: ../gui/wxpython/psmap/utils.py:102 msgid "point" msgstr "" -#: ../gui/wxpython/psmap/utils.py:102 +#: ../gui/wxpython/psmap/utils.py:103 msgid "centimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:103 +#: ../gui/wxpython/psmap/utils.py:104 msgid "millimeter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:110 ../gui/wxpython/psmap/utils.py:116 +#: ../gui/wxpython/psmap/utils.py:111 ../gui/wxpython/psmap/utils.py:117 msgid "nautical miles" msgstr "" -#: ../gui/wxpython/psmap/utils.py:114 +#: ../gui/wxpython/psmap/utils.py:115 msgid "pixel" msgstr "" -#: ../gui/wxpython/psmap/utils.py:115 +#: ../gui/wxpython/psmap/utils.py:116 msgid "meter" msgstr "" -#: ../gui/wxpython/psmap/utils.py:118 +#: ../gui/wxpython/psmap/utils.py:119 msgid "degree" msgstr "" -#: ../gui/wxpython/psmap/utils.py:395 +#: ../gui/wxpython/psmap/utils.py:396 msgid "Unable to run `ps.map -b`" msgstr "" @@ -30152,693 +31186,693 @@ msgid "" "edge of the paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:453 +#: ../gui/wxpython/psmap/dialogs.py:462 msgid "Font:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:483 +#: ../gui/wxpython/psmap/dialogs.py:492 msgid "Choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:533 +#: ../gui/wxpython/psmap/dialogs.py:559 msgid "Close dialog and apply changes" msgstr "대화 상자를 닫고 변경 사항을 적용합니다" -#: ../gui/wxpython/psmap/dialogs.py:576 +#: ../gui/wxpython/psmap/dialogs.py:602 msgid "Units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:578 +#: ../gui/wxpython/psmap/dialogs.py:604 msgid "Orientation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:579 ../gui/wxpython/psmap/dialogs.py:2892 +#: ../gui/wxpython/psmap/dialogs.py:605 ../gui/wxpython/psmap/dialogs.py:2923 msgid "Width" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:580 +#: ../gui/wxpython/psmap/dialogs.py:606 msgid "Height" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:581 +#: ../gui/wxpython/psmap/dialogs.py:607 msgid "Left" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:582 +#: ../gui/wxpython/psmap/dialogs.py:608 msgid "Right" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:654 +#: ../gui/wxpython/psmap/dialogs.py:680 msgid "Literal is not allowed!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:665 +#: ../gui/wxpython/psmap/dialogs.py:691 msgid "Page size" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:667 +#: ../gui/wxpython/psmap/dialogs.py:693 msgid "Margins" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Portrait" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:674 +#: ../gui/wxpython/psmap/dialogs.py:700 msgid "Landscape" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:812 +#: ../gui/wxpython/psmap/dialogs.py:838 msgid "Map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:824 +#: ../gui/wxpython/psmap/dialogs.py:850 msgid "Map frame settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:943 +#: ../gui/wxpython/psmap/dialogs.py:969 msgid "Map frame options:" msgstr "지도 틀 옵션:" -#: ../gui/wxpython/psmap/dialogs.py:945 +#: ../gui/wxpython/psmap/dialogs.py:971 msgid "fit frame to match selected map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:946 +#: ../gui/wxpython/psmap/dialogs.py:972 msgid "fit frame to match saved region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:947 +#: ../gui/wxpython/psmap/dialogs.py:973 msgid "fit frame to match current computational region" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:948 +#: ../gui/wxpython/psmap/dialogs.py:974 msgid "fixed scale and map center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:962 ../gui/wxpython/psmap/dialogs.py:1250 +#: ../gui/wxpython/psmap/dialogs.py:988 ../gui/wxpython/psmap/dialogs.py:1276 msgid "Map selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 ../gui/wxpython/psmap/dialogs.py:1758 +#: ../gui/wxpython/psmap/dialogs.py:1001 ../gui/wxpython/psmap/dialogs.py:1785 msgid "Map:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:975 +#: ../gui/wxpython/psmap/dialogs.py:1001 msgid "Region:" msgstr "영역:" -#: ../gui/wxpython/psmap/dialogs.py:1024 +#: ../gui/wxpython/psmap/dialogs.py:1050 msgid "Map scale and center" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1029 +#: ../gui/wxpython/psmap/dialogs.py:1055 msgid "Center:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1030 +#: ../gui/wxpython/psmap/dialogs.py:1056 msgid "E:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1031 +#: ../gui/wxpython/psmap/dialogs.py:1057 msgid "N:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1044 ../gui/wxpython/psmap/dialogs.py:5797 +#: ../gui/wxpython/psmap/dialogs.py:1070 ../gui/wxpython/psmap/dialogs.py:5850 msgid "Scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1045 +#: ../gui/wxpython/psmap/dialogs.py:1071 msgid "1 :" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1101 +#: ../gui/wxpython/psmap/dialogs.py:1127 msgid "Map max resolution (dpi):" msgstr "" #. GTC Line around legend or map frame #. GTC Line around legend or map frame -#: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645 +#: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684 msgid "Border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1127 +#: ../gui/wxpython/psmap/dialogs.py:1153 msgid "draw border around map frame" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1134 +#: ../gui/wxpython/psmap/dialogs.py:1160 msgid "border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1136 +#: ../gui/wxpython/psmap/dialogs.py:1162 msgid "border width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1260 +#: ../gui/wxpython/psmap/dialogs.py:1286 msgid "" "Region is set to match this map,\n" "raster or vector map must be added later" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1269 +#: ../gui/wxpython/psmap/dialogs.py:1296 msgid "Region selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1448 +#: ../gui/wxpython/psmap/dialogs.py:1475 msgid "No map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1480 +#: ../gui/wxpython/psmap/dialogs.py:1507 msgid "No region selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1539 +#: ../gui/wxpython/psmap/dialogs.py:1566 msgid "Invalid scale or map center!" msgstr "무효한 축척 또는 지도 중심!" -#: ../gui/wxpython/psmap/dialogs.py:1610 +#: ../gui/wxpython/psmap/dialogs.py:1637 msgid "Choose raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1616 +#: ../gui/wxpython/psmap/dialogs.py:1643 msgid "no raster map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1618 +#: ../gui/wxpython/psmap/dialogs.py:1645 msgid "raster:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1681 ../gui/wxpython/psmap/frame.py:246 +#: ../gui/wxpython/psmap/dialogs.py:1708 ../gui/wxpython/psmap/frame.py:246 msgid "Please, create map frame first." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1754 +#: ../gui/wxpython/psmap/dialogs.py:1781 msgid "Add map" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2262 msgid "points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:1794 ../gui/wxpython/psmap/dialogs.py:2264 msgid "lines" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1767 +#: ../gui/wxpython/psmap/dialogs.py:1794 msgid "areas" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1772 +#: ../gui/wxpython/psmap/dialogs.py:1799 msgid "Data Type" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1799 +#: ../gui/wxpython/psmap/dialogs.py:1826 msgid "Manage vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1805 +#: ../gui/wxpython/psmap/dialogs.py:1832 msgid "The topmost vector map overlaps the others" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:1813 +#: ../gui/wxpython/psmap/dialogs.py:1840 msgid "Properties..." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2045 +#: ../gui/wxpython/psmap/dialogs.py:2072 msgid "Raster map settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2098 +#: ../gui/wxpython/psmap/dialogs.py:2129 msgid "Vector maps settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2143 +#: ../gui/wxpython/psmap/dialogs.py:2174 #, python-format msgid "%s properties" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2218 +#: ../gui/wxpython/psmap/dialogs.py:2249 msgid "Data selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2231 +#: ../gui/wxpython/psmap/dialogs.py:2262 msgid "centroids" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2233 +#: ../gui/wxpython/psmap/dialogs.py:2264 msgid "boundaries" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2257 +#: ../gui/wxpython/psmap/dialogs.py:2288 msgid "Layer selection" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2266 +#: ../gui/wxpython/psmap/dialogs.py:2297 msgid "Database connection is not defined in DB file." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2268 +#: ../gui/wxpython/psmap/dialogs.py:2299 msgid "Select layer:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2302 +#: ../gui/wxpython/psmap/dialogs.py:2333 msgid "list of categories (e.g. 1,3,5-7)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2365 +#: ../gui/wxpython/psmap/dialogs.py:2396 msgid "Use current mask" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2384 ../gui/wxpython/psmap/dialogs.py:2532 +#: ../gui/wxpython/psmap/dialogs.py:2415 ../gui/wxpython/psmap/dialogs.py:2563 msgid "Colors" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2389 ../gui/wxpython/psmap/dialogs.py:2537 +#: ../gui/wxpython/psmap/dialogs.py:2420 ../gui/wxpython/psmap/dialogs.py:2568 msgid "Outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2393 ../gui/wxpython/psmap/dialogs.py:2546 +#: ../gui/wxpython/psmap/dialogs.py:2424 ../gui/wxpython/psmap/dialogs.py:2577 msgid "draw outline" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2396 ../gui/wxpython/psmap/dialogs.py:2550 -#: ../gui/wxpython/psmap/dialogs.py:5253 ../gui/wxpython/psmap/dialogs.py:5264 +#: ../gui/wxpython/psmap/dialogs.py:2427 ../gui/wxpython/psmap/dialogs.py:2581 +#: ../gui/wxpython/psmap/dialogs.py:5306 ../gui/wxpython/psmap/dialogs.py:5317 msgid "Width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2458 +#: ../gui/wxpython/psmap/dialogs.py:2489 msgid "fill color" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2465 ../gui/wxpython/psmap/dialogs.py:2612 +#: ../gui/wxpython/psmap/dialogs.py:2496 ../gui/wxpython/psmap/dialogs.py:2643 msgid "choose color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2479 ../gui/wxpython/psmap/dialogs.py:2627 +#: ../gui/wxpython/psmap/dialogs.py:2510 ../gui/wxpython/psmap/dialogs.py:2658 msgid "color from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2548 +#: ../gui/wxpython/psmap/dialogs.py:2579 msgid "No effect for fill color from table column" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2609 +#: ../gui/wxpython/psmap/dialogs.py:2640 msgid "Color of lines:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2675 ../gui/wxpython/psmap/dialogs.py:2887 -#: ../gui/wxpython/psmap/dialogs.py:2987 +#: ../gui/wxpython/psmap/dialogs.py:2706 ../gui/wxpython/psmap/dialogs.py:2918 +#: ../gui/wxpython/psmap/dialogs.py:3026 msgid "Size and style" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2696 +#: ../gui/wxpython/psmap/dialogs.py:2727 msgid "eps file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2704 ../gui/wxpython/psmap/dialogs.py:3002 +#: ../gui/wxpython/psmap/dialogs.py:2735 ../gui/wxpython/psmap/dialogs.py:3041 msgid "Type filename or click browse to choose file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2705 ../gui/wxpython/psmap/dialogs.py:3003 +#: ../gui/wxpython/psmap/dialogs.py:2736 ../gui/wxpython/psmap/dialogs.py:3042 msgid "Choose a file" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2757 +#: ../gui/wxpython/psmap/dialogs.py:2788 msgid "size from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2760 +#: ../gui/wxpython/psmap/dialogs.py:2791 msgid "scale:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2817 +#: ../gui/wxpython/psmap/dialogs.py:2848 msgid "Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2821 +#: ../gui/wxpython/psmap/dialogs.py:2852 msgid "rotate symbols:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2825 +#: ../gui/wxpython/psmap/dialogs.py:2856 msgid "counterclockwise in degrees:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2830 +#: ../gui/wxpython/psmap/dialogs.py:2861 msgid "from map table column:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2896 +#: ../gui/wxpython/psmap/dialogs.py:2927 msgid "Set width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2911 +#: ../gui/wxpython/psmap/dialogs.py:2942 msgid "multiply width by category value" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2941 +#: ../gui/wxpython/psmap/dialogs.py:2972 msgid "Choose line style:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2951 +#: ../gui/wxpython/psmap/dialogs.py:2990 msgid "Choose linecap:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2992 +#: ../gui/wxpython/psmap/dialogs.py:3031 msgid "Pattern" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:2996 +#: ../gui/wxpython/psmap/dialogs.py:3035 msgid "use pattern:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3000 +#: ../gui/wxpython/psmap/dialogs.py:3039 msgid "Choose pattern file:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3010 +#: ../gui/wxpython/psmap/dialogs.py:3049 msgid "pattern line width (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3014 +#: ../gui/wxpython/psmap/dialogs.py:3053 msgid "pattern scale factor:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3392 +#: ../gui/wxpython/psmap/dialogs.py:3431 msgid "Raster legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3402 +#: ../gui/wxpython/psmap/dialogs.py:3441 msgid "Source raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3407 +#: ../gui/wxpython/psmap/dialogs.py:3446 msgid "current raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3409 +#: ../gui/wxpython/psmap/dialogs.py:3448 msgid "select raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3418 ../gui/wxpython/psmap/dialogs.py:4400 +#: ../gui/wxpython/psmap/dialogs.py:3457 ../gui/wxpython/psmap/dialogs.py:4449 #, python-format msgid "%(rast)s: type %(type)s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3459 +#: ../gui/wxpython/psmap/dialogs.py:3498 msgid "Type of legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3465 +#: ../gui/wxpython/psmap/dialogs.py:3504 msgid "discrete legend (categorical maps)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3471 +#: ../gui/wxpython/psmap/dialogs.py:3510 msgid "continuous color gradient legend (floating point map)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3484 +#: ../gui/wxpython/psmap/dialogs.py:3523 msgid "Advanced legend settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3489 +#: ../gui/wxpython/psmap/dialogs.py:3528 msgid "draw \"no data\" box" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3496 +#: ../gui/wxpython/psmap/dialogs.py:3535 msgid "draw ticks across color table" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3567 +#: ../gui/wxpython/psmap/dialogs.py:3606 msgid "Vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3571 +#: ../gui/wxpython/psmap/dialogs.py:3610 msgid "Show vector legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3578 +#: ../gui/wxpython/psmap/dialogs.py:3617 msgid "Source vector maps" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3584 +#: ../gui/wxpython/psmap/dialogs.py:3623 msgid "Choose vector maps and their order in legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3613 ../gui/wxpython/psmap/dialogs.py:4086 +#: ../gui/wxpython/psmap/dialogs.py:3652 ../gui/wxpython/psmap/dialogs.py:4134 msgid "Edit label" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3650 +#: ../gui/wxpython/psmap/dialogs.py:3689 msgid "draw border around legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3695 +#: ../gui/wxpython/psmap/dialogs.py:3734 msgid "Size and position" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3762 +#: ../gui/wxpython/psmap/dialogs.py:3801 msgid "Leave the edit field empty, to use default values." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3810 +#: ../gui/wxpython/psmap/dialogs.py:3857 msgid "" "Width of the color symbol (for lines)\n" "in front of the legend text" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980 +#: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028 msgid "Columns:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3827 +#: ../gui/wxpython/psmap/dialogs.py:3874 msgid "column span:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:3831 +#: ../gui/wxpython/psmap/dialogs.py:3878 msgid "" "Column separation distance between the left edges\n" "of two columns in a multicolumn legend" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4085 +#: ../gui/wxpython/psmap/dialogs.py:4133 msgid "Edit legend label:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4135 +#: ../gui/wxpython/psmap/dialogs.py:4184 msgid "No raster map selected!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4136 +#: ../gui/wxpython/psmap/dialogs.py:4185 msgid "No raster" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4446 +#: ../gui/wxpython/psmap/dialogs.py:4495 msgid "Mapinfo settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4563 +#: ../gui/wxpython/psmap/dialogs.py:4612 msgid "Color settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4569 +#: ../gui/wxpython/psmap/dialogs.py:4618 msgid "use border color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4572 +#: ../gui/wxpython/psmap/dialogs.py:4621 msgid "use background color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4837 +#: ../gui/wxpython/psmap/dialogs.py:4886 msgid "Length:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4843 +#: ../gui/wxpython/psmap/dialogs.py:4892 msgid "Scalebar length is given in map units" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4848 +#: ../gui/wxpython/psmap/dialogs.py:4897 msgid "Scalebar height is real height on paper" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4850 +#: ../gui/wxpython/psmap/dialogs.py:4899 msgid "default" msgstr "기본값" -#: ../gui/wxpython/psmap/dialogs.py:4919 +#: ../gui/wxpython/psmap/dialogs.py:4968 msgid "Type:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4937 +#: ../gui/wxpython/psmap/dialogs.py:4990 msgid "Number of segments:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4941 +#: ../gui/wxpython/psmap/dialogs.py:4994 msgid "Label every " msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4942 +#: ../gui/wxpython/psmap/dialogs.py:4995 msgid "segments" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:4952 +#: ../gui/wxpython/psmap/dialogs.py:5005 msgid "transparent text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5074 +#: ../gui/wxpython/psmap/dialogs.py:5127 msgid "Length of scale bar is not defined" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5170 +#: ../gui/wxpython/psmap/dialogs.py:5223 msgid "Enter text:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5235 +#: ../gui/wxpython/psmap/dialogs.py:5288 msgid "Text effects" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5241 +#: ../gui/wxpython/psmap/dialogs.py:5294 msgid "text background" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5246 +#: ../gui/wxpython/psmap/dialogs.py:5299 msgid "highlight" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5257 +#: ../gui/wxpython/psmap/dialogs.py:5310 msgid "text border" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5389 +#: ../gui/wxpython/psmap/dialogs.py:5442 msgid "Offset" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5392 +#: ../gui/wxpython/psmap/dialogs.py:5445 msgid "horizontal (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5393 +#: ../gui/wxpython/psmap/dialogs.py:5446 msgid "vertical (pts):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5421 +#: ../gui/wxpython/psmap/dialogs.py:5474 msgid " Reference point" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5454 +#: ../gui/wxpython/psmap/dialogs.py:5507 msgid "Text rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5458 +#: ../gui/wxpython/psmap/dialogs.py:5511 msgid "rotate text (counterclockwise)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/psmap/dialogs.py:5600 msgid "No text entered!" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5746 +#: ../gui/wxpython/psmap/dialogs.py:5799 msgid "Choose a directory with images" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5781 +#: ../gui/wxpython/psmap/dialogs.py:5834 msgid "Note: only EPS format supported" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5791 +#: ../gui/wxpython/psmap/dialogs.py:5844 msgid "Scale And Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5822 ../gui/wxpython/psmap/dialogs.py:6342 +#: ../gui/wxpython/psmap/dialogs.py:5875 ../gui/wxpython/psmap/dialogs.py:6395 msgid "Rotation angle (deg):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5836 ../gui/wxpython/psmap/dialogs.py:6357 +#: ../gui/wxpython/psmap/dialogs.py:5889 ../gui/wxpython/psmap/dialogs.py:6410 msgid "Counterclockwise rotation in degrees" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5937 +#: ../gui/wxpython/psmap/dialogs.py:5990 msgid "" "PIL\n" "missing" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:5954 +#: ../gui/wxpython/psmap/dialogs.py:6007 #, python-format msgid "Unable to read file %s" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6017 +#: ../gui/wxpython/psmap/dialogs.py:6070 #, python-format msgid "size: %(width)s x %(height)s pts" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6039 +#: ../gui/wxpython/psmap/dialogs.py:6092 msgid "No image selected." msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6155 +#: ../gui/wxpython/psmap/dialogs.py:6208 msgid "North Arrow settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6165 +#: ../gui/wxpython/psmap/dialogs.py:6218 msgid "Compute convergence" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6238 +#: ../gui/wxpython/psmap/dialogs.py:6291 msgid "Symbol" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6244 +#: ../gui/wxpython/psmap/dialogs.py:6297 msgid "Select symbol:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6264 +#: ../gui/wxpython/psmap/dialogs.py:6317 msgid "" "Note: Selected symbol is not displayed\n" "in draft mode (only in preview mode)" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566 +#: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619 msgid "Outline color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6302 ../gui/wxpython/psmap/dialogs.py:6587 +#: ../gui/wxpython/psmap/dialogs.py:6355 ../gui/wxpython/psmap/dialogs.py:6640 msgid "Fill color:" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6326 +#: ../gui/wxpython/psmap/dialogs.py:6379 msgid "Size and Rotation" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6332 +#: ../gui/wxpython/psmap/dialogs.py:6385 msgid "Size (pt):" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6334 +#: ../gui/wxpython/psmap/dialogs.py:6387 msgid "Symbol size in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6529 +#: ../gui/wxpython/psmap/dialogs.py:6582 msgid "Rectangle settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6531 +#: ../gui/wxpython/psmap/dialogs.py:6584 msgid "Line settings" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6626 +#: ../gui/wxpython/psmap/dialogs.py:6679 msgid "Line width in points" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6695 +#: ../gui/wxpython/psmap/dialogs.py:6748 msgid "Vector labels" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6718 +#: ../gui/wxpython/psmap/dialogs.py:6771 msgid "Vector label files created beforehand by v.label module" msgstr "" -#: ../gui/wxpython/psmap/dialogs.py:6729 +#: ../gui/wxpython/psmap/dialogs.py:6782 msgid "You can select multiple label files." msgstr "" @@ -30865,138 +31899,139 @@ msgstr "" msgid "Program ps2pdf is not available. Please install it first to create PDF." msgstr "" -#: ../gui/wxpython/psmap/frame.py:373 +#: ../gui/wxpython/psmap/frame.py:374 msgid "Generating PDF..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:375 +#: ../gui/wxpython/psmap/frame.py:376 msgid "Generating PostScript..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:377 +#: ../gui/wxpython/psmap/frame.py:378 msgid "Generating preview..." msgstr "" -#: ../gui/wxpython/psmap/frame.py:397 +#: ../gui/wxpython/psmap/frame.py:398 #, python-format msgid "Ps.map exited with return code %s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:436 +#: ../gui/wxpython/psmap/frame.py:437 msgid "Program {} is not available." msgstr "" -#: ../gui/wxpython/psmap/frame.py:437 +#: ../gui/wxpython/psmap/frame.py:438 #, python-brace-format msgid "" "{title} Please install it to create PDF.\n" "\n" msgstr "" -#: ../gui/wxpython/psmap/frame.py:450 +#: ../gui/wxpython/psmap/frame.py:451 msgid "" "Program {} is not available. Please install it to create PDF.\n" "\n" " " msgstr "" -#: ../gui/wxpython/psmap/frame.py:459 +#: ../gui/wxpython/psmap/frame.py:460 #, python-format msgid "%(prg)s exited with return code %(code)s" msgstr "" -#: ../gui/wxpython/psmap/frame.py:463 +#: ../gui/wxpython/psmap/frame.py:464 msgid "PDF generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:471 +#: ../gui/wxpython/psmap/frame.py:472 msgid "You can download {} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:481 +#: ../gui/wxpython/psmap/frame.py:482 msgid "PostScript file generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:491 +#: ../gui/wxpython/psmap/frame.py:492 msgid "Generating preview, wait please" msgstr "" -#: ../gui/wxpython/psmap/frame.py:506 +#: ../gui/wxpython/psmap/frame.py:507 msgid "Preview not available" msgstr "" -#: ../gui/wxpython/psmap/frame.py:508 +#: ../gui/wxpython/psmap/frame.py:509 msgid "" "Preview is not available probably because Ghostscript is not installed or " "not on PATH." msgstr "" -#: ../gui/wxpython/psmap/frame.py:512 +#: ../gui/wxpython/psmap/frame.py:514 #, python-brace-format msgid "You can download {program} {arch} version here." msgstr "" -#: ../gui/wxpython/psmap/frame.py:529 +#: ../gui/wxpython/psmap/frame.py:531 msgid "Preview generated" msgstr "" -#: ../gui/wxpython/psmap/frame.py:561 +#: ../gui/wxpython/psmap/frame.py:563 msgid "Save file as" msgstr "" -#: ../gui/wxpython/psmap/frame.py:618 +#: ../gui/wxpython/psmap/frame.py:620 #, python-format msgid "Failed to read file %s." msgstr "" -#: ../gui/wxpython/psmap/frame.py:792 +#: ../gui/wxpython/psmap/frame.py:794 msgid "Scalebar is not appropriate for this projection" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1330 +#: ../gui/wxpython/psmap/frame.py:1333 msgid "Press button with green triangle icon to generate preview." msgstr "" -#: ../gui/wxpython/psmap/frame.py:1345 +#: ../gui/wxpython/psmap/frame.py:1348 msgid "wxGUI Cartographic Composer" msgstr "wxGUI 지도 작성자" -#: ../gui/wxpython/psmap/frame.py:1397 +#: ../gui/wxpython/psmap/frame.py:1400 msgid "MAP FRAME" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1398 +#: ../gui/wxpython/psmap/frame.py:1401 msgid "RASTER LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1399 +#: ../gui/wxpython/psmap/frame.py:1402 msgid "VECTOR LEGEND" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1400 +#: ../gui/wxpython/psmap/frame.py:1403 msgid "MAP INFO" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1401 +#: ../gui/wxpython/psmap/frame.py:1404 msgid "SCALE BAR" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1402 +#: ../gui/wxpython/psmap/frame.py:1405 msgid "IMAGE" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1403 +#: ../gui/wxpython/psmap/frame.py:1406 msgid "NORTH ARROW" msgstr "" -#: ../gui/wxpython/psmap/frame.py:1687 +#: ../gui/wxpython/psmap/frame.py:1692 msgid "Click and drag to resize object" msgstr "" -#: ../gui/wxpython/psmap/frame.py:2702 +#: ../gui/wxpython/psmap/frame.py:2711 msgid "labels: " msgstr "" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: ../gui/wxpython/psmap/g.gui.psmap.py:51 @@ -31007,6 +32042,8 @@ msgstr "" ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #~ msgid "MASK" #~ msgstr "마스크" @@ -31024,6 +32061,7 @@ msgid "Cartographic Composer - GRASS GIS" msgstr "" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31031,6 +32069,8 @@ msgstr "" #, fuzzy, python-format #~ msgid "Unable to rename mapset: %s" #~ msgstr "지도 세트를 삭제할 수 없습니다" +======= +>>>>>>> osgeo-main #, fuzzy, python-format #~ msgid "Unable to rename location: %s" @@ -31040,6 +32080,7 @@ msgstr "" #~ msgid "Unable to delete location: %s" #~ msgstr "로케이션을 삭제할 수 없습니다" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD msgid "GRASS GIS Raster Map Calculator" @@ -31150,6 +32191,8 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #, python-format #~ msgid "Invalid map size %d,%d\n" #~ msgstr "무효한 지도 크기 %d,%d\n" @@ -31232,10 +32275,6 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 #~ msgid "Unknown format '{0}'." #~ msgstr "알려지지 않은 포맷 '{0}'." -#, fuzzy -#~ msgid "Do you want to import {}to the newly created location?" -#~ msgstr "자료를 영구히 삭제하길 원하십니까? %s" - #~ msgid "Quit Cartographic Composer" #~ msgstr "지도 작성자를 종료합니다" @@ -31320,6 +32359,7 @@ msgstr "GRASS GIS 시간 도표 도구" msgid "GRASS GIS Histogramming Tool (d.histogram)" msgstr "GRASS GIS 주상도 도구 (d.histogram)" +<<<<<<< HEAD <<<<<<< HEAD #~ msgid "" @@ -31327,7 +32367,10 @@ msgstr "GRASS GIS 주상도 도구 (d.histogram)" #~ "user's current mapset." #~ msgstr "" #~ "지도 세트 검색 경로에서 가능한 파일을 현재 사용자 지도 세트로 복사합니다." +======= +>>>>>>> osgeo-main +<<<<<<< HEAD #~ msgid "" #~ "Neighborhood analysis tool for vector point maps. Makes each cell value a " #~ "function of the attribute values assigned to the vector points or " @@ -31501,6 +32544,9 @@ msgid "Do you want to quit GRASS including shell prompt or just close the GUI?" msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 닫을까요?" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/locale/po/grasswxpy_lv.po b/locale/po/grasswxpy_lv.po index aba50da33e0..9fbf2b598a6 100644 --- a/locale/po/grasswxpy_lv.po +++ b/locale/po/grasswxpy_lv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: grasswxpy_lv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-09 06:51-0700\n" +"POT-Creation-Date: 2024-05-23 03:37-0600\n" "PO-Revision-Date: 2020-07-31 15:18+0300\n" "Last-Translator: Maris Nartiss \n" "Language-Team: Latvian \n" @@ -27,12 +27,12 @@ msgstr "Skats" #: ../gui/wxpython/nviz/tools.py:112 #: ../gui/wxpython/gmodeler/preferences.py:285 -#: ../gui/wxpython/main_window/frame.py:646 ../gui/wxpython/lmgr/frame.py:628 +#: ../gui/wxpython/main_window/frame.py:643 ../gui/wxpython/lmgr/frame.py:629 msgid "Data" msgstr "Dati" #: ../gui/wxpython/nviz/tools.py:115 -#: ../gui/wxpython/gui_core/preferences.py:508 +#: ../gui/wxpython/gui_core/preferences.py:555 msgid "Appearance" msgstr "Izskats" @@ -40,837 +40,837 @@ msgstr "Izskats" msgid "Analysis" msgstr "Analīze" -#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:484 +#: ../gui/wxpython/nviz/tools.py:120 ../gui/wxpython/nviz/tools.py:552 msgid "Animation" msgstr "Animācija" -#: ../gui/wxpython/nviz/tools.py:249 +#: ../gui/wxpython/nviz/tools.py:315 msgid "Control View" msgstr "" -#: ../gui/wxpython/nviz/tools.py:270 +#: ../gui/wxpython/nviz/tools.py:337 msgid "Adjusts the distance and angular perspective of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:282 ../gui/wxpython/nviz/preferences.py:79 +#: ../gui/wxpython/nviz/tools.py:349 ../gui/wxpython/nviz/preferences.py:79 msgid "Perspective:" msgstr "Perspektīva:" -#: ../gui/wxpython/nviz/tools.py:298 +#: ../gui/wxpython/nviz/tools.py:365 msgid "Tilts the plane of the surface from the horizontal" msgstr "" -#: ../gui/wxpython/nviz/tools.py:308 ../gui/wxpython/nviz/tools.py:1296 +#: ../gui/wxpython/nviz/tools.py:375 ../gui/wxpython/nviz/tools.py:1390 msgid "Tilt:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:323 +#: ../gui/wxpython/nviz/tools.py:390 msgid "" "Adjusts the viewing height above the surface (angle of view automatically " "adjusts to maintain the same center of view)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:336 +#: ../gui/wxpython/nviz/tools.py:403 msgid "Adjusts the relative height of features above the plane of the surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:353 ../gui/wxpython/nviz/tools.py:1332 -#: ../gui/wxpython/nviz/tools.py:2177 +#: ../gui/wxpython/nviz/tools.py:420 ../gui/wxpython/nviz/tools.py:1426 +#: ../gui/wxpython/nviz/tools.py:2276 #: ../gui/wxpython/gmodeler/preferences.py:248 #: ../gui/wxpython/gmodeler/preferences.py:418 #: ../gui/wxpython/gmodeler/preferences.py:525 #: ../gui/wxpython/gmodeler/preferences.py:630 -#: ../gui/wxpython/gui_core/dialogs.py:1992 -#: ../gui/wxpython/psmap/dialogs.py:3770 ../gui/wxpython/psmap/dialogs.py:3998 -#: ../gui/wxpython/psmap/dialogs.py:4838 +#: ../gui/wxpython/gui_core/dialogs.py:1994 +#: ../gui/wxpython/psmap/dialogs.py:3811 ../gui/wxpython/psmap/dialogs.py:4046 +#: ../gui/wxpython/psmap/dialogs.py:4887 msgid "Height:" msgstr "Augstums:" -#: ../gui/wxpython/nviz/tools.py:369 ../gui/wxpython/nviz/preferences.py:193 +#: ../gui/wxpython/nviz/tools.py:436 ../gui/wxpython/nviz/preferences.py:193 msgid "Z-exag:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:394 +#: ../gui/wxpython/nviz/tools.py:461 msgid "Look:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:398 +#: ../gui/wxpython/nviz/tools.py:465 msgid "here" msgstr "šeit" -#: ../gui/wxpython/nviz/tools.py:403 +#: ../gui/wxpython/nviz/tools.py:470 msgid "" "Allows you to select a point on the surface that becomes the new center of " "view. Click on the button and then on the surface." msgstr "" -#: ../gui/wxpython/nviz/tools.py:412 +#: ../gui/wxpython/nviz/tools.py:479 msgid "center" msgstr "centrs" -#: ../gui/wxpython/nviz/tools.py:415 +#: ../gui/wxpython/nviz/tools.py:482 msgid "Resets the view to the original default center of view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:420 +#: ../gui/wxpython/nviz/tools.py:487 msgid "top" msgstr "no augšas" -#: ../gui/wxpython/nviz/tools.py:425 +#: ../gui/wxpython/nviz/tools.py:492 msgid "" "Sets the viewer directly over the scene's center position. This top view " "orients approximately north south." msgstr "" -#: ../gui/wxpython/nviz/tools.py:430 +#: ../gui/wxpython/nviz/tools.py:498 msgid "reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:431 +#: ../gui/wxpython/nviz/tools.py:499 msgid "Reset to default view" msgstr "" -#: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223 +#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223 msgid "Image Appearance" msgstr "" -#: ../gui/wxpython/nviz/tools.py:450 ../gui/wxpython/nviz/preferences.py:230 -#: ../gui/wxpython/gui_core/preferences.py:923 +#: ../gui/wxpython/nviz/tools.py:518 ../gui/wxpython/nviz/preferences.py:230 +#: ../gui/wxpython/gui_core/preferences.py:970 #: ../gui/wxpython/web_services/widgets.py:326 #: ../gui/wxpython/animation/dialogs.py:1903 msgid "Background color:" msgstr "Fona krāsa:" -#: ../gui/wxpython/nviz/tools.py:494 +#: ../gui/wxpython/nviz/tools.py:562 msgid "" "Press 'Record' button and start changing the view. It is recommended to use " "fly-through mode (Map Display toolbar) to achieve smooth motion." msgstr "" -#: ../gui/wxpython/nviz/tools.py:506 +#: ../gui/wxpython/nviz/tools.py:574 msgid "Record" msgstr "" -#: ../gui/wxpython/nviz/tools.py:508 +#: ../gui/wxpython/nviz/tools.py:576 msgid "Play" msgstr "" -#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/animation/toolbars.py:31 +#: ../gui/wxpython/nviz/tools.py:578 ../gui/wxpython/animation/toolbars.py:32 msgid "Pause" msgstr "Pauze" -#: ../gui/wxpython/nviz/tools.py:512 ../gui/wxpython/animation/toolbars.py:30 +#: ../gui/wxpython/nviz/tools.py:580 ../gui/wxpython/animation/toolbars.py:31 msgid "Stop" msgstr "" -#: ../gui/wxpython/nviz/tools.py:530 +#: ../gui/wxpython/nviz/tools.py:598 msgid "Total number of frames :" msgstr "" -#: ../gui/wxpython/nviz/tools.py:535 +#: ../gui/wxpython/nviz/tools.py:603 msgid "Frame rate (FPS):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:545 +#: ../gui/wxpython/nviz/tools.py:613 msgid "Frames are recorded with given frequency (FPS). " msgstr "" -#: ../gui/wxpython/nviz/tools.py:597 +#: ../gui/wxpython/nviz/tools.py:665 msgid "Save image sequence" msgstr "" -#: ../gui/wxpython/nviz/tools.py:607 ../gui/wxpython/psmap/dialogs.py:5745 +#: ../gui/wxpython/nviz/tools.py:675 ../gui/wxpython/psmap/dialogs.py:5798 msgid "Choose a directory:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:608 +#: ../gui/wxpython/nviz/tools.py:676 msgid "Choose a directory for images" msgstr "" -#: ../gui/wxpython/nviz/tools.py:609 ../gui/wxpython/tplot/frame.py:373 -#: ../gui/wxpython/location_wizard/wizard.py:1452 -#: ../gui/wxpython/location_wizard/wizard.py:1806 -#: ../gui/wxpython/gui_core/gselect.py:1234 -#: ../gui/wxpython/gui_core/gselect.py:1567 -#: ../gui/wxpython/gui_core/gselect.py:1584 -#: ../gui/wxpython/gui_core/gselect.py:1637 -#: ../gui/wxpython/gui_core/gselect.py:1672 -#: ../gui/wxpython/gui_core/forms.py:2020 -#: ../gui/wxpython/gui_core/forms.py:2130 -#: ../gui/wxpython/modules/import_export.py:825 +#: ../gui/wxpython/nviz/tools.py:677 ../gui/wxpython/tplot/frame.py:373 +#: ../gui/wxpython/location_wizard/wizard.py:1453 +#: ../gui/wxpython/location_wizard/wizard.py:1807 +#: ../gui/wxpython/gui_core/gselect.py:1235 +#: ../gui/wxpython/gui_core/gselect.py:1568 +#: ../gui/wxpython/gui_core/gselect.py:1585 +#: ../gui/wxpython/gui_core/gselect.py:1638 +#: ../gui/wxpython/gui_core/gselect.py:1673 +#: ../gui/wxpython/gui_core/forms.py:2040 +#: ../gui/wxpython/gui_core/forms.py:2151 +#: ../gui/wxpython/modules/import_export.py:841 #: ../gui/wxpython/animation/dialogs.py:490 #: ../gui/wxpython/animation/dialogs.py:1092 #: ../gui/wxpython/animation/dialogs.py:1194 #: ../gui/wxpython/animation/dialogs.py:1222 #: ../gui/wxpython/animation/dialogs.py:1245 #: ../gui/wxpython/animation/dialogs.py:1276 -#: ../gui/wxpython/psmap/dialogs.py:2703 ../gui/wxpython/psmap/dialogs.py:3001 -#: ../gui/wxpython/psmap/dialogs.py:5747 +#: ../gui/wxpython/psmap/dialogs.py:2734 ../gui/wxpython/psmap/dialogs.py:3040 +#: ../gui/wxpython/psmap/dialogs.py:5800 msgid "Browse" msgstr "Pārlūkot" -#: ../gui/wxpython/nviz/tools.py:613 ../gui/wxpython/animation/dialogs.py:1183 +#: ../gui/wxpython/nviz/tools.py:681 ../gui/wxpython/animation/dialogs.py:1183 msgid "File prefix:" msgstr "Datnes prefikss:" -#: ../gui/wxpython/nviz/tools.py:622 +#: ../gui/wxpython/nviz/tools.py:690 msgid "" "Generated files names will look like this: prefix_1.ppm, prefix_2.ppm, ..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:625 ../gui/wxpython/animation/dialogs.py:1185 +#: ../gui/wxpython/nviz/tools.py:694 ../gui/wxpython/animation/dialogs.py:1185 msgid "File format:" msgstr "Datnes formāts:" -#: ../gui/wxpython/nviz/tools.py:688 ../gui/wxpython/nviz/tools.py:2318 +#: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417 #: ../gui/wxpython/nviz/preferences.py:438 msgid "Surface" msgstr "Virsma" -#: ../gui/wxpython/nviz/tools.py:698 ../gui/wxpython/nviz/tools.py:1394 +#: ../gui/wxpython/nviz/tools.py:768 ../gui/wxpython/nviz/tools.py:1490 msgid "Constant surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557 +#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557 msgid "Vector" msgstr "Vektors" -#: ../gui/wxpython/nviz/tools.py:716 ../gui/wxpython/gui_core/dialogs.py:1507 +#: ../gui/wxpython/nviz/tools.py:786 ../gui/wxpython/gui_core/dialogs.py:1509 msgid "3D raster" msgstr "3D rastrs" -#: ../gui/wxpython/nviz/tools.py:760 ../gui/wxpython/nviz/preferences.py:316 +#: ../gui/wxpython/nviz/tools.py:837 ../gui/wxpython/nviz/preferences.py:316 msgid "Lighting" msgstr "Apgaismojums" -#: ../gui/wxpython/nviz/tools.py:768 +#: ../gui/wxpython/nviz/tools.py:845 msgid "Fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:779 ../gui/wxpython/animation/dialogs.py:950 +#: ../gui/wxpython/nviz/tools.py:856 ../gui/wxpython/animation/dialogs.py:950 msgid "Decorations" msgstr "Dekorācijas" -#: ../gui/wxpython/nviz/tools.py:804 ../gui/wxpython/nviz/tools.py:1148 +#: ../gui/wxpython/nviz/tools.py:890 ../gui/wxpython/nviz/tools.py:1242 msgid "Cutting planes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:828 ../gui/wxpython/nviz/mapwindow.py:1719 -#: ../gui/wxpython/menustrings.py:2123 ../gui/wxpython/lmgr/layertree.py:1011 -#: ../gui/wxpython/psmap/dialogs.py:1588 +#: ../gui/wxpython/nviz/tools.py:922 ../gui/wxpython/nviz/mapwindow.py:1719 +#: ../gui/wxpython/menustrings.py:2128 ../gui/wxpython/lmgr/layertree.py:1049 +#: ../gui/wxpython/psmap/dialogs.py:1615 msgid "Raster map" msgstr "Rastra karte" -#: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947 +#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399 #: ../gui/wxpython/timeline/frame.py:141 msgid "Draw" msgstr "Zīmēt" -#: ../gui/wxpython/nviz/tools.py:854 ../gui/wxpython/nviz/tools.py:1954 +#: ../gui/wxpython/nviz/tools.py:948 ../gui/wxpython/nviz/tools.py:2052 #: ../gui/wxpython/nviz/preferences.py:450 msgid "Mode:" msgstr "Režīms:" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "coarse" msgstr "rupjš" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "fine" msgstr "smalks" -#: ../gui/wxpython/nviz/tools.py:862 ../gui/wxpython/nviz/preferences.py:458 +#: ../gui/wxpython/nviz/tools.py:956 ../gui/wxpython/nviz/preferences.py:458 msgid "both" msgstr "abi" -#: ../gui/wxpython/nviz/tools.py:873 ../gui/wxpython/nviz/tools.py:1167 -#: ../gui/wxpython/nviz/tools.py:1972 +#: ../gui/wxpython/nviz/tools.py:967 ../gui/wxpython/nviz/tools.py:1261 +#: ../gui/wxpython/nviz/tools.py:2070 msgid "Shading:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "flat" msgstr "" -#: ../gui/wxpython/nviz/tools.py:878 ../gui/wxpython/nviz/tools.py:1980 +#: ../gui/wxpython/nviz/tools.py:972 ../gui/wxpython/nviz/tools.py:2078 msgid "gouraud" msgstr "" -#: ../gui/wxpython/nviz/tools.py:886 +#: ../gui/wxpython/nviz/tools.py:980 msgid "Set to all" msgstr "" -#: ../gui/wxpython/nviz/tools.py:887 +#: ../gui/wxpython/nviz/tools.py:981 msgid "Use draw settings for all loaded surfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:896 ../gui/wxpython/nviz/preferences.py:488 +#: ../gui/wxpython/nviz/tools.py:990 ../gui/wxpython/nviz/preferences.py:488 msgid "Coarse mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:901 ../gui/wxpython/nviz/tools.py:946 +#: ../gui/wxpython/nviz/tools.py:995 ../gui/wxpython/nviz/tools.py:1040 #: ../gui/wxpython/nviz/preferences.py:475 #: ../gui/wxpython/nviz/preferences.py:496 msgid "resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:915 ../gui/wxpython/nviz/preferences.py:508 +#: ../gui/wxpython/nviz/tools.py:1009 ../gui/wxpython/nviz/preferences.py:508 msgid "style:" msgstr "stils:" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "wire" msgstr "" -#: ../gui/wxpython/nviz/tools.py:923 ../gui/wxpython/nviz/preferences.py:513 +#: ../gui/wxpython/nviz/tools.py:1017 ../gui/wxpython/nviz/preferences.py:513 msgid "surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:934 +#: ../gui/wxpython/nviz/tools.py:1028 msgid "Change wire color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:940 ../gui/wxpython/nviz/preferences.py:469 +#: ../gui/wxpython/nviz/tools.py:1034 ../gui/wxpython/nviz/preferences.py:469 msgid "Fine mode:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:971 +#: ../gui/wxpython/nviz/tools.py:1065 msgid "Surface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:980 ../gui/wxpython/nviz/tools.py:2918 -#: ../gui/wxpython/iclass/dialogs.py:396 +#: ../gui/wxpython/nviz/tools.py:1074 ../gui/wxpython/nviz/tools.py:3018 +#: ../gui/wxpython/iclass/dialogs.py:399 #: ../gui/wxpython/gmodeler/preferences.py:140 #: ../gui/wxpython/gmodeler/preferences.py:459 #: ../gui/wxpython/gmodeler/preferences.py:566 -#: ../gui/wxpython/wxplot/dialogs.py:1072 -#: ../gui/wxpython/wxplot/dialogs.py:1134 ../gui/wxpython/psmap/dialogs.py:6282 -#: ../gui/wxpython/psmap/dialogs.py:6562 +#: ../gui/wxpython/wxplot/dialogs.py:1073 +#: ../gui/wxpython/wxplot/dialogs.py:1135 ../gui/wxpython/psmap/dialogs.py:6335 +#: ../gui/wxpython/psmap/dialogs.py:6615 msgid "Color" msgstr "Krāsa" -#: ../gui/wxpython/nviz/tools.py:981 ../gui/wxpython/nviz/tools.py:2919 -#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1301 -#: ../gui/wxpython/psmap/dialogs.py:2362 +#: ../gui/wxpython/nviz/tools.py:1075 ../gui/wxpython/nviz/tools.py:3019 +#: ../gui/wxpython/menustrings.py:338 ../gui/wxpython/menustrings.py:1303 +#: ../gui/wxpython/psmap/dialogs.py:2393 msgid "Mask" msgstr "Maska" -#: ../gui/wxpython/nviz/tools.py:982 ../gui/wxpython/nviz/tools.py:2920 +#: ../gui/wxpython/nviz/tools.py:1076 ../gui/wxpython/nviz/tools.py:3020 msgid "Transparency" msgstr "" -#: ../gui/wxpython/nviz/tools.py:983 ../gui/wxpython/nviz/tools.py:2921 +#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:3021 msgid "Shininess" msgstr "" -#: ../gui/wxpython/nviz/tools.py:992 ../gui/wxpython/nviz/tools.py:2936 +#: ../gui/wxpython/nviz/tools.py:1086 ../gui/wxpython/nviz/tools.py:3036 msgid "map" msgstr "karte" -#: ../gui/wxpython/nviz/tools.py:996 ../gui/wxpython/nviz/tools.py:2942 +#: ../gui/wxpython/nviz/tools.py:1090 ../gui/wxpython/nviz/tools.py:3042 msgid "unset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1001 ../gui/wxpython/nviz/tools.py:2947 +#: ../gui/wxpython/nviz/tools.py:1095 ../gui/wxpython/nviz/tools.py:3047 msgid "constant" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1053 ../gui/wxpython/nviz/tools.py:2071 -#: ../gui/wxpython/psmap/dialogs.py:3711 ../gui/wxpython/psmap/dialogs.py:4474 -#: ../gui/wxpython/psmap/dialogs.py:4764 ../gui/wxpython/psmap/dialogs.py:5377 -#: ../gui/wxpython/psmap/dialogs.py:5381 ../gui/wxpython/psmap/dialogs.py:5858 -#: ../gui/wxpython/psmap/dialogs.py:5863 ../gui/wxpython/psmap/dialogs.py:6375 -#: ../gui/wxpython/psmap/dialogs.py:6380 +#: ../gui/wxpython/nviz/tools.py:1147 ../gui/wxpython/nviz/tools.py:2169 +#: ../gui/wxpython/psmap/dialogs.py:3750 ../gui/wxpython/psmap/dialogs.py:4523 +#: ../gui/wxpython/psmap/dialogs.py:4813 ../gui/wxpython/psmap/dialogs.py:5430 +#: ../gui/wxpython/psmap/dialogs.py:5434 ../gui/wxpython/psmap/dialogs.py:5911 +#: ../gui/wxpython/psmap/dialogs.py:5916 ../gui/wxpython/psmap/dialogs.py:6428 +#: ../gui/wxpython/psmap/dialogs.py:6433 msgid "Position" msgstr "Novietojums" -#: ../gui/wxpython/nviz/tools.py:1058 +#: ../gui/wxpython/nviz/tools.py:1152 msgid "Changes the x, y, and z position of the current surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1077 ../gui/wxpython/nviz/tools.py:1371 -#: ../gui/wxpython/nviz/tools.py:2093 ../gui/wxpython/nviz/tools.py:3123 +#: ../gui/wxpython/nviz/tools.py:1171 ../gui/wxpython/nviz/tools.py:1466 +#: ../gui/wxpython/nviz/tools.py:2191 ../gui/wxpython/nviz/tools.py:3223 msgid "Reset" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1078 ../gui/wxpython/nviz/tools.py:2094 +#: ../gui/wxpython/nviz/tools.py:1172 ../gui/wxpython/nviz/tools.py:2192 msgid "Reset to default position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1155 +#: ../gui/wxpython/nviz/tools.py:1249 msgid "Active cutting plane:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1172 +#: ../gui/wxpython/nviz/tools.py:1266 msgid "clear" msgstr "notīrīt" -#: ../gui/wxpython/nviz/tools.py:1173 +#: ../gui/wxpython/nviz/tools.py:1267 msgid "top color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1174 +#: ../gui/wxpython/nviz/tools.py:1268 msgid "bottom color" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1175 +#: ../gui/wxpython/nviz/tools.py:1269 msgid "blend" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1176 +#: ../gui/wxpython/nviz/tools.py:1270 msgid "shaded" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1189 +#: ../gui/wxpython/nviz/tools.py:1283 msgid "Horizontal X:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1193 +#: ../gui/wxpython/nviz/tools.py:1287 msgid "Sets the X coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1224 +#: ../gui/wxpython/nviz/tools.py:1318 msgid "Horizontal Y:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1228 +#: ../gui/wxpython/nviz/tools.py:1322 msgid "Sets the Y coordinate of the current cutting plane" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1260 +#: ../gui/wxpython/nviz/tools.py:1354 msgid "Rotation:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1264 +#: ../gui/wxpython/nviz/tools.py:1358 msgid "Rotates the current cutting plane about vertical axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1300 +#: ../gui/wxpython/nviz/tools.py:1394 msgid "Rotates the current cutting plane about horizontal axis" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1337 +#: ../gui/wxpython/nviz/tools.py:1431 msgid "" "Sets the Z coordinate of the current cutting plane (only meaningful when " "tilt is not 0)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1406 ../gui/wxpython/menustrings.py:5 -#: ../gui/wxpython/menustrings.py:2056 +#: ../gui/wxpython/nviz/tools.py:1502 ../gui/wxpython/menustrings.py:5 +#: ../gui/wxpython/menustrings.py:2061 msgid "New" msgstr "Jauns" -#: ../gui/wxpython/nviz/tools.py:1410 ../gui/wxpython/nviz/tools.py:2457 -#: ../gui/wxpython/nviz/tools.py:2519 ../gui/wxpython/menustrings.py:180 -#: ../gui/wxpython/menustrings.py:1218 ../gui/wxpython/menustrings.py:2139 -#: ../gui/wxpython/psmap/dialogs.py:1812 +#: ../gui/wxpython/nviz/tools.py:1506 ../gui/wxpython/nviz/tools.py:2556 +#: ../gui/wxpython/nviz/tools.py:2618 ../gui/wxpython/menustrings.py:180 +#: ../gui/wxpython/menustrings.py:1220 ../gui/wxpython/menustrings.py:2144 +#: ../gui/wxpython/psmap/dialogs.py:1839 msgid "Delete" msgstr "Dzēst" -#: ../gui/wxpython/nviz/tools.py:1422 +#: ../gui/wxpython/nviz/tools.py:1518 msgid "Fine resolution:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1435 +#: ../gui/wxpython/nviz/tools.py:1531 msgid "Value:" msgstr "Vērtība:" -#: ../gui/wxpython/nviz/tools.py:1447 ../gui/wxpython/nviz/tools.py:3105 +#: ../gui/wxpython/nviz/tools.py:1543 ../gui/wxpython/nviz/tools.py:3205 msgid "Transparency:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1459 ../gui/wxpython/nviz/tools.py:2215 -#: ../gui/wxpython/nviz/tools.py:2378 ../gui/wxpython/nviz/preferences.py:412 +#: ../gui/wxpython/nviz/tools.py:1555 ../gui/wxpython/nviz/tools.py:2314 +#: ../gui/wxpython/nviz/tools.py:2477 ../gui/wxpython/nviz/preferences.py:412 #: ../gui/wxpython/nviz/preferences.py:585 #: ../gui/wxpython/nviz/preferences.py:667 -#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3051 -#: ../gui/wxpython/gui_core/preferences.py:1576 -#: ../gui/wxpython/image2target/ii2t_manager.py:2986 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2120 -#: ../gui/wxpython/psmap/dialogs.py:2418 ../gui/wxpython/psmap/dialogs.py:2569 +#: ../gui/wxpython/mapswipe/dialogs.py:293 ../gui/wxpython/gcp/manager.py:3056 +#: ../gui/wxpython/gui_core/preferences.py:1623 +#: ../gui/wxpython/image2target/ii2t_manager.py:3004 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2126 +#: ../gui/wxpython/psmap/dialogs.py:2449 ../gui/wxpython/psmap/dialogs.py:2600 msgid "Color:" msgstr "Krāsa:" -#: ../gui/wxpython/nviz/tools.py:1487 ../gui/wxpython/menustrings.py:2125 -#: ../gui/wxpython/lmgr/layertree.py:1015 ../gui/wxpython/psmap/dialogs.py:3589 +#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/menustrings.py:2130 +#: ../gui/wxpython/lmgr/layertree.py:1053 ../gui/wxpython/psmap/dialogs.py:3628 msgid "Vector map" msgstr "Vektoru karte" -#: ../gui/wxpython/nviz/tools.py:1509 +#: ../gui/wxpython/nviz/tools.py:1606 msgid "Show vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1523 ../gui/wxpython/nviz/preferences.py:562 +#: ../gui/wxpython/nviz/tools.py:1620 ../gui/wxpython/nviz/preferences.py:562 msgid "Vector lines" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1529 +#: ../gui/wxpython/nviz/tools.py:1626 msgid "Line:" msgstr "Līnija:" -#: ../gui/wxpython/nviz/tools.py:1534 +#: ../gui/wxpython/nviz/tools.py:1631 msgid "width:" msgstr "platums:" -#: ../gui/wxpython/nviz/tools.py:1549 ../gui/wxpython/nviz/tools.py:1744 +#: ../gui/wxpython/nviz/tools.py:1646 ../gui/wxpython/nviz/tools.py:1841 msgid "color:" msgstr "krāsa:" -#: ../gui/wxpython/nviz/tools.py:1565 ../gui/wxpython/nviz/tools.py:1798 +#: ../gui/wxpython/nviz/tools.py:1662 ../gui/wxpython/nviz/tools.py:1895 msgid "use color for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1568 +#: ../gui/wxpython/nviz/tools.py:1665 msgid "use width for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1584 ../gui/wxpython/nviz/tools.py:1595 -#: ../gui/wxpython/nviz/tools.py:1820 ../gui/wxpython/nviz/tools.py:1831 +#: ../gui/wxpython/nviz/tools.py:1681 ../gui/wxpython/nviz/tools.py:1692 +#: ../gui/wxpython/nviz/tools.py:1917 ../gui/wxpython/nviz/tools.py:1928 msgid "Set options..." msgstr "" -#: ../gui/wxpython/nviz/tools.py:1610 ../gui/wxpython/nviz/tools.py:1843 -#: ../gui/wxpython/gmodeler/frame.py:1624 +#: ../gui/wxpython/nviz/tools.py:1707 ../gui/wxpython/nviz/tools.py:1940 +#: ../gui/wxpython/gmodeler/canvas.py:369 #: ../gui/wxpython/vdigit/preferences.py:136 msgid "Display" msgstr "Ekrāns" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "on surface(s):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1619 ../gui/wxpython/nviz/tools.py:5510 -#: ../gui/wxpython/nviz/tools.py:5563 +#: ../gui/wxpython/nviz/tools.py:1716 ../gui/wxpython/nviz/tools.py:5610 +#: ../gui/wxpython/nviz/tools.py:5663 msgid "as 3D" msgstr "kā 3D" -#: ../gui/wxpython/nviz/tools.py:1633 ../gui/wxpython/nviz/tools.py:1852 +#: ../gui/wxpython/nviz/tools.py:1730 ../gui/wxpython/nviz/tools.py:1949 msgid "Height above surface:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1689 +#: ../gui/wxpython/nviz/tools.py:1786 msgid "Show vector points" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1702 ../gui/wxpython/nviz/preferences.py:607 +#: ../gui/wxpython/nviz/tools.py:1799 ../gui/wxpython/nviz/preferences.py:607 msgid "Vector points" msgstr "Vektoru punktus" -#: ../gui/wxpython/nviz/tools.py:1709 +#: ../gui/wxpython/nviz/tools.py:1806 msgid "Icon:" msgstr "Ikona:" -#: ../gui/wxpython/nviz/tools.py:1714 ../gui/wxpython/psmap/dialogs.py:2753 +#: ../gui/wxpython/nviz/tools.py:1811 ../gui/wxpython/psmap/dialogs.py:2784 msgid "size:" msgstr "izmērs:" -#: ../gui/wxpython/nviz/tools.py:1776 ../gui/wxpython/psmap/dialogs.py:2685 +#: ../gui/wxpython/nviz/tools.py:1873 ../gui/wxpython/psmap/dialogs.py:2716 msgid "symbol:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1801 +#: ../gui/wxpython/nviz/tools.py:1898 msgid "use size for thematic mapping" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1927 ../gui/wxpython/lmgr/layertree.py:1019 +#: ../gui/wxpython/nviz/tools.py:2025 ../gui/wxpython/lmgr/layertree.py:1057 msgid "3D raster map" msgstr "3D rastra karte" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1962 +#: ../gui/wxpython/nviz/tools.py:2060 msgid "slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:1989 +#: ../gui/wxpython/nviz/tools.py:2087 msgid "Resolution:" msgstr "Izšķirtspēja:" -#: ../gui/wxpython/nviz/tools.py:2003 +#: ../gui/wxpython/nviz/tools.py:2101 msgid "Draw wire box" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2016 ../gui/wxpython/nviz/tools.py:4358 +#: ../gui/wxpython/nviz/tools.py:2114 ../gui/wxpython/nviz/tools.py:4458 msgid "List of isosurfaces" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2135 +#: ../gui/wxpython/nviz/tools.py:2234 msgid "Show light model" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2147 +#: ../gui/wxpython/nviz/tools.py:2246 msgid "Light source position" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2164 +#: ../gui/wxpython/nviz/tools.py:2263 msgid "Adjusts the light height" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2209 +#: ../gui/wxpython/nviz/tools.py:2308 msgid "Light color and intensity" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2230 ../gui/wxpython/nviz/preferences.py:385 +#: ../gui/wxpython/nviz/tools.py:2329 ../gui/wxpython/nviz/preferences.py:385 msgid "Brightness:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2234 +#: ../gui/wxpython/nviz/tools.py:2333 msgid "Adjusts the brightness of the light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2255 ../gui/wxpython/nviz/preferences.py:399 +#: ../gui/wxpython/nviz/tools.py:2354 ../gui/wxpython/nviz/preferences.py:399 msgid "Ambient:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2259 +#: ../gui/wxpython/nviz/tools.py:2358 msgid "Adjusts the ambient light" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2332 +#: ../gui/wxpython/nviz/tools.py:2431 msgid "Edges with fringe" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2336 +#: ../gui/wxpython/nviz/tools.py:2435 msgid "N && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2337 +#: ../gui/wxpython/nviz/tools.py:2436 msgid "N && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2338 +#: ../gui/wxpython/nviz/tools.py:2437 msgid "S && W" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2339 +#: ../gui/wxpython/nviz/tools.py:2438 msgid "S && E" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2358 ../gui/wxpython/gui_core/toolbars.py:82 -#: ../gui/wxpython/vnet/dialogs.py:974 ../gui/wxpython/iscatt/toolbars.py:183 +#: ../gui/wxpython/nviz/tools.py:2457 ../gui/wxpython/gui_core/toolbars.py:82 +#: ../gui/wxpython/vnet/dialogs.py:981 ../gui/wxpython/iscatt/toolbars.py:185 msgid "Settings" msgstr "Iestatījumi" -#: ../gui/wxpython/nviz/tools.py:2365 +#: ../gui/wxpython/nviz/tools.py:2464 msgid "Elevation of fringe from bottom:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2416 ../gui/wxpython/menustrings.py:2137 -#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6150 +#: ../gui/wxpython/nviz/tools.py:2515 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/psmap/toolbars.py:102 ../gui/wxpython/psmap/dialogs.py:6203 msgid "North Arrow" msgstr "Ziemeļu bulta" -#: ../gui/wxpython/nviz/tools.py:2422 +#: ../gui/wxpython/nviz/tools.py:2521 msgid "Arrow length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2438 +#: ../gui/wxpython/nviz/tools.py:2537 msgid "Arrow color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2451 +#: ../gui/wxpython/nviz/tools.py:2550 msgid "Place arrow" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2473 ../gui/wxpython/menustrings.py:2131 +#: ../gui/wxpython/nviz/tools.py:2572 ../gui/wxpython/menustrings.py:2136 #: ../gui/wxpython/psmap/toolbars.py:100 msgid "Scale bar" msgstr "Mērogjosla" -#: ../gui/wxpython/nviz/tools.py:2479 +#: ../gui/wxpython/nviz/tools.py:2578 msgid "Scale bar length (in map units):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2495 +#: ../gui/wxpython/nviz/tools.py:2594 msgid "Scale bar color:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2509 +#: ../gui/wxpython/nviz/tools.py:2608 msgid "Place new scale bar" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2586 +#: ../gui/wxpython/nviz/tools.py:2685 msgid "Do you want to record new animation without saving the previous one?" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2591 +#: ../gui/wxpython/nviz/tools.py:2691 msgid "Animation already exists" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2757 +#: ../gui/wxpython/nviz/tools.py:2857 msgid "No file prefix given." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2760 +#: ../gui/wxpython/nviz/tools.py:2860 #, python-format msgid "Directory %s does not exist." msgstr "" -#: ../gui/wxpython/nviz/tools.py:2779 ../gui/wxpython/nviz/tools.py:2825 -#: ../gui/wxpython/nviz/tools.py:5233 ../gui/wxpython/nviz/mapwindow.py:2329 +#: ../gui/wxpython/nviz/tools.py:2879 ../gui/wxpython/nviz/tools.py:2925 +#: ../gui/wxpython/nviz/tools.py:5333 ../gui/wxpython/nviz/mapwindow.py:2329 #: ../gui/wxpython/nviz/mapwindow.py:2348 msgid "constant#" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2902 +#: ../gui/wxpython/nviz/tools.py:3002 msgid "Isosurface attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2909 +#: ../gui/wxpython/nviz/tools.py:3009 msgid "toggle normal direction" msgstr "" -#: ../gui/wxpython/nviz/tools.py:2917 +#: ../gui/wxpython/nviz/tools.py:3017 msgid "Isosurface value" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3030 +#: ../gui/wxpython/nviz/tools.py:3130 msgid "Slice attributes" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3037 +#: ../gui/wxpython/nviz/tools.py:3137 msgid "Slice parallel to axis:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:3193 +#: ../gui/wxpython/nviz/tools.py:3293 msgid "W" msgstr "R" -#: ../gui/wxpython/nviz/tools.py:3194 +#: ../gui/wxpython/nviz/tools.py:3294 msgid "N" msgstr "Z" -#: ../gui/wxpython/nviz/tools.py:3195 +#: ../gui/wxpython/nviz/tools.py:3295 msgid "S" msgstr "D" -#: ../gui/wxpython/nviz/tools.py:3196 +#: ../gui/wxpython/nviz/tools.py:3296 msgid "E" msgstr "A" -#: ../gui/wxpython/nviz/tools.py:3197 +#: ../gui/wxpython/nviz/tools.py:3297 msgid "NW" msgstr "ZR" -#: ../gui/wxpython/nviz/tools.py:3198 +#: ../gui/wxpython/nviz/tools.py:3298 msgid "NE" msgstr "ZA" -#: ../gui/wxpython/nviz/tools.py:3199 +#: ../gui/wxpython/nviz/tools.py:3299 msgid "SE" msgstr "DA" -#: ../gui/wxpython/nviz/tools.py:3200 +#: ../gui/wxpython/nviz/tools.py:3300 msgid "SW" msgstr "DR" -#: ../gui/wxpython/nviz/tools.py:3714 ../gui/wxpython/nviz/tools.py:5627 +#: ../gui/wxpython/nviz/tools.py:3814 ../gui/wxpython/nviz/tools.py:5727 msgid "Level" msgstr "Līmenis" -#: ../gui/wxpython/nviz/tools.py:4364 +#: ../gui/wxpython/nviz/tools.py:4464 msgid "List of slices" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4557 ../gui/wxpython/nviz/tools.py:4560 +#: ../gui/wxpython/nviz/tools.py:4657 ../gui/wxpython/nviz/tools.py:4660 #, python-brace-format msgid "Level {level}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4567 ../gui/wxpython/nviz/tools.py:4570 +#: ../gui/wxpython/nviz/tools.py:4667 ../gui/wxpython/nviz/tools.py:4670 #, python-brace-format msgid "Slice parallel to {axis}" msgstr "" -#: ../gui/wxpython/nviz/tools.py:4860 ../gui/wxpython/nviz/tools.py:5640 +#: ../gui/wxpython/nviz/tools.py:4960 ../gui/wxpython/nviz/tools.py:5740 msgid "Slice parallel to" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5086 +#: ../gui/wxpython/nviz/tools.py:5186 #, python-format msgid "Scalebar %d" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5241 +#: ../gui/wxpython/nviz/tools.py:5341 msgid "None" msgstr "Nav" -#: ../gui/wxpython/nviz/tools.py:5244 ../gui/wxpython/menustrings.py:507 -#: ../gui/wxpython/menustrings.py:1470 +#: ../gui/wxpython/nviz/tools.py:5344 ../gui/wxpython/menustrings.py:507 +#: ../gui/wxpython/menustrings.py:1472 msgid "Plane" msgstr "Plakne" -#: ../gui/wxpython/nviz/tools.py:5447 +#: ../gui/wxpython/nviz/tools.py:5547 msgid "Vector map is 3D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5450 +#: ../gui/wxpython/nviz/tools.py:5550 msgid "Vector map is 2D" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5452 +#: ../gui/wxpython/nviz/tools.py:5552 #, python-format msgid "%(features)d features (%(points)d points)" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5512 ../gui/wxpython/nviz/tools.py:5565 +#: ../gui/wxpython/nviz/tools.py:5612 ../gui/wxpython/nviz/tools.py:5665 msgid "on surface" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5662 +#: ../gui/wxpython/nviz/tools.py:5762 msgid "range:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5738 ../gui/wxpython/nviz/tools.py:5749 +#: ../gui/wxpython/nviz/tools.py:5838 ../gui/wxpython/nviz/tools.py:5849 msgid "North edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5739 ../gui/wxpython/nviz/tools.py:5750 +#: ../gui/wxpython/nviz/tools.py:5839 ../gui/wxpython/nviz/tools.py:5850 msgid "South edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5740 ../gui/wxpython/nviz/tools.py:5747 -#: ../gui/wxpython/nviz/tools.py:5756 +#: ../gui/wxpython/nviz/tools.py:5840 ../gui/wxpython/nviz/tools.py:5847 +#: ../gui/wxpython/nviz/tools.py:5856 msgid "West edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5741 ../gui/wxpython/nviz/tools.py:5748 -#: ../gui/wxpython/nviz/tools.py:5757 +#: ../gui/wxpython/nviz/tools.py:5841 ../gui/wxpython/nviz/tools.py:5848 +#: ../gui/wxpython/nviz/tools.py:5857 msgid "East edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5743 ../gui/wxpython/nviz/tools.py:5754 -#: ../gui/wxpython/nviz/tools.py:5762 +#: ../gui/wxpython/nviz/tools.py:5843 ../gui/wxpython/nviz/tools.py:5854 +#: ../gui/wxpython/nviz/tools.py:5862 msgid "Northing (Y):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5744 ../gui/wxpython/nviz/tools.py:5753 -#: ../gui/wxpython/nviz/tools.py:5763 +#: ../gui/wxpython/nviz/tools.py:5844 ../gui/wxpython/nviz/tools.py:5853 +#: ../gui/wxpython/nviz/tools.py:5863 msgid "Height (Z):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5745 ../gui/wxpython/nviz/tools.py:5752 -#: ../gui/wxpython/nviz/tools.py:5761 +#: ../gui/wxpython/nviz/tools.py:5845 ../gui/wxpython/nviz/tools.py:5852 +#: ../gui/wxpython/nviz/tools.py:5861 msgid "Easting (X):" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5758 +#: ../gui/wxpython/nviz/tools.py:5858 msgid "Bottom edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5759 +#: ../gui/wxpython/nviz/tools.py:5859 msgid "Top edge:" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5867 +#: ../gui/wxpython/nviz/tools.py:5967 msgid "Adjusts the distance and direction of the image viewpoint" msgstr "" -#: ../gui/wxpython/nviz/tools.py:5903 +#: ../gui/wxpython/nviz/tools.py:6003 msgid "" "Adjusts the light direction. Click and drag the puck to change the light " "direction." @@ -1065,8 +1065,8 @@ msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:395 #: ../gui/wxpython/gmodeler/preferences.py:502 #: ../gui/wxpython/gmodeler/preferences.py:607 -#: ../gui/wxpython/gui_core/dialogs.py:1987 -#: ../gui/wxpython/rdigit/toolbars.py:89 ../gui/wxpython/psmap/dialogs.py:3749 +#: ../gui/wxpython/gui_core/dialogs.py:1989 +#: ../gui/wxpython/rdigit/toolbars.py:90 ../gui/wxpython/psmap/dialogs.py:3788 msgid "Width:" msgstr "Platums:" @@ -1110,7 +1110,7 @@ msgstr "" #: ../gui/wxpython/nviz/wxnviz.py:473 ../gui/wxpython/iclass/g.gui.iclass.py:95 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:48 -#: ../gui/wxpython/dbmgr/sqlbuilder.py:71 +#: ../gui/wxpython/dbmgr/sqlbuilder.py:72 #, python-format msgid "Vector map <%s> not found" msgstr "" @@ -1219,14 +1219,14 @@ msgstr "" msgid "Do you want the CSV header?" msgstr "Vai vēlaties CSV galveni?" -#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:998 -#: ../gui/wxpython/menustrings.py:1961 ../gui/wxpython/lmgr/layertree.py:737 +#: ../gui/wxpython/tplot/frame.py:393 ../gui/wxpython/menustrings.py:1000 +#: ../gui/wxpython/menustrings.py:1965 ../gui/wxpython/lmgr/layertree.py:775 #: ../gui/wxpython/animation/dialogs.py:955 msgid "Export" msgstr "Eksportēt" #: ../gui/wxpython/tplot/frame.py:401 ../gui/wxpython/timeline/frame.py:143 -#: ../gui/wxpython/menustrings.py:2099 ../gui/wxpython/menustrings.py:2142 +#: ../gui/wxpython/menustrings.py:2104 ../gui/wxpython/menustrings.py:2147 msgid "Help" msgstr "Palīdzība" @@ -1336,8 +1336,8 @@ msgid "Invalid input vector dataset" msgstr "" #: ../gui/wxpython/tplot/frame.py:1166 ../gui/wxpython/timeline/frame.py:510 -#: ../gui/wxpython/animation/temporal_manager.py:245 -#: ../gui/wxpython/animation/utils.py:72 ../gui/wxpython/animation/utils.py:80 +#: ../gui/wxpython/animation/temporal_manager.py:248 +#: ../gui/wxpython/animation/utils.py:73 ../gui/wxpython/animation/utils.py:81 #, python-format msgid "Space time dataset <%s> not found." msgstr "" @@ -1408,12 +1408,12 @@ msgstr "" msgid "Set opacity level" msgstr "" -#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:295 +#: ../gui/wxpython/iclass/toolbars.py:33 ../gui/wxpython/iclass/dialogs.py:297 msgid "Class manager" msgstr "Klašu pārvaldītājs" -#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:56 -#: ../gui/wxpython/iscatt/toolbars.py:55 +#: ../gui/wxpython/iclass/toolbars.py:34 ../gui/wxpython/iclass/dialogs.py:57 +#: ../gui/wxpython/iscatt/toolbars.py:56 msgid "Select imagery group" msgstr "" @@ -1475,115 +1475,115 @@ msgstr "Pievienot rastra karti" msgid "Loading imagery lib failed" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:91 ../gui/wxpython/gcp/manager.py:597 -#: ../gui/wxpython/image2target/ii2t_manager.py:603 +#: ../gui/wxpython/iclass/dialogs.py:92 ../gui/wxpython/gcp/manager.py:597 +#: ../gui/wxpython/image2target/ii2t_manager.py:616 msgid "Create/edit group..." msgstr "Veidot / rediģēt grupu" -#: ../gui/wxpython/iclass/dialogs.py:99 +#: ../gui/wxpython/iclass/dialogs.py:100 msgid "Name of imagery group is missing." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:106 +#: ../gui/wxpython/iclass/dialogs.py:107 msgid "Name of imagery group:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:120 +#: ../gui/wxpython/iclass/dialogs.py:121 msgid "Name of imagery subgroup:" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:196 +#: ../gui/wxpython/iclass/dialogs.py:197 msgid "Please choose a subgroup." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:200 +#: ../gui/wxpython/iclass/dialogs.py:201 #, python-format msgid "Subgroup <%s> not found in group <%s>" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:209 +#: ../gui/wxpython/iclass/dialogs.py:210 #, python-format msgid "" "No data found in subgroup <%s> of group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:215 +#: ../gui/wxpython/iclass/dialogs.py:216 #, python-format msgid "" "No data found in group <%s>.\n" "." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:217 +#: ../gui/wxpython/iclass/dialogs.py:218 #: ../gui/wxpython/iclass/g.gui.iclass.py:77 #, python-format msgid "Group <%s> not found" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:261 +#: ../gui/wxpython/iclass/dialogs.py:263 msgid "Name of map is missing." msgstr "Trūkst kartes nosaukuma." -#: ../gui/wxpython/iclass/dialogs.py:268 ../gui/wxpython/gmodeler/dialogs.py:93 +#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:93 msgid "Name of raster map:" msgstr "Rastra kartes nosaukums:" -#: ../gui/wxpython/iclass/dialogs.py:270 ../gui/wxpython/gmodeler/dialogs.py:95 -#: ../gui/wxpython/gui_core/dialogs.py:265 +#: ../gui/wxpython/iclass/dialogs.py:272 ../gui/wxpython/gmodeler/dialogs.py:95 +#: ../gui/wxpython/gui_core/dialogs.py:266 msgid "Name of vector map:" msgstr "Vektordatu kartes nosaukums:" -#: ../gui/wxpython/iclass/dialogs.py:309 ../gui/wxpython/iscatt/frame.py:138 +#: ../gui/wxpython/iclass/dialogs.py:311 ../gui/wxpython/iscatt/frame.py:137 msgid "Classes" msgstr "Klases" -#: ../gui/wxpython/iclass/dialogs.py:396 ../gui/wxpython/iscatt/frame.py:410 +#: ../gui/wxpython/iclass/dialogs.py:399 ../gui/wxpython/iscatt/frame.py:409 msgid "Class name" msgstr "Klašu nosaukumi" -#: ../gui/wxpython/iclass/dialogs.py:428 ../gui/wxpython/iscatt/frame.py:447 +#: ../gui/wxpython/iclass/dialogs.py:431 ../gui/wxpython/iscatt/frame.py:446 msgid "Please use only ASCII characters." msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:539 +#: ../gui/wxpython/iclass/dialogs.py:542 msgid "Zoom to training areas of selected class" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:603 +#: ../gui/wxpython/iclass/dialogs.py:606 msgid "Save signature file" msgstr "Saglabāt parakstu datni" -#: ../gui/wxpython/iclass/dialogs.py:662 +#: ../gui/wxpython/iclass/dialogs.py:665 msgid "Enter name of signature file:" msgstr "Parakstu datnes nosaukums:" -#: ../gui/wxpython/iclass/dialogs.py:677 +#: ../gui/wxpython/iclass/dialogs.py:680 msgid "Signature file path:" msgstr "Parakstu datnes ceļš:" -#: ../gui/wxpython/iclass/dialogs.py:728 +#: ../gui/wxpython/iclass/dialogs.py:731 msgid "Export training areas" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:777 ../gui/wxpython/iscatt/dialogs.py:280 +#: ../gui/wxpython/iclass/dialogs.py:780 ../gui/wxpython/iscatt/dialogs.py:280 msgid "Enter name of new vector map:" msgstr "Jaunās vektoru kartes nosaukums:" -#: ../gui/wxpython/iclass/dialogs.py:795 ../gui/wxpython/lmgr/layertree.py:614 +#: ../gui/wxpython/iclass/dialogs.py:798 ../gui/wxpython/lmgr/layertree.py:641 msgid "Export attribute table" msgstr "Eksportēt atribūtu tabulu" -#: ../gui/wxpython/iclass/dialogs.py:799 +#: ../gui/wxpython/iclass/dialogs.py:802 msgid "Export attribute table containing computed statistical data" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:836 +#: ../gui/wxpython/iclass/dialogs.py:839 #, python-format msgid "Vector map <%s> already exists. Do you want to overwrite it?" msgstr "" -#: ../gui/wxpython/iclass/dialogs.py:839 +#: ../gui/wxpython/iclass/dialogs.py:842 #, python-format msgid "Vector <%s> exists" msgstr "" @@ -1624,7 +1624,7 @@ msgid "" "There is no class yet, do you want to create one?" msgstr "" -#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:455 +#: ../gui/wxpython/iclass/digit.py:82 ../gui/wxpython/iscatt/controllers.py:456 msgid "No class selected" msgstr "" @@ -1635,169 +1635,169 @@ msgid "" "%s" msgstr "" -#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1620 -#: ../gui/wxpython/main_window/frame.py:1815 ../gui/wxpython/lmgr/frame.py:1692 +#: ../gui/wxpython/iclass/frame.py:88 ../gui/wxpython/iclass/frame.py:1622 +#: ../gui/wxpython/main_window/frame.py:1851 ../gui/wxpython/lmgr/frame.py:1701 msgid "Supervised Classification Tool" msgstr "" -#: ../gui/wxpython/iclass/frame.py:305 ../gui/wxpython/mapswipe/frame.py:287 +#: ../gui/wxpython/iclass/frame.py:306 ../gui/wxpython/mapswipe/frame.py:287 #: ../gui/wxpython/gcp/mapdisplay.py:247 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:251 -#: ../gui/wxpython/mapdisp/frame.py:624 +#: ../gui/wxpython/mapdisp/frame.py:609 #: ../gui/wxpython/rlisetup/sampling_frame.py:103 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:243 msgid "Map Toolbar" msgstr "Kartes rīkjosla" -#: ../gui/wxpython/iclass/frame.py:327 +#: ../gui/wxpython/iclass/frame.py:328 msgid "IClass Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:349 +#: ../gui/wxpython/iclass/frame.py:350 msgid "IClass Misc Toolbar" msgstr "" -#: ../gui/wxpython/iclass/frame.py:389 +#: ../gui/wxpython/iclass/frame.py:390 msgid "Digitization Toolbar" msgstr "Digitizēšanas rīkjosla" -#: ../gui/wxpython/iclass/frame.py:419 +#: ../gui/wxpython/iclass/frame.py:420 msgid "Plots" msgstr "" -#: ../gui/wxpython/iclass/frame.py:454 +#: ../gui/wxpython/iclass/frame.py:455 msgid "Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:457 +#: ../gui/wxpython/iclass/frame.py:458 msgid "Training Areas Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:537 +#: ../gui/wxpython/iclass/frame.py:538 msgid "Adjust Training Area Display to Preview Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:541 +#: ../gui/wxpython/iclass/frame.py:542 msgid "Adjust Preview display to Training Area Display" msgstr "" -#: ../gui/wxpython/iclass/frame.py:544 +#: ../gui/wxpython/iclass/frame.py:545 msgid "Display synchronization ON" msgstr "" -#: ../gui/wxpython/iclass/frame.py:546 +#: ../gui/wxpython/iclass/frame.py:547 msgid "Display synchronization OFF" msgstr "" -#: ../gui/wxpython/iclass/frame.py:620 +#: ../gui/wxpython/iclass/frame.py:621 msgid "All changes will be lost. Do you want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:628 +#: ../gui/wxpython/iclass/frame.py:629 msgid "Import vector map" msgstr "Importēt vektrdatu karti" -#: ../gui/wxpython/iclass/frame.py:647 +#: ../gui/wxpython/iclass/frame.py:648 #, python-format msgid "No areas in vector map <%s>.\n" msgstr "" -#: ../gui/wxpython/iclass/frame.py:650 +#: ../gui/wxpython/iclass/frame.py:651 #, python-format msgid "Vector map <%s> contains points or lines, these features are ignored." msgstr "" -#: ../gui/wxpython/iclass/frame.py:676 +#: ../gui/wxpython/iclass/frame.py:677 #, python-format msgid "Unable to open vector map <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:686 +#: ../gui/wxpython/iclass/frame.py:687 #, python-format msgid "Unable to copy vector features from <%s>" msgstr "" -#: ../gui/wxpython/iclass/frame.py:697 +#: ../gui/wxpython/iclass/frame.py:698 msgid "Unable to open temporary vector map" msgstr "" -#: ../gui/wxpython/iclass/frame.py:794 +#: ../gui/wxpython/iclass/frame.py:795 msgid "No training areas to export." msgstr "" -#: ../gui/wxpython/iclass/frame.py:807 +#: ../gui/wxpython/iclass/frame.py:808 #, python-format msgid "%d training areas (%d classes) exported to vector map <%s>." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1066 +#: ../gui/wxpython/iclass/frame.py:1067 msgid "Failed to create temporary vector map." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1118 +#: ../gui/wxpython/iclass/frame.py:1119 msgid "" "There was an error initializing signatures. Check GUI console for any error " "messages." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1169 +#: ../gui/wxpython/iclass/frame.py:1170 #, python-format msgid "No area in category %s. Category skipped." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1174 +#: ../gui/wxpython/iclass/frame.py:1175 msgid "Analysis failed." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1181 +#: ../gui/wxpython/iclass/frame.py:1182 msgid "results" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1187 +#: ../gui/wxpython/iclass/frame.py:1188 msgid "No imagery group selected." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1194 +#: ../gui/wxpython/iclass/frame.py:1195 msgid "" "Due to recent changes in classes, signatures can be outdated and should be " "recalculated. Do you still want to continue?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1198 +#: ../gui/wxpython/iclass/frame.py:1199 msgid "Outdated signatures" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1211 +#: ../gui/wxpython/iclass/frame.py:1212 msgid "Signatures are not valid. Recalculate them and then try again." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1223 +#: ../gui/wxpython/iclass/frame.py:1224 #, python-format msgid "" "A signature file named %s already exists.\n" "Do you want to replace it?" msgstr "" -#: ../gui/wxpython/iclass/frame.py:1227 ../gui/wxpython/gmodeler/frame.py:594 +#: ../gui/wxpython/iclass/frame.py:1228 ../gui/wxpython/gmodeler/panels.py:923 msgid "File already exists" msgstr "Datne jau eksistē" -#: ../gui/wxpython/iclass/frame.py:1274 +#: ../gui/wxpython/iclass/frame.py:1275 msgid "No imagery group selected. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1285 +#: ../gui/wxpython/iclass/frame.py:1286 #, python-format msgid "" "Group <%(group)s> does not have enough files (it has %(files)d files). " "Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1294 +#: ../gui/wxpython/iclass/frame.py:1295 msgid "No areas given. Operation canceled." msgstr "" -#: ../gui/wxpython/iclass/frame.py:1312 +#: ../gui/wxpython/iclass/frame.py:1313 msgid "Vector features are outside raster layers. Operation canceled." msgstr "" @@ -1908,13 +1908,13 @@ msgid "" msgstr "" #: ../gui/wxpython/datacatalog/infomanager.py:54 -#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107 -#: ../gui/wxpython/modules/import_export.py:562 +#: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109 +#: ../gui/wxpython/modules/import_export.py:578 msgid "Import vector data" msgstr "Importēt vektordatus" #: ../gui/wxpython/datacatalog/infomanager.py:55 -#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072 +#: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074 #: ../gui/wxpython/modules/import_export.py:416 msgid "Import raster data" msgstr "Importēt rastra datus" @@ -1987,61 +1987,61 @@ msgid "Data catalog" msgstr "Datu katalogs" #: ../gui/wxpython/datacatalog/catalog.py:203 -#: ../gui/wxpython/location_wizard/wizard.py:329 +#: ../gui/wxpython/location_wizard/wizard.py:330 msgid "Choose GRASS data directory:" msgstr "Izvēlieties GRASS datu mapi:" -#: ../gui/wxpython/datacatalog/catalog.py:211 +#: ../gui/wxpython/datacatalog/catalog.py:212 #, fuzzy -msgid "Do you want to create a location?" +msgid "Do you want to create a new project (also known as location)?" msgstr "Vai vēlaties pārtraukt novietojuma lejupielādi?" -#: ../gui/wxpython/datacatalog/catalog.py:215 +#: ../gui/wxpython/datacatalog/catalog.py:217 #, fuzzy -msgid "Create location?" +msgid "Create project?" msgstr "Izveidot jaunu novietojumu?" -#: ../gui/wxpython/datacatalog/catalog.py:312 +#: ../gui/wxpython/datacatalog/catalog.py:314 #, fuzzy msgid "Link external raster data [r.external]" msgstr "Saitēt ārējos rastra datus" -#: ../gui/wxpython/datacatalog/catalog.py:318 +#: ../gui/wxpython/datacatalog/catalog.py:320 #, fuzzy msgid "Link external vector data [v.external]" msgstr "Saitēt ārējos vektordatus" -#: ../gui/wxpython/datacatalog/catalog.py:326 +#: ../gui/wxpython/datacatalog/catalog.py:328 msgid "Set raster output format [r.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:332 +#: ../gui/wxpython/datacatalog/catalog.py:334 msgid "Set vector output format [v.external.out]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:340 +#: ../gui/wxpython/datacatalog/catalog.py:342 #, fuzzy msgid "Unpack GRASS raster map [r.unpack]" msgstr "Atpakot rastra karti" -#: ../gui/wxpython/datacatalog/catalog.py:344 +#: ../gui/wxpython/datacatalog/catalog.py:346 msgid "Unpack GRASS vector map [v.unpack]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:351 +#: ../gui/wxpython/datacatalog/catalog.py:353 msgid "Create raster map from x,y,z data [r.in.xyz]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:357 +#: ../gui/wxpython/datacatalog/catalog.py:359 msgid "Create vector map from x,y,z data [v.in.ascii]" msgstr "" -#: ../gui/wxpython/datacatalog/catalog.py:363 -#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1202 +#: ../gui/wxpython/datacatalog/catalog.py:365 +#: ../gui/wxpython/menustrings.py:164 ../gui/wxpython/menustrings.py:1204 msgid "Link external data" msgstr "Saitēt ārējos datus" -#: ../gui/wxpython/datacatalog/catalog.py:366 +#: ../gui/wxpython/datacatalog/catalog.py:368 #, fuzzy msgid "More options..." msgstr "Grafika iestatījumi" @@ -2051,326 +2051,331 @@ msgstr "Grafika iestatījumi" msgid "Data Catalog - GRASS GIS" msgstr "Datu katalogs" -#: ../gui/wxpython/datacatalog/tree.py:95 +#: ../gui/wxpython/datacatalog/tree.py:96 #, python-brace-format -msgid "Failed to read mapsets from location <{l}>." +msgid "Failed to read mapsets from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:121 +#: ../gui/wxpython/datacatalog/tree.py:122 #, python-brace-format -msgid "Failed to read maps from location <{l}>." +msgid "Failed to read maps from project <{l}>." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:156 +#: ../gui/wxpython/datacatalog/tree.py:157 #, python-brace-format msgid "" "Map of type {elem} <{name}> already exists in mapset <{mapset}>. Do you want " "to overwrite it?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:159 ../gui/wxpython/gcp/manager.py:1803 -#: ../gui/wxpython/gui_core/dialogs.py:537 +#: ../gui/wxpython/datacatalog/tree.py:160 ../gui/wxpython/gcp/manager.py:1804 +#: ../gui/wxpython/gui_core/dialogs.py:539 #: ../gui/wxpython/rdigit/dialogs.py:114 #: ../gui/wxpython/modules/colorrules.py:674 -#: ../gui/wxpython/lmgr/layertree.py:1052 +#: ../gui/wxpython/lmgr/layertree.py:1090 #: ../gui/wxpython/animation/dialogs.py:1573 msgid "Overwrite?" msgstr "Pārrakstīt?" -#: ../gui/wxpython/datacatalog/tree.py:183 +#: ../gui/wxpython/datacatalog/tree.py:184 #, fuzzy msgid "name unknown" msgstr "nezināms" -#: ../gui/wxpython/datacatalog/tree.py:185 +#: ../gui/wxpython/datacatalog/tree.py:186 #, python-brace-format msgid "{name} (current)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:187 +#: ../gui/wxpython/datacatalog/tree.py:188 #, python-brace-format msgid "{name} (in use, owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:191 +#: ../gui/wxpython/datacatalog/tree.py:192 #, python-brace-format msgid "{name} (in use)" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:193 +#: ../gui/wxpython/datacatalog/tree.py:194 #, python-brace-format msgid "{name} (owner: {owner})" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:197 +#: ../gui/wxpython/datacatalog/tree.py:198 #, fuzzy, python-brace-format msgid "{name}" msgstr "Pārsaukt" -#: ../gui/wxpython/datacatalog/tree.py:902 +#: ../gui/wxpython/datacatalog/tree.py:875 #, python-brace-format msgid "" -"Map <{map_name}@{map_mapset}> is not in the current location. To be able to " -"display it you need to switch to <{map_location}> location. Note that if you " +"Map <{map_name}@{map_mapset}> is not in the current project. To be able to " +"display it you need to switch to <{map_location}> project. Note that if you " "switch there all current Map Displays will be closed.\n" "\n" "Do you want to switch anyway?" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:912 +#: ../gui/wxpython/datacatalog/tree.py:885 #, fuzzy -msgid "Map in a different location" +msgid "Map in a different project" msgstr "Izveidot jaunu karšu kopu izvēlētajā novietojumā" -#: ../gui/wxpython/datacatalog/tree.py:1031 +#: ../gui/wxpython/datacatalog/tree.py:1004 #, python-brace-format msgid "{c} maps marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1033 +#: ../gui/wxpython/datacatalog/tree.py:1006 #, python-brace-format msgid "Map <{layer}> marked for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1046 +#: ../gui/wxpython/datacatalog/tree.py:1019 #, python-brace-format msgid "{c} maps marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1048 +#: ../gui/wxpython/datacatalog/tree.py:1021 #, python-brace-format msgid "Map <{layer}> marked for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1063 -#: ../gui/wxpython/datacatalog/tree.py:1402 +#: ../gui/wxpython/datacatalog/tree.py:1036 +#: ../gui/wxpython/datacatalog/tree.py:1375 msgid "New name" msgstr "Jauns nosaukums" -#: ../gui/wxpython/datacatalog/tree.py:1064 +#: ../gui/wxpython/datacatalog/tree.py:1037 msgid "Rename map" msgstr "Pārsaukt karti" -#: ../gui/wxpython/datacatalog/tree.py:1213 +#: ../gui/wxpython/datacatalog/tree.py:1186 #, fuzzy msgid "Cannot rename mapset" msgstr "Pā&rsaukt karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:1226 +#: ../gui/wxpython/datacatalog/tree.py:1199 #, python-brace-format msgid "Renaming mapset <{oldmapset}> to <{newmapset}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1238 +#: ../gui/wxpython/datacatalog/tree.py:1211 #, fuzzy msgid "Cannot rename location" msgstr "Pā&rsaukt novietojumu" -#: ../gui/wxpython/datacatalog/tree.py:1250 +#: ../gui/wxpython/datacatalog/tree.py:1223 #, python-brace-format -msgid "Renaming location <{oldlocation}> to <{newlocation}> completed" +msgid "Renaming project <{oldlocation}> to <{newlocation}> completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1262 +#: ../gui/wxpython/datacatalog/tree.py:1235 #, python-brace-format msgid "Renaming map <{name}>..." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1272 +#: ../gui/wxpython/datacatalog/tree.py:1245 #, python-brace-format msgid "{cmd} -- completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1261 msgid "No map selected for copying." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1290 +#: ../gui/wxpython/datacatalog/tree.py:1263 msgid "No map selected for moving." msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1312 -#: ../gui/wxpython/datacatalog/tree.py:1332 +#: ../gui/wxpython/datacatalog/tree.py:1285 +#: ../gui/wxpython/datacatalog/tree.py:1305 #, fuzzy, python-brace-format msgid "New name for <{n}>" msgstr "Jauns nosaukums" -#: ../gui/wxpython/datacatalog/tree.py:1315 -#: ../gui/wxpython/datacatalog/tree.py:1335 -#: ../gui/wxpython/datacatalog/tree.py:1403 +#: ../gui/wxpython/datacatalog/tree.py:1288 +#: ../gui/wxpython/datacatalog/tree.py:1308 +#: ../gui/wxpython/datacatalog/tree.py:1376 msgid "Select new name" msgstr "Izvēlieties jaunu nosaukumu" -#: ../gui/wxpython/datacatalog/tree.py:1353 +#: ../gui/wxpython/datacatalog/tree.py:1326 #, python-brace-format msgid "Copying <{name}>..." msgstr "Kopē <{name}>..." -#: ../gui/wxpython/datacatalog/tree.py:1355 +#: ../gui/wxpython/datacatalog/tree.py:1328 #, python-brace-format msgid "Moving <{name}>..." msgstr "Pārvieto {name}..." -#: ../gui/wxpython/datacatalog/tree.py:1369 -#: ../gui/wxpython/datacatalog/tree.py:1371 +#: ../gui/wxpython/datacatalog/tree.py:1342 +#: ../gui/wxpython/datacatalog/tree.py:1344 msgid "g.copy completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1392 +#: ../gui/wxpython/datacatalog/tree.py:1365 msgid "Reprojection is not implemented for 3D rasters" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1468 -#: ../gui/wxpython/datacatalog/tree.py:1584 +#: ../gui/wxpython/datacatalog/tree.py:1441 +#: ../gui/wxpython/datacatalog/tree.py:1557 msgid "g.remove completed" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1548 +#: ../gui/wxpython/datacatalog/tree.py:1521 #, fuzzy, python-brace-format msgid "Do you really want to delete map(s) <{m}>?" msgstr "Nav iespējams izveidot jaunu karšu kopu: %s" -#: ../gui/wxpython/datacatalog/tree.py:1552 +#: ../gui/wxpython/datacatalog/tree.py:1525 #, fuzzy, python-brace-format msgid "Do you really want to delete {n} maps?" msgstr "Nav iespējams izveidot jaunu karšu kopu: %s" -#: ../gui/wxpython/datacatalog/tree.py:1553 +#: ../gui/wxpython/datacatalog/tree.py:1526 msgid "Delete map" msgstr "Dzēst karti" -#: ../gui/wxpython/datacatalog/tree.py:1554 +#: ../gui/wxpython/datacatalog/tree.py:1527 #, python-brace-format msgid "Deleting {name}..." msgstr "Dzēš {name}..." -#: ../gui/wxpython/datacatalog/tree.py:1744 +#: ../gui/wxpython/datacatalog/tree.py:1718 msgid "To move or copy maps to other mapsets, unlock editing of other mapsets" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:1757 +#: ../gui/wxpython/datacatalog/tree.py:1732 msgid "" -"To move or copy maps to other location, please drag them to a mapset in the " -"destination location" +"To move or copy maps to other project, please drag them to a mapset in the " +"destination project" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/datacatalog/tree.py:2062 msgid "&Cut" msgstr "&Izgriezt" -#: ../gui/wxpython/datacatalog/tree.py:2093 +#: ../gui/wxpython/datacatalog/tree.py:2068 msgid "&Copy" msgstr "&Kopēt" -#: ../gui/wxpython/datacatalog/tree.py:2097 +#: ../gui/wxpython/datacatalog/tree.py:2072 msgid "Copy &name" msgstr "Kopēt &nosaukumu" -#: ../gui/wxpython/datacatalog/tree.py:2101 -#: ../gui/wxpython/datacatalog/tree.py:2146 -#: ../gui/wxpython/datacatalog/tree.py:2250 +#: ../gui/wxpython/datacatalog/tree.py:2076 +#: ../gui/wxpython/datacatalog/tree.py:2121 +#: ../gui/wxpython/datacatalog/tree.py:2225 msgid "&Paste" msgstr "&Ielīmēt" #. GTC Delete mapset -#: ../gui/wxpython/datacatalog/tree.py:2107 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:240 +#: ../gui/wxpython/datacatalog/tree.py:2082 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:241 msgid "&Delete" msgstr "&Dzēst" #. GTC Rename mapset -#: ../gui/wxpython/datacatalog/tree.py:2112 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:233 -#: ../gui/wxpython/dbmgr/base.py:2488 +#: ../gui/wxpython/datacatalog/tree.py:2087 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:234 +#: ../gui/wxpython/dbmgr/base.py:2499 msgid "&Rename" msgstr "&Pārsaukt" -#: ../gui/wxpython/datacatalog/tree.py:2127 +#: ../gui/wxpython/datacatalog/tree.py:2102 msgid "&Display layers" msgstr "Rā&dīt slāņus" -#: ../gui/wxpython/datacatalog/tree.py:2129 +#: ../gui/wxpython/datacatalog/tree.py:2104 msgid "&Display layer" msgstr "&Attēlot slāni" -#: ../gui/wxpython/datacatalog/tree.py:2133 +#: ../gui/wxpython/datacatalog/tree.py:2108 msgid "Show &metadata" msgstr "Rādīt &metadatus" -#: ../gui/wxpython/datacatalog/tree.py:2152 +#: ../gui/wxpython/datacatalog/tree.py:2127 msgid "&Switch mapset" msgstr "Pār&slēgt karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2162 +#: ../gui/wxpython/datacatalog/tree.py:2137 msgid "&Delete mapset" msgstr "&Dzēst karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2168 +#: ../gui/wxpython/datacatalog/tree.py:2143 msgid "&Rename mapset" msgstr "Pā&rsaukt karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2174 -#: ../gui/wxpython/datacatalog/tree.py:2205 -#: ../gui/wxpython/datacatalog/tree.py:2240 +#: ../gui/wxpython/datacatalog/tree.py:2149 +#: ../gui/wxpython/datacatalog/tree.py:2180 +#: ../gui/wxpython/datacatalog/tree.py:2215 #, fuzzy msgid "Re&load maps" msgstr "Pārlādēt" -#: ../gui/wxpython/datacatalog/tree.py:2178 +#: ../gui/wxpython/datacatalog/tree.py:2153 #, fuzzy msgid "&Copy path to mapset" msgstr "&Izveidot jaunu karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2189 +#: ../gui/wxpython/datacatalog/tree.py:2164 msgid "&Create mapset" msgstr "&Izveidot jaunu karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2193 -msgid "&Delete location" -msgstr "&Dzēst novietojumu" +#: ../gui/wxpython/datacatalog/tree.py:2168 +#, fuzzy +msgid "&Delete project" +msgstr "&Dzēst karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2199 -msgid "&Rename location" -msgstr "Pā&rsaukt novietojumu" +#: ../gui/wxpython/datacatalog/tree.py:2174 +#, fuzzy +msgid "&Rename project" +msgstr "Pā&rsaukt karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2218 -msgid "&Create new location" +#: ../gui/wxpython/datacatalog/tree.py:2193 +#, fuzzy +msgid "&Create new project (location)" msgstr "Veidot &jaunu novietojumu" -#: ../gui/wxpython/datacatalog/tree.py:2222 -msgid "&Download sample location" +#: ../gui/wxpython/datacatalog/tree.py:2197 +#, fuzzy +msgid "&Download sample project (location)" msgstr "&Lejupielādēt parauga novietojumu" -#: ../gui/wxpython/datacatalog/tree.py:2227 +#: ../gui/wxpython/datacatalog/tree.py:2202 msgid "&Remove GRASS database from data catalog" msgstr "" -#: ../gui/wxpython/datacatalog/tree.py:2234 +#: ../gui/wxpython/datacatalog/tree.py:2209 #, fuzzy msgid "&Delete GRASS database from disk" msgstr "1. Izvēlieties GRASS GIS datubāzes mapi" -#: ../gui/wxpython/datacatalog/tree.py:2264 +#: ../gui/wxpython/datacatalog/tree.py:2239 #, fuzzy -msgid "&Delete locations" +msgid "&Delete projects (locations)" msgstr "&Dzēst novietojumu" -#: ../gui/wxpython/datacatalog/tree.py:2276 +#: ../gui/wxpython/datacatalog/tree.py:2251 msgid "&Delete mapsets" msgstr "&Dzēst karšu kopas" -#: ../gui/wxpython/datacatalog/tree.py:2282 +#: ../gui/wxpython/datacatalog/tree.py:2257 #, fuzzy msgid "&Copy paths to mapsets" msgstr "&Izveidot jaunu karšu kopu" -#: ../gui/wxpython/datacatalog/tree.py:2292 +#: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201 msgid "No available options" msgstr "" #: ../gui/wxpython/datacatalog/toolbars.py:23 -msgid "Reload GRASS locations" -msgstr "" +#, fuzzy +msgid "Reload GRASS projects" +msgstr "Pārprojecēt" #: ../gui/wxpython/datacatalog/toolbars.py:24 msgid "Reload current GRASS mapset only" @@ -2393,84 +2398,84 @@ msgstr "Nav iespējams izveidot jaunu GRASS datubāzi" #: ../gui/wxpython/datacatalog/toolbars.py:35 #, fuzzy -msgid "Create new mapset in current location" +msgid "Create new mapset in current project" msgstr "Izveidot jaunu karšu kopu izvēlētajā novietojumā" -#: ../gui/wxpython/datacatalog/toolbars.py:38 +#: ../gui/wxpython/datacatalog/toolbars.py:39 #, fuzzy -msgid "Create new location in current GRASS database" +msgid "Create new project (location) in current GRASS database" msgstr "Nav iespējams izveidot jaunu GRASS datubāzi" -#: ../gui/wxpython/datacatalog/toolbars.py:42 +#: ../gui/wxpython/datacatalog/toolbars.py:43 #, fuzzy -msgid "Download sample location to current GRASS database" +msgid "Download sample project (location) to current GRASS database" msgstr "Lejupielādēt parauga novietojumu" -#: ../gui/wxpython/datacatalog/toolbars.py:45 +#: ../gui/wxpython/datacatalog/toolbars.py:46 #, fuzzy msgid "Import raster data [r.import]" msgstr "Importēt rastra datus" -#: ../gui/wxpython/datacatalog/toolbars.py:48 +#: ../gui/wxpython/datacatalog/toolbars.py:49 #, fuzzy msgid "Import vector data [v.import]" msgstr "Importēt vektordatus" -#: ../gui/wxpython/datacatalog/toolbars.py:51 +#: ../gui/wxpython/datacatalog/toolbars.py:52 #, fuzzy msgid "Select another import option" msgstr "Izvēlieties rastra karti" -#: ../gui/wxpython/datacatalog/toolbars.py:61 -#: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164 +#: ../gui/wxpython/datacatalog/toolbars.py:62 +#: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204 #: ../gui/wxpython/modules/extensions.py:76 #, fuzzy msgid "Search" msgstr "Meklēt:" -#: ../gui/wxpython/datacatalog/toolbars.py:79 +#: ../gui/wxpython/datacatalog/toolbars.py:80 msgid "" "Type to search database by map type or name. Use Python regular expressions " "to refine your search." msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:45 -#: ../gui/wxpython/modules/import_export.py:927 +#: ../gui/wxpython/datacatalog/dialogs.py:44 +#: ../gui/wxpython/modules/import_export.py:943 msgid "Reprojection" msgstr "Pārprojecēšana" -#: ../gui/wxpython/datacatalog/dialogs.py:103 +#: ../gui/wxpython/datacatalog/dialogs.py:102 msgid "Reproject" msgstr "Pārprojecēt" -#: ../gui/wxpython/datacatalog/dialogs.py:105 +#: ../gui/wxpython/datacatalog/dialogs.py:104 msgid "Reproject raster" msgstr "Pārprojecēt rastru" -#: ../gui/wxpython/datacatalog/dialogs.py:107 +#: ../gui/wxpython/datacatalog/dialogs.py:106 msgid "Reproject vector" msgstr "Pārprojecēt vektorus" -#: ../gui/wxpython/datacatalog/dialogs.py:117 +#: ../gui/wxpython/datacatalog/dialogs.py:116 #, python-brace-format msgid "" "Map layer <{ml}> needs to be reprojected.\n" "Please review and modify reprojection parameters:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:125 +#: ../gui/wxpython/datacatalog/dialogs.py:124 msgid "Estimated resolution:" msgstr "Aprēķinātā izšķirtspēja:" -#: ../gui/wxpython/datacatalog/dialogs.py:131 +#: ../gui/wxpython/datacatalog/dialogs.py:130 msgid "Resampling method:" msgstr "" -#: ../gui/wxpython/datacatalog/dialogs.py:138 +#: ../gui/wxpython/datacatalog/dialogs.py:137 msgid "Maximum segment length:" msgstr "" -#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031 +#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036 #, fuzzy msgid "Data Catalog" msgstr "Datu katalogs" @@ -2485,9 +2490,9 @@ msgid "Map Swipe Tool - GRASS GIS" msgstr "Animācijas rīkjosla" #: ../gui/wxpython/mapswipe/toolbars.py:27 -#: ../gui/wxpython/gui_core/preferences.py:319 -#: ../gui/wxpython/gui_core/preferences.py:1149 -#: ../gui/wxpython/main_window/frame.py:676 ../gui/wxpython/lmgr/frame.py:635 +#: ../gui/wxpython/gui_core/preferences.py:413 +#: ../gui/wxpython/gui_core/preferences.py:1196 +#: ../gui/wxpython/main_window/frame.py:673 ../gui/wxpython/lmgr/frame.py:636 msgid "Tools" msgstr "Rīki" @@ -2548,7 +2553,7 @@ msgid "Switch to simple mode" msgstr "Pārslēgties uz vienkāršu režīmu" #: ../gui/wxpython/mapswipe/dialogs.py:205 ../gui/wxpython/menustrings.py:13 -#: ../gui/wxpython/menustrings.py:2064 ../gui/wxpython/gui_core/wrap.py:284 +#: ../gui/wxpython/menustrings.py:2069 ../gui/wxpython/gui_core/wrap.py:284 msgid "Close" msgstr "Aizvērt" @@ -2572,27 +2577,27 @@ msgstr "" msgid "Shape:" msgstr "" -#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3130 -#: ../gui/wxpython/gui_core/preferences.py:1466 -#: ../gui/wxpython/image2target/ii2t_manager.py:3065 -#: ../gui/wxpython/vnet/dialogs.py:1300 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2199 -#: ../gui/wxpython/psmap/dialogs.py:6612 +#: ../gui/wxpython/mapswipe/dialogs.py:338 ../gui/wxpython/gcp/manager.py:3135 +#: ../gui/wxpython/gui_core/preferences.py:1513 +#: ../gui/wxpython/image2target/ii2t_manager.py:3083 +#: ../gui/wxpython/vnet/dialogs.py:1307 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2205 +#: ../gui/wxpython/psmap/dialogs.py:6665 msgid "Line width:" msgstr "Līnijas platums:" #: ../gui/wxpython/mapswipe/frame.py:42 ../gui/wxpython/menustrings.py:211 -#: ../gui/wxpython/menustrings.py:2041 +#: ../gui/wxpython/menustrings.py:2046 msgid "Map Swipe" msgstr "Rādīt blakus" -#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:173 +#: ../gui/wxpython/mapswipe/frame.py:265 ../gui/wxpython/animation/frame.py:174 msgid "Main Toolbar" msgstr "Galvenā rīkjosla" #: ../gui/wxpython/mapswipe/frame.py:309 -#: ../gui/wxpython/main_window/frame.py:596 ../gui/wxpython/lmgr/frame.py:185 -#: ../gui/wxpython/animation/frame.py:212 +#: ../gui/wxpython/main_window/frame.py:593 ../gui/wxpython/lmgr/frame.py:186 +#: ../gui/wxpython/animation/frame.py:213 msgid "Misc Toolbar" msgstr "Dažādu rīku rīkjosla" @@ -2601,29 +2606,29 @@ msgstr "Dažādu rīku rīkjosla" msgid "Map <%s> not found. " msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084 -#: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106 +#: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167 +#: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107 #, python-format msgid "Map <%s> not found." msgstr "Karte <%s> nav atrasta." #: ../gui/wxpython/mapswipe/frame.py:605 ../gui/wxpython/gcp/mapdisplay.py:429 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:433 -#: ../gui/wxpython/mapdisp/frame.py:953 +#: ../gui/wxpython/mapdisp/frame.py:922 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:425 msgid "Nothing to render (empty map). Operation canceled." msgstr "" #: ../gui/wxpython/mapswipe/frame.py:614 ../gui/wxpython/gcp/mapdisplay.py:447 -#: ../gui/wxpython/gmodeler/frame.py:737 +#: ../gui/wxpython/gmodeler/panels.py:1009 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:451 -#: ../gui/wxpython/mapdisp/frame.py:775 +#: ../gui/wxpython/mapdisp/frame.py:744 #: ../gui/wxpython/modules/histogram.py:474 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:443 msgid "Choose a file name to save the image (no need to add extension)" msgstr "" -#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1067 +#: ../gui/wxpython/mapswipe/frame.py:742 ../gui/wxpython/mapdisp/frame.py:1034 msgid "No raster or vector map layer selected for querying." msgstr "" @@ -2637,206 +2642,327 @@ msgstr "" msgid "Unable to load icon theme. Reason: %s. Quitting wxGUI..." msgstr "" -#: ../gui/wxpython/history/tree.py:79 +#: ../gui/wxpython/history/tree.py:77 +msgid "No time info" +msgstr "" + +#: ../gui/wxpython/history/tree.py:142 msgid "Double-click to open the tool" msgstr "" -#: ../gui/wxpython/history/tree.py:120 +#: ../gui/wxpython/history/tree.py:191 #, fuzzy msgid "&Remove" msgstr "Noņemt" -#: ../gui/wxpython/history/tree.py:179 +#: ../gui/wxpython/history/tree.py:465 msgid "Cannot be parsed into command" msgstr "" -#: ../gui/wxpython/history/tree.py:195 +#: ../gui/wxpython/history/tree.py:491 #, fuzzy msgid "Do you really want to remove <{}> command?" msgstr "Nav iespējams izveidot jaunu karšu kopu: %s" -#: ../gui/wxpython/history/tree.py:196 +#: ../gui/wxpython/history/tree.py:492 #, fuzzy msgid "Remove command" msgstr "Noņemt leģendu" -#: ../gui/wxpython/history/tree.py:197 +#: ../gui/wxpython/history/tree.py:495 #, fuzzy msgid "Removing <{}>" msgstr "Pārvieto {name}..." -#: ../gui/wxpython/history/tree.py:203 +#: ../gui/wxpython/history/tree.py:512 msgid "<{}> removed" msgstr "" +#: ../gui/wxpython/history/browser.py:40 +#, fuzzy +msgid "Timestamp:" +msgstr "Laika zīmogs" + +#: ../gui/wxpython/history/browser.py:41 +#, fuzzy +msgid "Runtime duration:" +msgstr "Animācija" + +#: ../gui/wxpython/history/browser.py:42 +#, fuzzy +msgid "Status:" +msgstr "Rādīt statusa joslu" + +#: ../gui/wxpython/history/browser.py:43 +#, fuzzy +msgid "Mask 2D:" +msgstr "Maska" + +#: ../gui/wxpython/history/browser.py:44 +#, fuzzy +msgid "Mask 3D:" +msgstr "Maska" + +#: ../gui/wxpython/history/browser.py:45 +#, fuzzy +msgid "North:" +msgstr "Ziemeļi" + #: ../gui/wxpython/history/browser.py:46 #, fuzzy +msgid "South:" +msgstr "Dienvidi" + +#: ../gui/wxpython/history/browser.py:47 +#, fuzzy +msgid "West:" +msgstr "Rietumi" + +#: ../gui/wxpython/history/browser.py:48 +#, fuzzy +msgid "East:" +msgstr "Austrumi" + +#: ../gui/wxpython/history/browser.py:49 +#, fuzzy +msgid "North-south resolution:" +msgstr "Z-D izšķirtspēja" + +#: ../gui/wxpython/history/browser.py:50 +#, fuzzy +msgid "East-west resolution:" +msgstr "Aprēķinātā izšķirtspēja:" + +#: ../gui/wxpython/history/browser.py:51 +#, fuzzy +msgid "Number of rows:" +msgstr "Paralēlo procesu skaits:" + +#: ../gui/wxpython/history/browser.py:52 +#, fuzzy +msgid "Number of columns:" +msgstr "Elementa nosaukums:" + +#: ../gui/wxpython/history/browser.py:53 +#, fuzzy +msgid "Number of cells:" +msgstr "Elementa nosaukums:" + +#: ../gui/wxpython/history/browser.py:63 +#, fuzzy +msgid "{} sec" +msgstr "%d sek" + +#: ../gui/wxpython/history/browser.py:117 +#, fuzzy +msgid "General info" +msgstr "Vispārēji" + +#: ../gui/wxpython/history/browser.py:138 +#, fuzzy +msgid "Computational region during command execution" +msgstr "Rādīt aprēķinu reģiona apjomu" + +#: ../gui/wxpython/history/browser.py:265 +#: ../gui/wxpython/history/browser.py:292 +#, fuzzy +msgid "Update current region" +msgstr "Parādīt pašreizējo reģionu" + +#: ../gui/wxpython/history/browser.py:271 +#, fuzzy +msgid "Region match" +msgstr "Projekcijas atbilst" + +#: ../gui/wxpython/history/browser.py:294 +#, fuzzy +msgid "Set current computational region to the region of executed command" +msgstr "Saglabāt aprēķinu reģionu datnē" + +#: ../gui/wxpython/history/browser.py:359 +#, fuzzy msgid "History browser" msgstr "Datu pārlūks" -#: ../gui/wxpython/history/browser.py:68 +#: ../gui/wxpython/history/browser.py:383 ../gui/wxpython/gui_core/menu.py:214 +#, fuzzy +msgid "Double-click to run selected tool" +msgstr "Nav iespējams dzēst novietojumu" + +#: ../gui/wxpython/history/browser.py:396 #, fuzzy msgid "&Export history" msgstr "Eksportēt uz:" -#: ../gui/wxpython/history/browser.py:70 +#: ../gui/wxpython/history/browser.py:398 msgid "Export history of executed commands to a file" msgstr "" -#: ../gui/wxpython/history/browser.py:76 ../gui/wxpython/gui_core/menu.py:174 +#: ../gui/wxpython/history/browser.py:465 +#, python-brace-format +msgid "{json} (*.json)|*.txt|{files} (*)|*" +msgstr "" + +#: ../gui/wxpython/history/browser.py:466 #, fuzzy -msgid "Double-click to run selected tool" -msgstr "Nav iespējams dzēst novietojumu" +msgid "JSON files" +msgstr "Saglabāt datni kā" -#: ../gui/wxpython/history/browser.py:113 -#: ../gui/wxpython/gui_core/goutput.py:372 -msgid "Save file as..." -msgstr "Saglabāt failu kā..." +#: ../gui/wxpython/history/browser.py:466 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 +msgid "Files" +msgstr "Faili" -#: ../gui/wxpython/history/browser.py:115 +#: ../gui/wxpython/history/browser.py:470 #, python-brace-format msgid "{txt} (*.txt)|*.txt|{files} (*)|*" msgstr "" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 +#: ../gui/wxpython/history/browser.py:471 +#: ../gui/wxpython/gui_core/goutput.py:344 msgid "Text files" msgstr "Teksta faili" -#: ../gui/wxpython/history/browser.py:116 -#: ../gui/wxpython/gui_core/goutput.py:375 -msgid "Files" -msgstr "Faili" +#: ../gui/wxpython/history/browser.py:475 +#: ../gui/wxpython/gui_core/goutput.py:341 +msgid "Save file as..." +msgstr "Saglabāt failu kā..." -#: ../gui/wxpython/history/browser.py:127 +#: ../gui/wxpython/history/browser.py:485 msgid "Command history saved to '{}'" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:146 +#: ../gui/wxpython/startup/locdownload.py:148 msgid "Download in progress, wait until it is finished 0%" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:157 +#: ../gui/wxpython/startup/locdownload.py:159 #, python-brace-format msgid "" "Download in progress, wait until it is finished {0}%, {1} MB, {2} KB/s, " "{3:.0f} seconds passed" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:179 -msgid "Downloaded location is not valid" +#: ../gui/wxpython/startup/locdownload.py:181 +#, fuzzy +msgid "Downloaded project is not valid" msgstr "Lejupielādētais novietojums nav derīgs" -#: ../gui/wxpython/startup/locdownload.py:223 +#: ../gui/wxpython/startup/locdownload.py:225 msgid "Abort" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:224 -#, fuzzy -msgid "Abort download location" +#: ../gui/wxpython/startup/locdownload.py:226 +#: ../gui/wxpython/startup/locdownload.py:491 +msgid "Abort download" msgstr "Pārtraukt lejupielādi" -#: ../gui/wxpython/startup/locdownload.py:227 -msgid "Select sample location to download:" +#: ../gui/wxpython/startup/locdownload.py:229 +#, fuzzy +msgid "Select sample project to download:" msgstr "Izvēlieties parauga novietojumu lejupielādei:" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:439 +#: ../gui/wxpython/startup/locdownload.py:295 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:446 msgid "Do&wnload" msgstr "Le&jupielādēt" -#: ../gui/wxpython/startup/locdownload.py:292 -#: ../gui/wxpython/startup/locdownload.py:440 -msgid "Download selected location" +#: ../gui/wxpython/startup/locdownload.py:295 +#, fuzzy +msgid "Download selected project" msgstr "Lejupielādēt izvēlēto novietojumu" -#: ../gui/wxpython/startup/locdownload.py:302 -#: ../gui/wxpython/startup/locdownload.py:381 +#: ../gui/wxpython/startup/locdownload.py:305 +#: ../gui/wxpython/startup/locdownload.py:388 #, fuzzy msgid "Download" msgstr "Le&jupielādēt" -#: ../gui/wxpython/startup/locdownload.py:309 -#: ../gui/wxpython/startup/locdownload.py:356 +#: ../gui/wxpython/startup/locdownload.py:312 +#: ../gui/wxpython/startup/locdownload.py:361 msgid "Download in progress, wait until it is finished" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:324 -#, python-format -msgid "Location named <%s> already exists, download canceled" +#: ../gui/wxpython/startup/locdownload.py:328 +#, python-brace-format +msgid "Project name {name} already exists in {path}, download canceled" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:333 +#: ../gui/wxpython/startup/locdownload.py:338 #, python-format msgid "Download failed: %s" msgstr "Lejupielāde bija nesekmīga: %s" -#: ../gui/wxpython/startup/locdownload.py:338 +#: ../gui/wxpython/startup/locdownload.py:343 msgid "" -"Download completed. The downloaded sample data is listed in the location/" -"mapset tabs upon closing of this window" +"Download completed. The downloaded sample data is available now in the data " +"tree" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:379 -#, python-format -msgid "Location named <%s> already exists, rename it first" +#: ../gui/wxpython/startup/locdownload.py:384 +#, python-brace-format +msgid "Project named {name} already exists, rename it first" msgstr "" -#: ../gui/wxpython/startup/locdownload.py:415 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:583 +#: ../gui/wxpython/startup/locdownload.py:422 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:584 #, python-brace-format msgid "Error: {text}" msgstr "Kļūda: {text}" -#: ../gui/wxpython/startup/locdownload.py:432 +#: ../gui/wxpython/startup/locdownload.py:439 #, fuzzy -msgid "Location Download" +msgid "Dataset Download" msgstr "GRASS GIS novietojuma lejupielāde" -#: ../gui/wxpython/startup/locdownload.py:483 -msgid "Do you want to cancel location download?" -msgstr "Vai vēlaties pārtraukt novietojuma lejupielādi?" +#: ../gui/wxpython/startup/locdownload.py:447 +#, fuzzy +msgid "Download selected dataset" +msgstr "Lejupielādēt izvēlēto novietojumu" -#: ../gui/wxpython/startup/locdownload.py:484 -msgid "Abort download" -msgstr "Pārtraukt lejupielādi" +#: ../gui/wxpython/startup/locdownload.py:490 +#, fuzzy +msgid "Do you want to cancel dataset download?" +msgstr "Vai vēlaties pārtraukt novietojuma lejupielādi?" -#: ../gui/wxpython/startup/guiutils.py:85 +#: ../gui/wxpython/startup/guiutils.py:84 #, fuzzy msgid "Invalid mapset name" msgstr "Nederīgs nosaukums" -#: ../gui/wxpython/startup/guiutils.py:113 -msgid "Invalid location name" -msgstr "Nederīgs novietojuma nosaukums" +#: ../gui/wxpython/startup/guiutils.py:112 +#, fuzzy +msgid "Invalid project name" +msgstr "Nederīgs nosaukums" -#: ../gui/wxpython/startup/guiutils.py:134 +#: ../gui/wxpython/startup/guiutils.py:133 msgid "Name for the new mapset:" msgstr "Jaunās karšu kopas nosaukums:" -#: ../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 +#: ../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 msgid "Create new mapset" msgstr "Izveidot jaunu karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:150 +#: ../gui/wxpython/startup/guiutils.py:149 #, fuzzy msgid "Unable to create new mapset: {}" msgstr "Nav iespējams izveidot jaunu karšu kopu: %s" -#: ../gui/wxpython/startup/guiutils.py:175 +#: ../gui/wxpython/startup/guiutils.py:173 #, fuzzy -msgid "Do you want to import {} to the newly created location?" +msgid "Do you want to import {} to the newly created project?" msgstr "Vai vēlaties pārtraukt novietojuma lejupielādi?" -#: ../gui/wxpython/startup/guiutils.py:180 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:620 +#: ../gui/wxpython/startup/guiutils.py:179 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:621 msgid "Import data?" msgstr "Importēt datus?" -#: ../gui/wxpython/startup/guiutils.py:231 +#: ../gui/wxpython/startup/guiutils.py:230 #, python-brace-format msgid "" "Cannot rename mapset <{mapset}> for the following reason:\n" @@ -2846,13 +2972,13 @@ msgid "" "No mapset will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:235 +#: ../gui/wxpython/startup/guiutils.py:234 #, fuzzy msgid "Unable to rename selected mapset" msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:246 -#: ../gui/wxpython/startup/guiutils.py:300 +#: ../gui/wxpython/startup/guiutils.py:245 +#: ../gui/wxpython/startup/guiutils.py:299 #, fuzzy msgid "" "Current name: {}\n" @@ -2863,36 +2989,36 @@ msgstr "" "\n" "Jaunais nosaukums:" -#: ../gui/wxpython/startup/guiutils.py:247 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:235 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:706 +#: ../gui/wxpython/startup/guiutils.py:246 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:236 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:707 msgid "Rename selected mapset" msgstr "Pārsaukt izvēlēto karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:259 -#: ../gui/wxpython/startup/guiutils.py:312 -#: ../gui/wxpython/location_wizard/wizard.py:734 -#: ../gui/wxpython/location_wizard/wizard.py:918 -#: ../gui/wxpython/location_wizard/wizard.py:2116 -#: ../gui/wxpython/location_wizard/dialogs.py:122 -#: ../gui/wxpython/location_wizard/dialogs.py:140 -#: ../gui/wxpython/location_wizard/dialogs.py:543 -#: ../gui/wxpython/gmodeler/frame.py:1206 -#: ../gui/wxpython/gui_core/preferences.py:232 -#: ../gui/wxpython/gui_core/preferences.py:1979 -#: ../gui/wxpython/gui_core/preferences.py:2011 -#: ../gui/wxpython/gui_core/preferences.py:2023 -#: ../gui/wxpython/gui_core/preferences.py:2035 +#: ../gui/wxpython/startup/guiutils.py:258 +#: ../gui/wxpython/startup/guiutils.py:311 +#: ../gui/wxpython/location_wizard/wizard.py:735 +#: ../gui/wxpython/location_wizard/wizard.py:919 +#: ../gui/wxpython/location_wizard/wizard.py:2117 +#: ../gui/wxpython/location_wizard/dialogs.py:123 +#: ../gui/wxpython/location_wizard/dialogs.py:141 +#: ../gui/wxpython/location_wizard/dialogs.py:556 +#: ../gui/wxpython/gmodeler/panels.py:698 +#: ../gui/wxpython/gui_core/preferences.py:234 +#: ../gui/wxpython/gui_core/preferences.py:2044 +#: ../gui/wxpython/gui_core/preferences.py:2076 +#: ../gui/wxpython/gui_core/preferences.py:2088 +#: ../gui/wxpython/gui_core/preferences.py:2100 #: ../gui/wxpython/vdigit/dialogs.py:274 ../gui/wxpython/vdigit/dialogs.py:456 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:323 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:738 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:787 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:324 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:739 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:788 #: ../gui/wxpython/core/gcmd.py:96 ../gui/wxpython/core/workspace.py:1754 -#: ../gui/wxpython/lmgr/layertree.py:970 ../gui/wxpython/psmap/dialogs.py:5547 +#: ../gui/wxpython/lmgr/layertree.py:1008 ../gui/wxpython/psmap/dialogs.py:5600 msgid "Error" msgstr "Kļūda" -#: ../gui/wxpython/startup/guiutils.py:260 +#: ../gui/wxpython/startup/guiutils.py:259 #, fuzzy msgid "" "Unable to rename mapset.\n" @@ -2900,36 +3026,35 @@ msgid "" "{}" msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:285 +#: ../gui/wxpython/startup/guiutils.py:284 #, python-brace-format msgid "" -"Cannot rename location <{location}> for the following reasons:\n" +"Cannot rename project <{location}> for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No location will be renamed." +"No project will be renamed." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:289 +#: ../gui/wxpython/startup/guiutils.py:288 #, fuzzy -msgid "Unable to rename selected location" -msgstr "Nav iespējams dzēst novietojumu" +msgid "Unable to rename selected project" +msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:301 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:221 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:752 -msgid "Rename selected location" -msgstr "Pārsaukt izvēlēto novietojumu" +#: ../gui/wxpython/startup/guiutils.py:300 +#, fuzzy +msgid "Rename selected project" +msgstr "Pārsaukt izvēlēto karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:313 +#: ../gui/wxpython/startup/guiutils.py:312 #, fuzzy msgid "" -"Unable to rename location.\n" +"Unable to rename project.\n" "\n" "{}" -msgstr "Nav iespējams izveidot novietojumu" +msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:375 +#: ../gui/wxpython/startup/guiutils.py:374 #, python-brace-format msgid "" "Cannot delete one or more mapsets for the following reasons:\n" @@ -2939,12 +3064,12 @@ msgid "" "No mapsets will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:379 +#: ../gui/wxpython/startup/guiutils.py:378 #, fuzzy msgid "Unable to delete selected mapsets" msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:395 +#: ../gui/wxpython/startup/guiutils.py:394 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following mapsets?\n" @@ -2954,17 +3079,17 @@ msgid "" "All maps included in these mapsets will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:400 +#: ../gui/wxpython/startup/guiutils.py:399 #, fuzzy msgid "Delete selected mapsets" msgstr "Dzēst izvēlēto karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:413 +#: ../gui/wxpython/startup/guiutils.py:412 #, fuzzy msgid "Error when deleting mapsets" msgstr "Kļūda nolasot failu '%s'." -#: ../gui/wxpython/startup/guiutils.py:415 +#: ../gui/wxpython/startup/guiutils.py:414 #, python-brace-format msgid "" "The following error occurred when deleting mapset <{path}>:\n" @@ -2974,53 +3099,53 @@ msgid "" "Deleting of mapsets was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:460 +#: ../gui/wxpython/startup/guiutils.py:459 #, python-brace-format msgid "" -"Cannot delete one or more locations for the following reasons:\n" +"Cannot delete one or more projects for the following reasons:\n" "\n" "{reasons}\n" "\n" -"No locations will be deleted." +"No projects will be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:464 +#: ../gui/wxpython/startup/guiutils.py:463 #, fuzzy -msgid "Unable to delete selected locations" +msgid "Unable to delete selected projects" msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:480 +#: ../gui/wxpython/startup/guiutils.py:479 #, python-brace-format msgid "" "Do you want to continue with deleting one or more of the following " -"locations?\n" +"projects?\n" "\n" "{deletes}\n" "\n" -"All mapsets included in these locations will be permanently deleted!" +"All mapsets included in these projects will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:485 +#: ../gui/wxpython/startup/guiutils.py:484 #, fuzzy -msgid "Delete selected locations" -msgstr "Dzēst izvēlēto novietojumu" +msgid "Delete selected projects" +msgstr "Dzēst izvēlēto objektu" -#: ../gui/wxpython/startup/guiutils.py:498 +#: ../gui/wxpython/startup/guiutils.py:497 #, fuzzy -msgid "Error when deleting locations" +msgid "Error when deleting projects" msgstr "Kļūda nolasot failu '%s'." -#: ../gui/wxpython/startup/guiutils.py:500 +#: ../gui/wxpython/startup/guiutils.py:499 #, python-brace-format msgid "" -"The following error occurred when deleting location <{path}>:\n" +"The following error occurred when deleting project <{path}>:\n" "\n" "{error}\n" "\n" -"Deleting of locations was interrupted." +"Deleting of projects was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:533 +#: ../gui/wxpython/startup/guiutils.py:532 #, python-brace-format msgid "" "Cannot delete GRASS database from disk for the following reason:\n" @@ -3030,12 +3155,12 @@ msgid "" "GRASS database will not be deleted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:537 +#: ../gui/wxpython/startup/guiutils.py:536 #, fuzzy msgid "Unable to delete selected GRASS database" msgstr "Nav iespējams dzēst karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:545 +#: ../gui/wxpython/startup/guiutils.py:544 #, python-brace-format msgid "" "Do you want to delete the following GRASS database from disk?\n" @@ -3045,17 +3170,17 @@ msgid "" "The directory will be permanently deleted!" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:550 +#: ../gui/wxpython/startup/guiutils.py:549 #, fuzzy msgid "Delete selected GRASS database" msgstr "Dzēst izvēlēto karšu kopu" -#: ../gui/wxpython/startup/guiutils.py:562 +#: ../gui/wxpython/startup/guiutils.py:561 #, fuzzy msgid "Error when deleting GRASS database" msgstr "Kļūda nolasot failu '%s'." -#: ../gui/wxpython/startup/guiutils.py:564 +#: ../gui/wxpython/startup/guiutils.py:563 #, python-brace-format msgid "" "The following error occurred when deleting database <{path}>:\n" @@ -3065,14 +3190,15 @@ msgid "" "Deleting of GRASS database was interrupted." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:590 -#: ../gui/wxpython/gmodeler/model.py:1147 -#: ../gui/wxpython/gmodeler/model.py:1254 ../gui/wxpython/gmodeler/frame.py:317 -#: ../gui/wxpython/gui_core/ghelp.py:248 ../gui/wxpython/core/gconsole.py:721 +#: ../gui/wxpython/startup/guiutils.py:589 +#: ../gui/wxpython/gmodeler/panels.py:325 +#: ../gui/wxpython/gmodeler/model.py:1155 +#: ../gui/wxpython/gmodeler/model.py:1262 ../gui/wxpython/gui_core/ghelp.py:258 +#: ../gui/wxpython/core/gconsole.py:751 msgid "unknown" msgstr "nezināms" -#: ../gui/wxpython/startup/guiutils.py:597 +#: ../gui/wxpython/startup/guiutils.py:596 #, python-brace-format msgid "" "User {user} is already running GRASS in selected mapset <{mapset}>\n" @@ -3084,17 +3210,17 @@ msgid "" "selected mapset?" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:604 +#: ../gui/wxpython/startup/guiutils.py:603 #, fuzzy msgid "Mapset is in use" msgstr "Karšu kopu piekļuve" -#: ../gui/wxpython/startup/guiutils.py:615 +#: ../gui/wxpython/startup/guiutils.py:614 #, fuzzy msgid "Error when removing lock file" msgstr "Kļūda nolasot failu '%s'." -#: ../gui/wxpython/startup/guiutils.py:617 +#: ../gui/wxpython/startup/guiutils.py:616 #, fuzzy, python-brace-format msgid "" "Unable to remove {lockpath}.\n" @@ -3102,101 +3228,99 @@ msgid "" " Details: {error}." msgstr "Nav iespējams izveidot novietojumu" -#: ../gui/wxpython/startup/guiutils.py:657 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:675 +#: ../gui/wxpython/startup/guiutils.py:656 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:676 #, python-format msgid "" "Import of <%(name)s> failed.\n" "Reason: %(msg)s" msgstr "" -#: ../gui/wxpython/startup/guiutils.py:663 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:681 +#: ../gui/wxpython/startup/guiutils.py:662 #, python-format msgid "" -"Data file <%(name)s> imported successfully. The location's default region " -"was set from this imported map." +"Data file <%(name)s> imported successfully. The project's default region was " +"set from this imported map." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:694 +#: ../gui/wxpython/startup/guiutils.py:693 #, python-format msgid "" "Current GRASS database is <%(dbase)s>.\n" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:712 -#: ../gui/wxpython/lmgr/workspace.py:159 +#: ../gui/wxpython/startup/guiutils.py:711 #, python-format msgid "" -"Current location is <%(loc)s>.\n" +"Current project is <%(loc)s>.\n" "Current mapset is <%(mapset)s>." msgstr "" -#: ../gui/wxpython/startup/guiutils.py:724 +#: ../gui/wxpython/startup/guiutils.py:723 #, python-format msgid "Current mapset is <%s>." msgstr "Pašreizējā karšu kopa ir <%s>." #: ../gui/wxpython/gcp/manager.py:157 -#: ../gui/wxpython/image2target/ii2t_manager.py:187 +#: ../gui/wxpython/image2target/ii2t_manager.py:200 msgid "Setup for georectification" msgstr "" #: ../gui/wxpython/gcp/manager.py:190 ../gui/wxpython/gcp/manager.py:193 -#: ../gui/wxpython/image2target/ii2t_manager.py:220 -#: ../gui/wxpython/image2target/ii2t_manager.py:223 +#: ../gui/wxpython/image2target/ii2t_manager.py:233 +#: ../gui/wxpython/image2target/ii2t_manager.py:236 msgid "Georectifying setup canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:403 -#: ../gui/wxpython/image2target/ii2t_manager.py:409 +#: ../gui/wxpython/image2target/ii2t_manager.py:422 msgid "Select map type and location/mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:418 -#: ../gui/wxpython/image2target/ii2t_manager.py:424 +#: ../gui/wxpython/image2target/ii2t_manager.py:437 msgid "Map type to georectify" msgstr "" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1808 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/gui_core/dialogs.py:1748 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:968 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1383 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/gui_core/dialogs.py:1750 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:994 msgid "raster" msgstr "rastrs" -#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/frame.py:1809 -#: ../gui/wxpython/gui_core/dialogs.py:1507 -#: ../gui/wxpython/image2target/ii2t_manager.py:425 -#: ../gui/wxpython/psmap/dialogs.py:971 +#: ../gui/wxpython/gcp/manager.py:419 ../gui/wxpython/gmodeler/panels.py:1384 +#: ../gui/wxpython/gui_core/dialogs.py:1509 +#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/psmap/dialogs.py:997 msgid "vector" msgstr "vektors" #: ../gui/wxpython/gcp/manager.py:432 -#: ../gui/wxpython/image2target/ii2t_manager.py:438 +#: ../gui/wxpython/image2target/ii2t_manager.py:451 msgid "Select source location:" msgstr "Avota novietojums:" #: ../gui/wxpython/gcp/manager.py:447 -#: ../gui/wxpython/image2target/ii2t_manager.py:453 +#: ../gui/wxpython/image2target/ii2t_manager.py:466 msgid "Select source mapset:" msgstr "" #: ../gui/wxpython/gcp/manager.py:511 -#: ../gui/wxpython/image2target/ii2t_manager.py:517 +#: ../gui/wxpython/image2target/ii2t_manager.py:530 msgid "You must select a valid location before selecting a mapset" msgstr "" #: ../gui/wxpython/gcp/manager.py:525 -#: ../gui/wxpython/image2target/ii2t_manager.py:531 +#: ../gui/wxpython/image2target/ii2t_manager.py:544 msgid "You must select a valid location and mapset in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:548 -#: ../gui/wxpython/image2target/ii2t_manager.py:554 +#: ../gui/wxpython/image2target/ii2t_manager.py:567 msgid "Select image/map group to georectify" msgstr "" @@ -3205,19 +3329,19 @@ msgid "Select/create group:" msgstr "Rediģēt/izveidot grupu:" #: ../gui/wxpython/gcp/manager.py:589 -#: ../gui/wxpython/image2target/ii2t_manager.py:595 +#: ../gui/wxpython/image2target/ii2t_manager.py:608 msgid "Create group if none exists" msgstr "" #: ../gui/wxpython/gcp/manager.py:600 -#: ../gui/wxpython/image2target/ii2t_manager.py:606 +#: ../gui/wxpython/image2target/ii2t_manager.py:619 msgid "Add vector map to group..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3290 -#: ../gui/wxpython/image2target/ii2t_manager.py:622 -#: ../gui/wxpython/image2target/ii2t_manager.py:3223 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2329 +#: ../gui/wxpython/gcp/manager.py:616 ../gui/wxpython/gcp/manager.py:3295 +#: ../gui/wxpython/image2target/ii2t_manager.py:635 +#: ../gui/wxpython/image2target/ii2t_manager.py:3241 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2335 msgid "Extension for output maps:" msgstr "" @@ -3226,17 +3350,17 @@ msgid "No vector maps." msgstr "Nav vektoru kartes." #: ../gui/wxpython/gcp/manager.py:698 -#: ../gui/wxpython/image2target/ii2t_manager.py:691 +#: ../gui/wxpython/image2target/ii2t_manager.py:704 msgid "You must select a valid image/map group in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:706 -#: ../gui/wxpython/image2target/ii2t_manager.py:699 +#: ../gui/wxpython/image2target/ii2t_manager.py:712 msgid "You must enter an map name extension in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:779 -#: ../gui/wxpython/image2target/ii2t_manager.py:772 +#: ../gui/wxpython/image2target/ii2t_manager.py:785 msgid "Select maps to display for ground control point (GCP) creation" msgstr "" @@ -3244,34 +3368,34 @@ msgstr "" msgid "Map Display Web Service Layer(s)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3183 -#: ../gui/wxpython/image2target/ii2t_manager.py:783 -#: ../gui/wxpython/image2target/ii2t_manager.py:3117 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2241 +#: ../gui/wxpython/gcp/manager.py:791 ../gui/wxpython/gcp/manager.py:3188 +#: ../gui/wxpython/image2target/ii2t_manager.py:796 +#: ../gui/wxpython/image2target/ii2t_manager.py:3135 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2247 msgid "Select source map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3197 -#: ../gui/wxpython/image2target/ii2t_manager.py:809 -#: ../gui/wxpython/image2target/ii2t_manager.py:3134 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2258 +#: ../gui/wxpython/gcp/manager.py:817 ../gui/wxpython/gcp/manager.py:3202 +#: ../gui/wxpython/image2target/ii2t_manager.py:822 +#: ../gui/wxpython/image2target/ii2t_manager.py:3152 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2264 msgid "Select target raster map to display:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3211 -#: ../gui/wxpython/image2target/ii2t_manager.py:835 -#: ../gui/wxpython/image2target/ii2t_manager.py:3151 +#: ../gui/wxpython/gcp/manager.py:844 ../gui/wxpython/gcp/manager.py:3216 +#: ../gui/wxpython/image2target/ii2t_manager.py:848 +#: ../gui/wxpython/image2target/ii2t_manager.py:3169 msgid "Select target vector map to display:" msgstr "" #: ../gui/wxpython/gcp/manager.py:920 -#: ../gui/wxpython/image2target/ii2t_manager.py:911 +#: ../gui/wxpython/image2target/ii2t_manager.py:924 msgid "You must select a source map in order to continue" msgstr "" #: ../gui/wxpython/gcp/manager.py:949 ../gui/wxpython/gcp/manager.py:973 -#: ../gui/wxpython/image2target/ii2t_manager.py:940 -#: ../gui/wxpython/image2target/ii2t_manager.py:976 +#: ../gui/wxpython/image2target/ii2t_manager.py:953 +#: ../gui/wxpython/image2target/ii2t_manager.py:989 #, python-format msgid "" "No maps in selected group <%s>.\n" @@ -3279,42 +3403,42 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1049 ../gui/wxpython/gcp/mapdisplay.py:50 -#: ../gui/wxpython/image2target/ii2t_manager.py:1013 +#: ../gui/wxpython/image2target/ii2t_manager.py:1026 msgid "Manage Ground Control Points" msgstr "" #: ../gui/wxpython/gcp/manager.py:1341 -#: ../gui/wxpython/image2target/ii2t_manager.py:1315 -#: ../gui/wxpython/photo2image/ip2i_manager.py:689 +#: ../gui/wxpython/image2target/ii2t_manager.py:1328 +#: ../gui/wxpython/photo2image/ip2i_manager.py:690 #, python-format msgid "At least %d GCPs required. Operation canceled." msgstr "" #: ../gui/wxpython/gcp/manager.py:1490 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1460 -#: ../gui/wxpython/photo2image/ip2i_manager.py:835 +#: ../gui/wxpython/image2target/ii2t_manager.py:1473 +#: ../gui/wxpython/photo2image/ip2i_manager.py:836 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "source" msgstr "avots" #: ../gui/wxpython/gcp/manager.py:1492 ../gui/wxpython/gcp/toolbars.py:106 #: ../gui/wxpython/image2target/ii2t_toolbars.py:106 -#: ../gui/wxpython/image2target/ii2t_manager.py:1462 -#: ../gui/wxpython/photo2image/ip2i_manager.py:837 +#: ../gui/wxpython/image2target/ii2t_manager.py:1475 +#: ../gui/wxpython/photo2image/ip2i_manager.py:838 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:106 msgid "target" msgstr "mērķis" #: ../gui/wxpython/gcp/manager.py:1495 -#: ../gui/wxpython/image2target/ii2t_manager.py:1465 -#: ../gui/wxpython/photo2image/ip2i_manager.py:840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1478 +#: ../gui/wxpython/photo2image/ip2i_manager.py:841 msgid "Set GCP coordinates" msgstr "" #: ../gui/wxpython/gcp/manager.py:1497 -#: ../gui/wxpython/image2target/ii2t_manager.py:1467 -#: ../gui/wxpython/photo2image/ip2i_manager.py:842 +#: ../gui/wxpython/image2target/ii2t_manager.py:1480 +#: ../gui/wxpython/photo2image/ip2i_manager.py:843 #, python-format msgid "" "Set %(coor)s coordinates for GCP No. %(key)s? \n" @@ -3324,37 +3448,37 @@ msgid "" msgstr "" #: ../gui/wxpython/gcp/manager.py:1583 -#: ../gui/wxpython/photo2image/ip2i_manager.py:503 -#: ../gui/wxpython/photo2image/ip2i_manager.py:928 +#: ../gui/wxpython/photo2image/ip2i_manager.py:504 +#: ../gui/wxpython/photo2image/ip2i_manager.py:929 msgid "Writing POINTS file failed" msgstr "" #: ../gui/wxpython/gcp/manager.py:1596 -#: ../gui/wxpython/photo2image/ip2i_manager.py:942 +#: ../gui/wxpython/photo2image/ip2i_manager.py:943 #, python-format msgid "POINTS file saved for group <%s>" msgstr "" #: ../gui/wxpython/gcp/manager.py:1610 -#: ../gui/wxpython/image2target/ii2t_manager.py:1621 -#: ../gui/wxpython/photo2image/ip2i_manager.py:956 +#: ../gui/wxpython/image2target/ii2t_manager.py:1634 +#: ../gui/wxpython/photo2image/ip2i_manager.py:957 msgid "source mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1613 -#: ../gui/wxpython/image2target/ii2t_manager.py:1624 -#: ../gui/wxpython/photo2image/ip2i_manager.py:959 +#: ../gui/wxpython/image2target/ii2t_manager.py:1637 +#: ../gui/wxpython/photo2image/ip2i_manager.py:960 msgid "target mapwin not defined" msgstr "" #: ../gui/wxpython/gcp/manager.py:1643 -#: ../gui/wxpython/photo2image/ip2i_manager.py:989 +#: ../gui/wxpython/photo2image/ip2i_manager.py:990 msgid "Reading POINTS file failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1737 -#: ../gui/wxpython/image2target/ii2t_manager.py:1750 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1083 +#: ../gui/wxpython/gcp/manager.py:1738 +#: ../gui/wxpython/image2target/ii2t_manager.py:1764 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1085 #, python-format msgid "" "Insufficient points defined and active (checked) for selected rectification " @@ -3364,335 +3488,335 @@ msgid "" "10+ points for 3rd order." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1797 +#: ../gui/wxpython/gcp/manager.py:1798 #, fuzzy, python-brace-format msgid "The {map_type} map {map_name} exists. Do you want to overwrite?" msgstr "{pa} jau eksistē. Vai vēlies to pārrakstīt?" -#: ../gui/wxpython/gcp/manager.py:1839 -#: ../gui/wxpython/image2target/ii2t_manager.py:1780 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1113 +#: ../gui/wxpython/gcp/manager.py:1840 +#: ../gui/wxpython/image2target/ii2t_manager.py:1794 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1115 msgid "Rectifying images, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1894 -#: ../gui/wxpython/image2target/ii2t_manager.py:1822 +#: ../gui/wxpython/gcp/manager.py:1895 +#: ../gui/wxpython/image2target/ii2t_manager.py:1836 #, python-format msgid "Transforming <%s>..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1900 -#: ../gui/wxpython/image2target/ii2t_manager.py:1828 +#: ../gui/wxpython/gcp/manager.py:1901 +#: ../gui/wxpython/image2target/ii2t_manager.py:1842 #, python-format msgid "Rectifying vector map <%s>, please wait..." msgstr "" -#: ../gui/wxpython/gcp/manager.py:1937 -#: ../gui/wxpython/image2target/ii2t_manager.py:1864 +#: ../gui/wxpython/gcp/manager.py:1938 +#: ../gui/wxpython/image2target/ii2t_manager.py:1878 #, python-format msgid "Georectification of vector map <%s> failed" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1946 -#: ../gui/wxpython/image2target/ii2t_manager.py:1873 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1172 +#: ../gui/wxpython/gcp/manager.py:1947 +#: ../gui/wxpython/image2target/ii2t_manager.py:1887 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1174 msgid "GCP Manager settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1998 -#: ../gui/wxpython/image2target/ii2t_manager.py:1925 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1218 +#: ../gui/wxpython/gcp/manager.py:1999 +#: ../gui/wxpython/image2target/ii2t_manager.py:1939 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1220 msgid "Quit GCP Manager" msgstr "" -#: ../gui/wxpython/gcp/manager.py:1999 -#: ../gui/wxpython/image2target/ii2t_manager.py:1926 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1219 +#: ../gui/wxpython/gcp/manager.py:2000 +#: ../gui/wxpython/image2target/ii2t_manager.py:1940 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1221 msgid "Save ground control points?" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2080 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1298 +#: ../gui/wxpython/gcp/manager.py:2084 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1303 msgid "" "Could not calculate RMS Error.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2216 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1434 +#: ../gui/wxpython/gcp/manager.py:2220 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1439 msgid "" "Could not calculate new extends.\n" "Possible error with m.transform." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2352 -#: ../gui/wxpython/image2target/ii2t_manager.py:2277 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1570 +#: ../gui/wxpython/gcp/manager.py:2356 +#: ../gui/wxpython/image2target/ii2t_manager.py:2294 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1575 msgid "Adjust source display to target display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2358 -#: ../gui/wxpython/image2target/ii2t_manager.py:2283 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1576 +#: ../gui/wxpython/gcp/manager.py:2362 +#: ../gui/wxpython/image2target/ii2t_manager.py:2300 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1581 msgid "Adjust target display to source display" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2469 ../gui/wxpython/gcp/manager.py:2488 -#: ../gui/wxpython/image2target/ii2t_manager.py:2394 -#: ../gui/wxpython/image2target/ii2t_manager.py:2415 -#: ../gui/wxpython/vnet/vnet_data.py:251 ../gui/wxpython/vnet/widgets.py:99 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1688 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1707 +#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 +#: ../gui/wxpython/image2target/ii2t_manager.py:2411 +#: ../gui/wxpython/image2target/ii2t_manager.py:2432 +#: ../gui/wxpython/vnet/vnet_data.py:254 ../gui/wxpython/vnet/widgets.py:101 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 msgid "use" msgstr "izmantot" -#: ../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 +#: ../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 msgid "source E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2471 ../gui/wxpython/gcp/manager.py:2490 -#: ../gui/wxpython/image2target/ii2t_manager.py:2396 -#: ../gui/wxpython/image2target/ii2t_manager.py:2417 +#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 +#: ../gui/wxpython/image2target/ii2t_manager.py:2413 +#: ../gui/wxpython/image2target/ii2t_manager.py:2434 msgid "source N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2472 ../gui/wxpython/gcp/manager.py:2491 -#: ../gui/wxpython/image2target/ii2t_manager.py:2398 -#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/gcp/manager.py:2476 ../gui/wxpython/gcp/manager.py:2495 +#: ../gui/wxpython/image2target/ii2t_manager.py:2415 +#: ../gui/wxpython/image2target/ii2t_manager.py:2436 msgid "target E" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2473 ../gui/wxpython/gcp/manager.py:2492 -#: ../gui/wxpython/image2target/ii2t_manager.py:2399 -#: ../gui/wxpython/image2target/ii2t_manager.py:2420 +#: ../gui/wxpython/gcp/manager.py:2477 ../gui/wxpython/gcp/manager.py:2496 +#: ../gui/wxpython/image2target/ii2t_manager.py:2416 +#: ../gui/wxpython/image2target/ii2t_manager.py:2437 msgid "target N" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493 -#: ../gui/wxpython/image2target/ii2t_manager.py:2401 -#: ../gui/wxpython/image2target/ii2t_manager.py:2422 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1693 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1712 +#: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497 +#: ../gui/wxpython/image2target/ii2t_manager.py:2418 +#: ../gui/wxpython/image2target/ii2t_manager.py:2439 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1698 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1717 msgid "Forward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2475 ../gui/wxpython/gcp/manager.py:2494 -#: ../gui/wxpython/image2target/ii2t_manager.py:2402 -#: ../gui/wxpython/image2target/ii2t_manager.py:2423 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1694 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1713 +#: ../gui/wxpython/gcp/manager.py:2479 ../gui/wxpython/gcp/manager.py:2498 +#: ../gui/wxpython/image2target/ii2t_manager.py:2419 +#: ../gui/wxpython/image2target/ii2t_manager.py:2440 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1699 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1718 msgid "Backward error" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2629 -#: ../gui/wxpython/image2target/ii2t_manager.py:2560 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1848 +#: ../gui/wxpython/gcp/manager.py:2633 +#: ../gui/wxpython/image2target/ii2t_manager.py:2577 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1853 msgid "Invalid coordinate value. Operation canceled." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2686 -#: ../gui/wxpython/image2target/ii2t_manager.py:2619 +#: ../gui/wxpython/gcp/manager.py:2690 +#: ../gui/wxpython/image2target/ii2t_manager.py:2636 msgid "Create vector map group" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2764 -#: ../gui/wxpython/image2target/ii2t_manager.py:2697 +#: ../gui/wxpython/gcp/manager.py:2768 +#: ../gui/wxpython/image2target/ii2t_manager.py:2714 msgid "Select vector map(s) to add to group:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2827 -#: ../gui/wxpython/image2target/ii2t_manager.py:2755 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1894 +#: ../gui/wxpython/gcp/manager.py:2831 +#: ../gui/wxpython/image2target/ii2t_manager.py:2772 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1899 msgid "Edit GCP" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2841 -#: ../gui/wxpython/image2target/ii2t_manager.py:2769 -#: ../gui/wxpython/photo2image/ip2i_manager.py:1908 +#: ../gui/wxpython/gcp/manager.py:2845 +#: ../gui/wxpython/image2target/ii2t_manager.py:2786 +#: ../gui/wxpython/photo2image/ip2i_manager.py:1913 msgid "Ground Control Point No." msgstr "" -#: ../gui/wxpython/gcp/manager.py:2862 -#: ../gui/wxpython/image2target/ii2t_manager.py:2791 +#: ../gui/wxpython/gcp/manager.py:2866 +#: ../gui/wxpython/image2target/ii2t_manager.py:2808 msgid "source E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2863 -#: ../gui/wxpython/image2target/ii2t_manager.py:2792 +#: ../gui/wxpython/gcp/manager.py:2867 +#: ../gui/wxpython/image2target/ii2t_manager.py:2809 msgid "target E:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2864 -#: ../gui/wxpython/image2target/ii2t_manager.py:2793 +#: ../gui/wxpython/gcp/manager.py:2868 +#: ../gui/wxpython/image2target/ii2t_manager.py:2810 msgid "source N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2865 -#: ../gui/wxpython/image2target/ii2t_manager.py:2794 +#: ../gui/wxpython/gcp/manager.py:2869 +#: ../gui/wxpython/image2target/ii2t_manager.py:2811 msgid "target N:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2971 ../gui/wxpython/wxplot/dialogs.py:810 -#: ../gui/wxpython/wxplot/dialogs.py:1322 -#: ../gui/wxpython/image2target/ii2t_manager.py:2906 -#: ../gui/wxpython/vnet/dialogs.py:1321 ../gui/wxpython/iscatt/dialogs.py:405 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2038 +#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:810 +#: ../gui/wxpython/wxplot/dialogs.py:1324 +#: ../gui/wxpython/image2target/ii2t_manager.py:2923 +#: ../gui/wxpython/vnet/dialogs.py:1328 ../gui/wxpython/iscatt/dialogs.py:405 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2043 msgid "Apply changes for the current session" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2975 ../gui/wxpython/wxplot/dialogs.py:817 -#: ../gui/wxpython/wxplot/dialogs.py:1326 -#: ../gui/wxpython/gui_core/preferences.py:115 -#: ../gui/wxpython/image2target/ii2t_manager.py:2910 -#: ../gui/wxpython/vnet/dialogs.py:1325 ../gui/wxpython/iscatt/dialogs.py:409 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2042 +#: ../gui/wxpython/gcp/manager.py:2979 ../gui/wxpython/wxplot/dialogs.py:817 +#: ../gui/wxpython/wxplot/dialogs.py:1328 +#: ../gui/wxpython/gui_core/preferences.py:116 +#: ../gui/wxpython/image2target/ii2t_manager.py:2927 +#: ../gui/wxpython/vnet/dialogs.py:1332 ../gui/wxpython/iscatt/dialogs.py:409 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2047 msgid "" "Apply and save changes to user settings file (default for next sessions)" msgstr "" -#: ../gui/wxpython/gcp/manager.py:2979 +#: ../gui/wxpython/gcp/manager.py:2984 #: ../gui/wxpython/web_services/dialogs.py:152 -#: ../gui/wxpython/web_services/dialogs.py:912 -#: ../gui/wxpython/image2target/ii2t_manager.py:2914 -#: ../gui/wxpython/vnet/dialogs.py:1329 +#: ../gui/wxpython/web_services/dialogs.py:914 +#: ../gui/wxpython/image2target/ii2t_manager.py:2932 +#: ../gui/wxpython/vnet/dialogs.py:1337 #: ../gui/wxpython/modules/import_export.py:124 -#: ../gui/wxpython/modules/import_export.py:725 -#: ../gui/wxpython/iscatt/dialogs.py:413 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2046 +#: ../gui/wxpython/modules/import_export.py:741 +#: ../gui/wxpython/iscatt/dialogs.py:414 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2052 msgid "Close dialog" msgstr "Aizvērt dialogu" -#: ../gui/wxpython/gcp/manager.py:3000 ../gui/wxpython/vdigit/preferences.py:84 -#: ../gui/wxpython/image2target/ii2t_manager.py:2935 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2067 -#: ../gui/wxpython/psmap/dialogs.py:2680 +#: ../gui/wxpython/gcp/manager.py:3005 ../gui/wxpython/vdigit/preferences.py:84 +#: ../gui/wxpython/image2target/ii2t_manager.py:2953 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2073 +#: ../gui/wxpython/psmap/dialogs.py:2711 msgid "Symbology" msgstr "Simboloģija" -#: ../gui/wxpython/gcp/manager.py:3008 -#: ../gui/wxpython/image2target/ii2t_manager.py:2943 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2075 +#: ../gui/wxpython/gcp/manager.py:3013 +#: ../gui/wxpython/image2target/ii2t_manager.py:2961 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2081 msgid "Highlight highest RMS error only" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3020 -#: ../gui/wxpython/image2target/ii2t_manager.py:2955 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2087 +#: ../gui/wxpython/gcp/manager.py:3025 +#: ../gui/wxpython/image2target/ii2t_manager.py:2973 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2093 msgid "Highlight RMS error > M + SD * factor:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3024 -#: ../gui/wxpython/image2target/ii2t_manager.py:2959 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2092 +#: ../gui/wxpython/gcp/manager.py:3029 +#: ../gui/wxpython/image2target/ii2t_manager.py:2977 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2098 msgid "" "Highlight GCPs with an RMS error larger than \n" "mean + standard deviation * given factor. \n" "Recommended values for this factor are between 1 and 2." msgstr "" -#: ../gui/wxpython/gcp/manager.py:3043 -#: ../gui/wxpython/image2target/ii2t_manager.py:2978 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2112 +#: ../gui/wxpython/gcp/manager.py:3048 +#: ../gui/wxpython/image2target/ii2t_manager.py:2996 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2118 msgid "Symbol settings" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3065 -#: ../gui/wxpython/image2target/ii2t_manager.py:3000 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2134 +#: ../gui/wxpython/gcp/manager.py:3070 +#: ../gui/wxpython/image2target/ii2t_manager.py:3018 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2140 msgid "Color for high RMS error:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3080 -#: ../gui/wxpython/image2target/ii2t_manager.py:3015 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2149 +#: ../gui/wxpython/gcp/manager.py:3085 +#: ../gui/wxpython/image2target/ii2t_manager.py:3033 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2155 msgid "Color for selected GCP:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3095 -#: ../gui/wxpython/image2target/ii2t_manager.py:3030 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2164 +#: ../gui/wxpython/gcp/manager.py:3100 +#: ../gui/wxpython/image2target/ii2t_manager.py:3048 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2170 msgid "Color for unused GCPs:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3108 -#: ../gui/wxpython/image2target/ii2t_manager.py:3043 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2177 +#: ../gui/wxpython/gcp/manager.py:3113 +#: ../gui/wxpython/image2target/ii2t_manager.py:3061 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2183 msgid "Show unused GCPs" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3118 -#: ../gui/wxpython/gui_core/preferences.py:1499 -#: ../gui/wxpython/image2target/ii2t_manager.py:3053 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2187 +#: ../gui/wxpython/gcp/manager.py:3123 +#: ../gui/wxpython/gui_core/preferences.py:1546 +#: ../gui/wxpython/image2target/ii2t_manager.py:3071 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2193 msgid "Symbol size:" msgstr "Simbola izmērs:" -#: ../gui/wxpython/gcp/manager.py:3237 -#: ../gui/wxpython/image2target/ii2t_manager.py:3180 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2286 +#: ../gui/wxpython/gcp/manager.py:3242 +#: ../gui/wxpython/image2target/ii2t_manager.py:3198 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2292 msgid "Rectification" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3245 -#: ../gui/wxpython/image2target/ii2t_manager.py:3188 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2294 +#: ../gui/wxpython/gcp/manager.py:3250 +#: ../gui/wxpython/image2target/ii2t_manager.py:3206 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2300 msgid "Select rectification order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "1st order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "2nd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3246 -#: ../gui/wxpython/image2target/ii2t_manager.py:3189 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2295 +#: ../gui/wxpython/gcp/manager.py:3251 +#: ../gui/wxpython/image2target/ii2t_manager.py:3207 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2301 msgid "3rd order" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3256 -#: ../gui/wxpython/image2target/ii2t_manager.py:3199 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2305 +#: ../gui/wxpython/gcp/manager.py:3261 +#: ../gui/wxpython/image2target/ii2t_manager.py:3217 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2311 msgid "Select interpolation method:" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3272 -#: ../gui/wxpython/image2target/ii2t_manager.py:3215 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2321 +#: ../gui/wxpython/gcp/manager.py:3277 +#: ../gui/wxpython/image2target/ii2t_manager.py:3233 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2327 msgid "clip to computational region in target location" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3280 +#: ../gui/wxpython/gcp/manager.py:3285 #, fuzzy msgid "overwrite result map" msgstr "Pārrakstīt vektordatu karti" -#: ../gui/wxpython/gcp/manager.py:3326 -#: ../gui/wxpython/image2target/ii2t_manager.py:3264 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2370 +#: ../gui/wxpython/gcp/manager.py:3331 +#: ../gui/wxpython/image2target/ii2t_manager.py:3282 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2376 msgid "RMS threshold factor must be > 0" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3331 -#: ../gui/wxpython/image2target/ii2t_manager.py:3269 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2375 +#: ../gui/wxpython/gcp/manager.py:3336 +#: ../gui/wxpython/image2target/ii2t_manager.py:3287 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2381 msgid "" "RMS threshold factor is < 1\n" "Too many points might be highlighted" msgstr "" -#: ../gui/wxpython/gcp/manager.py:3574 -#: ../gui/wxpython/image2target/ii2t_manager.py:3481 -#: ../gui/wxpython/photo2image/ip2i_manager.py:2555 +#: ../gui/wxpython/gcp/manager.py:3579 +#: ../gui/wxpython/image2target/ii2t_manager.py:3499 +#: ../gui/wxpython/photo2image/ip2i_manager.py:2561 #, python-format msgid "GCP Manager settings saved to file '%s'." msgstr "" @@ -3727,10 +3851,10 @@ msgstr "" msgid "Target Display" msgstr "" -#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2106 +#: ../gui/wxpython/gcp/mapdisplay.py:476 ../gui/wxpython/menustrings.py:2111 #: ../gui/wxpython/wxplot/base.py:614 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:480 -#: ../gui/wxpython/mapdisp/frame.py:965 +#: ../gui/wxpython/mapdisp/frame.py:934 #: ../gui/wxpython/modules/histogram.py:502 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:472 #: ../gui/wxpython/psmap/toolbars.py:82 @@ -3739,7 +3863,7 @@ msgstr "Lapas iestatīšana" #: ../gui/wxpython/gcp/mapdisplay.py:480 ../gui/wxpython/wxplot/base.py:615 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:484 -#: ../gui/wxpython/mapdisp/frame.py:969 +#: ../gui/wxpython/mapdisp/frame.py:938 #: ../gui/wxpython/modules/histogram.py:506 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:476 msgid "Print preview" @@ -3748,7 +3872,7 @@ msgstr "Drukas priekšskatījums" #: ../gui/wxpython/gcp/mapdisplay.py:484 ../gui/wxpython/wxplot/base.py:616 #: ../gui/wxpython/gui_core/toolbars.py:68 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:488 -#: ../gui/wxpython/mapdisp/frame.py:973 +#: ../gui/wxpython/mapdisp/frame.py:942 #: ../gui/wxpython/modules/histogram.py:510 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:480 msgid "Print display" @@ -3762,14 +3886,14 @@ msgstr "Tuvināt līdz aprēķinu reģionam" #: ../gui/wxpython/gcp/mapdisplay.py:527 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:531 -#: ../gui/wxpython/mapdisp/frame.py:1552 +#: ../gui/wxpython/mapdisp/frame.py:1520 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:523 msgid "Zoom to default region" msgstr "" #: ../gui/wxpython/gcp/mapdisplay.py:531 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:535 -#: ../gui/wxpython/mapdisp/frame.py:1553 +#: ../gui/wxpython/mapdisp/frame.py:1521 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:527 msgid "Zoom to saved region" msgstr "" @@ -3782,33 +3906,33 @@ msgstr "Iestatīt aprēķinu reģionu no kartes skata" #: ../gui/wxpython/gcp/mapdisplay.py:542 #: ../gui/wxpython/image2target/ii2t_mapdisplay.py:546 -#: ../gui/wxpython/mapdisp/frame.py:1565 +#: ../gui/wxpython/mapdisp/frame.py:1533 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:538 msgid "Save display geometry to named region" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:37 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:37 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:37 +#: ../gui/wxpython/gcp/statusbar.py:36 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:36 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:36 #, fuzzy msgid "Pan to GCP by number" msgstr "Kategorijas numurs" -#: ../gui/wxpython/gcp/statusbar.py:53 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:53 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:53 +#: ../gui/wxpython/gcp/statusbar.py:52 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:52 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:52 msgid "Valid Range:" msgstr "Derīgs diapazons:" -#: ../gui/wxpython/gcp/statusbar.py:119 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:119 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:119 +#: ../gui/wxpython/gcp/statusbar.py:118 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:118 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:118 msgid "RMS error" msgstr "" -#: ../gui/wxpython/gcp/statusbar.py:124 -#: ../gui/wxpython/image2target/ii2t_statusbar.py:124 -#: ../gui/wxpython/photo2image/ip2i_statusbar.py:124 +#: ../gui/wxpython/gcp/statusbar.py:123 +#: ../gui/wxpython/image2target/ii2t_statusbar.py:123 +#: ../gui/wxpython/photo2image/ip2i_statusbar.py:123 #, python-format msgid "Forward: %(forw)s, Backward: %(back)s" msgstr "" @@ -3841,7 +3965,7 @@ msgid "Recalculate RMS error" msgstr "" #: ../gui/wxpython/gcp/toolbars.py:44 ../gui/wxpython/menustrings.py:197 -#: ../gui/wxpython/menustrings.py:2033 +#: ../gui/wxpython/menustrings.py:2038 #: ../gui/wxpython/image2target/ii2t_toolbars.py:44 #: ../gui/wxpython/photo2image/ip2i_toolbars.py:44 msgid "Georectify" @@ -3881,471 +4005,532 @@ msgstr "Koordinātes" msgid "Update GCP coordinates)" msgstr "Koordinātes" -#: ../gui/wxpython/location_wizard/wizard.py:183 -#: ../gui/wxpython/location_wizard/wizard.py:2431 -msgid "Define new GRASS Location" +#: ../gui/wxpython/location_wizard/wizard.py:184 +#: ../gui/wxpython/location_wizard/wizard.py:2432 +#, fuzzy +msgid "Define new GRASS project" msgstr "Definēt jaunu GRASS novietojumu" -#: ../gui/wxpython/location_wizard/wizard.py:197 +#: ../gui/wxpython/location_wizard/wizard.py:198 msgid "Change" msgstr "Mainīt" -#: ../gui/wxpython/location_wizard/wizard.py:214 +#: ../gui/wxpython/location_wizard/wizard.py:215 #: ../gui/wxpython/gui_core/forms.py:1170 msgid "This option is required" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:217 +#: ../gui/wxpython/location_wizard/wizard.py:218 msgid "(optional)" msgstr "(izvēles)" -#: ../gui/wxpython/location_wizard/wizard.py:227 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1841 ../gui/wxpython/gui_core/ghelp.py:432 -#: ../gui/wxpython/gui_core/ghelp.py:435 ../gui/wxpython/gui_core/ghelp.py:508 +#: ../gui/wxpython/location_wizard/wizard.py:228 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1416 +#: ../gui/wxpython/gui_core/ghelp.py:442 ../gui/wxpython/gui_core/ghelp.py:445 +#: ../gui/wxpython/gui_core/ghelp.py:518 msgid "Name" msgstr "Nosaukums" -#: ../gui/wxpython/location_wizard/wizard.py:228 -msgid "Name of location directory in GIS Data Directory" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:229 +#, fuzzy +msgid "Name of project directory in GIS Data Directory" +msgstr "Izvēlieties ĢIS datu mapi" -#: ../gui/wxpython/location_wizard/wizard.py:249 -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 -#: ../gui/wxpython/gmodeler/frame.py:1791 -#: ../gui/wxpython/gmodeler/frame.py:1859 +#: ../gui/wxpython/location_wizard/wizard.py:250 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1434 msgid "Description" msgstr "Apraksts" -#: ../gui/wxpython/location_wizard/wizard.py:250 -msgid "Description of location directory in GIS Data Directory" +#: ../gui/wxpython/location_wizard/wizard.py:251 +msgid "Description of project directory in GIS Data Directory" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:270 -msgid "Location will be created in GRASS database:" +#: ../gui/wxpython/location_wizard/wizard.py:271 +#, fuzzy +msgid "Project will be created in GRASS database:" msgstr "Novietojums tiks izveidots GRASS datubāzē:" -#: ../gui/wxpython/location_wizard/wizard.py:296 +#: ../gui/wxpython/location_wizard/wizard.py:297 msgid "" -"Name '{}' is not a valid name for location. Please use only ASCII characters " +"Name '{}' is not a valid name for project. Please use only ASCII characters " "excluding characters {} and space." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:300 -#: ../gui/wxpython/gui_core/widgets.py:894 -#: ../gui/wxpython/image2target/ii2t_gis_set.py:1196 +#: ../gui/wxpython/location_wizard/wizard.py:301 +#: ../gui/wxpython/gui_core/widgets.py:895 +#: ../gui/wxpython/image2target/ii2t_gis_set.py:1197 #: ../gui/wxpython/modules/import_export.py:261 msgid "Invalid name" msgstr "Nederīgs nosaukums" -#: ../gui/wxpython/location_wizard/wizard.py:310 +#: ../gui/wxpython/location_wizard/wizard.py:311 msgid "" -"Location '{}' already exists. Please consider using another name for your " -"location." +"Project '{}' already exists. Please consider using another name for your " +"project." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:313 -msgid "Existing location path" +#: ../gui/wxpython/location_wizard/wizard.py:314 +msgid "Existing project path" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:345 +#: ../gui/wxpython/location_wizard/wizard.py:346 msgid "" -"Title of the location is limited only to one line and 256 characters. The " +"Title of the project is limited only to one line and 256 characters. The " "rest of the text will be ignored." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:356 +#: ../gui/wxpython/location_wizard/wizard.py:357 #, fuzzy msgid "Select Coordinate Reference System (CRS)" msgstr "Izvēlēties koordinātu sistēmu no EPSG datubāzes" -#: ../gui/wxpython/location_wizard/wizard.py:369 +#: ../gui/wxpython/location_wizard/wizard.py:370 msgid "Select CRS from a list by EPSG or description" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:378 -#: ../gui/wxpython/location_wizard/wizard.py:1440 +#: ../gui/wxpython/location_wizard/wizard.py:379 +#: ../gui/wxpython/location_wizard/wizard.py:1441 #, fuzzy msgid "Read CRS from a georeferenced data file" msgstr "Nolasīt koordinātu sistēmas parametrus no ģeoreferencētas datnes" -#: ../gui/wxpython/location_wizard/wizard.py:383 +#: ../gui/wxpython/location_wizard/wizard.py:384 msgid "Create a generic cartesian coordinate system (XY)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:386 -#: ../gui/wxpython/location_wizard/wizard.py:1523 +#: ../gui/wxpython/location_wizard/wizard.py:387 +#: ../gui/wxpython/location_wizard/wizard.py:1524 msgid "Specify CRS using WKT string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:389 -#: ../gui/wxpython/location_wizard/wizard.py:2051 +#: ../gui/wxpython/location_wizard/wizard.py:390 +#: ../gui/wxpython/location_wizard/wizard.py:2052 msgid "Specify CRS using PROJ.4 string" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:392 -#: ../gui/wxpython/location_wizard/wizard.py:507 +#: ../gui/wxpython/location_wizard/wizard.py:393 +#: ../gui/wxpython/location_wizard/wizard.py:508 msgid "Define custom CRS" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:403 +#: ../gui/wxpython/location_wizard/wizard.py:404 #, fuzzy msgid "Additional methods:" msgstr "Sarežģītākas metodes:" -#: ../gui/wxpython/location_wizard/wizard.py:529 -#: ../gui/wxpython/location_wizard/wizard.py:1076 -#: ../gui/wxpython/location_wizard/wizard.py:1277 -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:530 +#: ../gui/wxpython/location_wizard/wizard.py:1077 +#: ../gui/wxpython/location_wizard/wizard.py:1278 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 msgid "Code" msgstr "Kods" -#: ../gui/wxpython/location_wizard/wizard.py:535 +#: ../gui/wxpython/location_wizard/wizard.py:536 msgid "Projection code:" msgstr "Projekcijas kods:" -#: ../gui/wxpython/location_wizard/wizard.py:545 -#: ../gui/wxpython/location_wizard/wizard.py:1095 -#: ../gui/wxpython/location_wizard/wizard.py:1303 +#: ../gui/wxpython/location_wizard/wizard.py:546 +#: ../gui/wxpython/location_wizard/wizard.py:1096 +#: ../gui/wxpython/location_wizard/wizard.py:1304 msgid "Search in description:" msgstr "Meklēt pēc apraksta:" -#: ../gui/wxpython/location_wizard/wizard.py:733 +#: ../gui/wxpython/location_wizard/wizard.py:734 #, python-format msgid "Unable to read list: %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:826 +#: ../gui/wxpython/location_wizard/wizard.py:827 msgid "Choose projection parameters" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:845 +#: ../gui/wxpython/location_wizard/wizard.py:846 msgid "Select datum or ellipsoid (next page)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:856 +#: ../gui/wxpython/location_wizard/wizard.py:857 msgid "Datum with associated ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:860 +#: ../gui/wxpython/location_wizard/wizard.py:861 msgid "Ellipsoid only" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:917 +#: ../gui/wxpython/location_wizard/wizard.py:918 #, python-format msgid "You must enter a value for %s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:935 -#: ../gui/wxpython/location_wizard/wizard.py:954 +#: ../gui/wxpython/location_wizard/wizard.py:936 +#: ../gui/wxpython/location_wizard/wizard.py:955 #, python-format msgid " Enter parameters for %s projection " msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:983 -#: ../gui/wxpython/gui_core/gselect.py:2301 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:982 +#: ../gui/wxpython/gui_core/gselect.py:2302 msgid "No" msgstr "Nē" -#: ../gui/wxpython/location_wizard/wizard.py:987 -#: ../gui/wxpython/gmodeler/dialogs.py:985 -#: ../gui/wxpython/gui_core/gselect.py:2303 +#: ../gui/wxpython/location_wizard/wizard.py:988 +#: ../gui/wxpython/gmodeler/dialogs.py:984 +#: ../gui/wxpython/gui_core/gselect.py:2304 msgid "Yes" msgstr "Jā" -#: ../gui/wxpython/location_wizard/wizard.py:1051 +#: ../gui/wxpython/location_wizard/wizard.py:1052 msgid "Specify geodetic datum" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1076 +#: ../gui/wxpython/location_wizard/wizard.py:1077 msgid "Ellipsoid" msgstr "Elipsoīds" -#: ../gui/wxpython/location_wizard/wizard.py:1082 +#: ../gui/wxpython/location_wizard/wizard.py:1083 msgid "Datum code:" msgstr "Datuma kods:" -#: ../gui/wxpython/location_wizard/wizard.py:1243 +#: ../gui/wxpython/location_wizard/wizard.py:1244 msgid "Specify ellipsoid" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1264 +#: ../gui/wxpython/location_wizard/wizard.py:1265 msgid "Earth based" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1267 +#: ../gui/wxpython/location_wizard/wizard.py:1268 msgid "Planetary bodies" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1284 +#: ../gui/wxpython/location_wizard/wizard.py:1285 msgid "Ellipsoid code:" msgstr "Elipsoīda kods:" -#: ../gui/wxpython/location_wizard/wizard.py:1450 +#: ../gui/wxpython/location_wizard/wizard.py:1451 msgid "Georeferenced file:" msgstr "Ģeoreferencēta datne:" -#: ../gui/wxpython/location_wizard/wizard.py:1508 +#: ../gui/wxpython/location_wizard/wizard.py:1509 msgid "Select georeferenced file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1534 +#: ../gui/wxpython/location_wizard/wizard.py:1535 msgid "Enter WKT parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1586 +#: ../gui/wxpython/location_wizard/wizard.py:1587 #, fuzzy msgid "Select CRS from a list" msgstr "Izvēlēties fontu" -#: ../gui/wxpython/location_wizard/wizard.py:1602 +#: ../gui/wxpython/location_wizard/wizard.py:1603 msgid "Filter by EPSG code or description:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1606 +#: ../gui/wxpython/location_wizard/wizard.py:1607 msgid "Find more information at:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1615 -#: ../gui/wxpython/location_wizard/wizard.py:1813 +#: ../gui/wxpython/location_wizard/wizard.py:1616 +#: ../gui/wxpython/location_wizard/wizard.py:1814 #: ../gui/wxpython/vnet/dialogs.py:384 msgid "Parameters" msgstr "Parametri" -#: ../gui/wxpython/location_wizard/wizard.py:1756 -#: ../gui/wxpython/gui_core/preferences.py:1970 +#: ../gui/wxpython/location_wizard/wizard.py:1757 +#: ../gui/wxpython/gui_core/preferences.py:2035 #, python-brace-format msgid "Unable to read EPGS codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1775 +#: ../gui/wxpython/location_wizard/wizard.py:1776 msgid "Choose IAU Code" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1791 +#: ../gui/wxpython/location_wizard/wizard.py:1792 msgid "Path to the IAU-codes file:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1795 +#: ../gui/wxpython/location_wizard/wizard.py:1796 msgid "IAU code:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:1997 +#: ../gui/wxpython/location_wizard/wizard.py:1998 msgid "Choose IAU codes file" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2032 +#: ../gui/wxpython/location_wizard/wizard.py:2033 #, python-brace-format msgid "Unable to read IAU codes: {0}" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2067 +#: ../gui/wxpython/location_wizard/wizard.py:2068 msgid "Enter PROJ.4 parameters string:" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2132 -#: ../gui/wxpython/location_wizard/wizard.py:2136 +#: ../gui/wxpython/location_wizard/wizard.py:2133 +#: ../gui/wxpython/location_wizard/wizard.py:2137 msgid "Datum transform is required." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2180 +#: ../gui/wxpython/location_wizard/wizard.py:2181 #: ../gui/wxpython/rlisetup/wizard.py:1954 msgid "Summary" msgstr "Kopsavilkums" -#: ../gui/wxpython/location_wizard/wizard.py:2229 +#: ../gui/wxpython/location_wizard/wizard.py:2230 msgid "GRASS Database:" msgstr "GRASS datubāze:" -#: ../gui/wxpython/location_wizard/wizard.py:2238 -msgid "Location Name:" -msgstr "Novietojuma nosaukums:" +#: ../gui/wxpython/location_wizard/wizard.py:2239 +#, fuzzy +msgid "Project Name:" +msgstr "Projekcijas kods:" -#: ../gui/wxpython/location_wizard/wizard.py:2247 +#: ../gui/wxpython/location_wizard/wizard.py:2248 #: ../gui/wxpython/gmodeler/preferences.py:740 msgid "Description:" msgstr "Apraksts:" -#: ../gui/wxpython/location_wizard/wizard.py:2259 +#: ../gui/wxpython/location_wizard/wizard.py:2260 msgid "Projection:" msgstr "Projekcija:" -#: ../gui/wxpython/location_wizard/wizard.py:2271 +#: ../gui/wxpython/location_wizard/wizard.py:2272 msgid "" "PROJ.4 definition:\n" " (non-definitive)" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2390 -#: ../gui/wxpython/psmap/dialogs.py:742 ../gui/wxpython/psmap/dialogs.py:764 +#: ../gui/wxpython/location_wizard/wizard.py:2391 +#: ../gui/wxpython/psmap/dialogs.py:768 ../gui/wxpython/psmap/dialogs.py:790 msgid "custom" msgstr "pielāgots" -#: ../gui/wxpython/location_wizard/wizard.py:2530 +#: ../gui/wxpython/location_wizard/wizard.py:2531 #, python-format msgid "" -"Unable to create new location. Location <%(loc)s> not created.\n" +"Unable to create new project. Project <%(loc)s> not created.\n" "\n" "Details: %(err)s" msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2663 -msgid "Unable to create new location" -msgstr "" +#: ../gui/wxpython/location_wizard/wizard.py:2664 +#, fuzzy +msgid "Unable to create new project" +msgstr "Nav iespējams izveidot jaunu karšu kopu: %s" -#: ../gui/wxpython/location_wizard/wizard.py:2665 -msgid "Location already exists in GRASS Database." +#: ../gui/wxpython/location_wizard/wizard.py:2666 +#, fuzzy +msgid "Project already exists in GRASS Database." msgstr "GRASS datubāzē šāds novietojums jau eksistē." -#: ../gui/wxpython/location_wizard/wizard.py:2682 +#: ../gui/wxpython/location_wizard/wizard.py:2683 #, fuzzy, python-brace-format msgid "Unable to create new GRASS Database <{path}>: {error}" msgstr "Nav iespējams izveidot jaunu GRASS datubāzi" -#: ../gui/wxpython/location_wizard/wizard.py:2721 +#: ../gui/wxpython/location_wizard/wizard.py:2722 msgid "EPSG code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2733 +#: ../gui/wxpython/location_wizard/wizard.py:2734 msgid "IAU code missing." msgstr "" -#: ../gui/wxpython/location_wizard/wizard.py:2747 +#: ../gui/wxpython/location_wizard/wizard.py:2748 #, python-format msgid "File <%s> not found." msgstr "Datne <%s> nav atrasta." -#: ../gui/wxpython/location_wizard/wizard.py:2757 +#: ../gui/wxpython/location_wizard/wizard.py:2758 msgid "WKT string missing." msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:39 +#: ../gui/wxpython/location_wizard/dialogs.py:40 msgid "Set default region extent and resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:92 +#: ../gui/wxpython/location_wizard/dialogs.py:93 msgid "&Set region" msgstr "&Iestatīt reģionu" -#: ../gui/wxpython/location_wizard/dialogs.py:121 +#: ../gui/wxpython/location_wizard/dialogs.py:122 msgid "Invalid location selected." msgstr "Izvēlēts nederīgs novietojums" -#: ../gui/wxpython/location_wizard/dialogs.py:139 +#: ../gui/wxpython/location_wizard/dialogs.py:140 msgid "Invalid region" msgstr "Nederīgs reģions" -#: ../gui/wxpython/location_wizard/dialogs.py:171 +#: ../gui/wxpython/location_wizard/dialogs.py:172 msgid "Click here to show 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:172 +#: ../gui/wxpython/location_wizard/dialogs.py:173 msgid "Click here to hide 3D settings" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:200 -#: ../gui/wxpython/location_wizard/dialogs.py:580 +#: ../gui/wxpython/location_wizard/dialogs.py:201 +#: ../gui/wxpython/location_wizard/dialogs.py:593 #, python-format msgid "Rows: %d" msgstr "Rindas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:201 -#: ../gui/wxpython/location_wizard/dialogs.py:581 +#: ../gui/wxpython/location_wizard/dialogs.py:202 +#: ../gui/wxpython/location_wizard/dialogs.py:594 #, python-format msgid "Cols: %d" msgstr "Kolonas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:202 -#: ../gui/wxpython/location_wizard/dialogs.py:582 +#: ../gui/wxpython/location_wizard/dialogs.py:203 +#: ../gui/wxpython/location_wizard/dialogs.py:595 #, python-format msgid "Cells: %d" msgstr "Šūnas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:247 -#: ../gui/wxpython/location_wizard/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:250 +#: ../gui/wxpython/location_wizard/dialogs.py:597 #, python-format msgid "Depth: %d" msgstr "Dziļums: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:248 -#: ../gui/wxpython/location_wizard/dialogs.py:585 +#: ../gui/wxpython/location_wizard/dialogs.py:251 +#: ../gui/wxpython/location_wizard/dialogs.py:598 #, python-format msgid "3D Cells: %d" msgstr "3D šūnas: %d" -#: ../gui/wxpython/location_wizard/dialogs.py:252 -#: ../gui/wxpython/psmap/dialogs.py:583 +#: ../gui/wxpython/location_wizard/dialogs.py:255 +#: ../gui/wxpython/psmap/dialogs.py:609 msgid "Top" msgstr "Augšā" -#: ../gui/wxpython/location_wizard/dialogs.py:262 -#: ../gui/wxpython/psmap/dialogs.py:584 +#: ../gui/wxpython/location_wizard/dialogs.py:265 +#: ../gui/wxpython/psmap/dialogs.py:610 msgid "Bottom" msgstr "Lejā" -#: ../gui/wxpython/location_wizard/dialogs.py:272 +#: ../gui/wxpython/location_wizard/dialogs.py:275 msgid "T-B resolution" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:344 +#: ../gui/wxpython/location_wizard/dialogs.py:357 msgid "North" msgstr "Ziemeļi" -#: ../gui/wxpython/location_wizard/dialogs.py:361 +#: ../gui/wxpython/location_wizard/dialogs.py:374 msgid "West" msgstr "Rietumi" -#: ../gui/wxpython/location_wizard/dialogs.py:398 +#: ../gui/wxpython/location_wizard/dialogs.py:411 msgid "East" msgstr "Austrumi" -#: ../gui/wxpython/location_wizard/dialogs.py:415 +#: ../gui/wxpython/location_wizard/dialogs.py:428 msgid "South" msgstr "Dienvidi" -#: ../gui/wxpython/location_wizard/dialogs.py:426 +#: ../gui/wxpython/location_wizard/dialogs.py:439 msgid "N-S resolution" msgstr "Z-D izšķirtspēja" -#: ../gui/wxpython/location_wizard/dialogs.py:443 +#: ../gui/wxpython/location_wizard/dialogs.py:456 msgid "E-W resolution" msgstr "A-R izšķirtspēja" -#: ../gui/wxpython/location_wizard/dialogs.py:542 +#: ../gui/wxpython/location_wizard/dialogs.py:555 #, python-format msgid "Invalid value: %s" msgstr "Nederīga vērtība: %s" -#: ../gui/wxpython/location_wizard/dialogs.py:646 +#: ../gui/wxpython/location_wizard/dialogs.py:659 msgid "Select datum transformation" msgstr "" -#: ../gui/wxpython/location_wizard/dialogs.py:674 +#: ../gui/wxpython/location_wizard/dialogs.py:687 msgid "Select from list of datum transformations" msgstr "" -#: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 -#, fuzzy -msgid "Graphical Modeler - GRASS GIS" -msgstr "Grafiskais modelētājs" +#: ../gui/wxpython/gmodeler/canvas.py:322 ../gui/wxpython/menustrings.py:972 +#: ../gui/wxpython/menustrings.py:1937 +#: ../gui/wxpython/gui_core/simplelmgr.py:515 +#: ../gui/wxpython/rlisetup/frame.py:159 ../gui/wxpython/lmgr/layertree.py:451 +#: ../gui/wxpython/animation/dialogs.py:788 +#: ../gui/wxpython/animation/dialogs.py:1030 +msgid "Remove" +msgstr "Noņemt" -#: ../gui/wxpython/gmodeler/preferences.py:31 -#: ../gui/wxpython/menustrings.py:2074 -msgid "Modeler settings" -msgstr "Modelētāja iestatījumi" +#: ../gui/wxpython/gmodeler/canvas.py:326 +msgid "Disable" +msgstr "Atslēgt" -#: ../gui/wxpython/gmodeler/preferences.py:50 -#: ../gui/wxpython/gui_core/preferences.py:271 -#: ../gui/wxpython/vdigit/preferences.py:129 -#: ../gui/wxpython/mapdisp/properties.py:381 -#: ../gui/wxpython/animation/dialogs.py:360 -#: ../gui/wxpython/animation/dialogs.py:1895 +#: ../gui/wxpython/gmodeler/canvas.py:329 +msgid "Enable" +msgstr "Ieslēgt" + +#: ../gui/wxpython/gmodeler/canvas.py:334 +#: ../gui/wxpython/gmodeler/canvas.py:412 +msgid "Set label" +msgstr "Iestatīt birku" + +#: ../gui/wxpython/gmodeler/canvas.py:337 +#: ../gui/wxpython/gmodeler/canvas.py:428 +msgid "Set comment" +msgstr "Iestatīt komentāru" + +#: ../gui/wxpython/gmodeler/canvas.py:342 +msgid "Add control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:344 +msgid "Remove control point" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:358 +msgid "Intermediate" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:387 ../gui/wxpython/lmgr/layertree.py:513 +msgid "Properties" +msgstr "Īpašības" + +#: ../gui/wxpython/gmodeler/canvas.py:411 +#: ../gui/wxpython/gmodeler/dialogs.py:242 +msgid "Label:" +msgstr "" + +#: ../gui/wxpython/gmodeler/canvas.py:427 +#: ../gui/wxpython/gmodeler/panels.py:1166 +#: ../gui/wxpython/gmodeler/dialogs.py:248 +msgid "Comment:" +msgstr "Komentārs:" + +#: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:56 +#, fuzzy +msgid "Graphical Modeler - GRASS GIS" +msgstr "Grafiskais modelētājs" + +#: ../gui/wxpython/gmodeler/preferences.py:31 +#: ../gui/wxpython/gmodeler/toolbars.py:80 ../gui/wxpython/menustrings.py:2079 +msgid "Modeler settings" +msgstr "Modelētāja iestatījumi" + +#: ../gui/wxpython/gmodeler/preferences.py:50 +#: ../gui/wxpython/gui_core/preferences.py:273 +#: ../gui/wxpython/vdigit/preferences.py:129 +#: ../gui/wxpython/mapdisp/properties.py:381 +#: ../gui/wxpython/animation/dialogs.py:360 +#: ../gui/wxpython/animation/dialogs.py:1895 msgid "General" msgstr "Vispārēji" @@ -4358,7 +4543,6 @@ msgid "Disabled:" msgstr "Atslēgts:" #: ../gui/wxpython/gmodeler/preferences.py:88 -#: ../gui/wxpython/gmodeler/frame.py:176 msgid "Python editor" msgstr "Python redaktors" @@ -4368,10 +4552,10 @@ msgid "GRASS API:" msgstr "Iziet no GRASS GIS" #: ../gui/wxpython/gmodeler/preferences.py:136 +#: ../gui/wxpython/gmodeler/panels.py:1520 #: ../gui/wxpython/gmodeler/dialogs.py:196 #: ../gui/wxpython/gmodeler/dialogs.py:536 #: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 msgid "Command" msgstr "Komanda" @@ -4397,7 +4581,7 @@ msgid "Shape size" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:289 -#: ../gui/wxpython/dbmgr/base.py:2411 ../gui/wxpython/dbmgr/dialogs.py:818 +#: ../gui/wxpython/dbmgr/base.py:2422 ../gui/wxpython/dbmgr/dialogs.py:820 msgid "Type" msgstr "Tips" @@ -4426,13 +4610,13 @@ msgid "Comment" msgstr "Komentārs" #: ../gui/wxpython/gmodeler/preferences.py:686 -#: ../gui/wxpython/menustrings.py:2090 +#: ../gui/wxpython/menustrings.py:2095 msgid "Model properties" msgstr "Modeļa īpašības" #: ../gui/wxpython/gmodeler/preferences.py:693 -#: ../gui/wxpython/lmgr/layertree.py:725 ../gui/wxpython/lmgr/layertree.py:820 -#: ../gui/wxpython/lmgr/layertree.py:846 +#: ../gui/wxpython/lmgr/layertree.py:763 ../gui/wxpython/lmgr/layertree.py:858 +#: ../gui/wxpython/lmgr/layertree.py:884 msgid "Metadata" msgstr "Metadati" @@ -4441,7 +4625,7 @@ msgid "Commands" msgstr "Komandas" #: ../gui/wxpython/gmodeler/preferences.py:707 -#: ../gui/wxpython/gui_core/preferences.py:1167 +#: ../gui/wxpython/gui_core/preferences.py:1214 #: ../gui/wxpython/modules/import_export.py:102 #: ../gui/wxpython/modules/mcalc_builder.py:284 msgid "Allow output files to overwrite existing files" @@ -4452,19 +4636,19 @@ msgid "Apply properties" msgstr "" #: ../gui/wxpython/gmodeler/preferences.py:720 -#: ../gui/wxpython/wxplot/dialogs.py:820 ../gui/wxpython/wxplot/dialogs.py:1329 -#: ../gui/wxpython/gui_core/preferences.py:120 +#: ../gui/wxpython/wxplot/dialogs.py:821 ../gui/wxpython/wxplot/dialogs.py:1332 +#: ../gui/wxpython/gui_core/preferences.py:122 #: ../gui/wxpython/vdigit/preferences.py:64 -#: ../gui/wxpython/psmap/dialogs.py:535 +#: ../gui/wxpython/psmap/dialogs.py:561 msgid "Close dialog and ignore changes" msgstr "Ignorēt izmaiņas un aizvērt dialogu" #: ../gui/wxpython/gmodeler/preferences.py:730 -#: ../gui/wxpython/gui_core/gselect.py:1635 -#: ../gui/wxpython/gui_core/gselect.py:1652 +#: ../gui/wxpython/gui_core/gselect.py:1636 #: ../gui/wxpython/gui_core/gselect.py:1653 -#: ../gui/wxpython/gui_core/widgets.py:1447 -#: ../gui/wxpython/vnet/dialogs.py:1680 +#: ../gui/wxpython/gui_core/gselect.py:1654 +#: ../gui/wxpython/gui_core/widgets.py:1448 +#: ../gui/wxpython/vnet/dialogs.py:1689 #: ../gui/wxpython/animation/dialogs.py:411 msgid "Name:" msgstr "Nosaukums:" @@ -4473,698 +4657,679 @@ msgstr "Nosaukums:" msgid "Author(s):" msgstr "Autors:" -#: ../gui/wxpython/gmodeler/toolbars.py:42 -#, fuzzy -msgid "Create new model (Ctrl+N)" -msgstr "Veidot jaunu modeli" - -#: ../gui/wxpython/gmodeler/toolbars.py:43 -#, fuzzy -msgid "Load model from file (Ctrl+O)" -msgstr "Ielādēt modeli no datnes" - -#: ../gui/wxpython/gmodeler/toolbars.py:45 -#, fuzzy -msgid "Save current model to file (Ctrl+S)" -msgstr "Saglabāt modeli datnē" - -#: ../gui/wxpython/gmodeler/toolbars.py:47 ../gui/wxpython/menustrings.py:2067 -msgid "Export model to image" -msgstr "Eksportē modeli kā attēlu" - -#: ../gui/wxpython/gmodeler/toolbars.py:49 ../gui/wxpython/menustrings.py:2069 -msgid "Export model to Python script" -msgstr "Eksportē modeli kā Python skriptu" - -#: ../gui/wxpython/gmodeler/toolbars.py:52 -msgid "Add GRASS tool (module) to model" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:54 -#, fuzzy -msgid "Add data to model" -msgstr "Pievienot datus" - -#: ../gui/wxpython/gmodeler/toolbars.py:57 -msgid "Manually define relation between data and commands" -msgstr "" - -#: ../gui/wxpython/gmodeler/toolbars.py:59 -msgid "Add loop/series to model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:104 ../gui/wxpython/gmodeler/frame.py:31 +#: ../gui/wxpython/gui_core/forms.py:1520 +#: ../gui/wxpython/main_window/frame.py:906 +#: ../gui/wxpython/lmgr/toolbars.py:208 +msgid "Graphical Modeler" +msgstr "Grafiskais modelētājs" -#: ../gui/wxpython/gmodeler/toolbars.py:60 -#, fuzzy -msgid "Add comment to model" -msgstr "Pievienot komentāru" +#: ../gui/wxpython/gmodeler/panels.py:183 +msgid "Model" +msgstr "Modelis" -#: ../gui/wxpython/gmodeler/toolbars.py:61 ../gui/wxpython/menustrings.py:201 -#: ../gui/wxpython/menustrings.py:2094 -msgid "Run model" -msgstr "Darbināt modeli" +#: ../gui/wxpython/gmodeler/panels.py:184 +msgid "Items" +msgstr "Vienumi" -#: ../gui/wxpython/gmodeler/toolbars.py:62 ../gui/wxpython/menustrings.py:2096 -msgid "Validate model" -msgstr "Validēt modeli" +#: ../gui/wxpython/gmodeler/panels.py:186 +#: ../gui/wxpython/gmodeler/model.py:3721 +msgid "Variables" +msgstr "Mainīgie" -#: ../gui/wxpython/gmodeler/toolbars.py:64 +#: ../gui/wxpython/gmodeler/panels.py:189 #, fuzzy -msgid "Show model properties" -msgstr "Modeļa īpašības" +msgid "Script editor" +msgstr "Vienkārš r&edaktors" -#: ../gui/wxpython/gmodeler/toolbars.py:66 -#, fuzzy -msgid "Manage model variables" -msgstr "Pārvaldīt tabulas" +#: ../gui/wxpython/gmodeler/panels.py:192 +#: ../gui/wxpython/gui_core/forms.py:2539 +msgid "Command output" +msgstr "Komandas izvade" -#: ../gui/wxpython/gmodeler/toolbars.py:68 +#: ../gui/wxpython/gmodeler/panels.py:273 #, fuzzy -msgid "Redraw model canvas" -msgstr "Pārzīmē modeli..." - -#: ../gui/wxpython/gmodeler/dialogs.py:55 -msgid "Data properties" -msgstr "Datu īpašības" - -#: ../gui/wxpython/gmodeler/dialogs.py:98 -#: ../gui/wxpython/gmodeler/dialogs.py:115 -msgid "Name of element:" -msgstr "Elementa nosaukums:" +msgid "{} script contains local modifications" +msgstr "Python skripts satur lokālas izmaiņas" -#: ../gui/wxpython/gmodeler/dialogs.py:107 -msgid "Type of element:" +#: ../gui/wxpython/gmodeler/panels.py:282 +#: ../gui/wxpython/gmodeler/panels.py:1843 +#: ../gui/wxpython/gmodeler/panels.py:1862 +msgid "{} script is up-to-date" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:173 -msgid "Add GRASS command to the model" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:316 ../gui/wxpython/core/gconsole.py:742 +#, python-format +msgid "%d sec" +msgstr "%d sek" -#: ../gui/wxpython/gmodeler/dialogs.py:199 -msgid "Label and comment" +#: ../gui/wxpython/gmodeler/panels.py:319 ../gui/wxpython/core/gconsole.py:745 +#, python-format +msgid "%(min)d min %(sec)d sec" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:242 -#: ../gui/wxpython/gmodeler/frame.py:1666 -msgid "Label:" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:332 ../gui/wxpython/core/gconsole.py:769 +msgid "Command finished" +msgstr "Komanda izpildīta" -#: ../gui/wxpython/gmodeler/dialogs.py:248 -#: ../gui/wxpython/gmodeler/frame.py:912 ../gui/wxpython/gmodeler/frame.py:1682 -msgid "Comment:" -msgstr "Komentārs:" +#: ../gui/wxpython/gmodeler/panels.py:345 +msgid "Model computation finished" +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:308 -msgid "" -"Command not defined.\n" -"\n" -"Unable to add new action to the model." +#: ../gui/wxpython/gmodeler/panels.py:381 +#, python-format +msgid "%d intermediate maps deleted from current mapset" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:317 +#: ../gui/wxpython/gmodeler/panels.py:607 #, python-format msgid "" -"'%s' is not a GRASS tool.\n" +"Reading model file <%s> failed.\n" +"Invalid file, unable to parse XML document.\n" "\n" -"Unable to add new action to the model." +"%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:359 -msgid "Relation properties" +#: ../gui/wxpython/gmodeler/panels.py:619 +msgid "Please wait, loading model..." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:380 -msgid "From" -msgstr "No" - -#: ../gui/wxpython/gmodeler/dialogs.py:382 ../gui/wxpython/dbmgr/base.py:2477 -msgid "To" -msgstr "Uz" +#: ../gui/wxpython/gmodeler/panels.py:685 +msgid "Writing current settings to model file failed." +msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:431 +#: ../gui/wxpython/gmodeler/panels.py:697 ../gui/wxpython/lmgr/workspace.py:449 #, python-format -msgid "Data: %s" -msgstr "Dati: %s" - -#: ../gui/wxpython/gmodeler/dialogs.py:440 -msgid "Command:" -msgstr "Komanda:" - -#: ../gui/wxpython/gmodeler/dialogs.py:448 -msgid "Option:" +msgid "Unable to open file <%s> for writing." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:463 +#: ../gui/wxpython/gmodeler/panels.py:808 +#: ../gui/wxpython/gmodeler/panels.py:949 msgid "" -"Relation doesn't start with data item.\n" -"Unable to add relation." +"Current model is not empty. Do you want to store current settings to model " +"file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:473 -msgid "" -"Relation doesn't point to GRASS command.\n" -"Unable to add relation." -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:812 +#: ../gui/wxpython/gmodeler/panels.py:953 +msgid "Create new model?" +msgstr "Veidot jaunu modeli?" -#: ../gui/wxpython/gmodeler/dialogs.py:488 -msgid "" -"No relevant option found.\n" -"Unable to add relation." +#: ../gui/wxpython/gmodeler/panels.py:841 +msgid "Choose model file" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:528 -msgid "Condition" +#: ../gui/wxpython/gmodeler/panels.py:843 +#: ../gui/wxpython/gmodeler/panels.py:901 +#: ../gui/wxpython/main_window/frame.py:975 ../gui/wxpython/lmgr/frame.py:852 +msgid "GRASS Model File (*.gxm)|*.gxm" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:536 -#: ../gui/wxpython/gmodeler/dialogs.py:662 -#: ../gui/wxpython/gmodeler/frame.py:1945 ../gui/wxpython/psmap/dialogs.py:3590 -msgid "Label" -msgstr "Birka" - -#: ../gui/wxpython/gmodeler/dialogs.py:564 -msgid "Loop properties" +#: ../gui/wxpython/gmodeler/panels.py:861 +#, python-format +msgid "%(items)d items (%(actions)d actions) loaded into model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:571 -msgid "List of items in loop" +#: ../gui/wxpython/gmodeler/panels.py:875 +#: ../gui/wxpython/gmodeler/panels.py:919 +#, python-format +msgid "Model file <%s> already exists. Do you want to overwrite this file?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:574 -msgid "Series" -msgstr "Sērijas" +#: ../gui/wxpython/gmodeler/panels.py:879 ../gui/wxpython/menustrings.py:2066 +msgid "Save model" +msgstr "Saglabāt modeli" -#: ../gui/wxpython/gmodeler/dialogs.py:575 -msgid "Define map series as condition for the loop" +#: ../gui/wxpython/gmodeler/panels.py:887 +#: ../gui/wxpython/gmodeler/panels.py:935 +#, python-format +msgid "File <%s> saved" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:618 -msgid "Define series of maps" +#: ../gui/wxpython/gmodeler/panels.py:899 +msgid "Choose file to save current model" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:641 -msgid "If-else properties" +#: ../gui/wxpython/gmodeler/panels.py:1037 +#: ../gui/wxpython/gmodeler/panels.py:1061 +#, python-format +msgid "Model exported to <%s>" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:650 -msgid "List of items in 'if' block" +#: ../gui/wxpython/gmodeler/panels.py:1167 ../gui/wxpython/menustrings.py:2091 +msgid "Add comment" +msgstr "Pievienot komentāru" + +#: ../gui/wxpython/gmodeler/panels.py:1175 +msgid "Empty comment. Nothing to add to the model." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:658 -msgid "List of items in 'else' block" +#: ../gui/wxpython/gmodeler/panels.py:1264 +msgid "No intermediate data to delete." msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:839 +#: ../gui/wxpython/gmodeler/panels.py:1269 #, python-format -msgid "Variable <%s> already exists in the model. Adding variable failed." +msgid "Do you want to permanently delete data?%s" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:872 -msgid "Do you want to delete all variables from the model?" +#: ../gui/wxpython/gmodeler/panels.py:1270 +msgid "Delete intermediate data?" msgstr "" -#: ../gui/wxpython/gmodeler/dialogs.py:873 -msgid "Delete variables" -msgstr "Dzēst mainīgos" - -#: ../gui/wxpython/gmodeler/dialogs.py:913 -#: ../gui/wxpython/gmodeler/dialogs.py:1079 -#: ../gui/wxpython/vdigit/dialogs.py:304 -msgid "Delete selected" -msgstr "Dzēst izvēlēto" - -#: ../gui/wxpython/gmodeler/dialogs.py:914 -#: ../gui/wxpython/vdigit/dialogs.py:308 -msgid "Delete all" -msgstr "Dzēst visu" - -#: ../gui/wxpython/gmodeler/dialogs.py:920 -#: ../gui/wxpython/gmodeler/dialogs.py:1083 -#: ../gui/wxpython/vdigit/dialogs.py:310 ../gui/wxpython/dbmgr/base.py:1471 -#: ../gui/wxpython/dbmgr/base.py:2671 -msgid "Reload" -msgstr "Pārlādēt" - -#: ../gui/wxpython/gmodeler/model.py:74 -msgid "model" +#: ../gui/wxpython/gmodeler/panels.py:1282 +msgid "Model is empty. Nothing to validate." msgstr "" -#: ../gui/wxpython/gmodeler/model.py:75 -msgid "Script generated by wxGUI Graphical Modeler." -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1285 +#: ../gui/wxpython/gmodeler/model.py:648 +msgid "Validating model..." +msgstr "Validē modeli..." -#: ../gui/wxpython/gmodeler/model.py:515 ../gui/wxpython/gmodeler/model.py:579 +#: ../gui/wxpython/gmodeler/panels.py:1291 #, python-format -msgid "undefined variable '%s'" -msgstr "" +msgid "" +"Model is not valid.\n" +"\n" +"%s" +msgstr "Modelis nav korekts. %s" -#: ../gui/wxpython/gmodeler/model.py:612 -msgid "Running model..." -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1294 +msgid "Model is valid." +msgstr "Modelis ir korekts." -#: ../gui/wxpython/gmodeler/model.py:633 -msgid "Model is empty. Nothing to run." -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1302 +msgid "wxGUI Graphical Modeler" +msgstr "wxGUI grafiskais modelētājs" -#: ../gui/wxpython/gmodeler/model.py:642 ../gui/wxpython/gmodeler/frame.py:695 -msgid "Validating model..." -msgstr "Validē modeli..." +#: ../gui/wxpython/gmodeler/panels.py:1306 +msgid "Redrawing model..." +msgstr "Pārzīmē modeli..." -#: ../gui/wxpython/gmodeler/model.py:650 -#, python-format -msgid "" -"Model is not valid. Do you want to run the model anyway?\n" -"\n" -"%s" -msgstr "" +#: ../gui/wxpython/gmodeler/panels.py:1320 +msgid "Do you want to save changes in the model?" +msgstr "Vai vēlaties saglabāt modeļa izmaiņas?" -#: ../gui/wxpython/gmodeler/model.py:653 -msgid "Run model?" +#: ../gui/wxpython/gmodeler/panels.py:1323 +msgid "Do you want to store current model settings to model file?" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:688 -msgid "Variables below not defined:" +#: ../gui/wxpython/gmodeler/panels.py:1330 +msgid "Quit Graphical Modeler" +msgstr "Iziet no grafiskā modelētāja" + +#: ../gui/wxpython/gmodeler/panels.py:1361 +msgid "List of variables - right-click to delete" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:801 -msgid "Raster maps" -msgstr "Rastra kartes" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1422 ../gui/wxpython/dbmgr/base.py:3006 +msgid "Data type" +msgstr "Datu tips" -#: ../gui/wxpython/gmodeler/model.py:804 -msgid "3D raster maps" -msgstr "3D rastra kartes" +#: ../gui/wxpython/gmodeler/panels.py:1366 +#: ../gui/wxpython/gmodeler/panels.py:1428 +msgid "Default value" +msgstr "Noklusējuma vērtība" -#: ../gui/wxpython/gmodeler/model.py:807 ../gui/wxpython/psmap/dialogs.py:1745 -msgid "Vector maps" +#: ../gui/wxpython/gmodeler/panels.py:1372 +msgid "Add new variable" msgstr "" -#: ../gui/wxpython/gmodeler/model.py:1556 -msgid "" -msgstr "
    • <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD
  • Use thise negative distances as solver for a second pass of ======= @@ -131,6 +132,8 @@

    OPTIONS

    ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main
  • Use these negative distances as solver for a second pass of =======
  • Use thise negative distances as solver for a second pass of @@ -139,6 +142,9 @@

    OPTIONS

  • Use thise negative distances as solver for a second pass of >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.cross/r.cross.html b/raster/r.cross/r.cross.html index d5959085777..af3728dc2cb 100644 --- a/raster/r.cross/r.cross.html +++ b/raster/r.cross/r.cross.html @@ -9,6 +9,7 @@

    DESCRIPTION

    OPTIONS

    +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -16,6 +17,8 @@

    OPTIONS

    ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

    With the -z flag NULL values are not crossed. This means that if a NULL value occurs in any input data layer, @@ -29,6 +32,9 @@

    OPTIONS

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47,6 +53,7 @@

    OPTIONS

    <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -58,6 +65,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 f34aa032724..cc3a0ebaf3c 100644 --- a/raster/r.external/main.c +++ b/raster/r.external/main.c @@ -109,6 +109,7 @@ int main(int argc, char *argv[]) "Assume that the dataset has same projection as the current location"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -119,6 +120,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 2736c530799..fec44e2e53d 100644 --- a/raster/r.external/proj.c +++ b/raster/r.external/proj.c @@ -131,6 +131,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, /* do not create a xy location if an existing SRS was unreadable */ if (proj_trouble == 2) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to convert input map projection to GRASS " "format; cannot create new location.")); @@ -139,6 +140,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error( _("Unable to convert input map coordinate reference " "system to GRASS format; cannot create new project.")); @@ -151,6 +154,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "format; cannot create new location.")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -159,6 +165,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to create new location <%s>"), outloc); } @@ -168,6 +175,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create new project <%s>"), outloc); } G_message(_("Project <%s> created"), outloc); @@ -182,6 +191,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, G_message(_("Location <%s> created"), outloc); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -241,6 +253,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, proj_info, proj_units)) != 1) { int i_value; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -250,6 +263,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); @@ -262,6 +277,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -271,6 +289,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, /* error in proj_info */ if (loc_proj_info != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, _("Location PROJ_INFO is:\n")); ======= @@ -278,6 +297,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); ======= strcat(error_msg, _("Location PROJ_INFO is:\n")); @@ -286,6 +307,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -299,11 +323,14 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); if (loc_wind.proj == PROJECTION_XY) sprintf(error_msg + strlen(error_msg), @@ -324,6 +351,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -345,6 +375,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "Location proj = %d (unknown), zone = %d\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -355,6 +386,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); } @@ -430,6 +466,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, /* error in proj_units */ if (loc_proj_units != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, "Location PROJ_UNITS is:\n"); ======= @@ -437,6 +474,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, "Project PROJ_UNITS is:\n"); ======= strcat(error_msg, "Location PROJ_UNITS is:\n"); @@ -445,6 +484,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -467,11 +509,14 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, if (!check_only) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("\nIn case of no significant differences " "in the coordinate reference system definitions," @@ -484,6 +529,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -496,6 +544,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "the 'location' parameter.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -506,6 +555,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 } @@ -525,6 +579,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, else msg_fn = G_verbose_message; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD msg_fn(_("Projection of input dataset and current location " "appear to match")); @@ -533,6 +588,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msg_fn(_("Coordinate reference system of input dataset and current " "project appear to match")); ======= @@ -544,6 +601,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "appear to match")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.external/testsuite/data/generate_data.sh b/raster/r.external/testsuite/data/generate_data.sh index f4bdece46a2..2bfbbd677aa 100755 --- a/raster/r.external/testsuite/data/generate_data.sh +++ b/raster/r.external/testsuite/data/generate_data.sh @@ -19,11 +19,14 @@ r.to.rast3 input=elevation output=elevation3d r3.out.netcdf input=elevation3d output=elevation3d.nc <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -40,6 +43,9 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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 bef0eabfc05..8adb3b32e9f 100644 --- a/raster/r.external/testsuite/test_r_external.py +++ b/raster/r.external/testsuite/test_r_external.py @@ -4,17 +4,23 @@ """ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40,6 +46,7 @@ def tearDown(self): def test_1(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -47,12 +54,17 @@ def test_1(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -86,6 +98,7 @@ def test_1(self): def test_2(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -93,12 +106,17 @@ def test_2(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132,6 +150,7 @@ def test_2(self): def test_3(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -139,12 +158,17 @@ def test_3(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -178,6 +202,7 @@ def test_3(self): def test_4(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -185,12 +210,17 @@ def test_4(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -224,6 +254,7 @@ def test_4(self): def test_netCDF_3d_1(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -231,12 +262,17 @@ def test_netCDF_3d_1(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -280,6 +316,7 @@ def test_netCDF_3d_1(self): def test_netCDF_3d_2(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -287,12 +324,17 @@ def test_netCDF_3d_2(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -336,6 +378,7 @@ def test_netCDF_3d_2(self): def test_netCDF_3d_3(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -343,12 +386,17 @@ def test_netCDF_3d_3(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.external/window.c b/raster/r.external/window.c index 63f6fcc923a..e4d14a664e2 100644 --- a/raster/r.external/window.c +++ b/raster/r.external/window.c @@ -92,6 +92,7 @@ void update_default_window(struct Cell_head *cellhd) if (strcmp(G_mapset(), "PERMANENT") == 0) { G_put_element_window(&cur_wind, "", "DEFAULT_WIND"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Default region for this location updated")); ======= @@ -99,6 +100,8 @@ void update_default_window(struct Cell_head *cellhd) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Default region for this project updated")); ======= G_message(_("Default region for this location updated")); @@ -107,6 +110,9 @@ void update_default_window(struct Cell_head *cellhd) G_message(_("Default region for this location updated")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.fill.dir/resolve.c b/raster/r.fill.dir/resolve.c index 678cc3c04a8..4840a0eea5f 100644 --- a/raster/r.fill.dir/resolve.c +++ b/raster/r.fill.dir/resolve.c @@ -32,6 +32,7 @@ CELL select_dir(CELL i) return dir[i]; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3, @@ -41,6 +42,8 @@ void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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) ======= @@ -52,6 +55,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.fill.dir/tinf.c b/raster/r.fill.dir/tinf.c index 8d51bdadb83..9d3279954a7 100644 --- a/raster/r.fill.dir/tinf.c +++ b/raster/r.fill.dir/tinf.c @@ -13,6 +13,7 @@ int (*is_null)(void *); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -24,6 +25,10 @@ int (*is_null)(void *); <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main size_t (*bpe)(void); void *(*get_max)(void *, void *); void *(*get_min)(void *, void *); @@ -31,10 +36,13 @@ void (*get_row)(int, void *, int); void *(*get_buf)(void); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -63,6 +71,9 @@ void *(*get_buf)(void); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.fill.dir/tinf.h b/raster/r.fill.dir/tinf.h index 14babd38827..2039e892b17 100644 --- a/raster/r.fill.dir/tinf.h +++ b/raster/r.fill.dir/tinf.h @@ -67,6 +67,7 @@ void prod_d(void *, void *); extern int (*is_null)(void *); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -78,6 +79,10 @@ extern int (*is_null)(void *); <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main extern size_t (*bpe)(void); extern void *(*get_max)(void *, void *); extern void *(*get_min)(void *, void *); @@ -85,10 +90,13 @@ extern void (*get_row)(int, void *, int); extern void *(*get_buf)(void); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -117,6 +125,9 @@ extern void *(*get_buf)(void); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.fill.stats/main.c b/raster/r.fill.stats/main.c index 9f173085288..b04e00c353b 100644 --- a/raster/r.fill.stats/main.c +++ b/raster/r.fill.stats/main.c @@ -147,6 +147,7 @@ long int estimate_mem_needed(long int cols, char *mode) return (mem_count); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -154,6 +155,8 @@ long int estimate_mem_needed(long int cols, char *mode) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #define WEIGHT_MATRIX_LINE_LENGTH 80 ======= @@ -161,6 +164,9 @@ long int estimate_mem_needed(long int cols, char *mode) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -173,6 +179,7 @@ void print_weights_matrix(long int rows, long int cols) { int i, j; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD size_t weight_matrix_line_length = 80; ======= @@ -180,6 +187,8 @@ void print_weights_matrix(long int rows, long int cols) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD char weight_matrix_line_buf[WEIGHT_MATRIX_LINE_LENGTH + 1]; char weight_matrix_weight_buf[WEIGHT_MATRIX_LINE_LENGTH + 1]; @@ -195,6 +204,9 @@ void print_weights_matrix(long int rows, long int cols) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -217,6 +229,7 @@ void print_weights_matrix(long int rows, long int cols) if (strlen(weight_matrix_weight_buf) + strlen(weight_matrix_line_buf) > <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD weight_matrix_line_length) { ======= @@ -224,6 +237,8 @@ void print_weights_matrix(long int rows, long int cols) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main WEIGHT_MATRIX_LINE_LENGTH) { ======= weight_matrix_line_length) { @@ -232,6 +247,9 @@ void print_weights_matrix(long int rows, long int cols) weight_matrix_line_length) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -260,6 +278,7 @@ void *get_input_row(unsigned long row_idx) void *my_cell = NULL; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -270,6 +289,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]; @@ -277,6 +301,7 @@ void *get_input_row(unsigned long row_idx) for (i = 0; i < PADDING_WIDTH; i++) my_cell += CELL_IN_SIZE; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -284,11 +309,16 @@ void *get_input_row(unsigned long row_idx) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main return (void *)my_cell; ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -325,6 +355,7 @@ void *get_input_row(unsigned long row_idx) * types of information to be collected. */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void collect_values_unfiltered(double val1, double val2, double min, double max, @@ -334,6 +365,8 @@ void collect_values_unfiltered(double val1, double val2, double min, double max, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void collect_values_unfiltered(double val1, double val2, double min UNUSED, double max UNUSED, stats_struct *stats) ======= @@ -345,6 +378,9 @@ void collect_values_unfiltered(double val1, double val2, double min, double max, stats_struct *stats) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -362,6 +398,7 @@ void collect_values_filtered(double val1, double val2, double min, double max, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void collect_values_and_weights_unfiltered(double val1, double val2, double min, @@ -371,6 +408,8 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void collect_values_and_weights_unfiltered(double val1, double val2, double min UNUSED, double max UNUSED, stats_struct *stats) @@ -383,6 +422,9 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min, double max, stats_struct *stats) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -409,6 +451,7 @@ void collect_values_and_frequencies_unfiltered(double val1, double val2, double min, double max, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -419,6 +462,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) { @@ -668,6 +716,7 @@ void advance_one_row(int file_desc, long current_row) void *cell_input; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -678,6 +727,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 b3b6c3a5d46..44cb3bb66a8 100644 --- a/raster/r.fill.stats/r.fill.stats.html +++ b/raster/r.fill.stats/r.fill.stats.html @@ -516,11 +516,14 @@

    AUTHOR

    Benjamin Ducke <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -536,6 +539,9 @@

    AUTHOR

    >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.flow/aspect.h b/raster/r.flow/aspect.h index ad95664f112..c29f6155d21 100644 --- a/raster/r.flow/aspect.h +++ b/raster/r.flow/aspect.h @@ -5,6 +5,7 @@ * globals r: region, parm */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */); @@ -22,6 +23,12 @@ DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */); DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -37,6 +44,9 @@ DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.flow/mem.h b/raster/r.flow/mem.h index 7ea0cdc5ebd..8a84f39c00e 100644 --- a/raster/r.flow/mem.h +++ b/raster/r.flow/mem.h @@ -25,6 +25,7 @@ void allocate_heap(void); void deallocate_heap(void); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void put_row_seg(layer, int /* l, row */); @@ -42,6 +43,12 @@ void put_row_seg(layer, int /* l, row */); void put_row_seg(layer, int /* l, row */); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +void put_row_seg(layer, int /* l, row */); +======= +>>>>>>> osgeo-main void put_row_seg(/* l, row */); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -57,6 +64,9 @@ void put_row_seg(layer, int /* l, row */); >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.flow/r.flow.html b/raster/r.flow/r.flow.html index c728069dfd0..79f0e7ab4b7 100644 --- a/raster/r.flow/r.flow.html +++ b/raster/r.flow/r.flow.html @@ -2,9 +2,9 @@

    DESCRIPTION

    r.flow generates flowlines using a combined raster-vector approach -(see Mitasova +(see Mitasova and Hofierka 1993 -and Mitasova +and Mitasova et al. 1995) from an input elevation raster map (integer or floating point), and optionally an input aspect raster map and/or an input barrier raster map. @@ -189,12 +189,12 @@

    REFERENCES

    • Mitasova, H., L. Mitas, 1993, Interpolation by regularized spline with tension : I. Theory and implementation. Mathematical Geology 25, p. 641-655. -(online) +(online)
    • Mitasova and Hofierka 1993 : Interpolation by Regularized Spline with Tension: II. Application to Terrain Modeling and Surface Geometry Analysis. Mathematical Geology 25(6), 657-669 -(online). +(online).
    • Mitasova, H., Mitas, L., Brown, W.M., Gerdes, D.P., Kosinovsky, I., Baker, T., 1995: Modeling spatially and temporally distributed phenomena: @@ -232,5 +232,5 @@

      AUTHORS

      The version of the program (adapted for GRASS 5.0): Joshua Caplan, Mark Ruesink, Helena Mitasova, University of Illinois at Urbana-Champaign with support from USA CERL. -GMSL/University of Illinois +GMSL/University of Illinois at Urbana-Champaign diff --git a/raster/r.geomorphon/geom.c b/raster/r.geomorphon/geom.c index 2b36deb7a11..cb9e7c18bf3 100644 --- a/raster/r.geomorphon/geom.c +++ b/raster/r.geomorphon/geom.c @@ -219,6 +219,7 @@ float variance(float *elevation, int pattern_size) return variance / (float)pattern_size; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void radial2cartesian(PATTERN *pattern) @@ -236,6 +237,12 @@ void radial2cartesian(PATTERN *pattern) void radial2cartesian(PATTERN *pattern) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +void radial2cartesian(PATTERN *pattern) +======= +>>>>>>> osgeo-main int radial2cartesian(PATTERN *pattern) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -251,6 +258,9 @@ void radial2cartesian(PATTERN *pattern) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.geomorphon/local_proto.h b/raster/r.geomorphon/local_proto.h index 9b715b14829..ad472a3bff0 100644 --- a/raster/r.geomorphon/local_proto.h +++ b/raster/r.geomorphon/local_proto.h @@ -73,6 +73,7 @@ GLOBAL double flat_threshold, flat_threshold_height; GLOBAL struct Cell_head window; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -86,6 +87,12 @@ GLOBAL struct Cell_head window; <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)) @@ -98,6 +105,9 @@ GLOBAL struct Cell_head window; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.geomorphon/main.c b/raster/r.geomorphon/main.c index 76b44fde605..d64e8213c05 100644 --- a/raster/r.geomorphon/main.c +++ b/raster/r.geomorphon/main.c @@ -44,6 +44,7 @@ typedef enum { o_size } outputs; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -51,6 +52,8 @@ typedef enum { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= typedef struct @@ -69,6 +72,9 @@ typedef struct ======= >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -115,9 +121,13 @@ int main(int argc, char **argv) struct GModule *module; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main struct Option *opt_input, *opt_output[o_size], *par_search_radius, *par_skip_radius, *par_flat_threshold, *par_flat_distance, @@ -126,12 +136,15 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct Option *opt_input, *opt_output[o_size], *par_search_radius, *par_skip_radius, *par_flat_threshold, *par_flat_distance, *par_comparison, *par_coords, *par_profiledata, *par_profileformat; ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main struct Option *opt_input, @@ -159,6 +172,9 @@ int main(int argc, char **argv) *par_comparison, *par_coords, *par_profiledata, *par_profileformat; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -407,17 +423,23 @@ int main(int argc, char **argv) window_square / search_square > 10) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -430,10 +452,13 @@ int main(int argc, char **argv) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main G_warning(_("There may be a notable processing delay because the " "computational region is %lu times larger than necessary"), window_square / search_square); @@ -446,6 +471,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.geomorphon/memory.c b/raster/r.geomorphon/memory.c index c2545b4922d..b3150ef882b 100644 --- a/raster/r.geomorphon/memory.c +++ b/raster/r.geomorphon/memory.c @@ -1,5 +1,6 @@ #include "local_proto.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD typedef struct { @@ -15,6 +16,11 @@ typedef struct { typedef struct { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +typedef struct { +======= +>>>>>>> osgeo-main typedef struct { <<<<<<< HEAD @@ -28,6 +34,9 @@ typedef struct { typedef struct { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -60,6 +69,7 @@ static const CATCOLORS ccolors[CNT] = { [VL] = {"VL", 0, 0, 255, "valley"}, [PT] = {"PT", 0, 0, 56, "pit"}, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD [__] = {"ERROR", 255, 0, 255, "ERROR"}}; ======= @@ -75,6 +85,12 @@ static const CATCOLORS ccolors[CNT] = { <<<<<<< HEAD [__] = {"ERROR", 255, 0, 255, "ERROR"}}; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + [__] = {"ERROR", 255, 0, 255, "ERROR"}}; +======= >>>>>>> osgeo-main [__] = {"ERROR", 255, 0, 255, "ERROR"} }; @@ -90,6 +106,9 @@ static const CATCOLORS ccolors[CNT] = { [__] = {"ERROR", 255, 0, 255, "ERROR"}}; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -117,6 +136,7 @@ int open_map(MAPS *rast) window.ns_res + 1e-10 < cellhd.ns_res) G_warning( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Region resolution shoudn't be lesser than map %s resolution. " ======= @@ -124,6 +144,8 @@ int open_map(MAPS *rast) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Region resolution shouldn't be lesser than map %s resolution. " ======= _("Region resolution shoudn't be lesser than map %s resolution. " @@ -132,6 +154,9 @@ int open_map(MAPS *rast) _("Region resolution shoudn't be lesser than map %s resolution. " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -229,10 +254,15 @@ int write_form_cat_colors(char *raster) for (i = FL; i <= PT; ++i) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 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, @@ -242,12 +272,15 @@ int write_form_cat_colors(char *raster) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 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, CELL_TYPE); ======= ======= +>>>>>>> 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, @@ -269,6 +302,9 @@ int write_form_cat_colors(char *raster) CELL_TYPE); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.geomorphon/r.geomorphon.html b/raster/r.geomorphon/r.geomorphon.html index a452f23d42d..24098c096f8 100644 --- a/raster/r.geomorphon/r.geomorphon.html +++ b/raster/r.geomorphon/r.geomorphon.html @@ -162,6 +162,7 @@

      Geomorphon calculation: extraction of terrestrial landforms

      Geomorphon calculation example using the EU DEM 25m (with search=11)
      +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -169,6 +170,8 @@

      Geomorphon calculation: extraction of terrestrial landforms

      ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -181,6 +184,9 @@

      Geomorphon calculation: extraction of terrestrial landforms

      ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.grow.distance/r.grow.distance.html b/raster/r.grow.distance/r.grow.distance.html index ecbc11f6243..7cbd0b5d62a 100644 --- a/raster/r.grow.distance/r.grow.distance.html +++ b/raster/r.grow.distance/r.grow.distance.html @@ -62,12 +62,15 @@

      NOTES

      The Geodesic metric is calculated as geodesic distance, to <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD be used only in latitude-longitude locations. It is recommended ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main be used only in latitude-longitude coordinate reference system. It is recommended ======= be used only in latitude-longitude locations. It is recommended @@ -76,6 +79,9 @@

      NOTES

      be used only in latitude-longitude locations. It is recommended >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.gwflow/main.c b/raster/r.gwflow/main.c index de0a16bd906..9173e5f0653 100644 --- a/raster/r.gwflow/main.c +++ b/raster/r.gwflow/main.c @@ -234,6 +234,7 @@ int main(int argc, char *argv[]) /* Make sure that the current projection is not lat/long */ if ((G_projection() == PROJECTION_LL)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Lat/Long location is not supported by %s. Please " ======= @@ -241,6 +242,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Lat/Long project is not supported by %s. Please " ======= G_fatal_error(_("Lat/Long location is not supported by %s. Please " @@ -249,6 +252,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -478,6 +484,7 @@ int main(int argc, char *argv[]) N_write_array_2d_to_rast(xcomp, param.vector_x->answer); N_write_array_2d_to_rast(ycomp, param.vector_y->answer); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (buff) G_free(buff); @@ -487,6 +494,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= if (buff) G_free(buff); @@ -498,6 +507,9 @@ int main(int argc, char *argv[]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.gwflow/r.gwflow.html b/raster/r.gwflow/r.gwflow.html index cdd177b1b9c..9e28c11eac4 100644 --- a/raster/r.gwflow/r.gwflow.html +++ b/raster/r.gwflow/r.gwflow.html @@ -6,16 +6,22 @@

      DESCRIPTION

      All initial and boundary conditions must be provided as <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main raster maps. The unit of the current project's coordinate reference system must be meters. ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.horizon/main.c b/raster/r.horizon/main.c index a6fce1e0277..d8bd74f0b0c 100644 --- a/raster/r.horizon/main.c +++ b/raster/r.horizon/main.c @@ -13,11 +13,14 @@ Joint Research Centre of the European Commission, based on bits of the r.sun module by Jaro Hofierka <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Program was refactored by Anna Petrasova to remove most global variables. ======= @@ -25,6 +28,9 @@ Program was refactored by Anna Petrasova to remove most global variables. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -57,6 +63,7 @@ Program was refactored by Anna Petrasova to remove most global variables. #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -64,6 +71,8 @@ Program was refactored by Anna Petrasova to remove most global variables. ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #define WHOLE_RASTER 1 #define SINGLE_POINT 0 #define RAD (180. / M_PI) @@ -84,6 +93,9 @@ Program was refactored by Anna Petrasova to remove most global variables. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -191,6 +203,7 @@ typedef struct { double length; } HorizonProperties; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* why not use G_distance() here which switches to geodesic/great @@ -200,6 +213,8 @@ typedef struct { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main typedef struct { int n, m, m100, n100; double stepx, stepy, stepxy; @@ -256,6 +271,9 @@ double distance(double x1, double x2, double y1, double y2, double coslatsq) circle distance as needed? */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -282,6 +300,7 @@ int main(int argc, char *argv[]) struct Option *elevin, *dist, *coord, *direction, *horizon, *step, *start, *end, *bufferzone, *e_buff, *w_buff, *n_buff, *s_buff, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *maxdistance, *output; } parm; @@ -293,6 +312,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main *maxdistance, *format, *output; } parm; @@ -313,6 +334,9 @@ int main(int argc, char *argv[]) struct Flag *degreeOutput, *compassOutput; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -383,17 +407,23 @@ int main(int argc, char *argv[]) "present region"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main parm.bufferzone->options = "0-"; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -407,17 +437,23 @@ int main(int argc, char *argv[]) "extra buffer eastward the present region"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main parm.e_buff->options = "0-"; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -431,17 +467,23 @@ int main(int argc, char *argv[]) "extra buffer westward the present region"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main parm.w_buff->options = "0-"; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -455,17 +497,23 @@ int main(int argc, char *argv[]) "extra buffer northward the present region"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main parm.n_buff->options = "0-"; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -479,17 +527,23 @@ int main(int argc, char *argv[]) "extra buffer southward the present region"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main parm.s_buff->options = "0-"; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -510,6 +564,7 @@ int main(int argc, char *argv[]) parm.coord = G_define_standard_option(G_OPT_M_COORDS); parm.coord->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Coordinate for which you want to calculate the horizon"); ======= @@ -517,6 +572,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Coordinate(s) for which you want to calculate the horizon"); parm.coord->multiple = YES; ======= @@ -526,6 +583,9 @@ int main(int argc, char *argv[]) _("Coordinate for which you want to calculate the horizon"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -539,15 +599,7 @@ int main(int argc, char *argv[]) parm.dist->description = _("Sampling distance step coefficient (0.5-1.5)"); parm.dist->guisection = _("Optional"); - parm.format = G_define_option(); - parm.format->key = "format"; - parm.format->type = TYPE_STRING; - parm.format->required = YES; - parm.format->label = _("Output format used for point mode"); - parm.format->options = "plain,json"; - parm.format->descriptions = "plain;Plain text output;" - "json;JSON (JavaScript Object Notation);"; - parm.format->answer = "plain"; + parm.format = G_define_standard_option(G_OPT_F_FORMAT); parm.format->guisection = _("Point mode"); parm.output = G_define_standard_option(G_OPT_F_OUTPUT); @@ -595,6 +647,7 @@ int main(int argc, char *argv[]) geometry.offsetx = 0.5; geometry.offsety = 0.5; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD n /*n_cols */ = cellhd.cols; @@ -604,6 +657,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main geometry.n /*n_cols */ = cellhd.cols; geometry.m /*n_rows */ = cellhd.rows; ======= @@ -615,6 +670,9 @@ int main(int argc, char *argv[]) m /*n_rows */ = cellhd.rows; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -639,6 +697,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -648,6 +707,10 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main elevin = parm.elevin->answer; @@ -660,6 +723,7 @@ int main(int argc, char *argv[]) if (parm.coord->answer == NULL) { G_debug(1, "Setting mode: WHOLE_RASTER"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD setMode(WHOLE_RASTER); } @@ -696,6 +760,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main mode = WHOLE_RASTER; } else { @@ -742,6 +808,9 @@ int main(int argc, char *argv[]) ======= setMode(WHOLE_RASTER); <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -810,11 +879,14 @@ int main(int argc, char *argv[]) if (parm.direction->answer != NULL) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sscanf(parm.direction->answer, "%lf", &settings.single_direction); settings.step = 0; @@ -831,6 +903,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -842,6 +917,7 @@ int main(int argc, char *argv[]) "size. Aborting.")); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -854,6 +930,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( @@ -861,11 +942,14 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main settings.horizon_basename = parm.horizon->answer; if (parm.step->answer != NULL) { settings.str_step = parm.step->answer; @@ -886,6 +970,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -907,6 +994,7 @@ int main(int argc, char *argv[]) if (end < 0.0 || end > 360.0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -917,6 +1005,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.")); } @@ -935,11 +1028,14 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sscanf(parm.step->answer, "%lf", &settings.step); } @@ -949,6 +1045,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -959,6 +1058,7 @@ int main(int argc, char *argv[]) step = 360.; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -969,6 +1069,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., @@ -1005,6 +1110,7 @@ int main(int argc, char *argv[]) settings.fixedMaxLength = BIG; if (parm.maxdistance->answer != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (sscanf(parm.maxdistance->answer, "%lf", &fixedMaxLength) != 1) G_fatal_error(_("Could not read maximum distance. Aborting.")); @@ -1015,6 +1121,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (sscanf(parm.maxdistance->answer, "%lf", &settings.fixedMaxLength) != 1) G_fatal_error(_("Could not read maximum distance. Aborting.")); @@ -1028,6 +1136,9 @@ int main(int argc, char *argv[]) G_debug(1, "Using maxdistance %f", fixedMaxLength); /* predefined as BIG */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1039,6 +1150,7 @@ int main(int argc, char *argv[]) : AMAX1(deltx, delty); G_debug(1,"Using maxdistance %f", fixedMaxLength); */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD sscanf(parm.dist->answer, "%lf", &dist); @@ -1047,6 +1159,8 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sscanf(parm.dist->answer, "%lf", &geometry.distxy); if (geometry.distxy < 0.5 || geometry.distxy > 1.5) @@ -1068,6 +1182,9 @@ int main(int argc, char *argv[]) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1092,6 +1209,7 @@ int main(int argc, char *argv[]) if (nbufferZone == 0.) nbufferZone = bufferZone; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD new_cellhd.rows += (int)((nbufferZone + sbufferZone) / stepy); @@ -1120,6 +1238,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* adjust buffer to multiples of resolution */ ebufferZone = (int)(ebufferZone / geometry.stepx) * geometry.stepx; wbufferZone = (int)(wbufferZone / geometry.stepx) * geometry.stepx; @@ -1193,6 +1313,9 @@ int main(int argc, char *argv[]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1268,6 +1391,7 @@ int main(int argc, char *argv[]) (int)(nbufferZone / stepy)); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1278,6 +1402,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); @@ -1285,6 +1414,7 @@ int main(int argc, char *argv[]) /**********************end of main.c*****************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1292,11 +1422,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int INPUT(Geometry *geometry, const char *elevin) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1325,6 +1460,7 @@ int INPUT(void) z100[l] = (float *)G_malloc(sizeof(float) * (n100)); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1335,6 +1471,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 */ @@ -1355,6 +1496,7 @@ int INPUT(void) row_rev = m - row - 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1365,6 +1507,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)) @@ -1377,6 +1524,7 @@ int INPUT(void) /* create low resolution array 100 */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for (i = 0; i < m100; i++) { lmax = (i + 1) * 100; @@ -1388,6 +1536,8 @@ int INPUT(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for (int i = 0; i < geometry->m100; i++) { int lmax = (i + 1) * 100; if (lmax > geometry->m) @@ -1418,6 +1568,9 @@ int INPUT(void) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1434,6 +1587,7 @@ int INPUT(void) z100[i][j] = zmax; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1444,6 +1598,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]); } @@ -1460,6 +1619,7 @@ int INPUT(void) zmax = amax1(zmax, z[i][j]); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1470,6 +1630,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 } } @@ -1477,6 +1642,7 @@ int INPUT(void) return 1; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1484,12 +1650,17 @@ int INPUT(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int OUTGR(const Settings *settings, char *shad_filename, struct Cell_head *cellhd) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1509,6 +1680,7 @@ int OUTGR(int numrows, int numcols) if (horizon != NULL) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1519,6 +1691,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); @@ -1546,6 +1723,7 @@ int OUTGR(int numrows, int numcols) for (j = 0; j < numcols; j++) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1556,6 +1734,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); @@ -1575,6 +1758,7 @@ int OUTGR(int numrows, int numcols) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -1585,6 +1769,10 @@ int OUTGR(int numrows, int numcols) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main double amax1(arg1, arg2) double arg1; double arg2; @@ -1645,6 +1833,7 @@ int arg2; return res; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1658,6 +1847,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, @@ -1729,6 +1923,7 @@ void com_par(const Geometry *geometry, OriginAngle *origin_angle, double angle, distcosangle = 100. / (distxy * cosangle); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1739,6 +1934,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 } @@ -1772,6 +1972,7 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry, origin_point.coslatsq = coslat * coslat; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD tanh0 = -INFINITY; @@ -1781,6 +1982,9 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry, >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD origin_point.z_orig = z[yindex][xindex]; G_debug(1, "yindex: %d, xindex %d, z_orig %.2f", yindex, xindex, @@ -1808,6 +2012,9 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1833,17 +2040,23 @@ void calculate_shadow(void) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void calculate_shadow(void) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void calculate_shadow() ======= void calculate_shadow(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1869,10 +2082,13 @@ void calculate_shadow(void) printCount = 1; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) double angle = (settings->single_direction * deg2rad) + pihalf; @@ -1880,6 +2096,9 @@ void calculate_shadow(void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1921,6 +2140,7 @@ void calculate_shadow(void) shadow_angle *= rad2deg; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ip = jp = 0; @@ -1992,6 +2212,8 @@ void calculate_shadow(void) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (settings->compassOutput) { double tmpangle; @@ -2188,6 +2410,9 @@ void calculate_shadow(void) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2198,6 +2423,7 @@ void calculate_shadow(void) } /* end of for loop over angles */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2209,10 +2435,16 @@ 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 } /*////////////////////////////////////////////////////////////////////// */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int new_point(void) @@ -2222,6 +2454,9 @@ int new_point(void) >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD int new_point(const Geometry *geometry, const OriginPoint *origin_point, const OriginAngle *origin_angle, SearchPoint *search_point, @@ -2241,6 +2476,9 @@ int new_point(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2303,6 +2541,7 @@ int new_point(void) zp = z[jp][ip]; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2313,6 +2552,11 @@ int new_point(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 return (1); } @@ -2321,6 +2565,7 @@ int new_point(void) return -1; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int test_low_res(void) @@ -2330,6 +2575,9 @@ int test_low_res(void) >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD int test_low_res(const Geometry *geometry, const OriginPoint *origin_point, const OriginAngle *origin_angle, SearchPoint *search_point, @@ -2349,6 +2597,9 @@ int test_low_res(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2385,6 +2636,7 @@ int test_low_res(void) G_debug(2, "ip:%d jp:%d z2:%lf zp100:%lf \n", ip, jp, z2, zp100); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2395,12 +2647,18 @@ int test_low_res(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 (zp100 <= z2) /*skip to the next lowres cell */ { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD delx = 32000; dely = 32000; @@ -2437,6 +2695,8 @@ int test_low_res(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int delx = 32000; int dely = 32000; if (origin_angle->cosangle > 0.) { @@ -2538,6 +2798,9 @@ int test_low_res(void) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2553,6 +2816,7 @@ int test_low_res(void) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD double searching(void) @@ -2562,6 +2826,9 @@ double searching(void) >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD HorizonProperties horizon_height(const Geometry *geometry, const OriginPoint *origin_point, @@ -2581,6 +2848,9 @@ double searching(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2588,6 +2858,7 @@ double searching(void) SearchPoint search_point; HorizonProperties horizon; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (zp == UNDEFZ) @@ -2619,6 +2890,8 @@ double searching(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main search_point.ip = 0; search_point.jp = 0; search_point.xx0 = origin_point->xg0; @@ -2713,6 +2986,9 @@ double searching(void) if (length >= maxlength) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2736,6 +3012,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, int buffer_s, int buffer_n) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2747,6 +3024,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; @@ -2759,6 +3041,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, if ((G_projection() == PROJECTION_LL)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ll_correction = TRUE; } @@ -2768,6 +3051,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ll_correction = true; } @@ -2806,6 +3091,9 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2836,6 +3124,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, fclose(fp); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2846,6 +3135,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 { @@ -2856,6 +3150,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, ++arrayNumInt; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /****************************************************************/ @@ -2892,6 +3187,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main size_t decimals = G_get_num_decimals(settings->str_step); for (int k = 0; k < arrayNumInt; k++) { @@ -2915,6 +3212,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, /****************************************************************/ /* The loop over raster points starts here! */ <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main /****************************************************************/ @@ -2928,6 +3226,11 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, /****************************************************************/ +>>>>>>> osgeo-main +======= + + /****************************************************************/ + >>>>>>> osgeo-main if (horizon != NULL) { horizon_raster = @@ -3080,6 +3383,9 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3240,6 +3546,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3250,6 +3557,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 843add0761d..8ed58ca90c6 100644 --- a/raster/r.horizon/r.horizon.html +++ b/raster/r.horizon/r.horizon.html @@ -7,17 +7,23 @@

      DESCRIPTION

        <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main
      • point: as a series of horizon heights in the specified directions from the given point(s). The results are ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -126,12 +132,15 @@

        Input parameters:

        is the angle in degrees with the direction. If you use r.horizon <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD in the single point mode this option will be ignored. ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main in the point mode this option will be ignored. ======= in the single point mode this option will be ignored. @@ -140,6 +149,9 @@

        Input parameters:

        in the single point mode this option will be ignored. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -149,6 +161,7 @@

        Input parameters:

        or in a JSON file with option format=json (point mode only). If you use r.horizon in the raster map mode this option will be ignored. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -156,12 +169,17 @@

        Input parameters:

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -171,6 +189,7 @@

        Input parameters:

        be in meters. The buffer parameters must be in the same units as the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD raster coordinates (e.g., for latitude-longitude locations buffers are measured in degree unit). ======= @@ -178,6 +197,8 @@

        Input parameters:

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main raster coordinates (e.g., for latitude-longitude buffers are measured in degrees). ======= @@ -196,6 +217,9 @@

        Input parameters:

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -333,6 +357,7 @@

        AUTHORS

        Thomas Huld, Joint Research Centre of <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD the European Commission, Ispra, Italy ======= <<<<<<< HEAD @@ -349,6 +374,12 @@

        AUTHORS

        ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) @@ -362,6 +393,9 @@

        AUTHORS

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -379,6 +413,7 @@

        AUTHORS

        hofierka@geomodel.sk <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Marcel.Suri@jrc.it ======= <<<<<<< HEAD @@ -392,6 +427,11 @@

        AUTHORS

        Marcel.Suri@jrc.it ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +Marcel.Suri@jrc.it +======= +>>>>>>> osgeo-main Marcel.Suri@jrc.it <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -407,6 +447,9 @@

        AUTHORS

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.ascii/gethead.c b/raster/r.in.ascii/gethead.c index ed2f74cd7ef..4c175031c9a 100644 --- a/raster/r.in.ascii/gethead.c +++ b/raster/r.in.ascii/gethead.c @@ -73,6 +73,7 @@ int getgrdhead(FILE *fd, struct Cell_head *cellhd) cellhd->ns_res = (double)(ymax - ymin) / (nr - 1); /* the Surfer grid specifies x,y locations of gridded points. The GRASS <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD raster specifies an area covered by rectangular cells centerd at gridded ======= @@ -80,6 +81,8 @@ int getgrdhead(FILE *fd, struct Cell_head *cellhd) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main raster specifies an area covered by rectangular cells centered at gridded ======= raster specifies an area covered by rectangular cells centerd at gridded @@ -88,6 +91,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -246,6 +252,7 @@ int gethead(FILE *fd, struct Cell_head *cellhd, RASTER_MAP_TYPE *d_type, return 1; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static int scan_int(const char *s, double *i, int proj) @@ -254,6 +261,8 @@ static int scan_int(const char *s, double *i, int proj) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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) @@ -262,6 +271,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -271,6 +283,7 @@ static int scan_int(const char *s, double *i, int proj) *dummy = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -283,6 +296,10 @@ static int scan_int(const char *s, double *i, int proj) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main if (sscanf(s, "%d%1s", i_loc, dummy) != 1) return 0; @@ -291,7 +308,10 @@ static int scan_int(const char *s, double *i, int proj) if (*i_loc <= 0) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -325,6 +345,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -334,6 +357,7 @@ static int scan_int(const char *s, double *i, int proj) static int extract(int count, char *label, char *value, void *data, int proj, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int (*scanner)(const char *, double *, int)) ======= @@ -349,6 +373,12 @@ static int extract(int count, char *label, char *value, void *data, int proj, <<<<<<< HEAD int (*scanner)(const char *, double *, int)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + int (*scanner)(const char *, double *, int)) +======= >>>>>>> osgeo-main int (*scanner)()) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -365,6 +395,9 @@ static int extract(int count, char *label, char *value, void *data, int proj, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.ascii/main.c b/raster/r.in.ascii/main.c index 147fb6614a0..718abda828e 100644 --- a/raster/r.in.ascii/main.c +++ b/raster/r.in.ascii/main.c @@ -233,6 +233,7 @@ int main(int argc, char *argv[]) for (row = 0; row < nrows; row += 1) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (fread(rast, Rast_cell_size(data_type), ncols, ft) != (size_t)ncols) ======= @@ -248,6 +249,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD if (fread(rast, Rast_cell_size(data_type), ncols, ft) != (size_t)ncols) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -264,6 +271,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.bin/main.c b/raster/r.in.bin/main.c index 9293dad1ee9..74ec1853a3a 100644 --- a/raster/r.in.bin/main.c +++ b/raster/r.in.bin/main.c @@ -256,6 +256,7 @@ int main(int argc, char *argv[]) char output[GNAME_MAX]; const char *title; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double null_val = NAN; ======= @@ -271,6 +272,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD double null_val = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + double null_val = NAN; +======= >>>>>>> osgeo-main double null_val = 0.0 / 0.0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -287,6 +294,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -638,6 +648,7 @@ int main(int argc, char *argv[]) if (file_size != expected) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("File Size %" PRI_OFF_T " ... Total Bytes %" PRI_OFF_T), ======= @@ -645,6 +656,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("File Size %" PRId64 " ... Total Bytes %" PRId64), ======= G_warning(_("File Size %" PRI_OFF_T " ... Total Bytes %" PRI_OFF_T), @@ -653,6 +666,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -695,6 +711,7 @@ int main(int argc, char *argv[]) SEEK_SET); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (fread(in_buf, bytes, ncols, fp) != (size_t)ncols) @@ -711,6 +728,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD if (fread(in_buf, bytes, ncols, fp) != (size_t)ncols) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -727,6 +750,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.gdal/main.c b/raster/r.in.gdal/main.c index 1881736c9bf..7df4f99104a 100644 --- a/raster/r.in.gdal/main.c +++ b/raster/r.in.gdal/main.c @@ -158,6 +158,7 @@ int main(int argc, char *argv[]) "projection from for GCPs transformation"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -168,6 +169,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"); @@ -251,6 +257,7 @@ int main(int argc, char *argv[]) "Assume that the dataset has same projection as the current location"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -261,6 +268,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"); @@ -304,6 +316,7 @@ int main(int argc, char *argv[]) flag_c = G_define_flag(); flag_c->key = 'c'; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD flag_c->description = _( "Create the location specified by the \"location\" parameter and exit." @@ -313,6 +326,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main flag_c->description = _("Create the project specified by the \"project\" parameter and exit." " Do not import the raster file."); @@ -327,6 +342,9 @@ int main(int argc, char *argv[]) " Do not import the raster file."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -413,6 +431,7 @@ int main(int argc, char *argv[]) if (parm.target->answer && parm.outloc->answer && strcmp(parm.target->answer, parm.outloc->answer) == 0) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("You have to specify a target location different from " "output location")); @@ -429,6 +448,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("You have to specify a target project different from " "output project")); } @@ -464,6 +485,9 @@ int main(int argc, char *argv[]) G_fatal_error(_("The '-l' flag only works in Lat/Lon locations")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -484,6 +508,7 @@ int main(int argc, char *argv[]) croptoregion = flag_r->answer; if (flag_r->answer && parm.outloc->answer) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Disabling '-r' flag for new location")); ======= @@ -491,6 +516,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Disabling '-r' flag for new project")); ======= G_warning(_("Disabling '-r' flag for new location")); @@ -499,6 +526,9 @@ int main(int argc, char *argv[]) G_warning(_("Disabling '-r' flag for new location")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1110,6 +1140,7 @@ int main(int argc, char *argv[]) if (!hSRS || GPJ_osr_to_grass(&gcpcellhd, &proj_info, &proj_units, hSRS, 0) == 1) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning( _("Unable to convert input map projection to GRASS " @@ -1119,6 +1150,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Unable to convert input map CRS to GRASS " "format; cannot create new project.")); ======= @@ -1132,6 +1165,9 @@ int main(int argc, char *argv[]) "format; cannot create new location.")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1190,6 +1226,7 @@ int main(int argc, char *argv[]) parm.target->answer, &gcpcellhd, proj_info, proj_units, gdalsrid, gdalwkt)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to create new location <%s>"), ======= @@ -1197,6 +1234,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create new project <%s>"), ======= G_fatal_error(_("Unable to create new location <%s>"), @@ -1205,6 +1244,9 @@ int main(int argc, char *argv[]) G_fatal_error(_("Unable to create new location <%s>"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1213,6 +1255,7 @@ int main(int argc, char *argv[]) /* switch back to import location */ G_switch_env(); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_message(_("Location <%s> created"), parm.target->answer); @@ -1221,6 +1264,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Project <%s> created"), parm.target->answer); ======= G_message(_("Location <%s> created"), parm.target->answer); @@ -1229,6 +1274,9 @@ int main(int argc, char *argv[]) G_message(_("Location <%s> created"), parm.target->answer); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1237,6 +1285,7 @@ int main(int argc, char *argv[]) G_message(_("The target for the output group <%s> has been " "set to " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "location <%s>, mapset ."), ======= @@ -1244,6 +1293,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "project <%s>, mapset ."), ======= "location <%s>, mapset ."), @@ -1252,6 +1303,9 @@ int main(int argc, char *argv[]) "location <%s>, mapset ."), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1294,6 +1348,7 @@ int main(int argc, char *argv[]) if (strcmp(G_mapset(), "PERMANENT") == 0) { G_put_element_window(&cur_wind, "", "DEFAULT_WIND"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Default region for this location updated")); ======= @@ -1301,6 +1356,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Default region for this project updated")); ======= G_message(_("Default region for this location updated")); @@ -1309,6 +1366,9 @@ int main(int argc, char *argv[]) G_message(_("Default region for this location updated")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1362,11 +1422,14 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc, if ((out_proj_info = G_get_projinfo()) == NULL) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to get CRS info of target project")); if ((out_unit_info = G_get_projunits()) == NULL) G_fatal_error(_("Unable to get CRS units of target project")); @@ -1376,6 +1439,9 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1389,6 +1455,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc, _("Unable to get projection key values of target location")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1399,6 +1466,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) @@ -1407,6 +1479,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc, else { /* can't access target mapset */ /* access to mapset PERMANENT in target location is not required */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD sprintf(errbuf, _("Mapset <%s> in target location <%s> - "), ======= @@ -1414,6 +1487,8 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sprintf(errbuf, _("Mapset <%s> in target project <%s> - "), ======= sprintf(errbuf, _("Mapset <%s> in target location <%s> - "), @@ -1422,6 +1497,9 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc, sprintf(errbuf, _("Mapset <%s> in target location <%s> - "), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.gdal/proj.c b/raster/r.in.gdal/proj.c index d10374af6ef..c6767ff6e79 100644 --- a/raster/r.in.gdal/proj.c +++ b/raster/r.in.gdal/proj.c @@ -132,6 +132,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, if (proj_trouble == 2) { G_fatal_error(_("Unable to convert input map projection to GRASS " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "format; cannot create new location.")); ======= @@ -139,6 +140,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "format; cannot create new project.")); ======= "format; cannot create new location.")); @@ -147,6 +150,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "format; cannot create new location.")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -155,6 +161,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to create new location <%s>"), outloc); } @@ -164,6 +171,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create new project <%s>"), outloc); } G_message(_("Project <%s> created"), outloc); @@ -178,6 +187,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, G_message(_("Location <%s> created"), outloc); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -238,6 +250,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, proj_info, proj_units)) != 1) { int i_value; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -247,6 +260,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); @@ -259,6 +274,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -268,6 +286,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, /* error in proj_info */ if (loc_proj_info != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, _("Location PROJ_INFO is:\n")); ======= @@ -275,6 +294,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); ======= strcat(error_msg, _("Location PROJ_INFO is:\n")); @@ -283,6 +304,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -296,11 +320,14 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); if (loc_wind.proj == PROJECTION_XY) sprintf(error_msg + strlen(error_msg), @@ -321,6 +348,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -342,6 +372,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "Location proj = %d (unknown), zone = %d\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -352,6 +383,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); } @@ -427,6 +463,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, /* error in proj_units */ if (loc_proj_units != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, "Location PROJ_UNITS is:\n"); ======= @@ -434,6 +471,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, "Project PROJ_UNITS is:\n"); ======= strcat(error_msg, "Location PROJ_UNITS is:\n"); @@ -442,6 +481,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -465,11 +507,14 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, strcat(error_msg, _("\nIn case of no significant differences " <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "in the CRS definitions," " use the -o flag to ignore them and use" " current project definition.\n")); @@ -480,6 +525,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -491,6 +539,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "the 'location' parameter.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -501,6 +550,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 } @@ -520,6 +574,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, else msg_fn = G_verbose_message; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD msg_fn(_("Projection of input dataset and current location " "appear to match")); @@ -528,6 +583,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msg_fn(_("Coordinate reference system of input dataset and current " "project appear to match")); ======= @@ -539,6 +596,9 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc, "appear to match")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.gdal/r.in.gdal.html b/raster/r.in.gdal/r.in.gdal.html index 9585d407f96..947117eb874 100644 --- a/raster/r.in.gdal/r.in.gdal.html +++ b/raster/r.in.gdal/r.in.gdal.html @@ -4,17 +4,23 @@

        DESCRIPTION

        or imagery group, from any GDAL supported raster map format, with an optional <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main title. The imported file may also be used to create a new project (previously called location). ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -165,6 +171,7 @@

        Project Creation

        If the user wishes to ignore the difference between the apparent coordinate <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD system of the source data and the current location, they may pass the -o flag to override the projection check. ======= @@ -172,6 +179,8 @@

        Project Creation

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main system of the source data and the current project, they may pass the -o flag to override the CRS check. ======= @@ -183,6 +192,9 @@

        Project Creation

        -o flag to override the projection check. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -207,6 +219,7 @@

        Support for Ground Control Points

        <<<<<<< 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 @@ -215,6 +228,8 @@

        Support for Ground Control Points

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -229,6 +244,9 @@

        Support for Ground Control Points

        the output group will be set to the new location, and >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -292,6 +310,7 @@

        NOTES

        or to define a new location. Internally GDAL represents projections in <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -303,6 +322,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.
        @@ -321,12 +345,15 @@

        NOTES

        The coordinate system of the ground control points is reported by r.in.gdal <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD but not preserved. It is up to the user to ensure that the location ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -335,6 +362,9 @@

        NOTES

        but not preserved. It is up to the user to ensure that the location >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.lidar/main.c b/raster/r.in.lidar/main.c index f68530a66a8..95e29bcc89e 100644 --- a/raster/r.in.lidar/main.c +++ b/raster/r.in.lidar/main.c @@ -301,6 +301,7 @@ int main(int argc, char *argv[]) over_flag->key = 'o'; over_flag->label = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Override projection check (use current location's projection)"); over_flag->description = _( @@ -310,6 +311,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Override projection check (use current project's CRS)"); over_flag->description = _("Assume that the dataset has the same coordinate reference system as " @@ -325,6 +328,9 @@ int main(int argc, char *argv[]) "Assume that the dataset has same projection as the current location"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.lidar/projection.c b/raster/r.in.lidar/projection.c index 3e0d8f04f6f..8c8214e0af6 100644 --- a/raster/r.in.lidar/projection.c +++ b/raster/r.in.lidar/projection.c @@ -29,6 +29,7 @@ void projection_mismatch_report(struct Cell_head cellhd, int i_value; char error_msg[8192]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -38,6 +39,8 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); ======= @@ -49,6 +52,9 @@ void projection_mismatch_report(struct Cell_head cellhd, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -109,11 +115,14 @@ void projection_mismatch_report(struct Cell_head cellhd, sprintf(error_msg + strlen(error_msg), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("\nIn case of no significant differences" " in the coordinate reference system definitions," " use the -o flag to ignore them and use" @@ -122,6 +131,9 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -131,6 +143,7 @@ void projection_mismatch_report(struct Cell_head cellhd, " current location definition.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -141,6 +154,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 dff4fb7c10e..d94f9942840 100644 --- a/raster/r.in.lidar/r.in.lidar.html +++ b/raster/r.in.lidar/r.in.lidar.html @@ -501,6 +501,7 @@

        Height above ground

        Multiple file input

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The file option requres a file that contains a list of file names with the full @@ -509,6 +510,8 @@

        Multiple file input

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -517,6 +520,9 @@

        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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.mat/main.c b/raster/r.in.mat/main.c index 515945d0582..de25d7ec35d 100644 --- a/raster/r.in.mat/main.c +++ b/raster/r.in.mat/main.c @@ -214,6 +214,7 @@ int main(int argc, char *argv[]) if (data_format == 5) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -224,6 +225,10 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main if (fread(&map_name, sizeof(char), ncols, fp1) != (size_t)ncols) G_fatal_error(_("Error reading data")); @@ -233,10 +238,13 @@ int main(int argc, char *argv[]) (size_t)ncols) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -266,6 +274,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -324,6 +335,7 @@ int main(int argc, char *argv[]) if (data_format == 5) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (fread(&map_title, sizeof(char), ncols, fp1) != (size_t)ncols) @@ -342,6 +354,13 @@ int main(int argc, char *argv[]) if (fread(&map_title, sizeof(char), ncols, fp1) != (size_t)ncols) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + 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)) @@ -360,6 +379,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -368,6 +390,7 @@ int main(int argc, char *argv[]) else if (data_format == 0) { /* sigh.. */ if (fread(&map_name_d, sizeof(double), ncols, fp1) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD (size_t)ncols) /* note reusing variable */ ======= @@ -383,6 +406,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD (size_t)ncols) /* note reusing variable */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + (size_t)ncols) /* note reusing variable */ +======= >>>>>>> osgeo-main ncols) /* note reusing variable */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -399,6 +428,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -432,6 +464,7 @@ int main(int argc, char *argv[]) G_calloc(mrows * (ncols + 1), Rast_cell_size(map_type)); if (fread(array_data, sizeof(double), (size_t)mrows * ncols, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fp1) != (size_t)(mrows * ncols)) ======= @@ -447,6 +480,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD fp1) != (size_t)(mrows * ncols)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + fp1) != (size_t)(mrows * ncols)) +======= >>>>>>> osgeo-main fp1) != (mrows * ncols)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -463,6 +502,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -475,6 +517,7 @@ int main(int argc, char *argv[]) G_calloc(mrows * (ncols + 1), Rast_cell_size(map_type)); if (fread(array_data, sizeof(float), (size_t)mrows * ncols, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fp1) != (size_t)(mrows * ncols)) ======= @@ -490,6 +533,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD fp1) != (size_t)(mrows * ncols)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + fp1) != (size_t)(mrows * ncols)) +======= >>>>>>> osgeo-main fp1) != (mrows * ncols)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -506,6 +555,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -518,6 +570,7 @@ int main(int argc, char *argv[]) G_calloc(mrows * (ncols + 1), Rast_cell_size(map_type)); if (fread(array_data, sizeof(int), (size_t)mrows * ncols, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fp1) != (size_t)(mrows * ncols)) ======= @@ -533,6 +586,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD fp1) != (size_t)(mrows * ncols)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + fp1) != (size_t)(mrows * ncols)) +======= >>>>>>> osgeo-main fp1) != (mrows * ncols)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -549,6 +608,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.mat/r.in.mat.html b/raster/r.in.mat/r.in.mat.html index d49c25089ff..28f8bf9e6e4 100644 --- a/raster/r.in.mat/r.in.mat.html +++ b/raster/r.in.mat/r.in.mat.html @@ -32,16 +32,22 @@

        DESCRIPTION

        The 'map_northern_edge' and like variables are mandatory unless the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main user is importing to a "XY" non-georeferenced project ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/Makefile b/raster/r.in.pdal/Makefile index 2b29e14f112..3cc6ca3d86e 100644 --- a/raster/r.in.pdal/Makefile +++ b/raster/r.in.pdal/Makefile @@ -10,6 +10,7 @@ EXTRA_CFLAGS = $(VECT_CFLAGS) include $(MODULE_TOPDIR)/include/Make/Module.make +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -17,6 +18,8 @@ include $(MODULE_TOPDIR)/include/Make/Module.make ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -42,6 +45,9 @@ $(OBJDIR)/grasslidarfilter.o : EXTRA_CFLAGS += $(PDALCPPFLAGS) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/bin_update.c b/raster/r.in.pdal/bin_update.c index 31e237bad3b..f4d67f7f7d4 100644 --- a/raster/r.in.pdal/bin_update.c +++ b/raster/r.in.pdal/bin_update.c @@ -14,6 +14,7 @@ #include <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #include ======= <<<<<<< HEAD @@ -27,6 +28,11 @@ #include ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +#include +======= +>>>>>>> osgeo-main >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= #include @@ -35,6 +41,9 @@ #include >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -45,6 +54,7 @@ #include "point_binning.h" #include "bin_update.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -52,6 +62,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -61,6 +73,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -71,6 +86,7 @@ static int new_node(struct BinIndex *bin_index, size_t size) if (bin_index->num_nodes >= bin_index->max_nodes) { bin_index->max_nodes += SIZE_INCREMENT; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD bin_index->nodes = G_realloc(bin_index->nodes, (size_t)bin_index->max_nodes * size); @@ -87,6 +103,12 @@ 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 +======= +<<<<<<< HEAD + 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); @@ -100,6 +122,9 @@ static int new_node(struct BinIndex *bin_index, size_t size) G_realloc(bin_index->nodes, (size_t)bin_index->max_nodes * size); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -108,6 +133,7 @@ static int new_node(struct BinIndex *bin_index, size_t size) return n; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -115,6 +141,8 @@ static int new_node(struct BinIndex *bin_index, size_t size) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -124,6 +152,9 @@ static int new_node(struct BinIndex *bin_index, size_t size) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -136,6 +167,7 @@ void update_val(void *array, int cols, int row, int col, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -143,6 +175,8 @@ void update_val(void *array, int cols, int row, int col, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -152,6 +186,9 @@ void update_val(void *array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -166,6 +203,7 @@ void update_n(void *array, int cols, int row, int col) return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -173,6 +211,8 @@ void update_n(void *array, int cols, int row, int col) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -182,6 +222,9 @@ void update_n(void *array, int cols, int row, int col) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -194,6 +237,7 @@ void update_min(void *array, int cols, int row, int col, if (Rast_is_null_value(ptr, map_type)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -205,6 +249,11 @@ void update_min(void *array, int cols, int row, int col, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main Rast_set_d_value(ptr, (DCELL)value, map_type); else { @@ -215,8 +264,11 @@ void update_min(void *array, int cols, int row, int col, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Rast_set_d_value(ptr, (DCELL) value, map_type); else { @@ -234,6 +286,9 @@ void update_min(void *array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -241,6 +296,7 @@ void update_min(void *array, int cols, int row, int col, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -248,6 +304,8 @@ void update_min(void *array, int cols, int row, int col, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -257,6 +315,9 @@ void update_min(void *array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -269,6 +330,7 @@ void update_max(void *array, int cols, int row, int col, if (Rast_is_null_value(ptr, map_type)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -280,6 +342,11 @@ void update_max(void *array, int cols, int row, int col, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main Rast_set_d_value(ptr, (DCELL)value, map_type); else { @@ -290,7 +357,10 @@ void update_max(void *array, int cols, int row, int col, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main Rast_set_d_value(ptr, (DCELL) value, map_type); @@ -309,6 +379,9 @@ void update_max(void *array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -329,6 +402,7 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col, old_c = Rast_get_d_value(c_ptr, map_type); tmp = old_sum + value; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (fabs(old_sum) >= fabs(value)) @@ -343,6 +417,11 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col, <<<<<<< HEAD if (fabs(old_sum) >= fabs(value)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if (fabs(old_sum) >= fabs(value)) +======= >>>>>>> osgeo-main if (abs(old_sum) >= abs(value)) >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -353,6 +432,9 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col, if (fabs(old_sum) >= fabs(value)) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -365,6 +447,7 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -372,6 +455,8 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -381,6 +466,9 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -417,6 +505,7 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -424,6 +513,8 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -433,6 +524,9 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -451,6 +545,7 @@ void update_moving_mean(void *array, int cols, int row, int col, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -458,6 +553,8 @@ void update_moving_mean(void *array, int cols, int row, int col, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -467,6 +564,9 @@ void update_moving_mean(void *array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -495,6 +595,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) return -1; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if (node_id == head_id) { /* pole position, insert as head */ ======= @@ -508,6 +609,11 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) <<<<<<< HEAD else if (node_id == head_id) { /* pole position, insert as head */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -518,6 +624,9 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) else if (node_id == head_id) { /* pole position, insert as head */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -528,6 +637,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) return (head_id); } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else { /* somewhere in the middle, insert */ ======= @@ -541,6 +651,11 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) <<<<<<< HEAD else { /* somewhere in the middle, insert */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + else { /* somewhere in the middle, insert */ +======= >>>>>>> osgeo-main else { /* somewhere in the middle, insert */ >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -551,6 +666,9 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) else { /* somewhere in the middle, insert */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -562,6 +680,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -569,6 +688,8 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -578,6 +699,9 @@ int add_z_node(struct BinIndex *bin_index, int head, double z) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -606,6 +730,7 @@ void add_cnt_node(struct BinIndex *bin_index, int head, int value) return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -620,6 +745,11 @@ void add_cnt_node(struct BinIndex *bin_index, int head, int value) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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, @@ -628,7 +758,10 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -646,6 +779,9 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -653,6 +789,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, int head_id; void *ptr = index_array; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) * @@ -670,6 +807,12 @@ 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 +======= +<<<<<<< HEAD + ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) * + Rast_cell_size(CELL_TYPE)); +======= >>>>>>> osgeo-main ptr = G_incr_void_ptr(ptr, @@ -685,6 +828,9 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, Rast_cell_size(CELL_TYPE)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -711,6 +857,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -718,6 +865,8 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -727,6 +876,9 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -736,6 +888,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array, int head_id; void *ptr = index_array; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) * @@ -753,6 +906,12 @@ 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 +======= +<<<<<<< HEAD + ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) * + Rast_cell_size(CELL_TYPE)); +======= >>>>>>> osgeo-main ptr = G_incr_void_ptr(ptr, @@ -768,6 +927,9 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array, Rast_cell_size(CELL_TYPE)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -790,6 +952,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -797,6 +960,8 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -806,6 +971,9 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -820,12 +988,16 @@ void update_com_node(struct com_node *cn, int item, double x, double y) cn->comoment[item] = cn->comoment[item] + dx * (y - cn->meany[item]); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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) @@ -834,12 +1006,15 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void update_bin_com_index(struct BinIndex *bin_index, void *index_array, int cols, int row, int col, double x, double y, double z) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void update_bin_com_index(struct BinIndex *bin_index, void *index_array, int cols, int row, int col, @@ -856,6 +1031,9 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, double z) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -863,6 +1041,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, int node_id; void *ptr = index_array; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) * @@ -880,6 +1059,12 @@ 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 +======= +<<<<<<< HEAD + ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) * + Rast_cell_size(CELL_TYPE)); +======= >>>>>>> osgeo-main ptr = G_incr_void_ptr(ptr, @@ -895,6 +1080,9 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, Rast_cell_size(CELL_TYPE)); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -922,17 +1110,23 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, ((struct com_node *)bin_index->nodes)[node_id].n++; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -946,10 +1140,13 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> 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]), @@ -968,6 +1165,9 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -975,6 +1175,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, return; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -989,6 +1190,11 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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) @@ -1009,7 +1215,10 @@ int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1039,6 +1248,9 @@ int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/bin_update.h b/raster/r.in.pdal/bin_update.h index 48c57c5d729..d2bee55c61a 100644 --- a/raster/r.in.pdal/bin_update.h +++ b/raster/r.in.pdal/bin_update.h @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /**************************************************************************** ======= <<<<<<< HEAD @@ -12,6 +13,11 @@ <<<<<<< HEAD /**************************************************************************** ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +/**************************************************************************** +======= >>>>>>> osgeo-main /**************************************************************************** @@ -23,6 +29,9 @@ /**************************************************************************** >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -62,6 +71,7 @@ void update_max(void *, int, int, int, RASTER_MAP_TYPE, double); void update_sum(void *, void *, int, int, int, RASTER_MAP_TYPE, double); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE, double); ======= <<<<<<< HEAD @@ -75,6 +85,11 @@ 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 +======= +<<<<<<< HEAD +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)) @@ -85,6 +100,9 @@ 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); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -98,6 +116,7 @@ void update_bin_cnt_index(struct BinIndex *, void *, int, int, int, int); void update_com_node(struct com_node *, int, double, double); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -110,6 +129,11 @@ void update_com_node(struct com_node *, int, double, double); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main void update_bin_com_index(struct BinIndex *, void *, int, int, int, double, double, double); @@ -119,9 +143,12 @@ int row_array_get_value_row_col(void *, int, int, int, RASTER_MAP_TYPE, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void update_bin_com_index(struct BinIndex *, void *, int, int, int, double, double, double); @@ -139,6 +166,9 @@ int row_array_get_value_row_col(void *, int, int, int, RASTER_MAP_TYPE, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/bin_write.c b/raster/r.in.pdal/bin_write.c index ec4ab58b83e..dea8733ef46 100644 --- a/raster/r.in.pdal/bin_write.c +++ b/raster/r.in.pdal/bin_write.c @@ -22,12 +22,16 @@ #include "point_binning.h" #include "bin_write.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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) @@ -36,12 +40,15 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /* Get error corrected sum */ double get_sum(void *sum_array, void *c_array, int row, int cols, int col, RASTER_MAP_TYPE rtype) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Get error corrected sum */ double get_sum(void *sum_array, void *c_array, @@ -58,6 +65,9 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col, RASTER_MAP_TYPE rtype) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -69,6 +79,7 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col, return sum + c; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void write_sum(void *raster_row, void *sum_array, void *c_array, int row, @@ -87,6 +98,12 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row, int cols, RASTER_MAP_TYPE rtype) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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) @@ -100,6 +117,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -115,12 +135,16 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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) @@ -129,12 +153,15 @@ void write_variance(void *raster_row, void *n_array, void *mean_array, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void write_variance(void *raster_row, void *n_array, void *mean_array, void *m2_array, int row, int cols, @@ -151,6 +178,9 @@ void write_variance(void *raster_row, void *n_array, void *mean_array, int method) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -189,6 +219,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -196,6 +227,8 @@ void write_variance(void *raster_row, void *n_array, void *mean_array, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -205,6 +238,9 @@ void write_variance(void *raster_row, void *n_array, void *mean_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -223,6 +259,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -234,6 +271,11 @@ void write_median(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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 */ @@ -243,8 +285,11 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> 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); @@ -259,6 +304,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -269,6 +317,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row, n = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD while (node_id != -1) { /* count number of points in cell */ @@ -283,6 +332,11 @@ void write_median(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD while (node_id != -1) { /* count number of points in cell */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -293,6 +347,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row, while (node_id != -1) { /* count number of points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -300,6 +357,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row, node_id = ((struct z_node *)bin_index->nodes)[node_id].next; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -307,12 +365,17 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -326,6 +389,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -333,6 +397,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD ======= >>>>>>> 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; @@ -348,8 +415,11 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (n == 1) /* only one point, use that */ Rast_set_d_value(ptr, @@ -376,6 +446,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -386,6 +459,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row, for (j = 1; j < n; j++) /* get element "below" */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -397,6 +471,11 @@ void write_median(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main node_id = ((struct z_node *)bin_index->nodes)[node_id].next; @@ -409,8 +488,11 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main node_id = ((struct z_node *)bin_index->nodes)[node_id].next; @@ -432,6 +514,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -442,6 +527,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, @@ -460,6 +546,12 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, int row, int cols) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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) @@ -473,6 +565,9 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, int row, int cols) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -485,6 +580,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, size_t n_offset = ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE)) /* no points in cell */ @@ -501,6 +597,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -513,6 +615,9 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, CELL_TYPE)) /* no points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -528,6 +633,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, mode_node = node_id; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -539,6 +645,11 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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) @@ -552,8 +663,11 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main else if (((struct cnt_node *)bin_index-> nodes)[node_id].count > @@ -579,6 +693,9 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -587,6 +704,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -594,6 +712,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -603,6 +723,9 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -622,6 +745,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, size_t n_offset = ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE)) /* no points in cell */ @@ -638,6 +762,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -650,6 +780,9 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, CELL_TYPE)) /* no points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -660,6 +793,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, node_id = head_id; n = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD while (node_id != -1) { /* count number of points in cell */ @@ -674,6 +808,11 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD while (node_id != -1) { /* count number of points in cell */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -684,6 +823,9 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, while (node_id != -1) { /* count number of points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -693,6 +835,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, z = (pth * (n + 1)) / 100.0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD r_low = floor(z); /* lower rank */ ======= @@ -706,6 +849,11 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD r_low = floor(z); /* lower rank */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + r_low = floor(z); /* lower rank */ +======= >>>>>>> osgeo-main r_low = floor(z); /* lower rank */ >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -716,6 +864,9 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, r_low = floor(z); /* lower rank */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -724,6 +875,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, else if (r_low > n) r_low = n; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD r_up = ceil(z); /* upper rank */ @@ -738,6 +890,11 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD r_up = ceil(z); /* upper rank */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + r_up = ceil(z); /* upper rank */ +======= >>>>>>> osgeo-main r_up = ceil(z); /* upper rank */ >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -748,6 +905,9 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, r_up = ceil(z); /* upper rank */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -758,6 +918,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, for (j = 1; j < r_low; j++) /* search lower value */ node_id = ((struct z_node *)bin_index->nodes)[node_id].next; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -771,6 +932,11 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main z = ((struct z_node *)bin_index->nodes)[node_id] .z; /* save lower value */ @@ -780,8 +946,11 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main z = ((struct z_node *)bin_index->nodes)[node_id].z; /* save lower value */ node_id = head_id; @@ -796,6 +965,9 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -808,6 +980,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void write_skewness(struct BinIndex *bin_index, void *raster_row, @@ -826,6 +999,12 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, void *index_array, int row, int cols, RASTER_MAP_TYPE rtype) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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, @@ -840,6 +1019,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -857,6 +1039,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, size_t n_offset = ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE)) /* no points in cell */ @@ -873,6 +1056,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -885,6 +1074,9 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, CELL_TYPE)) /* no points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -894,6 +1086,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, Rast_get_c_value(((char *)index_array) + n_offset, CELL_TYPE); node_id = head_id; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -901,12 +1094,17 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -919,10 +1117,13 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main n = 0; /* count */ sum = 0.0; /* sum */ sumsq = 0.0; /* sum of squares */ @@ -934,6 +1135,9 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -946,6 +1150,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, node_id = ((struct z_node *)bin_index->nodes)[node_id].next; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (n > 1) { /* if n == 1, skew is "0.0" */ @@ -960,6 +1165,11 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD if (n > 1) { /* if n == 1, skew is "0.0" */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -970,6 +1180,9 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, if (n > 1) { /* if n == 1, skew is "0.0" */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -979,6 +1192,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, z = ((struct z_node *)bin_index->nodes)[node_id].z; sumdev += pow((z - mean), 3); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD node_id = ((struct z_node *)bin_index->nodes)[node_id].next; ======= @@ -992,6 +1206,11 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD node_id = ((struct z_node *)bin_index->nodes)[node_id].next; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + node_id = ((struct z_node *)bin_index->nodes)[node_id].next; +======= >>>>>>> osgeo-main node_id = ((struct z_node *)bin_index->nodes)[node_id].next; @@ -1003,6 +1222,9 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, node_id = ((struct z_node *)bin_index->nodes)[node_id].next; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1020,12 +1242,16 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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) @@ -1034,12 +1260,15 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void write_trimmean(struct BinIndex *bin_index, void *raster_row, void *index_array, int row, int cols, RASTER_MAP_TYPE rtype, double trim) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void write_trimmean(struct BinIndex *bin_index, void *raster_row, void *index_array, int row, int cols, @@ -1056,6 +1285,9 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, double trim) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1072,6 +1304,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, size_t n_offset = ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE)) /* no points in cell */ @@ -1088,6 +1321,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -1100,6 +1339,9 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, CELL_TYPE)) /* no points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1111,6 +1353,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, node_id = head_id; n = 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD while (node_id != -1) { /* count number of points in cell */ ======= @@ -1124,6 +1367,11 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD while (node_id != -1) { /* count number of points in cell */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -1134,6 +1382,9 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, while (node_id != -1) { /* count number of points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1146,6 +1397,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1157,6 +1409,11 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main k = floor(trim * n + 0.5); /* number of ranks to discard on each tail */ @@ -1168,8 +1425,11 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main k = floor(trim * n + 0.5); /* number of ranks to discard on each tail */ @@ -1188,6 +1448,9 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1199,6 +1462,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, n = 0; sum = 0.0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD while (j <= k) { /* get values in interval */ @@ -1213,6 +1477,11 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, <<<<<<< HEAD while (j <= k) { /* get values in interval */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -1223,6 +1492,9 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, while (j <= k) { /* get values in interval */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1252,6 +1524,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, @@ -1270,6 +1543,12 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, int row, int cols, int min) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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) @@ -1283,6 +1562,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1296,6 +1578,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, size_t n_offset = ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE)) /* no points in cell */ @@ -1312,6 +1595,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -1324,6 +1613,9 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, CELL_TYPE)) /* no points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1340,6 +1632,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, ((struct cnt_node *)bin_index->nodes)[node_id].count < <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1351,6 +1644,11 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main count) count = @@ -1362,7 +1660,10 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main count) @@ -1383,6 +1684,9 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1396,6 +1700,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1403,6 +1708,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -1412,6 +1719,9 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1426,6 +1736,7 @@ void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array, size_t n_offset = ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE)) /* no points in cell */ @@ -1442,6 +1753,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -1454,6 +1771,9 @@ void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array, CELL_TYPE)) /* no points in cell */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/bin_write.h b/raster/r.in.pdal/bin_write.h index 1851ac24156..9ffbcb190f8 100644 --- a/raster/r.in.pdal/bin_write.h +++ b/raster/r.in.pdal/bin_write.h @@ -24,6 +24,7 @@ double get_sum(void *, void *, int, int, int, RASTER_MAP_TYPE); void write_sum(void *, void *, void *, int, int, RASTER_MAP_TYPE); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -36,6 +37,11 @@ void write_sum(void *, void *, void *, int, int, RASTER_MAP_TYPE); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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); @@ -53,7 +59,10 @@ void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main void write_variance(void *, void *, void *, @@ -85,6 +94,9 @@ void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/filters.c b/raster/r.in.pdal/filters.c index a7bfd72c6fd..aaa5a405a8f 100644 --- a/raster/r.in.pdal/filters.c +++ b/raster/r.in.pdal/filters.c @@ -12,6 +12,7 @@ * */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -19,6 +20,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -28,6 +31,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40,6 +46,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -47,6 +54,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -56,6 +65,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -84,6 +96,7 @@ int spatial_filter_from_option(struct Option *option, double *xmin, return TRUE; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax, @@ -102,6 +115,12 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax, double *ymax) ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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)) @@ -114,6 +133,9 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax, double *ymax) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/filters.h b/raster/r.in.pdal/filters.h index 83af5a9d2dd..2e72e17d81d 100644 --- a/raster/r.in.pdal/filters.h +++ b/raster/r.in.pdal/filters.h @@ -15,6 +15,7 @@ #ifndef __FILTERS_H__ #define __FILTERS_H__ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -29,6 +30,11 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main struct ReturnFilter { int filter; }; @@ -38,7 +44,10 @@ struct ClassFilter { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main struct ReturnFilter @@ -59,6 +68,9 @@ struct ClassFilter { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -73,6 +85,7 @@ int spatial_filter_from_option(struct Option *option, double *xmin, double *ymin, double *xmax, double *ymax); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax, double *ymax); ======= @@ -89,6 +102,12 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax, double *ymax); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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)) @@ -101,6 +120,9 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax, double *ymax); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/grasslidarfilter.cpp b/raster/r.in.pdal/grasslidarfilter.cpp index 99877fd8d28..0c4d4c31e0d 100644 --- a/raster/r.in.pdal/grasslidarfilter.cpp +++ b/raster/r.in.pdal/grasslidarfilter.cpp @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /**************************************************************************** ======= <<<<<<< HEAD @@ -12,6 +13,11 @@ <<<<<<< HEAD /**************************************************************************** ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +/**************************************************************************** +======= >>>>>>> osgeo-main /**************************************************************************** @@ -23,6 +29,9 @@ /**************************************************************************** >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42,6 +51,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -56,6 +66,11 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #include "grasslidarfilter.h" bool GrassLidarFilter::processOne(pdal::PointRef &point) @@ -69,7 +84,10 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -94,6 +112,9 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -110,6 +131,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) } if (use_irange_) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double intensity = point.getFieldAs(Id::Intensity); ======= @@ -123,6 +145,11 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) <<<<<<< HEAD double intensity = point.getFieldAs(Id::Intensity); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + double intensity = point.getFieldAs(Id::Intensity); +======= >>>>>>> osgeo-main double intensity = point.getFieldAs < double >(Id::Intensity); >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -133,6 +160,9 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) double intensity = point.getFieldAs(Id::Intensity); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -145,6 +175,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) } if (use_drange_) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double value = point.getFieldAs(dim_to_import_); ======= @@ -158,6 +189,11 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) <<<<<<< HEAD double value = point.getFieldAs(dim_to_import_); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -168,6 +204,9 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) double value = point.getFieldAs(dim_to_import_); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -186,6 +225,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) z -= base_z; else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return false; // skip points outside of base raster ======= @@ -199,6 +239,11 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) <<<<<<< HEAD return false; // skip points outside of base raster ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -209,6 +254,9 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) return false; // skip points outside of base raster >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -221,6 +269,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) } if (use_return_filter_) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int return_n = point.getFieldAs(Id::ReturnNumber); int n_returns = point.getFieldAs(Id::NumberOfReturns); @@ -237,6 +286,12 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) int return_n = point.getFieldAs(Id::ReturnNumber); int n_returns = point.getFieldAs(Id::NumberOfReturns); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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); @@ -250,6 +305,9 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) int n_returns = point.getFieldAs(Id::NumberOfReturns); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -261,6 +319,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) } if (use_class_filter_) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int point_class = point.getFieldAs(Id::Classification); ======= @@ -274,6 +333,11 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) <<<<<<< HEAD int point_class = point.getFieldAs(Id::Classification); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -284,6 +348,9 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point) int point_class = point.getFieldAs(Id::Classification); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/grasslidarfilter.h b/raster/r.in.pdal/grasslidarfilter.h index d85cc12db43..252f28292a8 100644 --- a/raster/r.in.pdal/grasslidarfilter.h +++ b/raster/r.in.pdal/grasslidarfilter.h @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /**************************************************************************** ======= <<<<<<< HEAD @@ -12,6 +13,11 @@ <<<<<<< HEAD /**************************************************************************** ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +/**************************************************************************** +======= >>>>>>> osgeo-main /**************************************************************************** @@ -23,6 +29,9 @@ /**************************************************************************** >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -42,6 +51,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -56,6 +66,11 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifndef GRASSLIDARFILTER_H #define GRASSLIDARFILTER_H @@ -64,7 +79,10 @@ extern "C" { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -83,6 +101,9 @@ extern "C" { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -91,6 +112,7 @@ extern "C" { #include "rast_segment.h" } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -98,6 +120,8 @@ extern "C" { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-parameter" @@ -113,6 +137,9 @@ extern "C" { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -120,6 +147,7 @@ extern "C" { #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* All GRASS GIS filters which are similar across multiple modules @@ -130,6 +158,8 @@ extern "C" { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) /* All GRASS GIS filters which are similar across multiple modules @@ -147,6 +177,9 @@ extern "C" { */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -163,8 +196,11 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable { base_segment_(nullptr) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { } @@ -172,6 +208,7 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { } @@ -179,6 +216,8 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable { ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main class GrassLidarFilter:public pdal::Filter, public pdal::Streamable { public: @@ -229,6 +268,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable std::string getName() const { return "filters.grasslidar"; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -238,6 +280,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable dim_to_import_ = dim_to_import; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void set_spatial_filter(double xmin, double xmax, double ymin, double ymax) @@ -252,6 +295,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable <<<<<<< HEAD void set_spatial_filter(double xmin, double xmax, double ymin, double ymax) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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) @@ -263,6 +311,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable void set_spatial_filter(double xmin, double xmax, double ymin, double ymax) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -308,6 +359,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable n_class_filtered_ = 0; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD void set_base_raster(SEGMENT *base_segment, struct Cell_head *region, RASTER_MAP_TYPE rtype) @@ -324,6 +376,12 @@ 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 +======= +<<<<<<< HEAD + 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) @@ -337,6 +395,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable RASTER_MAP_TYPE rtype) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -347,6 +408,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -358,6 +420,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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; } @@ -378,8 +445,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main void set_z_scale(double scale) { @@ -419,6 +489,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -430,6 +503,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable } } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD virtual bool processOne(pdal::PointRef &point); ======= @@ -443,6 +517,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable <<<<<<< HEAD virtual bool processOne(pdal::PointRef &point); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + virtual bool processOne(pdal::PointRef &point); +======= >>>>>>> osgeo-main virtual bool processOne(pdal::PointRef & point); >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -453,6 +532,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable virtual bool processOne(pdal::PointRef &point); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -498,6 +580,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable // not implemented <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -509,6 +592,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main GrassLidarFilter &operator=(const GrassLidarFilter &); GrassLidarFilter(const GrassLidarFilter &); @@ -518,8 +606,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main GrassLidarFilter & operator=(const GrassLidarFilter &); GrassLidarFilter(const GrassLidarFilter &); @@ -536,6 +627,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/grassrasterwriter.h b/raster/r.in.pdal/grassrasterwriter.h index 124e615ba49..a1d4fcfc061 100644 --- a/raster/r.in.pdal/grassrasterwriter.h +++ b/raster/r.in.pdal/grassrasterwriter.h @@ -1,10 +1,13 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -14,6 +17,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -37,6 +43,7 @@ #ifndef GRASSRASTERWRITER_H #define GRASSRASTERWRITER_H +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD extern "C" { @@ -52,6 +59,11 @@ extern "C" { extern "C" { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +extern "C" { +======= +>>>>>>> osgeo-main extern "C" { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -62,6 +74,9 @@ extern "C" { extern "C" { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -69,6 +84,7 @@ extern "C" { #include "point_binning.h" } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD extern "C" { @@ -84,6 +100,11 @@ extern "C" { extern "C" { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +extern "C" { +======= +>>>>>>> osgeo-main extern "C" { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -94,6 +115,9 @@ extern "C" { extern "C" { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -104,6 +128,7 @@ extern "C" { #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* Binning code wrapped as a PDAL Writer class */ @@ -113,6 +138,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD /* Binning code wrapped as a PDAL Writer class */ #ifdef HAVE_PDAL_NOFILENAMEWRITER @@ -133,10 +160,13 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { int cols) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -165,6 +195,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { int cols) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -181,6 +214,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { dim_to_import_ = dim_to_import; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -194,6 +228,11 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main void set_output_scale(double scale) { scale_ = scale; } @@ -203,7 +242,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main void set_output_scale(double scale) @@ -223,6 +265,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -241,6 +286,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -254,6 +300,11 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main virtual bool processOne(pdal::PointRef &point) { @@ -266,8 +317,11 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main virtual bool processOne(pdal::PointRef & point) { @@ -289,6 +343,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -313,6 +370,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { if (arr_row >= region_->rows || arr_col >= region_->cols) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -324,6 +382,11 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_message(_("A point on the edge of computational region detected. " "Ignoring.")); @@ -336,8 +399,11 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_message(_("A point on the edge of computational region detected. Ignoring.")); return false; @@ -358,6 +424,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -367,6 +436,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { gpoint_count n_processed; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD private: @@ -381,6 +451,11 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { <<<<<<< HEAD private: ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +private: +======= >>>>>>> osgeo-main private: >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -391,6 +466,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable { private: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/info.cpp b/raster/r.in.pdal/info.cpp index 3cd65046fab..81f567c8519 100644 --- a/raster/r.in.pdal/info.cpp +++ b/raster/r.in.pdal/info.cpp @@ -1,6 +1,7 @@ /* * r.in.pdal Functions printing out various information on input LAS files <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * ======= @@ -14,6 +15,11 @@ <<<<<<< HEAD * ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + * +======= >>>>>>> osgeo-main * >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -24,6 +30,9 @@ * >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -38,11 +47,16 @@ #include "info.h" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main #include ======= ======= @@ -54,6 +68,7 @@ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD @@ -74,6 +89,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -82,6 +99,9 @@ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -91,6 +111,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, pdal::StageFactory factory; bool first = 1; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD *min_x = *max_x = *min_y = *max_y = *min_z = *max_z = NAN; @@ -107,6 +128,12 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, <<<<<<< HEAD *min_x = *max_x = *min_y = *max_y = *min_z = *max_z = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + *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)) @@ -123,6 +150,9 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -142,6 +172,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, las_reader.setOptions(las_opts); las_reader.prepare(table); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const pdal::LasHeader &las_header = las_reader.header(); ======= @@ -155,6 +186,11 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, <<<<<<< HEAD const pdal::LasHeader &las_header = las_reader.header(); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -165,6 +201,9 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, const pdal::LasHeader &las_header = las_reader.header(); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -195,6 +234,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -202,6 +242,8 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -211,6 +253,9 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -221,6 +266,7 @@ void print_extent(struct StringList *infiles) get_extent(infiles, &min_x, &max_x, &min_y, &max_y, &min_z, &max_z); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -232,6 +278,11 @@ void print_extent(struct StringList *infiles) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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); @@ -241,7 +292,10 @@ void print_extent(struct StringList *infiles) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main fprintf(stdout, "n=%f s=%f e=%f w=%f b=%f t=%f\n", @@ -259,6 +313,9 @@ void print_extent(struct StringList *infiles) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -267,6 +324,7 @@ void print_lasinfo(struct StringList *infiles) pdal::StageFactory factory; pdal::MetadataNode meta_node; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -274,12 +332,17 @@ void print_lasinfo(struct StringList *infiles) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -291,10 +354,13 @@ void print_lasinfo(struct StringList *infiles) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main std::cout << std::endl << "Using PDAL library version '" << pdal::Config::fullVersionString() << "'" << std::endl << std::endl; >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -303,6 +369,9 @@ void print_lasinfo(struct StringList *infiles) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -323,6 +392,7 @@ void print_lasinfo(struct StringList *infiles) las_reader.prepare(table); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -334,6 +404,11 @@ void print_lasinfo(struct StringList *infiles) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main const pdal::LasHeader &h = las_reader.header(); pdal::PointLayoutPtr point_layout = table.layout(); @@ -377,8 +452,11 @@ void print_lasinfo(struct StringList *infiles) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main pdal::LasHeader las_header = las_reader.header(); ======= @@ -429,6 +507,9 @@ void print_lasinfo(struct StringList *infiles) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/info.h b/raster/r.in.pdal/info.h index 43e05432cf3..1f8f2c4624b 100644 --- a/raster/r.in.pdal/info.h +++ b/raster/r.in.pdal/info.h @@ -1,6 +1,7 @@ /* * r.in.pdal Functions printing out various information on input LAS files <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * ======= @@ -14,6 +15,11 @@ <<<<<<< HEAD * ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + * +======= >>>>>>> osgeo-main * >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -24,6 +30,9 @@ * >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41,11 +50,14 @@ #include <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-parameter" @@ -56,6 +68,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -66,6 +81,7 @@ #include <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD extern "C" { ======= @@ -73,6 +89,8 @@ extern "C" { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #if defined(__clang__) #pragma clang diagnostic pop #endif @@ -92,6 +110,9 @@ extern "C" { extern "C" { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -100,6 +121,7 @@ extern "C" { #include "string_list.h" } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void get_extent(struct StringList *, double *, double *, double *, double *, @@ -118,6 +140,12 @@ void get_extent(struct StringList *, double *, double *, double *, double *, double *, double *); ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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)) @@ -130,6 +158,9 @@ void get_extent(struct StringList *, double *, double *, double *, double *, double *, double *); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/lidar.c b/raster/r.in.pdal/lidar.c index 56cf363aee1..8314ef348da 100644 --- a/raster/r.in.pdal/lidar.c +++ b/raster/r.in.pdal/lidar.c @@ -1,10 +1,13 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -14,6 +17,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31,6 +37,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -38,6 +45,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -47,6 +56,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -76,6 +88,7 @@ struct class_table class_val[] = { {12, "Overlap Points"}, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -87,6 +100,11 @@ struct class_table class_val[] = { <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main {13 /* 13 - 31 */, "Reserved for ASPRS Definition"}, {0, 0}}; @@ -97,7 +115,10 @@ struct class_table class_type[] = { ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main {13 /* 13 - 31 */ , "Reserved for ASPRS Definition"}, @@ -121,6 +142,9 @@ struct class_table class_type[] = { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/lidar.h b/raster/r.in.pdal/lidar.h index 3d760c14a1c..880a66bb9c6 100644 --- a/raster/r.in.pdal/lidar.h +++ b/raster/r.in.pdal/lidar.h @@ -1,10 +1,13 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -14,6 +17,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31,6 +37,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -45,6 +52,11 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifndef GRASS_LIDAR_H #define GRASS_LIDAR_H @@ -56,9 +68,12 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -78,6 +93,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -93,6 +111,7 @@ typedef unsigned long gpoint_count; #define GPOINT_COUNT_FORMAT "%lu" #endif +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct GLidarLayers { @@ -108,6 +127,11 @@ struct GLidarLayers { struct GLidarLayers { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct GLidarLayers { +======= +>>>>>>> osgeo-main struct GLidarLayers { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -118,6 +142,9 @@ struct GLidarLayers { struct GLidarLayers { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -165,6 +192,7 @@ void GLidarLayers_set_no_layers(struct GLidarLayers *layers); /* keep the comments above in sync with the .c file */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct class_table { @@ -180,6 +208,11 @@ struct class_table { struct class_table { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct class_table { +======= +>>>>>>> osgeo-main struct class_table { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -190,6 +223,9 @@ struct class_table { struct class_table { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/main.cpp b/raster/r.in.pdal/main.cpp index 2314d065f3f..30714d91b9e 100644 --- a/raster/r.in.pdal/main.cpp +++ b/raster/r.in.pdal/main.cpp @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /**************************************************************************** ======= <<<<<<< HEAD @@ -12,6 +13,11 @@ <<<<<<< HEAD /**************************************************************************** ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +/**************************************************************************** +======= >>>>>>> osgeo-main /**************************************************************************** @@ -23,6 +29,9 @@ /**************************************************************************** >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44,6 +53,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -51,6 +61,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-parameter" @@ -61,6 +73,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -75,6 +90,7 @@ #include <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD extern "C" { ======= @@ -82,6 +98,8 @@ extern "C" { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #if defined(__clang__) #pragma clang diagnostic pop #endif @@ -101,6 +119,9 @@ extern "C" { extern "C" { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -114,6 +135,7 @@ extern "C" { #include "grassrasterwriter.h" #include "info.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD extern "C" { @@ -129,6 +151,11 @@ extern "C" { extern "C" { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +extern "C" { +======= +>>>>>>> osgeo-main extern "C" { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -139,6 +166,9 @@ extern "C" { extern "C" { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -151,6 +181,7 @@ extern "C" { #define BUFFSIZE GPATH_MAX +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -158,6 +189,8 @@ extern "C" { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -167,6 +200,9 @@ extern "C" { ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -184,6 +220,7 @@ int main(int argc, char *argv[]) struct Cell_head region; struct Cell_head input_region; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int rows, cols; /* scan box size */ ======= @@ -197,6 +234,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD int rows, cols; /* scan box size */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + int rows, cols; /* scan box size */ +======= >>>>>>> osgeo-main int rows, cols; /* scan box size */ >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -207,6 +249,9 @@ int main(int argc, char *argv[]) int rows, cols; /* scan box size */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -233,6 +278,7 @@ int main(int argc, char *argv[]) G_add_keyword(_("aggregation")); G_add_keyword(_("binning")); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD module->description = _("Creates a raster map from LAS LiDAR points using " "univariate statistics."); @@ -249,6 +295,12 @@ int main(int argc, char *argv[]) module->description = _("Creates a raster map from LAS LiDAR points using " "univariate statistics."); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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."); @@ -262,6 +314,9 @@ int main(int argc, char *argv[]) "univariate statistics."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -298,6 +353,7 @@ int main(int argc, char *argv[]) "n,min,max,range,sum,mean,stddev,variance,coeff_var,median,mode," "percentile,skewness,trimmean,sidnmax,sidnmin,ev1,ev2,ev3"; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD method_opt->answer = const_cast("mean"); ======= @@ -311,6 +367,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD method_opt->answer = const_cast("mean"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + method_opt->answer = const_cast("mean"); +======= >>>>>>> osgeo-main method_opt->answer = const_cast < char *>("mean"); >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -321,6 +382,9 @@ int main(int argc, char *argv[]) method_opt->answer = const_cast("mean"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -370,6 +434,7 @@ int main(int argc, char *argv[]) type_opt->required = NO; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD type_opt->answer = const_cast("FCELL"); ======= @@ -383,6 +448,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD type_opt->answer = const_cast("FCELL"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + type_opt->answer = const_cast("FCELL"); +======= >>>>>>> osgeo-main type_opt->answer = const_cast < char *>("FCELL"); >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -393,6 +463,9 @@ int main(int argc, char *argv[]) type_opt->answer = const_cast("FCELL"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -402,6 +475,7 @@ int main(int argc, char *argv[]) base_raster_opt->key = "base_raster"; base_raster_opt->required = NO; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD base_raster_opt->label = _("Subtract raster values from the Z coordinates"); ======= @@ -415,6 +489,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD base_raster_opt->label = _("Subtract raster values from the Z coordinates"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + base_raster_opt->label = _("Subtract raster values from the Z coordinates"); +======= >>>>>>> osgeo-main base_raster_opt->label = _("Subtract raster values from the Z coordinates"); @@ -426,6 +505,9 @@ int main(int argc, char *argv[]) base_raster_opt->label = _("Subtract raster values from the Z coordinates"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -451,6 +533,7 @@ int main(int argc, char *argv[]) zscale_opt->type = TYPE_DOUBLE; zscale_opt->required = NO; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD zscale_opt->answer = const_cast("1.0"); ======= @@ -464,6 +547,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD zscale_opt->answer = const_cast("1.0"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -474,6 +562,9 @@ int main(int argc, char *argv[]) zscale_opt->answer = const_cast("1.0"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -488,6 +579,7 @@ int main(int argc, char *argv[]) irange_opt->required = NO; irange_opt->key_desc = "min,max"; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD irange_opt->description = _("Filter range for intensity values (min,max)"); ======= @@ -501,6 +593,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD irange_opt->description = _("Filter range for intensity values (min,max)"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + irange_opt->description = _("Filter range for intensity values (min,max)"); +======= >>>>>>> osgeo-main irange_opt->description = _("Filter range for intensity values (min,max)"); @@ -512,6 +609,9 @@ int main(int argc, char *argv[]) irange_opt->description = _("Filter range for intensity values (min,max)"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -523,6 +623,7 @@ int main(int argc, char *argv[]) iscale_opt->type = TYPE_DOUBLE; iscale_opt->required = NO; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD iscale_opt->answer = const_cast("1.0"); ======= @@ -536,6 +637,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD iscale_opt->answer = const_cast("1.0"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -546,6 +652,9 @@ int main(int argc, char *argv[]) iscale_opt->answer = const_cast("1.0"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -579,11 +688,14 @@ int main(int argc, char *argv[]) reproject_flag->label = <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Reproject to project's coordinate system if needed"); reproject_flag->description = _("Reprojects input dataset to the coordinate system of" @@ -597,6 +709,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -607,6 +722,7 @@ int main(int argc, char *argv[]) " matching cordinate system can be imported"); reproject_flag->guisection = _("Projection"); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD // TODO: from the API it seems that also prj file path and proj string will @@ -616,6 +732,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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)) ======= @@ -627,6 +745,9 @@ int main(int argc, char *argv[]) // work >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -662,6 +783,7 @@ int main(int argc, char *argv[]) trim_opt->label = _("Discard given percentage of the smallest and largest values"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD trim_opt->description = _("Discard percent of the smallest and " " percent of the largest observations"); @@ -678,6 +800,12 @@ int main(int argc, char *argv[]) trim_opt->description = _("Discard percent of the smallest and " " percent of the largest observations"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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"); @@ -691,6 +819,9 @@ int main(int argc, char *argv[]) " percent of the largest observations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -710,6 +841,7 @@ int main(int argc, char *argv[]) return_filter_opt->type = TYPE_STRING; return_filter_opt->required = NO; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD return_filter_opt->label = _("Only import points of selected return type"); ======= @@ -723,6 +855,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD return_filter_opt->label = _("Only import points of selected return type"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + return_filter_opt->label = _("Only import points of selected return type"); +======= >>>>>>> osgeo-main return_filter_opt->label = _("Only import points of selected return type"); @@ -734,6 +871,9 @@ int main(int argc, char *argv[]) return_filter_opt->label = _("Only import points of selected return type"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -751,9 +891,13 @@ int main(int argc, char *argv[]) class_filter_opt->label = _("Only import points of selected class(es)"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main class_filter_opt->description = _("Input is comma separated integers. " @@ -762,12 +906,15 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD class_filter_opt->description = _("Input is comma separated integers. " "If not specified, all points are imported."); ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main class_filter_opt->description = _("Input is comma separated integers. " "If not specified, all points are imported."); @@ -783,6 +930,9 @@ int main(int argc, char *argv[]) "If not specified, all points are imported."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -797,6 +947,7 @@ int main(int argc, char *argv[]) dimension_opt->options = "z,intensity,number,returns,direction,angle,class,source"; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dimension_opt->answer = const_cast("z"); ======= @@ -810,6 +961,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD dimension_opt->answer = const_cast("z"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + dimension_opt->answer = const_cast("z"); +======= >>>>>>> osgeo-main dimension_opt->answer = const_cast < char *>("z"); >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -820,6 +976,9 @@ int main(int argc, char *argv[]) dimension_opt->answer = const_cast("z"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -833,17 +992,23 @@ int main(int argc, char *argv[]) "direction;%s;" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -855,10 +1020,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main "angle;%s;" "class;%s;" "source;%s", _("Z coordinate"), >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -866,6 +1034,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -919,6 +1090,7 @@ int main(int argc, char *argv[]) over_flag->key = 'o'; over_flag->label = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Override projection check (use current location's projection)"); over_flag->description = _( @@ -928,6 +1100,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Override projection check (use current project's CRS)"); over_flag->description = _("Assume that the dataset has the same coordinate reference system as " @@ -948,6 +1122,9 @@ int main(int argc, char *argv[]) "Assume that the dataset has same projection as the current location"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -974,6 +1151,7 @@ int main(int argc, char *argv[]) print_extent_flag->description = _("Print data file extent in shell script style and then exit"); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -981,6 +1159,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -990,6 +1170,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1000,6 +1183,7 @@ int main(int argc, char *argv[]) G_option_exclusive(reproject_flag, over_flag, NULL); G_option_required(output_opt, print_extent_flag, print_info_flag, NULL); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1007,6 +1191,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -1016,6 +1202,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1028,6 +1217,7 @@ int main(int argc, char *argv[]) if (file_list_opt->answer) { if (access(file_list_opt->answer, F_OK) != 0) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("File <%s> does not exist"), file_list_opt->answer); ======= @@ -1041,6 +1231,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD G_fatal_error(_("File <%s> does not exist"), file_list_opt->answer); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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); @@ -1052,6 +1247,9 @@ int main(int argc, char *argv[]) G_fatal_error(_("File <%s> does not exist"), file_list_opt->answer); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1075,17 +1273,23 @@ int main(int argc, char *argv[]) /* we could use rules but this gives more info and allows continuing */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1097,10 +1301,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main if (set_region_flag->answer && !(extents_flag->answer || res_opt->answer || base_rast_res_flag->answer)) { @@ -1111,6 +1318,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1155,6 +1365,7 @@ int main(int argc, char *argv[]) /* G_get_window seems to be unreliable if the location has been changed */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1166,6 +1377,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_get_set_window( &loc_wind); /* TODO: v.in.lidar uses G_get_default_window() */ @@ -1176,7 +1392,10 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main G_get_set_window(&loc_wind); /* TODO: v.in.lidar uses G_get_default_window() */ @@ -1193,6 +1412,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1213,6 +1435,7 @@ int main(int argc, char *argv[]) if (!extents_flag->answer) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1224,6 +1447,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main use_spatial_filter = spatial_filter_from_current_region(&xmin, &ymin, &xmax, &ymax); @@ -1248,7 +1476,10 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main use_spatial_filter = spatial_filter_from_current_region(&xmin, @@ -1285,6 +1516,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1432,6 +1666,7 @@ int main(int argc, char *argv[]) Rast_get_cellhd(base_raster_opt->answer, "", &input_region); /* TODO: make it only as small as the output is or points are */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Rast_set_input_window(&input_region); /* we have split window */ ======= @@ -1445,6 +1680,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD Rast_set_input_window(&input_region); /* we have split window */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -1455,6 +1695,9 @@ int main(int argc, char *argv[]) Rast_set_input_window(&input_region); /* we have split window */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1478,6 +1721,7 @@ int main(int argc, char *argv[]) G_message(_("Reading data...")); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD std::vector readers; @@ -1492,6 +1736,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD std::vector readers; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + std::vector readers; +======= >>>>>>> osgeo-main std::vector < pdal::Stage * >readers; >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -1502,6 +1751,9 @@ int main(int argc, char *argv[]) std::vector readers; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1521,6 +1773,7 @@ int main(int argc, char *argv[]) // stages created by factory are destroyed with the factory <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1532,6 +1785,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main pdal::Stage *reader = factory.createStage(pdal_read_driver); if (!reader) @@ -1541,7 +1799,10 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main pdal::Stage * reader = factory.createStage(pdal_read_driver); @@ -1559,6 +1820,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1571,6 +1835,7 @@ int main(int argc, char *argv[]) // merge filter puts the n readers into one stage, // so we don't have to worry about the list of stages later <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD pdal::Stage *last_stage = &merge_filter; ======= @@ -1584,6 +1849,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD pdal::Stage *last_stage = &merge_filter; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + pdal::Stage *last_stage = &merge_filter; +======= >>>>>>> osgeo-main pdal::Stage * last_stage = &merge_filter; >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -1594,6 +1864,9 @@ int main(int argc, char *argv[]) pdal::Stage *last_stage = &merge_filter; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1602,6 +1875,7 @@ int main(int argc, char *argv[]) // we reproject when requested regardless of the input projection if (reproject_flag->answer) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Reprojecting the input to the location projection")); ======= @@ -1609,6 +1883,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Reprojecting the input to the project's CRS")); ======= G_message(_("Reprojecting the input to the location projection")); @@ -1617,6 +1893,9 @@ int main(int argc, char *argv[]) G_message(_("Reprojecting the input to the location projection")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1626,6 +1905,7 @@ int main(int argc, char *argv[]) // TODO: try catch for user input error if (input_srs_opt->answer) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD o4.add("in_srs", input_srs_opt->answer); o4.add("out_srs", proj_wkt); @@ -1642,6 +1922,12 @@ int main(int argc, char *argv[]) o4.add("in_srs", input_srs_opt->answer); o4.add("out_srs", proj_wkt); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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); @@ -1655,6 +1941,9 @@ int main(int argc, char *argv[]) o4.add("out_srs", proj_wkt); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1682,6 +1971,7 @@ int main(int argc, char *argv[]) if (use_class_filter) grass_filter.set_class_filter(class_filter); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD grass_filter.set_z_scale(zscale); // Default is 1 == no scale ======= @@ -1695,6 +1985,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD grass_filter.set_z_scale(zscale); // Default is 1 == no scale ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -1705,6 +2000,9 @@ int main(int argc, char *argv[]) grass_filter.set_z_scale(zscale); // Default is 1 == no scale >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1718,9 +2016,13 @@ int main(int argc, char *argv[]) binning_writer.setInput(grass_filter); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main // stream_filter.setInput(*last_stage); // there is no difference between 1 and 10k points in memory @@ -1729,12 +2031,15 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD // stream_filter.setInput(*last_stage); // there is no difference between 1 and 10k points in memory // consumption, so using 10k in case it is faster for some cases ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main //stream_filter.setInput(*last_stage); // there is no difference between 1 and 10k points in memory @@ -1751,6 +2056,9 @@ int main(int argc, char *argv[]) // consumption, so using 10k in case it is faster for some cases >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1762,6 +2070,7 @@ int main(int argc, char *argv[]) if (over_flag->answer) { G_important_message(_("Overriding projection check and assuming" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD " that the projection of input matches" " the location projection")); @@ -1770,6 +2079,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main " that the CRS of input matches" " the project's CRS")); ======= @@ -1781,6 +2092,9 @@ int main(int argc, char *argv[]) " the location projection")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1831,17 +2145,23 @@ int main(int argc, char *argv[]) if (!(strcmp(dimension_opt->answer, "z") == 0)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1853,10 +2173,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main G_warning(_("Both dimension and user dimension parameters are specified. " "Using '%s' as the dimension to import."), user_dimension_opt->answer); @@ -1866,6 +2189,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1880,6 +2206,7 @@ int main(int argc, char *argv[]) // TODO: add percentage printing to one of the filters <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD binning_writer.set_binning(®ion, &point_binning, &bin_index_nodes, rtype, cols); @@ -1896,6 +2223,12 @@ int main(int argc, char *argv[]) binning_writer.set_binning(®ion, &point_binning, &bin_index_nodes, rtype, cols); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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); @@ -1909,6 +2242,9 @@ int main(int argc, char *argv[]) cols); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1926,6 +2262,7 @@ int main(int argc, char *argv[]) for (int row = 0; row < rows; row++) { /* assemble final values into a row */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD write_values(&point_binning, &bin_index_nodes, raster_row, row, cols, rtype); @@ -1942,6 +2279,12 @@ int main(int argc, char *argv[]) write_values(&point_binning, &bin_index_nodes, raster_row, row, cols, rtype); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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); @@ -1955,6 +2298,9 @@ int main(int argc, char *argv[]) rtype); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1968,6 +2314,7 @@ int main(int argc, char *argv[]) if (base_raster_opt->answer) Segment_close(&base_segment); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_percent(1, 1, 1); /* flush */ @@ -1982,6 +2329,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD G_percent(1, 1, 1); /* flush */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + G_percent(1, 1, 1); /* flush */ +======= >>>>>>> osgeo-main G_percent(1, 1, 1); /* flush */ >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -1992,6 +2344,9 @@ int main(int argc, char *argv[]) G_percent(1, 1, 1); /* flush */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2003,6 +2358,7 @@ int main(int argc, char *argv[]) /* close raster file & write history */ Rast_close(out_fd); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2010,11 +2366,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2026,8 +2387,11 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sprintf(title, "Raw X,Y,Z data binned into a raster grid by cell %s", method_opt->answer); @@ -2049,6 +2413,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2076,17 +2443,23 @@ int main(int argc, char *argv[]) if (infiles.num_items > 1) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2097,10 +2470,13 @@ int main(int argc, char *argv[]) outmap, grass_filter.num_passed(), infiles.num_items); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else { @@ -2110,9 +2486,12 @@ int main(int argc, char *argv[]) outmap, grass_filter.num_passed()); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= sprintf(buff, _("Raster map <%s> created." " " GPOINT_COUNT_FORMAT @@ -2164,6 +2543,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 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 1bbec2fb18b..bff5007db6b 100644 --- a/raster/r.in.pdal/point_binning.c +++ b/raster/r.in.pdal/point_binning.c @@ -24,6 +24,7 @@ #include "bin_update.h" #include "bin_write.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -38,6 +39,11 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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) { @@ -49,9 +55,12 @@ void *get_cell_ptr(void *array, int cols, int row, int col, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -70,6 +79,9 @@ void *get_cell_ptr(void *array, int cols, int row, int col, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -100,6 +112,7 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type, /* fill with NULL */ /* alloc for col+1, do we come up (nrows) short? no. */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Rast_set_null_value(array, nrows * ncols, map_type); ======= @@ -107,6 +120,8 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for (row = 0; row < nrows; row++) { Rast_set_null_value(ptr, ncols, map_type); ptr = G_incr_void_ptr(ptr, ncols * Rast_cell_size(map_type)); @@ -118,6 +133,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -130,6 +148,7 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type, return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -137,6 +156,8 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -146,6 +167,9 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -244,6 +268,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method, point_binning->pth = atoi(percentile); else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to calculate percentile without the pth " "option specified!")); @@ -260,6 +285,12 @@ void point_binning_set(struct PointBinning *point_binning, char *method, G_fatal_error(_("Unable to calculate percentile without the pth " "option specified!")); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + 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)) @@ -272,6 +303,9 @@ void point_binning_set(struct PointBinning *point_binning, char *method, "option specified!")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -287,6 +321,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method, point_binning->trim = atof(trim) / 100.0; else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to calculate trimmed mean without the trim " "option specified!")); @@ -303,6 +338,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -315,6 +356,9 @@ void point_binning_set(struct PointBinning *point_binning, char *method, "option specified!")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -343,6 +387,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -350,6 +395,8 @@ void point_binning_set(struct PointBinning *point_binning, char *method, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -359,6 +406,9 @@ void point_binning_set(struct PointBinning *point_binning, char *method, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -376,6 +426,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, point_binning->min_array = G_calloc((size_t)rows * (cols + 1), Rast_cell_size(rtype)); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD blank_array(point_binning->min_array, rows, cols, rtype, -1); /* fill with NULLs */ @@ -392,6 +443,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -404,6 +461,9 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, -1); /* fill with NULLs */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -413,6 +473,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, point_binning->max_array = G_calloc((size_t)rows * (cols + 1), Rast_cell_size(rtype)); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD blank_array(point_binning->max_array, rows, cols, rtype, -1); /* fill with NULLs */ @@ -429,6 +490,12 @@ 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 +======= +<<<<<<< HEAD + 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)) @@ -441,6 +508,9 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, -1); /* fill with NULLs */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -468,6 +538,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -479,6 +550,11 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (point_binning->bin_z_index || point_binning->bin_cnt_index || point_binning->bin_eigenvalues) { @@ -494,7 +570,10 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main if (point_binning->bin_z_index || @@ -519,6 +598,9 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -541,6 +623,7 @@ void point_binning_free(struct PointBinning *point_binning, G_free(point_binning->n_array); } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (point_binning->bin_z_index || point_binning->bin_cnt_index || point_binning->bin_eigenvalues) { @@ -557,6 +640,12 @@ 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 +======= +<<<<<<< HEAD + 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) { @@ -570,6 +659,9 @@ void point_binning_free(struct PointBinning *point_binning, point_binning->bin_eigenvalues) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -581,6 +673,7 @@ void point_binning_free(struct PointBinning *point_binning, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -588,6 +681,8 @@ void point_binning_free(struct PointBinning *point_binning, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -597,6 +692,9 @@ void point_binning_free(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -610,6 +708,7 @@ void write_values(struct PointBinning *point_binning, switch (point_binning->method) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -621,6 +720,11 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case METHOD_N: /* n is a straight copy */ Rast_raster_cpy(raster_row, @@ -630,7 +734,10 @@ void write_values(struct PointBinning *point_binning, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main case METHOD_N: /* n is a straight copy */ @@ -647,6 +754,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -657,6 +767,7 @@ void write_values(struct PointBinning *point_binning, Rast_raster_cpy(raster_row, ((char *)point_binning->min_array) + <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ((size_t)row * cols * Rast_cell_size(rtype)), cols, rtype); @@ -673,6 +784,12 @@ void write_values(struct PointBinning *point_binning, ((size_t)row * cols * Rast_cell_size(rtype)), cols, rtype); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + ((size_t)row * cols * Rast_cell_size(rtype)), + cols, rtype); +======= >>>>>>> osgeo-main ((size_t)row * cols * Rast_cell_size(rtype)), cols, rtype); @@ -686,6 +803,9 @@ void write_values(struct PointBinning *point_binning, cols, rtype); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -696,6 +816,7 @@ void write_values(struct PointBinning *point_binning, ((char *)point_binning->max_array) + <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -707,6 +828,11 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ((size_t)row * cols * Rast_cell_size(rtype)), cols, rtype); @@ -729,7 +855,10 @@ void write_values(struct PointBinning *point_binning, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ((size_t)row * cols * Rast_cell_size(rtype)), cols, @@ -768,6 +897,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -777,6 +909,7 @@ void write_values(struct PointBinning *point_binning, } break; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD case METHOD_MEAN: /* (sum / n) */ @@ -791,6 +924,11 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD case METHOD_MEAN: /* (sum / n) */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + case METHOD_MEAN: /* (sum / n) */ +======= >>>>>>> osgeo-main case METHOD_MEAN: /* (sum / n) */ >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -801,6 +939,9 @@ void write_values(struct PointBinning *point_binning, case METHOD_MEAN: /* (sum / n) */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -810,17 +951,23 @@ void write_values(struct PointBinning *point_binning, ((size_t)row * cols + col) * Rast_cell_size(CELL_TYPE); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -832,10 +979,13 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main int n = Rast_get_c_value(((char *)point_binning->n_array) + n_offset, CELL_TYPE); @@ -848,6 +998,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -861,6 +1014,7 @@ void write_values(struct PointBinning *point_binning, } break; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -874,6 +1028,11 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case METHOD_STDDEV: /* sqrt(variance) */ case METHOD_VARIANCE: /* (sumsq - sum*sum/n)/n */ @@ -888,8 +1047,11 @@ void write_values(struct PointBinning *point_binning, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case METHOD_STDDEV: /* sqrt(variance) */ case METHOD_VARIANCE: /* (sumsq - sum*sum/n)/n */ @@ -913,6 +1075,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -923,6 +1088,7 @@ void write_values(struct PointBinning *point_binning, case METHOD_MODE: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -934,6 +1100,11 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_mode(bin_index_nodes, raster_row, point_binning->index_array, row, cols); @@ -944,7 +1115,10 @@ void write_values(struct PointBinning *point_binning, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main write_mode(bin_index_nodes, raster_row, point_binning->index_array, @@ -963,6 +1137,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -971,6 +1148,7 @@ void write_values(struct PointBinning *point_binning, point_binning->pth); break; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -984,6 +1162,11 @@ void write_values(struct PointBinning *point_binning, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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, @@ -1007,7 +1190,10 @@ void write_values(struct PointBinning *point_binning, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main case METHOD_SKEWNESS: /* skewness = sum(xi-mean)^3/(N-1)*s^3 */ @@ -1042,6 +1228,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1051,6 +1240,7 @@ void write_values(struct PointBinning *point_binning, case METHOD_EV2: case METHOD_EV3: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD write_ev(bin_index_nodes, raster_row, point_binning->index_array, row, cols, rtype, point_binning->method); @@ -1067,6 +1257,12 @@ 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 +======= +<<<<<<< HEAD + 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); @@ -1080,6 +1276,9 @@ void write_values(struct PointBinning *point_binning, cols, rtype, point_binning->method); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1090,6 +1289,7 @@ void write_values(struct PointBinning *point_binning, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1097,6 +1297,8 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -1106,6 +1308,9 @@ void write_values(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1119,9 +1324,13 @@ void update_value(struct PointBinning *point_binning, if (point_binning->bin_min) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main update_min(point_binning->min_array, cols, arr_row, arr_col, rtype, z); if (point_binning->bin_max) @@ -1130,12 +1339,15 @@ void update_value(struct PointBinning *point_binning, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD update_min(point_binning->min_array, cols, arr_row, arr_col, rtype, z); if (point_binning->bin_max) update_max(point_binning->max_array, cols, arr_row, arr_col, rtype, z); ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_min(point_binning->min_array, cols, arr_row, arr_col, rtype, z); @@ -1154,6 +1366,9 @@ void update_value(struct PointBinning *point_binning, update_max(point_binning->max_array, cols, arr_row, arr_col, rtype, z); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1169,6 +1384,7 @@ void update_value(struct PointBinning *point_binning, if (point_binning->bin_cnt_index) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1180,6 +1396,11 @@ void update_value(struct PointBinning *point_binning, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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); @@ -1190,8 +1411,11 @@ void update_value(struct PointBinning *point_binning, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_bin_cnt_index(bin_index_nodes, point_binning->index_array, cols, arr_row, arr_col, z); @@ -1209,6 +1433,9 @@ void update_value(struct PointBinning *point_binning, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/point_binning.h b/raster/r.in.pdal/point_binning.h index 5b8220ac151..e5bf81610ba 100644 --- a/raster/r.in.pdal/point_binning.h +++ b/raster/r.in.pdal/point_binning.h @@ -21,17 +21,23 @@ /* Point binning methods: */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -49,10 +55,13 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main #define METHOD_NONE 0 #define METHOD_N 1 #define METHOD_MIN 2 @@ -69,6 +78,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -83,6 +95,7 @@ #define METHOD_EV2 18 #define METHOD_EV3 19 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct z_node { @@ -98,6 +111,11 @@ struct z_node { struct z_node { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct z_node { +======= +>>>>>>> osgeo-main struct z_node { @@ -109,6 +127,9 @@ struct z_node { struct z_node { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -116,6 +137,7 @@ struct z_node { double z; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct cnt_node { @@ -131,6 +153,11 @@ struct cnt_node { struct cnt_node { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct cnt_node { +======= +>>>>>>> osgeo-main struct cnt_node { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -141,6 +168,9 @@ struct cnt_node { struct cnt_node { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -149,6 +179,7 @@ struct cnt_node { int count; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct com_node { @@ -164,6 +195,11 @@ struct com_node { struct com_node { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct com_node { +======= +>>>>>>> osgeo-main struct com_node { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -174,6 +210,9 @@ struct com_node { struct com_node { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -183,6 +222,7 @@ struct com_node { double *comoment; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct BinIndex { @@ -198,6 +238,11 @@ struct BinIndex { struct BinIndex { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct BinIndex { +======= +>>>>>>> osgeo-main struct BinIndex { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -208,6 +253,9 @@ struct BinIndex { struct BinIndex { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -216,6 +264,7 @@ struct BinIndex { void *nodes; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct PointBinning { @@ -231,6 +280,11 @@ struct PointBinning { struct PointBinning { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +struct PointBinning { +======= +>>>>>>> osgeo-main struct PointBinning { >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -241,6 +295,9 @@ struct PointBinning { struct PointBinning { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -278,6 +335,7 @@ void point_binning_set(struct PointBinning *, char *, char *, char *); void point_binning_allocate(struct PointBinning *, int, int, RASTER_MAP_TYPE); void point_binning_free(struct PointBinning *, struct BinIndex *); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -285,12 +343,17 @@ void point_binning_free(struct PointBinning *, struct BinIndex *); ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -302,10 +365,13 @@ void update_value(struct PointBinning *, struct BinIndex *, int, int, int, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main void write_values(struct PointBinning *, struct BinIndex *, void *, int, int, RASTER_MAP_TYPE); @@ -319,6 +385,9 @@ void update_value(struct PointBinning *, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/projection.c b/raster/r.in.pdal/projection.c index 6399a99bdbe..38d1f1b077b 100644 --- a/raster/r.in.pdal/projection.c +++ b/raster/r.in.pdal/projection.c @@ -27,6 +27,7 @@ void projection_mismatch_report(struct Cell_head cellhd, int i_value; char error_msg[8192]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -36,6 +37,8 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); @@ -53,6 +56,9 @@ void projection_mismatch_report(struct Cell_head cellhd, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -61,6 +67,7 @@ void projection_mismatch_report(struct Cell_head cellhd, if (loc_wind.proj != cellhd.proj || err != -2) { if (loc_proj_info != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n")); ======= @@ -68,6 +75,8 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("GRASS project PROJ_INFO is:\n")); ======= strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n")); @@ -76,6 +85,9 @@ void projection_mismatch_report(struct Cell_head cellhd, strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -105,6 +117,7 @@ void projection_mismatch_report(struct Cell_head cellhd, sprintf(error_msg + strlen(error_msg), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -116,6 +129,11 @@ void projection_mismatch_report(struct Cell_head cellhd, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "Dataset proj = %d (UTM), zone = %d\n", cellhd.proj, cellhd.zone); @@ -127,7 +145,10 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main "Dataset proj = %d (UTM), zone = %d\n", @@ -148,6 +169,9 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -156,6 +180,7 @@ void projection_mismatch_report(struct Cell_head cellhd, else { if (loc_proj_units != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n"); ======= @@ -163,6 +188,8 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, "GRASS project PROJ_UNITS is:\n"); ======= strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n"); @@ -171,6 +198,9 @@ void projection_mismatch_report(struct Cell_head cellhd, strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -191,11 +221,14 @@ void projection_mismatch_report(struct Cell_head cellhd, sprintf(error_msg + strlen(error_msg), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD _("\nIn case of no significant differences" " in the coordinate reference system definitions," @@ -211,6 +244,9 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -219,6 +255,7 @@ void projection_mismatch_report(struct Cell_head cellhd, " use the -o flag to ignore them and use" " current location definition.\n")); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, _("Consider generating a new location with 'location' parameter" @@ -226,6 +263,8 @@ void projection_mismatch_report(struct Cell_head cellhd, <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) strcat(error_msg, _("Consider generating a new location with 'location' parameter" @@ -235,6 +274,9 @@ void projection_mismatch_report(struct Cell_head cellhd, _("Consider generating a new location with 'location' parameter" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -242,6 +284,7 @@ void projection_mismatch_report(struct Cell_head cellhd, G_fatal_error("%s", error_msg); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, @@ -257,6 +300,11 @@ 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 +======= +<<<<<<< HEAD +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)) @@ -267,6 +315,9 @@ 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, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -300,6 +351,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -311,6 +363,11 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 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, @@ -321,12 +378,15 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, else { if (verbose) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Projection of input dataset and current location " "appear to match")); ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_message(_("Coordinate reference system of input dataset and " "current project appear to match")); @@ -353,6 +413,9 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, "appear to match")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -360,6 +423,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -367,6 +431,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -376,6 +442,9 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -404,6 +473,7 @@ int is_wkt_projection_same_as_loc(const char *wkt) return FALSE; } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else if (G_compare_projections(loc_proj_info, loc_proj_units, proj_info, proj_units) != 1) { @@ -420,6 +490,12 @@ 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 +======= +<<<<<<< HEAD + 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) { @@ -433,6 +509,9 @@ int is_wkt_projection_same_as_loc(const char *wkt) proj_units) != 1) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -465,6 +544,7 @@ void wkt_projection_mismatch_report(const char *wkt) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -476,6 +556,11 @@ void wkt_projection_mismatch_report(const char *wkt) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main int err = G_compare_projections(loc_proj_info, loc_proj_units, proj_info, proj_units); @@ -486,8 +571,11 @@ void wkt_projection_mismatch_report(const char *wkt) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int err = G_compare_projections(loc_proj_info, loc_proj_units, proj_info, proj_units); @@ -505,6 +593,9 @@ void wkt_projection_mismatch_report(const char *wkt) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/projection.h b/raster/r.in.pdal/projection.h index eeb9deca4f3..fa420aea9aa 100644 --- a/raster/r.in.pdal/projection.h +++ b/raster/r.in.pdal/projection.h @@ -1,10 +1,13 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -14,6 +17,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -31,6 +37,7 @@ * *****************************************************************************/ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -38,6 +45,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -47,6 +56,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -60,12 +72,16 @@ void projection_mismatch_report(struct Cell_head cellhd, struct Key_Value *proj_info, struct Key_Value *proj_units, int err); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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); @@ -74,12 +90,15 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, const char *projstr, int override, int return_value, int verbose); ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, const char *projstr, int override, @@ -96,6 +115,9 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind, int verbose); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.in.pdal/r.in.pdal.html b/raster/r.in.pdal/r.in.pdal.html index 2c6c7492f9c..85a230c5778 100644 --- a/raster/r.in.pdal/r.in.pdal.html +++ b/raster/r.in.pdal/r.in.pdal.html @@ -238,12 +238,15 @@

        Filtering and selection

        The user can use a combination of r.in.pdal output maps <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD to create custom raster-based filters, for examplee, use ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main to create custom raster-based filters, for example, use ======= to create custom raster-based filters, for examplee, use @@ -252,6 +255,9 @@

        Filtering and selection

        to create custom raster-based filters, for examplee, use >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -270,10 +276,14 @@

        Filtering and selection

        By default r.in.pdal will use point Z coordinate as the output <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +>>>>>>> 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 @@ -282,12 +292,15 @@

        Filtering and selection

        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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 ======= ======= >>>>>>> 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 @@ -303,6 +316,9 @@

        Filtering and selection

        value is chosen, output map type will be set to CELL. Explanation >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -397,6 +413,7 @@

        Transformation

        filtering or further transformation takes place. In the same way act <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD iscale and dscale parameters - values are multiplied ======= <<<<<<< HEAD @@ -410,6 +427,11 @@

        Transformation

        iscale and dscale parameters - values are multiplied ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +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)) ======= @@ -419,6 +441,9 @@

        Transformation

        iscale and dscale parameters - values are multiplied >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -429,6 +454,7 @@

        Transformation

        output value independently of its dimension. Thus if zrange and <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD dscale are set for Z output dimension, filtering by zrange ======= <<<<<<< HEAD @@ -444,6 +470,12 @@

        Transformation

        dscale are set for Z output dimension, filtering by zrange ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +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)) ======= @@ -459,6 +491,9 @@

        Transformation

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -475,6 +510,7 @@

        Format and projection support

        libLAS has been compiled with LASzip support. It is also recommended to <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD compile libLAS with GDAL which is used to test if the LAS projection matches that of the GRASS location. ======= @@ -482,6 +518,8 @@

        Format and projection support

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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). ======= @@ -493,6 +531,9 @@

        Format and projection support

        matches that of the GRASS location. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -574,12 +615,15 @@

        EXAMPLES

        Simple example of binning of point from a LAS file into a newly created <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD raster map in an existing location/mapset (using metric units): ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main raster map in an existing project/mapset (using metric units): ======= raster map in an existing location/mapset (using metric units): @@ -588,6 +632,9 @@

        EXAMPLES

        raster map in an existing location/mapset (using metric units): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -655,11 +702,14 @@

        Finding suitable extent and resolution

        g.region -e <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Metric project: # points_per_sq_m = n_points / (ns_extent * ew_extent) @@ -668,6 +718,9 @@

        Finding suitable extent and resolution

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -677,6 +730,7 @@

        Finding suitable extent and resolution

        # Lat/Lon location: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -687,6 +741,11 @@

        Finding suitable extent and resolution

        >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # points_per_sq_m = n_points / (ns_extent * ew_extent*cos(lat) * (1852*60)^2) @@ -703,6 +762,7 @@

        Serpent Mound dataset

        # print LAS file info r.in.pdal -p input="Serpent Mound Model LAS Data.las" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -710,6 +770,8 @@

        Serpent Mound dataset

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # using v.in.lidar to create a new project # create a project with CRS information of the LAS data v.in.lidar -i input="Serpent Mound Model LAS Data.las" project=Serpent_Mound @@ -719,6 +781,9 @@

        Serpent Mound dataset

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -729,6 +794,7 @@

        Serpent Mound dataset

        # quit and restart GRASS in the newly created location "Serpent_Mound" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -740,6 +806,11 @@

        Serpent Mound dataset

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # scan the extents of the LAS data r.in.pdal -g input="Serpent Mound Model LAS Data.las" @@ -774,6 +845,7 @@

        Height above ground

        Multiple file input

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The file option requres a file that contains a list of file names with the full @@ -782,6 +854,8 @@

        Multiple file input

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> 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 @@ -790,6 +864,9 @@

        Multiple file input

        The file option requres a file that contains a list of file names with the full >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -839,6 +916,7 @@

        Multiple file input

        base_raster='elevation' method='mean') +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -846,6 +924,8 @@

        Multiple file input

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -855,6 +935,9 @@

        Multiple file input

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -870,6 +953,7 @@

        KNOWN ISSUES

        If you encounter any problems (or solutions!) please contact the GRASS Development Team. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -877,6 +961,8 @@

        KNOWN ISSUES

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -886,6 +972,9 @@

        KNOWN ISSUES

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -912,6 +1001,7 @@

        SEE ALSO

        OpenTopography (LiDAR point cloud repository) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -919,6 +1009,8 @@

        SEE ALSO

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -928,6 +1020,9 @@

        SEE ALSO

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -956,6 +1051,7 @@

        AUTHORS


        <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD based on r.in.xyz by Hamish Bowman and Volker Wichmann ======= <<<<<<< HEAD @@ -969,6 +1065,11 @@

        AUTHORS

        based on r.in.xyz by Hamish Bowman and Volker Wichmann ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +based on r.in.xyz by Hamish Bowman and Volker Wichmann +======= +>>>>>>> osgeo-main based on r.in.xyz by Hamish Bowman and Volker Wichmann
        Result written to ASCII file <$HOME/.grass8/r.li/output/landsat_shannon> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -74,6 +77,9 @@ r.li.shannon input=lsat7_2002_40 conf=landsat_test output=landsat_shannon ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.cwed/cwed.c b/raster/r.li/r.li.cwed/cwed.c index eadbd2c4a79..a080b1108c3 100644 --- a/raster/r.li/r.li.cwed/cwed.c +++ b/raster/r.li/r.li.cwed/cwed.c @@ -131,6 +131,7 @@ int contrastWeightedEdgeDensity(int fd, char **par, struct area_entry *ad, /* <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * every row of a rigth file has this layout ======= @@ -138,6 +139,8 @@ int contrastWeightedEdgeDensity(int fd, char **par, struct area_entry *ad, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * every row of a right file has this layout ======= * every row of a rigth file has this layout @@ -146,6 +149,9 @@ int contrastWeightedEdgeDensity(int fd, char **par, struct area_entry *ad, * every row of a rigth file has this layout >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -709,6 +715,7 @@ int calculateF(int fd, struct area_entry *ad, Coppie *cc, long totCoppie, int addCoppia(Coppie *cc, generic_cell ce1, generic_cell ce2, double pe, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long tc, long *siz) ======= @@ -716,6 +723,8 @@ int addCoppia(Coppie *cc, generic_cell ce1, generic_cell ce2, double pe, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main long tc, long *siz UNUSED) ======= long tc, long *siz) @@ -724,6 +733,9 @@ int addCoppia(Coppie *cc, generic_cell ce1, generic_cell ce2, double pe, long tc, long *siz) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.cwed/utility.c b/raster/r.li/r.li.cwed/utility.c index 88a3d89cc0b..ed87ca121e4 100644 --- a/raster/r.li/r.li.cwed/utility.c +++ b/raster/r.li/r.li.cwed/utility.c @@ -35,6 +35,7 @@ char **split_arg(char *linea, char separatore, long *numerotoken) char **argv; /* token array */ char *copialinea; /* line copy */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD long i; /* find token number */ @@ -54,6 +55,13 @@ char **split_arg(char *linea, char separatore, long *numerotoken) long i; /* find token number */ size_t it; /* iterator */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long i; /* find token number */ + size_t it; /* iterator */ +======= >>>>>>> osgeo-main long i; /* find token number */ long it; /* iterator */ @@ -75,6 +83,9 @@ char **split_arg(char *linea, char separatore, long *numerotoken) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.daemon/daemon.c b/raster/r.li/r.li.daemon/daemon.c index eaa7344eccf..cfc6723449a 100644 --- a/raster/r.li/r.li.daemon/daemon.c +++ b/raster/r.li/r.li.daemon/daemon.c @@ -66,12 +66,17 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, char rlipath[GPATH_MAX]; char testpath[GPATH_MAX]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main /* conf files go into ~/.grass8/r.li/ */ sprintf(rlipath, "%s%c%s%c", G_config_path(), HOST_DIRSEP, "r.li", @@ -81,6 +86,7 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* conf files go into ~/.grass8/r.li/ */ sprintf(rlipath, "%s%c%s%c", G_config_path(), HOST_DIRSEP, "r.li", @@ -89,6 +95,8 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) /* conf files go into ~/.grass8/r.li/ */ sprintf(rlipath, "%s%c%s%c", G_config_path(), HOST_DIRSEP, "r.li", HOST_DIRSEP); @@ -104,6 +112,9 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, HOST_DIRSEP); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -136,6 +147,7 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, } else { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* text file output */ /* check if ~/.grass8/ exists */ @@ -152,6 +164,12 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, /* text file output */ /* check if ~/.grass8/ exists */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + /* text file output */ + /* check if ~/.grass8/ exists */ +======= >>>>>>> osgeo-main /* text file output */ /* check if ~/.grass8/ exists */ @@ -168,6 +186,9 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, /* check if ~/.grass8/ exists */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -176,6 +197,7 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, if (doneDir == -1 && errno != EEXIST) G_fatal_error(_("Cannot create %s directory"), out); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -183,6 +205,8 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -190,6 +214,9 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -200,12 +227,15 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, G_fatal_error(_("Cannot create %s directory"), out); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* check if ~/.grass7/r.li/output exists */ if (snprintf(out, GPATH_MAX, "%s%s", rlipath, "output") >= GPATH_MAX) @@ -243,6 +273,9 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -261,6 +294,7 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *raster, G_fatal_error(_("Cannot create %s output"), out); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -271,6 +305,11 @@ int calculateIndex(char *file, rli_func *f, char **parameters, char *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 } @@ -831,6 +870,7 @@ int error_Output(int out, msg m) sprintf(s, "ERROR %i", m.f.f_d.aid); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (write(out, s, strlen(s)) == (ssize_t)strlen(s)) @@ -847,6 +887,12 @@ int error_Output(int out, msg m) <<<<<<< HEAD if (write(out, s, strlen(s)) == (ssize_t)strlen(s)) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (write(out, s, strlen(s)) == (ssize_t)strlen(s)) +======= >>>>>>> osgeo-main if (write(out, s, strlen(s)) == strlen(s)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -863,6 +909,9 @@ int error_Output(int out, msg m) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -872,6 +921,7 @@ int error_Output(int out, msg m) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -879,11 +929,16 @@ int error_Output(int out, msg m) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int raster_Output(int fd, int aid, struct g_area *g UNUSED, double res) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.daemon/ipc.h b/raster/r.li/r.li.daemon/ipc.h index e77d23c9420..1c015ad8572 100644 --- a/raster/r.li/r.li.daemon/ipc.h +++ b/raster/r.li/r.li.daemon/ipc.h @@ -2,6 +2,7 @@ * \file IPC.h * <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \brief Types, definitions and primitives for interprocess comunication ======= @@ -9,6 +10,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * \brief Types, definitions and primitives for interprocess communication ======= * \brief Types, definitions and primitives for interprocess comunication @@ -17,6 +20,9 @@ * \brief Types, definitions and primitives for interprocess comunication >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.dominance/dominance.c b/raster/r.li/r.li.dominance/dominance.c index 709e5f0795f..7e32b92a554 100644 --- a/raster/r.li/r.li.dominance/dominance.c +++ b/raster/r.li/r.li.dominance/dominance.c @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -72,11 +73,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int dominance(int fd, char **par UNUSED, struct area_entry *ad, double *result) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.html b/raster/r.li/r.li.html index 146cd45140e..61c7c8a64c5 100644 --- a/raster/r.li/r.li.html +++ b/raster/r.li/r.li.html @@ -3,6 +3,7 @@ r.li - GRASS GIS manual <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ======= @@ -18,6 +19,12 @@ <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + +======= >>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34,6 +41,9 @@ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.mpa/mpa.c b/raster/r.li/r.li.mpa/mpa.c index 1f19d4878e9..0e288a7a864 100644 --- a/raster/r.li/r.li.mpa/mpa.c +++ b/raster/r.li/r.li.mpa/mpa.c @@ -61,6 +61,7 @@ int main(int argc, char *argv[]) raster->answer, output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int meanPixelAttribute(int fd, char **par, struct area_entry *ad, @@ -69,6 +70,8 @@ int meanPixelAttribute(int fd, char **par, struct area_entry *ad, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int meanPixelAttribute(int fd, char **par UNUSED, struct area_entry *ad, ======= int meanPixelAttribute(int fd, char **par, struct area_entry *ad, @@ -77,6 +80,9 @@ int meanPixelAttribute(int fd, char **par, struct area_entry *ad, int meanPixelAttribute(int fd, char **par, struct area_entry *ad, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.mps/mps.c b/raster/r.li/r.li.mps/mps.c index 4c60700c037..e054e2d4fb3 100644 --- a/raster/r.li/r.li.mps/mps.c +++ b/raster/r.li/r.li.mps/mps.c @@ -71,6 +71,7 @@ int main(int argc, char *argv[]) output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -78,12 +79,17 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int meanPatchSize(int fd, char **par UNUSED, struct area_entry *ad, double *result) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.padcv/padcv.c b/raster/r.li/r.li.padcv/padcv.c index c68a5eadd19..835c3d5972c 100644 --- a/raster/r.li/r.li.padcv/padcv.c +++ b/raster/r.li/r.li.padcv/padcv.c @@ -70,6 +70,7 @@ int main(int argc, char *argv[]) raster->answer, output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int patchAreaDistributionCV(int fd, char **par, struct area_entry *ad, @@ -78,6 +79,8 @@ int patchAreaDistributionCV(int fd, char **par, struct area_entry *ad, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int patchAreaDistributionCV(int fd, char **par UNUSED, struct area_entry *ad, ======= int patchAreaDistributionCV(int fd, char **par, struct area_entry *ad, @@ -86,6 +89,9 @@ int patchAreaDistributionCV(int fd, char **par, struct area_entry *ad, int patchAreaDistributionCV(int fd, char **par, struct area_entry *ad, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.padrange/padrange.c b/raster/r.li/r.li.padrange/padrange.c index 528e9332e29..91d4c7c8bff 100644 --- a/raster/r.li/r.li.padrange/padrange.c +++ b/raster/r.li/r.li.padrange/padrange.c @@ -76,6 +76,7 @@ int patchAreaDistributionRANGE(int fd, char **par UNUSED, struct area_entry *ad, int patchAreaDistributionRANGE(int fd, char **par, struct area_entry *ad, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86,6 +87,11 @@ int patchAreaDistributionRANGE(int fd, char **par, struct area_entry *ad, >>>>>>> 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 *result) { @@ -125,6 +131,7 @@ int calculate(int fd, struct area_entry *ad, double *result) CELL *buf, *buf_sup, *buf_null; CELL corrCell, precCell, supCell; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long npatch; ======= @@ -140,6 +147,12 @@ int calculate(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD long npatch; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long npatch; +======= >>>>>>> osgeo-main long npatch, area; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -156,6 +169,9 @@ int calculate(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -258,10 +274,13 @@ int calculate(int fd, struct area_entry *ad, double *result) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -270,6 +289,9 @@ int calculate(int fd, struct area_entry *ad, double *result) area++; >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main supCell = buf_sup[j + ad->x]; if (masked && (mask_sup[j] == 0)) { @@ -323,6 +345,7 @@ int calculate(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -378,6 +401,8 @@ int calculate(int fd, struct area_entry *ad, double *result) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main area++; @@ -473,6 +498,9 @@ int calculate(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -532,6 +560,7 @@ int calculate(int fd, struct area_entry *ad, double *result) /* get min and max patch size */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD min = INFINITY; max = -INFINITY; @@ -550,6 +579,13 @@ int calculate(int fd, struct area_entry *ad, double *result) min = INFINITY; max = -INFINITY; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + min = INFINITY; + max = -INFINITY; +======= >>>>>>> osgeo-main min = 1.0 / 0.0; /* inf */ max = -1.0 / 0.0; /* -inf */ @@ -571,6 +607,9 @@ int calculate(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -606,6 +645,7 @@ int calculateD(int fd, struct area_entry *ad, double *result) DCELL *buf, *buf_sup, *buf_null; DCELL corrCell, precCell, supCell; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long npatch; ======= @@ -621,6 +661,12 @@ int calculateD(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD long npatch; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long npatch; +======= >>>>>>> osgeo-main long npatch, area; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -637,6 +683,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -739,10 +788,13 @@ int calculateD(int fd, struct area_entry *ad, double *result) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -751,6 +803,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) area++; >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main supCell = buf_sup[j + ad->x]; if (masked && (mask_sup[j] == 0)) { @@ -804,6 +859,7 @@ int calculateD(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -859,6 +915,8 @@ int calculateD(int fd, struct area_entry *ad, double *result) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main area++; @@ -954,6 +1012,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1013,6 +1074,7 @@ int calculateD(int fd, struct area_entry *ad, double *result) /* get min and max patch size */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD min = INFINITY; max = -INFINITY; @@ -1031,6 +1093,13 @@ int calculateD(int fd, struct area_entry *ad, double *result) min = INFINITY; max = -INFINITY; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + min = INFINITY; + max = -INFINITY; +======= >>>>>>> osgeo-main min = 1.0 / 0.0; /* inf */ max = -1.0 / 0.0; /* -inf */ @@ -1052,6 +1121,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1087,6 +1159,7 @@ int calculateF(int fd, struct area_entry *ad, double *result) FCELL *buf, *buf_sup, *buf_null; FCELL corrCell, precCell, supCell; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long npatch; ======= @@ -1102,6 +1175,12 @@ int calculateF(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD long npatch; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long npatch; +======= >>>>>>> osgeo-main long npatch, area; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1118,6 +1197,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1220,10 +1302,13 @@ int calculateF(int fd, struct area_entry *ad, double *result) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1232,6 +1317,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) area++; >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main supCell = buf_sup[j + ad->x]; if (masked && (mask_sup[j] == 0)) { @@ -1285,6 +1373,7 @@ int calculateF(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -1340,6 +1429,8 @@ int calculateF(int fd, struct area_entry *ad, double *result) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main area++; @@ -1435,6 +1526,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1494,6 +1588,7 @@ int calculateF(int fd, struct area_entry *ad, double *result) /* get min and max patch size */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD min = INFINITY; max = -INFINITY; @@ -1512,6 +1607,13 @@ int calculateF(int fd, struct area_entry *ad, double *result) min = INFINITY; max = -INFINITY; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + min = INFINITY; + max = -INFINITY; +======= >>>>>>> osgeo-main min = 1.0 / 0.0; /* inf */ max = -1.0 / 0.0; /* -inf */ @@ -1533,6 +1635,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.padsd/padsd.c b/raster/r.li/r.li.padsd/padsd.c index 150cbf3b017..ad5c18b92dd 100644 --- a/raster/r.li/r.li.padsd/padsd.c +++ b/raster/r.li/r.li.padsd/padsd.c @@ -70,6 +70,7 @@ int main(int argc, char *argv[]) raster->answer, output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int patchAreaDistributionSD(int fd, char **par, struct area_entry *ad, @@ -78,6 +79,8 @@ int patchAreaDistributionSD(int fd, char **par, struct area_entry *ad, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int patchAreaDistributionSD(int fd, char **par UNUSED, struct area_entry *ad, ======= int patchAreaDistributionSD(int fd, char **par, struct area_entry *ad, @@ -86,6 +89,9 @@ int patchAreaDistributionSD(int fd, char **par, struct area_entry *ad, int patchAreaDistributionSD(int fd, char **par, struct area_entry *ad, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.patchdensity/main.c b/raster/r.li/r.li.patchdensity/main.c index cc3eda8c892..cd236781751 100644 --- a/raster/r.li/r.li.patchdensity/main.c +++ b/raster/r.li/r.li.patchdensity/main.c @@ -69,6 +69,7 @@ int main(int argc, char *argv[]) output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -76,12 +77,17 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int patch_density(int fd, char **par UNUSED, struct area_entry *ad, double *result) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.patchnum/main.c b/raster/r.li/r.li.patchnum/main.c index 44a465f4ce5..b3dec380f8b 100644 --- a/raster/r.li/r.li.patchnum/main.c +++ b/raster/r.li/r.li.patchnum/main.c @@ -107,6 +107,7 @@ int calculate(int fd, struct area_entry *ad, double *result) CELL *buf, *buf_sup, *buf_null; CELL corrCell, precCell, supCell; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long npatch; ======= @@ -122,6 +123,12 @@ int calculate(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD long npatch; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long npatch; +======= >>>>>>> osgeo-main long npatch, area; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -138,6 +145,9 @@ int calculate(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -240,10 +250,13 @@ int calculate(int fd, struct area_entry *ad, double *result) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -252,6 +265,9 @@ int calculate(int fd, struct area_entry *ad, double *result) area++; >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main supCell = buf_sup[j + ad->x]; if (masked && (mask_sup[j] == 0)) { @@ -315,6 +331,7 @@ int calculate(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -380,6 +397,8 @@ int calculate(int fd, struct area_entry *ad, double *result) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main area++; @@ -503,6 +522,9 @@ int calculate(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -550,6 +572,7 @@ int calculateD(int fd, struct area_entry *ad, double *result) DCELL *buf, *buf_sup, *buf_null; DCELL corrCell, precCell, supCell; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long npatch; ======= @@ -565,6 +588,12 @@ int calculateD(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD long npatch; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long npatch; +======= >>>>>>> osgeo-main long npatch, area; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -581,6 +610,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -683,10 +715,13 @@ int calculateD(int fd, struct area_entry *ad, double *result) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -695,6 +730,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) area++; >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main supCell = buf_sup[j + ad->x]; if (masked && (mask_sup[j] == 0)) { @@ -748,6 +786,7 @@ int calculateD(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -803,6 +842,8 @@ int calculateD(int fd, struct area_entry *ad, double *result) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main area++; @@ -898,6 +939,9 @@ int calculateD(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -955,6 +999,7 @@ int calculateF(int fd, struct area_entry *ad, double *result) FCELL *buf, *buf_sup, *buf_null; FCELL corrCell, precCell, supCell; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD long npatch; ======= @@ -970,6 +1015,12 @@ int calculateF(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD long npatch; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + long npatch; +======= >>>>>>> osgeo-main long npatch, area; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -986,6 +1037,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1088,10 +1142,13 @@ int calculateF(int fd, struct area_entry *ad, double *result) continue; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1100,6 +1157,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) area++; >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main supCell = buf_sup[j + ad->x]; if (masked && (mask_sup[j] == 0)) { @@ -1153,6 +1213,7 @@ int calculateF(int fd, struct area_entry *ad, double *result) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -1208,6 +1269,8 @@ int calculateF(int fd, struct area_entry *ad, double *result) ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main area++; @@ -1303,6 +1366,9 @@ int calculateF(int fd, struct area_entry *ad, double *result) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.pielou/pielou.c b/raster/r.li/r.li.pielou/pielou.c index 5f006f34698..1d6ddf64fd0 100644 --- a/raster/r.li/r.li.pielou/pielou.c +++ b/raster/r.li/r.li.pielou/pielou.c @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -72,11 +73,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int pielou(int fd, char **par UNUSED, struct area_entry *ad, double *result) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.shannon/shannon.c b/raster/r.li/r.li.shannon/shannon.c index a3d48e79072..361de381dde 100644 --- a/raster/r.li/r.li.shannon/shannon.c +++ b/raster/r.li/r.li.shannon/shannon.c @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -72,11 +73,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int shannon(int fd, char **par UNUSED, struct area_entry *ad, double *result) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.shape/r.li.shape.html b/raster/r.li/r.li.shape/r.li.shape.html index 813097d6690..3648e957846 100644 --- a/raster/r.li/r.li.shape/r.li.shape.html +++ b/raster/r.li/r.li.shape/r.li.shape.html @@ -73,6 +73,7 @@

        REFERENCES

        AUTHORS

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Claudio Porta and Lucio Davide Spano, students of Computer Science @@ -91,6 +92,12 @@

        AUTHORS

        ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Claudio Porta and Lucio Davide Spano, students of Computer Science +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Claudio Porta and Lucio Davide Spano, students of Computer Science >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -104,6 +111,9 @@

        AUTHORS

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.li/r.li.simpson/simpson.c b/raster/r.li/r.li.simpson/simpson.c index 20bbfc2f7fb..a94ac25bf71 100644 --- a/raster/r.li/r.li.simpson/simpson.c +++ b/raster/r.li/r.li.simpson/simpson.c @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) output->answer); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -72,11 +73,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int simpson(int fd, char **par UNUSED, struct area_entry *ad, double *result) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mapcalc/evaluate.c b/raster/r.mapcalc/evaluate.c index bd9dfc11549..f3343b4e9a8 100644 --- a/raster/r.mapcalc/evaluate.c +++ b/raster/r.mapcalc/evaluate.c @@ -188,6 +188,7 @@ static void evaluate_constant(expression *e) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static void evaluate_variable(expression *e) @@ -196,6 +197,8 @@ static void evaluate_variable(expression *e) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static void evaluate_variable(expression *e UNUSED) ======= static void evaluate_variable(expression *e) @@ -204,6 +207,9 @@ static void evaluate_variable(expression *e) static void evaluate_variable(expression *e) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mapcalc/main.c b/raster/r.mapcalc/main.c index ac82441df47..aae34e833c0 100644 --- a/raster/r.mapcalc/main.c +++ b/raster/r.mapcalc/main.c @@ -87,11 +87,14 @@ int main(int argc, char **argv) region->options = "current,intersect,union"; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main region->description = _("The computational region that should be used."); desc = NULL; G_asprintf(&desc, @@ -108,6 +111,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -120,6 +126,7 @@ int main(int argc, char **argv) " and uses the smallest resolution"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -130,6 +137,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 file = G_define_standard_option(G_OPT_F_INPUT); diff --git a/raster/r.mapcalc/map.c b/raster/r.mapcalc/map.c index d9fdbc0b4fd..02f752900cd 100644 --- a/raster/r.mapcalc/map.c +++ b/raster/r.mapcalc/map.c @@ -601,6 +601,7 @@ void get_map_row(int idx, int mod, int depth, int row, int col, void *buf, int res_type) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -612,6 +613,11 @@ void get_map_row(int idx, int mod, int depth, int row, int col, void *buf, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { CELL *ibuf; DCELL *fbuf; @@ -742,6 +748,7 @@ void copy_history(const char *dst, int idx) Rast_write_history((char *)dst, &hist); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -749,12 +756,17 @@ void copy_history(const char *dst, int idx) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #define RECORD_LEN 80 ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -768,6 +780,7 @@ void create_history(const char *dst, expression *e) Rast_short_history(dst, "raster", &hist); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for (;;) { @@ -784,6 +797,12 @@ void create_history(const char *dst, expression *e) <<<<<<< HEAD for (;;) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + for (;;) { +======= >>>>>>> osgeo-main for (i = 0;; i++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -800,6 +819,9 @@ void create_history(const char *dst, expression *e) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mapcalc/map3.c b/raster/r.mapcalc/map3.c index f1116dd6812..c3fc2d89c3a 100644 --- a/raster/r.mapcalc/map3.c +++ b/raster/r.mapcalc/map3.c @@ -319,6 +319,7 @@ static void translate_from_cats(map *m, CELL *cell, DCELL *xcell, int ncols) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static void setup_map(map *m) @@ -327,6 +328,8 @@ static void setup_map(map *m) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static void setup_map(map *m UNUSED) ======= static void setup_map(map *m) @@ -335,6 +338,9 @@ static void setup_map(map *m) static void setup_map(map *m) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -684,6 +690,7 @@ void copy_history(const char *dst UNUSED, int idx UNUSED) { } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void create_history(const char *dst, expression *e) @@ -692,6 +699,8 @@ void create_history(const char *dst, expression *e) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void create_history(const char *dst UNUSED, expression *e UNUSED) ======= void create_history(const char *dst, expression *e) @@ -700,6 +709,9 @@ void create_history(const char *dst, expression *e) void create_history(const char *dst, expression *e) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mapcalc/r.mapcalc.html b/raster/r.mapcalc/r.mapcalc.html index e04876f9d92..6952e1e1dae 100644 --- a/raster/r.mapcalc/r.mapcalc.html +++ b/raster/r.mapcalc/r.mapcalc.html @@ -389,6 +389,7 @@

        Functions

        Note, that the row() and col() indexing starts with 1. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -396,6 +397,8 @@

        Functions

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

        Data types and their precision

        There are three data types that can be used within the mapcalc expression. They @@ -430,6 +433,9 @@

        Data types and their precision

        ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mapcalc/r3.mapcalc.html b/raster/r.mapcalc/r3.mapcalc.html index 6d396e4c9d4..b5c1a1f9b12 100644 --- a/raster/r.mapcalc/r3.mapcalc.html +++ b/raster/r.mapcalc/r3.mapcalc.html @@ -257,6 +257,7 @@

        Functions

        <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Note, that the row(), col() and depth() indexing starts with 1. ======= <<<<<<< HEAD @@ -270,6 +271,11 @@

        Functions

        Note, that the row(), col() and depth() indexing starts with 1. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +Note, that the row(), col() and depth() indexing starts with 1. +======= +>>>>>>> osgeo-main Note, that the row(), col() and depth() indexing starts with 1. <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -285,6 +291,9 @@

        Functions

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -625,6 +634,7 @@

        REFERENCES

        Construction Engineering Research Laboratory (March/1991). <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD

        ======= <<<<<<< HEAD @@ -640,6 +650,12 @@

        REFERENCES

        ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +

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

        >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -655,6 +671,9 @@

        REFERENCES

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -665,6 +684,7 @@

        REFERENCES

        <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Neteler, M. (2001): Volume modelling of soils using GRASS GIS 3D tools. - in: ======= <<<<<<< HEAD @@ -680,6 +700,12 @@

        REFERENCES

        Neteler, M. (2001): Volume modelling of soils using GRASS GIS 3D tools. - in: ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +Neteler, M. (2001): Volume modelling of soils using GRASS GIS 3D tools. - in: +======= +>>>>>>> osgeo-main Neteler, M. (2001): Volume modelling of soils using GRASS GIS 3D tools. - in: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -695,6 +721,9 @@

        REFERENCES

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mfilter/Makefile b/raster/r.mfilter/Makefile index 10ec86c45fc..eb920b15e55 100644 --- a/raster/r.mfilter/Makefile +++ b/raster/r.mfilter/Makefile @@ -2,6 +2,7 @@ MODULE_TOPDIR = ../.. PGM = r.mfilter +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -15,16 +16,23 @@ PGM = r.mfilter <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main LIBES = $(ROWIOLIB) $(RASTERLIB) $(GISLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) DEPENDENCIES = $(ROWIODEP) $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OPENMP_CFLAGS) EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= LIBES = $(ROWIOLIB) $(RASTERLIB) $(GISLIB) $(OMPLIB) DEPENDENCIES = $(ROWIODEP) $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OMPCFLAGS) @@ -50,6 +58,9 @@ EXTRA_INC = $(OPENMP_INCPATH) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mfilter/execute.c b/raster/r.mfilter/execute.c index cc98d3b2190..974bec34764 100644 --- a/raster/r.mfilter/execute.c +++ b/raster/r.mfilter/execute.c @@ -141,6 +141,7 @@ int execute_filter(ROWIO *r, int *out, FILTER *filter, DCELL **cell) /* write row */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (write(out[id], cellp, buflen) < 0) G_fatal_error("Error writing temporary file"); @@ -159,6 +160,13 @@ int execute_filter(ROWIO *r, int *out, FILTER *filter, DCELL **cell) if (write(out[id], cellp, buflen) < 0) G_fatal_error("Error writing temporary file"); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (write(out[id], cellp, buflen) < 0) + G_fatal_error("Error writing temporary file"); +======= >>>>>>> osgeo-main write(out[id], cellp, buflen); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -177,6 +185,9 @@ int execute_filter(ROWIO *r, int *out, FILTER *filter, DCELL **cell) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mfilter/main.c b/raster/r.mfilter/main.c index 07ac45d9961..ad6dc362cf1 100644 --- a/raster/r.mfilter/main.c +++ b/raster/r.mfilter/main.c @@ -134,12 +134,15 @@ int main(int argc, char **argv) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { G_warning(_("Parallel processing disabled due to active MASK.")); nprocs = 1; @@ -151,6 +154,9 @@ int main(int argc, char **argv) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.mfilter/testsuite/test_r_mfilter.py b/raster/r.mfilter/testsuite/test_r_mfilter.py index de66af14c8a..c890da5a008 100644 --- a/raster/r.mfilter/testsuite/test_r_mfilter.py +++ b/raster/r.mfilter/testsuite/test_r_mfilter.py @@ -174,10 +174,15 @@ class TestNeighbors(TestCase): MATRIX 3 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main 1 1 1 1 1 1 @@ -187,12 +192,15 @@ class TestNeighbors(TestCase): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD 1 1 1 1 1 1 1 1 1 ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main 1 1 1 1 1 1 @@ -218,6 +226,9 @@ class TestNeighbors(TestCase): >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.neighbors/Makefile b/raster/r.neighbors/Makefile index da9876e298f..2b950df09d1 100644 --- a/raster/r.neighbors/Makefile +++ b/raster/r.neighbors/Makefile @@ -13,7 +13,10 @@ EXTRA_CFLAGS = $(OPENMP_CFLAGS) EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -43,6 +46,9 @@ EXTRA_INC = $(OPENMP_INCPATH) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.neighbors/main.c b/raster/r.neighbors/main.c index 51f625e0513..c2a4e79927d 100644 --- a/raster/r.neighbors/main.c +++ b/raster/r.neighbors/main.c @@ -51,6 +51,7 @@ struct menu { <<<<<<< HEAD }; +<<<<<<< HEAD struct weight_functions { char *name; /* name of the weight type */ char *text; /* weight types display - full description */ @@ -61,6 +62,8 @@ struct weight_functions { <<<<<<< HEAD }; +======= +>>>>>>> osgeo-main <<<<<<< HEAD struct weight_functions { char *name; /* name of the weight type */ @@ -88,6 +91,9 @@ enum out_type { T_SUM = 5 >>>>>>> a025896dba (r.report: add default units, change to full unit names (#1666)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -95,12 +101,15 @@ enum out_type { enum out_type { T_FLOAT = 1, T_INT = 2, T_COUNT = 3, T_COPY = 4, T_SUM = 5 }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= enum out_type { T_FLOAT = 1, T_INT = 2, T_COUNT = 3, T_COPY = 4, T_SUM = 5 }; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -116,6 +125,9 @@ enum out_type { T_FLOAT = 1, T_INT = 2, T_COUNT = 3, T_COPY = 4, T_SUM = 5 }; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -212,6 +224,7 @@ int main(int argc, char *argv[]) int nrows, ncols, brows; int i, n, t; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD size_t size; ======= @@ -219,6 +232,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main size_t size, in_buf_size, out_buf_size; ======= size_t size; @@ -227,6 +242,9 @@ int main(int argc, char *argv[]) size_t size; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -237,17 +255,23 @@ int main(int argc, char *argv[]) struct GModule *module; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -265,10 +289,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main struct { struct Option *input, *output, *selection; @@ -284,6 +311,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -373,7 +403,10 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -420,6 +453,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 1dffc5dfd4 (r.report: add default units, change to full unit names (#1666)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -430,10 +466,15 @@ int main(int argc, char *argv[]) parm.weighting_factor->multiple = NO; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main parm.weighting_factor->description = _("Factor used in the selected weighting function (ignored for none " @@ -443,12 +484,15 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD parm.weighting_factor->description = _("Factor used in the selected weighting function (ignored for none " "and file)"); ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main parm.weighting_factor->description = _("Factor used in the selected weighting function (ignored for none and file)"); >>>>>>> a025896dba (r.report: add default units, change to full unit names (#1666)) @@ -466,6 +510,9 @@ int main(int argc, char *argv[]) "and file)"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -492,11 +539,14 @@ int main(int argc, char *argv[]) parm.title->description = _("Title for output raster map"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main parm.nprocs = G_define_standard_option(G_OPT_M_NPROCS); parm.memory = G_define_standard_option(G_OPT_MEMORYMB); @@ -508,6 +558,9 @@ int main(int argc, char *argv[]) parm.nprocs = G_define_standard_option(G_OPT_M_NPROCS); parm.memory = G_define_standard_option(G_OPT_MEMORYMB); <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -534,6 +587,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Neighborhood size must be odd")); ncb.dist = ncb.nsize / 2; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -541,6 +595,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -548,6 +604,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -564,6 +623,7 @@ int main(int argc, char *argv[]) ncb.threads = 1; #endif <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (strcmp(parm.weighting_function->answer, "none") && flag.circle->answer) @@ -575,6 +635,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (ncb.threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) { G_warning(_("Parallel processing disabled due to active MASK.")); ncb.threads = 1; @@ -597,7 +659,10 @@ int main(int argc, char *argv[]) parm.weighting_factor->key); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -655,6 +720,9 @@ int main(int argc, char *argv[]) parm.weighting_factor->key); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -728,8 +796,11 @@ int main(int argc, char *argv[]) if (strcmp(parm.weighting_function->answer, "file") == 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD read_weights(parm.weight->answer); @@ -767,6 +838,9 @@ int main(int argc, char *argv[]) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) } ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main read_weights(parm.weight->answer); weights = 1; @@ -779,6 +853,7 @@ int main(int argc, char *argv[]) weights = 1; } <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -833,6 +908,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 copycolr = 0; @@ -846,6 +924,7 @@ int main(int argc, char *argv[]) RASTER_MAP_TYPE otype = output_type(map_type, weights, menu[method].otype); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -853,12 +932,17 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -900,10 +984,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main out->name = output_name; if (weights) { if (menu[method].method_w) { @@ -943,6 +1030,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1050,6 +1140,7 @@ int main(int argc, char *argv[]) * is shifted by ncb.dist! */ for (i = 0; i < num_outputs; i++) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD outputs[i].buf[brow_idx * ncols + col] = ======= @@ -1057,6 +1148,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main outputs[i].buf[(size_t)brow_idx * ncols + col] = ======= outputs[i].buf[brow_idx * ncols + col] = @@ -1065,6 +1158,9 @@ int main(int argc, char *argv[]) outputs[i].buf[brow_idx * ncols + col] = >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1080,6 +1176,7 @@ int main(int argc, char *argv[]) for (i = 0; i < num_outputs; i++) { struct output *out = &outputs[i]; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD DCELL *rp = &out->buf[brow_idx * ncols + col]; ======= @@ -1087,6 +1184,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main DCELL *rp = &out->buf[(size_t)brow_idx * ncols + col]; ======= DCELL *rp = &out->buf[brow_idx * ncols + col]; @@ -1095,6 +1194,9 @@ int main(int argc, char *argv[]) DCELL *rp = &out->buf[brow_idx * ncols + col]; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.neighbors/readweights.c b/raster/r.neighbors/readweights.c index 819dc15b98c..5c0293326bc 100644 --- a/raster/r.neighbors/readweights.c +++ b/raster/r.neighbors/readweights.c @@ -67,6 +67,7 @@ void compute_weights(const char *function_type, double factor) weight = exponential; } <<<<<<< HEAD +<<<<<<< HEAD ======= { double sigma2 = factor * factor; @@ -116,6 +117,11 @@ void compute_weights(const char *function_type, double factor) <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= + >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD diff --git a/raster/r.object.geometry/r.object.geometry.html b/raster/r.object.geometry/r.object.geometry.html index 54e830025f6..c75035a6783 100644 --- a/raster/r.object.geometry/r.object.geometry.html +++ b/raster/r.object.geometry/r.object.geometry.html @@ -6,6 +6,7 @@

        DESCRIPTION

        (or standard output if no output filename or '-' is given), with fields separated by the chosen separator. Objects are defined <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as clumps of adjacent cells with the same category value (e.g. output of ======= @@ -21,6 +22,12 @@

        DESCRIPTION

        <<<<<<< HEAD as clumps of adjacent cells with the same category value (e.g. output of ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + as clumps of adjacent cells with the same category value (e.g. output of +======= >>>>>>> osgeo-main as clumps of adjacent cells with the same category value (e.g. output of >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -37,6 +44,9 @@

        DESCRIPTION

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47,6 +57,7 @@

        DESCRIPTION

        By default, values are in pixels. If values in meters is desired, the user <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD can set the -m flag. If the current working region is in lat-long or ======= <<<<<<< HEAD @@ -62,6 +73,12 @@

        DESCRIPTION

        can set the -m flag. If the current working region is in lat-long or ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +can set the -m flag. If the current working region is in lat-long or +======= +>>>>>>> osgeo-main can set the -m flag. If the current working region is in lat-long or >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -77,6 +94,9 @@

        DESCRIPTION

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -86,6 +106,7 @@

        DESCRIPTION

        Statistics currently calculated are exactly the same as in <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD v.to.db (except for compact_square and ======= <<<<<<< HEAD @@ -101,6 +122,12 @@

        DESCRIPTION

        v.to.db (except for compact_square and ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +v.to.db (except for compact_square and +======= +>>>>>>> osgeo-main v.to.db (except for compact_square and >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -116,6 +143,9 @@

        DESCRIPTION

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -126,11 +156,16 @@

        DESCRIPTION

      • perimeter
        • <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main
      • compact_square (compactness compared to a square: compact_square = 4 * sqrt(area) / perimeter)
      • compact_circle (compactness compared to a circle: @@ -140,12 +175,15 @@

        DESCRIPTION

        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
      • compact_square (compactness compared to a square: compact_square = 4 * sqrt(area) / perimeter)
      • compact_circle (compactness compared to a circle: ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
      • compact_square (compactness compared to a square: compact_square = 4 * sqrt(area) / perimeter)
      • compact_circle (compactness compared to a circle: @@ -170,6 +208,9 @@

        DESCRIPTION

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -200,11 +241,14 @@

        AUTHORS

        Markus Metz (diagonal clump tracing) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -221,6 +265,9 @@

        AUTHORS

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.bin/main.c b/raster/r.out.bin/main.c index d16ba9c7273..37386637fc3 100644 --- a/raster/r.out.bin/main.c +++ b/raster/r.out.bin/main.c @@ -485,6 +485,7 @@ int main(int argc, char *argv[]) convert_row(out_buf, in_buf, ncols, is_fp, bytes, swap_flag, null_val); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (fwrite(out_buf, bytes, ncols, fp) != (size_t)ncols) @@ -501,6 +502,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD if (fwrite(out_buf, bytes, ncols, fp) != (size_t)ncols) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (fwrite(out_buf, bytes, ncols, fp) != (size_t)ncols) +======= >>>>>>> osgeo-main if (fwrite(out_buf, bytes, ncols, fp) != ncols) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -517,6 +524,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.gdal/export_band.c b/raster/r.out.gdal/export_band.c index 09b51bbce57..0afc1aa2e9b 100644 --- a/raster/r.out.gdal/export_band.c +++ b/raster/r.out.gdal/export_band.c @@ -3,6 +3,7 @@ * MODULE: r.out.gdal * AUTHOR(S): Vytautas Vebra <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * PURPOSE: Exports GRASS raster to GDAL suported formats; ======= @@ -10,6 +11,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * PURPOSE: Exports GRASS raster to GDAL supported formats; ======= * PURPOSE: Exports GRASS raster to GDAL suported formats; @@ -18,6 +21,9 @@ * PURPOSE: Exports GRASS raster to GDAL suported formats; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.gdal/main.c b/raster/r.out.gdal/main.c index 29ace04e998..6dea3c39740 100644 --- a/raster/r.out.gdal/main.c +++ b/raster/r.out.gdal/main.c @@ -3,6 +3,7 @@ * MODULE: r.out.gdal * AUTHOR(S): Vytautas Vebra , Markus Metz <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * PURPOSE: Exports GRASS raster to GDAL suported formats; ======= @@ -10,6 +11,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * PURPOSE: Exports GRASS raster to GDAL supported formats; ======= * PURPOSE: Exports GRASS raster to GDAL suported formats; @@ -18,6 +21,9 @@ * PURPOSE: Exports GRASS raster to GDAL suported formats; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1067,6 +1073,7 @@ double set_default_nodata_value(GDALDataType datatype, double min, double max) case GDT_CFloat32: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1077,6 +1084,10 @@ double set_default_nodata_value(GDALDataType datatype, double min, double max) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main return NAN; @@ -1085,7 +1096,10 @@ double set_default_nodata_value(GDALDataType datatype, double min, double max) return NAN; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -1119,6 +1133,9 @@ double set_default_nodata_value(GDALDataType datatype, double min, double max) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.mpeg/write.c b/raster/r.out.mpeg/write.c index 9872ce82730..4850022b45c 100644 --- a/raster/r.out.mpeg/write.c +++ b/raster/r.out.mpeg/write.c @@ -193,6 +193,7 @@ void write_ppm(char *tr, char *tg, char *tb, int nrows, int ncols, int *y_rows, /*******************************************************/ void write_params(char *mpfilename, char *yfiles[], char *outfile, int frames, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int quality, int y_rows, int y_cols, int fly) ======= @@ -200,6 +201,8 @@ void write_params(char *mpfilename, char *yfiles[], char *outfile, int frames, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int quality, int y_rows UNUSED, int y_cols UNUSED, int fly) ======= int quality, int y_rows, int y_cols, int fly) @@ -208,6 +211,9 @@ void write_params(char *mpfilename, char *yfiles[], char *outfile, int frames, int quality, int y_rows, int y_cols, int fly) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.vrml/put_view.c b/raster/r.out.vrml/put_view.c index fac34224cd2..d490636c1ad 100644 --- a/raster/r.out.vrml/put_view.c +++ b/raster/r.out.vrml/put_view.c @@ -2,6 +2,7 @@ /* Not yet implemented - just defaults */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void vrml_put_view(FILE *vout, struct G_3dview *v3d) @@ -10,6 +11,8 @@ void vrml_put_view(FILE *vout, struct G_3dview *v3d) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void vrml_put_view(FILE *vout, struct G_3dview *v3d UNUSED) ======= void vrml_put_view(FILE *vout, struct G_3dview *v3d) @@ -18,6 +21,9 @@ void vrml_put_view(FILE *vout, struct G_3dview *v3d) void vrml_put_view(FILE *vout, struct G_3dview *v3d) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.vrml/r.out.vrml.html b/raster/r.out.vrml/r.out.vrml.html index d1fcb12ec85..42fce18604b 100644 --- a/raster/r.out.vrml/r.out.vrml.html +++ b/raster/r.out.vrml/r.out.vrml.html @@ -14,6 +14,7 @@

        DESCRIPTION

        WARNING

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -21,11 +22,16 @@

        WARNING

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main VRML is not well suited for large geometries which can result from even ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.vtk/main.c b/raster/r.out.vtk/main.c index 1f90b43498a..489ec005791 100644 --- a/raster/r.out.vtk/main.c +++ b/raster/r.out.vtk/main.c @@ -45,6 +45,7 @@ int main(int argc, char *argv[]) char *null_value; int out_type; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int fd; /*Normale maps ;) */ ======= @@ -52,6 +53,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int fd; /*Normal maps ;) */ ======= int fd; /*Normale maps ;) */ @@ -60,6 +63,9 @@ int main(int argc, char *argv[]) int fd; /*Normale maps ;) */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -109,6 +115,7 @@ int main(int argc, char *argv[]) /*Correct the coordinates, so the precision of VTK is not hurt :( */ if (param.coorcorr->answer) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*Get the default region for coordiante correction */ ======= @@ -116,6 +123,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /*Get the default region for coordinate correction */ ======= /*Get the default region for coordiante correction */ @@ -124,6 +133,9 @@ int main(int argc, char *argv[]) /*Get the default region for coordiante correction */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.vtk/r.out.vtk.html b/raster/r.out.vtk/r.out.vtk.html index 63aa2759bd8..e9a9a2c00bb 100644 --- a/raster/r.out.vtk/r.out.vtk.html +++ b/raster/r.out.vtk/r.out.vtk.html @@ -30,6 +30,7 @@

        DESCRIPTION

        NOTES

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD This filter generates: @@ -48,6 +49,12 @@

        NOTES

        ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +This filter generates: +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) This filter generates: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61,6 +68,9 @@

        NOTES

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -104,6 +114,7 @@

        Difference between point- and celldata

      • celldata -- is only provided if no elevation map is given. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD The cells are created with the same hight and width as in GRASS. Each cell ======= @@ -111,6 +122,8 @@

        Difference between point- and celldata

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main The cells are created with the same height and width as in GRASS. Each cell ======= The cells are created with the same hight and width as in GRASS. Each cell @@ -119,6 +132,9 @@

        Difference between point- and celldata

        The cells are created with the same hight and width as in GRASS. Each cell >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.out.vtk/writeascii.c b/raster/r.out.vtk/writeascii.c index 764a478f9e2..a46fe143f45 100644 --- a/raster/r.out.vtk/writeascii.c +++ b/raster/r.out.vtk/writeascii.c @@ -152,12 +152,15 @@ void write_vtk_pointdata_header(FILE *fp, struct Cell_head region) /* ************************************************************************* */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void write_vtk_structured_coordinates(int fd, FILE *fp, char *varname, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void write_vtk_structured_coordinates(int fd, FILE *fp, char *varname UNUSED, ======= void write_vtk_structured_coordinates(int fd, FILE *fp, char *varname, @@ -166,6 +169,9 @@ void write_vtk_structured_coordinates(int fd, FILE *fp, char *varname, void write_vtk_structured_coordinates(int fd, FILE *fp, char *varname, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -221,12 +227,15 @@ void write_vtk_structured_coordinates(int fd, FILE *fp, char *varname, /* ************************************************************************* */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname UNUSED, ======= void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, @@ -235,6 +244,9 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -292,6 +304,7 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, if (polytype == QUADS) { /*The default */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*If Datafiltering should be supportet, we use Polygons to represent the ======= @@ -299,6 +312,8 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /*If Datafiltering should be supported, we use Polygons to represent the ======= /*If Datafiltering should be supportet, we use Polygons to represent the @@ -307,6 +322,9 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, /*If Datafiltering should be supportet, we use Polygons to represent the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -314,6 +332,7 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, fprintf(fp, "POLYGONS %i %i\n", (region.rows - 1) * (region.cols - 1), 5 * (region.rows - 1) * (region.cols - 1)); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /*We creat a grid of quads, the corners of the quads are the datapoints @@ -322,6 +341,8 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /*We create a grid of quads, the corners of the quads are the datapoints ======= /*We creat a grid of quads, the corners of the quads are the datapoints @@ -330,6 +351,9 @@ void write_vtk_polygonal_coordinates(int fd, FILE *fp, char *varname, /*We creat a grid of quads, the corners of the quads are the datapoints >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.param.scale/disp_matrix.c b/raster/r.param.scale/disp_matrix.c index 7ecc96e1ba9..54e357ea09c 100644 --- a/raster/r.param.scale/disp_matrix.c +++ b/raster/r.param.scale/disp_matrix.c @@ -14,6 +14,7 @@ void disp_matrix(double **a, double *x, double *z, int n) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -24,12 +25,17 @@ void disp_matrix(double **a, double *x, double *z, int n) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main /* Displays matrices used to solve a set of linear equations in the form _ _ _ _ _ _ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD | a(0,0) a(0,1) ... a(0,n) | | x0 | | z0 | | a(1,0) a(1,1) ... a(1,n) | | x1 | | z1 | @@ -42,6 +48,8 @@ void disp_matrix(double **a, double *x, double *z, int n) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) /* Displays matrices used to solve a @@ -83,6 +91,9 @@ void disp_matrix(double **a, double *x, double *z, int n) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -124,17 +135,23 @@ void disp_wind(CELL * z) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main extern int dummy_for_iso_compilers; /* suppress -Wempty-translation-unit */ ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.param.scale/feature.c b/raster/r.param.scale/feature.c index 5a6edb72f8c..f9f1716c8f9 100644 --- a/raster/r.param.scale/feature.c +++ b/raster/r.param.scale/feature.c @@ -29,6 +29,7 @@ DCELL feature(double *coeff) double a = C_A * zscale, /* Scale parameters if necessary. */ b = C_B * zscale, c = C_C * zscale, d = C_D * zscale, e = C_E * zscale; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD double maxic, minic, /* Minimium and maximum curvature. */ @@ -37,6 +38,8 @@ DCELL feature(double *coeff) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double maxic, minic, /* Minimum and maximum curvature. */ ======= double maxic, minic, /* Minimium and maximum curvature. */ @@ -45,6 +48,9 @@ DCELL feature(double *coeff) double maxic, minic, /* Minimium and maximum curvature. */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.param.scale/main.c b/raster/r.param.scale/main.c index aecbce07e1e..759915f3ca7 100644 --- a/raster/r.param.scale/main.c +++ b/raster/r.param.scale/main.c @@ -37,6 +37,7 @@ int main(int argc, char **argv) /* Make sure that the current projection is not lat/long */ if ((G_projection() == PROJECTION_LL)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Lat/Long locations are not supported by this module")); ======= @@ -44,6 +45,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Lat/Long projects are not supported by this module")); ======= G_fatal_error(_("Lat/Long locations are not supported by this module")); @@ -52,6 +55,9 @@ int main(int argc, char **argv) G_fatal_error(_("Lat/Long locations are not supported by this module")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.param.scale/nrutil.c b/raster/r.param.scale/nrutil.c index 022586973e4..fcf1733e8b9 100644 --- a/raster/r.param.scale/nrutil.c +++ b/raster/r.param.scale/nrutil.c @@ -146,6 +146,7 @@ float **submatrix(float **a, int oldrl, int oldrh, int oldcl, int oldch UNUSED, float **submatrix(float **a, int oldrl, int oldrh, int oldcl, int oldch, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -156,6 +157,11 @@ float **submatrix(float **a, int oldrl, int oldrh, int oldcl, int oldch, >>>>>>> 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 newrl, int newcl) { @@ -302,6 +308,7 @@ void free_convert_matrix(float **b, int nrl, int nrh UNUSED, int ncl UNUSED, /* free a float f3tensor allocated by f3tensor() */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void free_f3tensor(float ***t, int nrl, int nrh, int ncl, int nch, int ndl, int ndh) ======= @@ -309,6 +316,8 @@ void free_f3tensor(float ***t, int nrl, int nrh, int ncl, int nch, int ndl, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void free_f3tensor(float ***t, int nrl, int nrh UNUSED, int ncl, int nch UNUSED, int ndl, int ndh UNUSED) ======= @@ -320,6 +329,9 @@ void free_f3tensor(float ***t, int nrl, int nrh, int ncl, int nch, int ndl, int ndh) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/Makefile b/raster/r.patch/Makefile index 52fb1f67b6b..eab76ef4bf9 100644 --- a/raster/r.patch/Makefile +++ b/raster/r.patch/Makefile @@ -13,7 +13,10 @@ EXTRA_CFLAGS = $(OPENMP_CFLAGS) EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -43,6 +46,9 @@ EXTRA_INC = $(OPENMP_INCPATH) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/benchmark/benchmark_r_patch.py b/raster/r.patch/benchmark/benchmark_r_patch.py index e7084f37f37..89afde59d88 100644 --- a/raster/r.patch/benchmark/benchmark_r_patch.py +++ b/raster/r.patch/benchmark/benchmark_r_patch.py @@ -66,6 +66,7 @@ def generate_map(rows, cols, fname): Module( "r.random.surface", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD maximum=255, ======= @@ -73,6 +74,8 @@ def generate_map(rows, cols, fname): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main high=255, ======= maximum=255, @@ -81,6 +84,9 @@ def generate_map(rows, cols, fname): maximum=255, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/do_patch.c b/raster/r.patch/do_patch.c index aa9da9970c5..3c1e576024c 100644 --- a/raster/r.patch/do_patch.c +++ b/raster/r.patch/do_patch.c @@ -23,6 +23,7 @@ int is_zero_value(void *rast, RASTER_MAP_TYPE data_type) int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD RASTER_MAP_TYPE out_type, size_t out_cell_size, int use_zero, int no_support) @@ -39,6 +40,12 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, RASTER_MAP_TYPE out_type, size_t out_cell_size, int use_zero, int no_support) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + RASTER_MAP_TYPE out_type, size_t out_cell_size, int use_zero, + int no_support) +======= >>>>>>> osgeo-main RASTER_MAP_TYPE out_type, size_t out_cell_size, int use_zero) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -51,6 +58,9 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, int no_support) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -72,6 +82,7 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, Rast_raster_cpy(result, patch, 1, out_type); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -83,6 +94,11 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (out_type == CELL_TYPE && !no_support) Rast_update_cell_stats((CELL *)result, 1, statf); @@ -94,7 +110,10 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main if (out_type == CELL_TYPE) @@ -114,6 +133,9 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -124,6 +146,7 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, else { Rast_raster_cpy(result, patch, 1, out_type); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (out_type == CELL_TYPE && !no_support) Rast_update_cell_stats((CELL *)result, 1, statf); @@ -140,6 +163,12 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, if (out_type == CELL_TYPE && !no_support) Rast_update_cell_stats((CELL *)result, 1, statf); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + if (out_type == CELL_TYPE && !no_support) + Rast_update_cell_stats((CELL *)result, 1, statf); +======= >>>>>>> osgeo-main if (out_type == CELL_TYPE) Rast_update_cell_stats((CELL *) result, 1, statf); @@ -153,6 +182,9 @@ int do_patch(void *result, void *patch, struct Cell_stats *statf, int ncols, Rast_update_cell_stats((CELL *)result, 1, statf); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/local_proto.h b/raster/r.patch/local_proto.h index 53b4d96fec5..b190520d8f2 100644 --- a/raster/r.patch/local_proto.h +++ b/raster/r.patch/local_proto.h @@ -3,6 +3,7 @@ int do_patch(void *result, void *, struct Cell_stats *, int, RASTER_MAP_TYPE, size_t, int, int); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /* support.c */ int support(char **, struct Cell_stats *, int, struct Categories *, int *, struct Colors *, int *, RASTER_MAP_TYPE); @@ -18,6 +19,14 @@ int support(char **, struct Cell_stats *, int, struct Categories *, int *, ======= <<<<<<< HEAD +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +/* support.c */ +int support(char **, struct Cell_stats *, int, struct Categories *, int *, + struct Colors *, int *, RASTER_MAP_TYPE); +>>>>>>> osgeo-main +======= + ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) /* support.c */ @@ -35,6 +44,9 @@ int support(char **, struct Cell_stats *, int, struct Categories *, int *, struct Colors *, int *, RASTER_MAP_TYPE); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/main.c b/raster/r.patch/main.c index f3c58c00b78..5cad61fa379 100644 --- a/raster/r.patch/main.c +++ b/raster/r.patch/main.c @@ -9,6 +9,7 @@ * Jan-Oliver Wagner , <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -20,6 +21,11 @@ <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * Huidae Cho , * Aaron Saw Min Sern (OpenMP parallelization) @@ -29,7 +35,10 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main * Huidae Cho @@ -45,6 +54,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -140,11 +152,14 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sscanf(threads->answer, "%d", &nprocs); if (nprocs < 1) @@ -166,6 +181,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -200,11 +218,14 @@ int main(int argc, char *argv[]) infd[t] = G_malloc(nfiles * sizeof(int)); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main thread_statf = G_malloc(nprocs * (nfiles * sizeof(struct Cell_stats))); for (t = 0; t < nprocs; t++) { thread_statf[t] = G_malloc(nfiles * sizeof(struct Cell_stats)); @@ -213,6 +234,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -224,6 +248,7 @@ int main(int argc, char *argv[]) const char *name = names[i]; int fd; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -237,6 +262,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (t = 0; t < nprocs; t++) { infd[t][i] = Rast_open_old(name, ""); @@ -245,7 +275,10 @@ int main(int argc, char *argv[]) fd = infd[0][i]; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= fd = Rast_open_old(name, ""); @@ -258,6 +291,9 @@ int main(int argc, char *argv[]) fd = infd[0][i]; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main map_type = Rast_get_map_type(fd); @@ -266,6 +302,7 @@ int main(int argc, char *argv[]) else if (map_type == DCELL_TYPE) out_type = DCELL_TYPE; +<<<<<<< HEAD <<<<<<< HEAD Rast_init_cell_stats(&statf[i]); @@ -314,6 +351,17 @@ int main(int argc, char *argv[]) Rast_get_cellhd(name, "", &cellhd[i]); } >>>>>>> osgeo-main +======= + for (t = 0; t < nprocs; t++) { + Rast_init_cell_stats(&thread_statf[t][i]); + } +======= + Rast_init_cell_stats(&statf[i]); +>>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) + + Rast_get_cellhd(name, "", &cellhd[i]); + } +>>>>>>> osgeo-main <<<<<<< HEAD ======= ======= @@ -330,6 +378,9 @@ int main(int argc, char *argv[]) } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -358,6 +409,7 @@ int main(int argc, char *argv[]) nrows = Rast_window_rows(); ncols = Rast_window_cols(); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD bufrows = atoi(memory->answer) * (((1 << 20) / out_cell_size) / ncols); @@ -366,6 +418,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD /* memory reserved for presult and patch */ in_buf_size = out_cell_size * ncols * nprocs * 2; @@ -385,6 +439,9 @@ int main(int argc, char *argv[]) bufrows = atoi(memory->answer) * (((1 << 20) / out_cell_size) / ncols); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -399,10 +456,13 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main G_verbose_message(_("Percent complete...")); for (row = 0; row < nrows; row++) { double north_edge, south_edge; @@ -435,6 +495,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -475,6 +538,7 @@ int main(int argc, char *argv[]) north_edge = Rast_row_to_northing(row, &window); south_edge = north_edge - window.ns_res; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (out_type == CELL_TYPE && !no_support) @@ -485,6 +549,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (out_type == CELL_TYPE && !no_support) { Rast_update_cell_stats((CELL *)local_presult, ncols, &thread_statf[t_id][0]); @@ -500,6 +566,9 @@ int main(int argc, char *argv[]) &statf[0]); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -513,6 +582,7 @@ int main(int argc, char *argv[]) Rast_get_row(local_infd[i], local_patch, row, out_type); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (!do_patch(local_presult, local_patch, &statf[i], ncols, out_type, out_cell_size, use_zero, @@ -522,6 +592,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (!do_patch(local_presult, local_patch, &(thread_statf[t_id][i]), ncols, out_type, out_cell_size, use_zero, no_support)) @@ -536,6 +608,9 @@ int main(int argc, char *argv[]) no_support)) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -570,17 +645,23 @@ int main(int argc, char *argv[]) G_free(presult); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -594,11 +675,14 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main for (i = 0; i < nfiles; i++) @@ -611,6 +695,9 @@ int main(int argc, char *argv[]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -622,6 +709,7 @@ int main(int argc, char *argv[]) G_verbose_message(_("Creating support files for raster map <%s>..."), new_name); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD support(names, statf, nfiles, &cats, &cats_ok, &colr, &colr_ok, out_type); @@ -630,6 +718,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (out_type == CELL_TYPE) { merge_threads(thread_statf, nprocs, nfiles); @@ -646,6 +736,9 @@ int main(int argc, char *argv[]) out_type); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/support.c b/raster/r.patch/support.c index 8ae25007fc3..04650c9e307 100644 --- a/raster/r.patch/support.c +++ b/raster/r.patch/support.c @@ -1,6 +1,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -8,6 +9,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /** * Merges the statf[] arrays for each thread into * Thread 0 for use in the support computation. @@ -46,6 +49,9 @@ void merge_threads(struct Cell_stats **thread_statf, int nprocs, int nfiles) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -99,6 +105,7 @@ int support(char **names, struct Cell_stats *statf, int nfiles, Rast_update_cell_stats(&n, 1, statf); Rast_set_c_cat( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD &n, &n, Rast_get_c_cat((CELL *)&n, &pcats), cats); ======= @@ -112,6 +119,11 @@ int support(char **names, struct Cell_stats *statf, int nfiles, <<<<<<< HEAD &n, &n, Rast_get_c_cat((CELL *)&n, &pcats), cats); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + &n, &n, Rast_get_c_cat((CELL *)&n, &pcats), cats); +======= >>>>>>> osgeo-main &n, &n, Rast_get_c_cat((CELL *) &n, &pcats), cats); >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -122,6 +134,9 @@ int support(char **names, struct Cell_stats *statf, int nfiles, &n, &n, Rast_get_c_cat((CELL *)&n, &pcats), cats); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132,6 +147,7 @@ int support(char **names, struct Cell_stats *statf, int nfiles, } } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } else { @@ -148,6 +164,12 @@ int support(char **names, struct Cell_stats *statf, int nfiles, } else { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + } + else { +======= >>>>>>> osgeo-main } else { >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -160,6 +182,9 @@ int support(char **names, struct Cell_stats *statf, int nfiles, else { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.patch/testsuite/test_rpatch_artificial.py b/raster/r.patch/testsuite/test_rpatch_artificial.py index a42a2fa438f..7d1dd4a7d80 100644 --- a/raster/r.patch/testsuite/test_rpatch_artificial.py +++ b/raster/r.patch/testsuite/test_rpatch_artificial.py @@ -275,11 +275,14 @@ def test_patch_oder_ba_cell(self): ) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main class TestCELLColorCategory(TestCase): @@ -418,6 +421,9 @@ def test_patch_categories_and_color(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.path/main.c b/raster/r.path/main.c index 26cec06047c..2a6c496f912 100644 --- a/raster/r.path/main.c +++ b/raster/r.path/main.c @@ -377,6 +377,7 @@ int main(int argc, char **argv) Rast_get_d_row(fd, map_buf, i); if (write(val_fd, map_buf, ncols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ncols * (int)sizeof(DCELL)) { ======= @@ -392,6 +393,12 @@ int main(int argc, char **argv) <<<<<<< HEAD ncols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ncols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main ncols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -408,6 +415,9 @@ int main(int argc, char **argv) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -482,6 +492,7 @@ int main(int argc, char **argv) Rast_get_c_row(dir_id, dir_buf, i); if (write(dir_fd, dir_buf, ncols * sizeof(CELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ncols * (int)sizeof(CELL)) { ======= @@ -497,6 +508,12 @@ int main(int argc, char **argv) <<<<<<< HEAD ncols * (int)sizeof(CELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ncols * (int)sizeof(CELL)) { +======= >>>>>>> osgeo-main ncols * sizeof(CELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -513,6 +530,9 @@ int main(int argc, char **argv) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -533,6 +553,7 @@ int main(int argc, char **argv) } if (write(dir_fd, dir_buf, ncols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ncols * (int)sizeof(DCELL)) { ======= @@ -548,6 +569,12 @@ int main(int argc, char **argv) <<<<<<< HEAD ncols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ncols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main ncols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -564,6 +591,9 @@ int main(int argc, char **argv) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -846,6 +876,7 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, SEEK_SET); if (read(val_fd, val_buf, window->cols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= @@ -861,6 +892,12 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + window->cols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main window->cols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -877,6 +914,9 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -911,6 +951,7 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, SEEK_SET); if (read(dir_fd, dir_buf, window->cols * sizeof(CELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD window->cols * (int)sizeof(CELL)) { ======= @@ -926,6 +967,12 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, <<<<<<< HEAD window->cols * (int)sizeof(CELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + window->cols * (int)sizeof(CELL)) { +======= >>>>>>> osgeo-main window->cols * sizeof(CELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -942,6 +989,9 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1074,6 +1124,7 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, if (read(val_fd, val_buf, window->cols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= @@ -1089,6 +1140,12 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + window->cols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main window->cols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1105,6 +1162,9 @@ int dir_bitmask(int dir_fd, int val_fd, struct point *startp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1219,6 +1279,7 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, SEEK_SET); if (read(val_fd, val_buf, window->cols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= @@ -1234,6 +1295,12 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + window->cols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main window->cols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1250,6 +1317,9 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1279,6 +1349,7 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, SEEK_SET); if (read(dir_fd, dir_buf, window->cols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= @@ -1294,6 +1365,12 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + window->cols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main window->cols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1310,6 +1387,9 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1412,6 +1492,7 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, if (read(val_fd, val_buf, window->cols * sizeof(DCELL)) != <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= @@ -1427,6 +1508,12 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, <<<<<<< HEAD window->cols * (int)sizeof(DCELL)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + window->cols * (int)sizeof(DCELL)) { +======= >>>>>>> osgeo-main window->cols * sizeof(DCELL)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1443,6 +1530,9 @@ int dir_degree(int dir_fd, int val_fd, struct point *startp, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.path/r.path.html b/raster/r.path/r.path.html index 97b685ffc39..7edad37e1a3 100644 --- a/raster/r.path/r.path.html +++ b/raster/r.path/r.path.html @@ -60,6 +60,7 @@

        DESCRIPTION

        NOTES

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The directions are recorded as degrees CCW from East, the Knight's move @@ -78,6 +79,12 @@

        NOTES

        ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +The directions are recorded as degrees CCW from East, the Knight's move +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) The directions are recorded as degrees CCW from East, the Knight's move >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91,6 +98,9 @@

        NOTES

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.profile/main.c b/raster/r.profile/main.c index b043574976b..3340c0e5422 100644 --- a/raster/r.profile/main.c +++ b/raster/r.profile/main.c @@ -100,6 +100,7 @@ int main(int argc, char *argv[]) parm.units->label = parm.units->description; parm.units->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("If units are not specified, current location units are used. " "Meters are used by default in geographic (latlon) locations."); @@ -108,6 +109,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("If units are not specified, current project units are used. " "Meters are used by default in geographic (latlon) projects."); ======= @@ -119,6 +122,9 @@ int main(int argc, char *argv[]) "Meters are used by default in geographic (latlon) locations."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.profile/r.profile.html b/raster/r.profile/r.profile.html index 8b13637a52a..a69e4117517 100644 --- a/raster/r.profile/r.profile.html +++ b/raster/r.profile/r.profile.html @@ -35,16 +35,22 @@

        OUTPUT FORMAT

        is compatible with v.in.ascii and can <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main be piped directly into this program. ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.proj/bordwalk.c b/raster/r.proj/bordwalk.c index 5a59c536ccc..6c9fce31c91 100644 --- a/raster/r.proj/bordwalk.c +++ b/raster/r.proj/bordwalk.c @@ -13,11 +13,14 @@ * the smallest possible rectangular region. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * * Simply using corner and midpoints (original r.proj) will only work * between cylindrical projections. In other projections, though he input @@ -29,6 +32,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41,6 +47,7 @@ * <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -51,6 +58,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 * In many projections, especially when large areas are displayed, the edges * of rectangular GRASS regions do not necessarily represent east, west, north diff --git a/raster/r.proj/main.c b/raster/r.proj/main.c index ce7995c1276..9cdb3b8b923 100644 --- a/raster/r.proj/main.c +++ b/raster/r.proj/main.c @@ -33,12 +33,15 @@ * - output map will be clipped to borders of the current region. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * - output map cell edges and centers will coinside with those ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * - output map cell edges and centers will coincide with those ======= * - output map cell edges and centers will coinside with those @@ -47,6 +50,9 @@ * - output map cell edges and centers will coinside with those >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -166,6 +172,7 @@ int main(int argc, char **argv) G_add_keyword(_("transformation")); G_add_keyword(_("import")); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD module->description = _("Re-projects a raster map from given location to " "the current location."); @@ -174,6 +181,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main module->description = _("Re-projects a raster map from given project to " "the current project."); ======= @@ -185,6 +194,9 @@ int main(int argc, char **argv) "the current location."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -249,7 +261,9 @@ int main(int argc, char **argv) nocrop = G_define_flag(); nocrop->key = 'n'; - nocrop->description = _("Do not perform region cropping optimization"); + nocrop->description = + _("Do not perform region cropping optimization. See Notes if working " + "with a global latitude-longitude projection"); print_bounds = G_define_flag(); print_bounds->key = 'p'; @@ -295,6 +309,7 @@ int main(int argc, char **argv) G_fatal_error(_("Input and output locations can not be the same")); #else <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Input and output locations are the same")); ======= @@ -302,6 +317,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Input and output projects are the same")); ======= G_warning(_("Input and output locations are the same")); @@ -310,6 +327,9 @@ int main(int argc, char **argv) G_warning(_("Input and output locations are the same")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -344,6 +364,7 @@ int main(int argc, char **argv) permissions = G_mapset_permissions(setname); if (permissions < 0) /* can't access mapset */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Mapset <%s> in input location <%s> - %s"), setname, ======= @@ -351,6 +372,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Mapset <%s> in input project <%s> - %s"), setname, ======= G_fatal_error(_("Mapset <%s> in input location <%s> - %s"), setname, @@ -359,6 +382,9 @@ int main(int argc, char **argv) G_fatal_error(_("Mapset <%s> in input location <%s> - %s"), setname, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -371,6 +397,7 @@ int main(int argc, char **argv) int i; char **srclist; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_verbose_message(_("Checking location <%s> mapset <%s>"), @@ -379,6 +406,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_verbose_message(_("Checking project <%s> mapset <%s>"), ======= G_verbose_message(_("Checking location <%s> mapset <%s>"), @@ -387,6 +416,9 @@ int main(int argc, char **argv) G_verbose_message(_("Checking location <%s> mapset <%s>"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -406,6 +438,7 @@ int main(int argc, char **argv) if (!G_find_raster(inmap->answer, setname)) G_fatal_error( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Raster map <%s> in location <%s> in mapset <%s> not found"), ======= @@ -413,6 +446,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Raster map <%s> in project <%s> in mapset <%s> not found"), ======= _("Raster map <%s> in location <%s> in mapset <%s> not found"), @@ -421,6 +456,9 @@ int main(int argc, char **argv) _("Raster map <%s> in location <%s> in mapset <%s> not found"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -470,6 +508,7 @@ int main(int argc, char **argv) if (G_projection() == PROJECTION_XY) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to work with unprojected data (xy location)")); ======= @@ -477,6 +516,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to work with unprojected data (xy project)")); ======= G_fatal_error(_("Unable to work with unprojected data (xy location)")); @@ -485,6 +526,9 @@ int main(int argc, char **argv) G_fatal_error(_("Unable to work with unprojected data (xy location)")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -506,6 +550,7 @@ int main(int argc, char **argv) if (print_bounds->answer) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Input map <%s@%s> in location <%s>:"), inmap->answer, ======= @@ -513,6 +558,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Input map <%s@%s> in project <%s>:"), inmap->answer, ======= G_message(_("Input map <%s@%s> in location <%s>:"), inmap->answer, @@ -521,6 +568,9 @@ int main(int argc, char **argv) G_message(_("Input map <%s@%s> in location <%s>:"), inmap->answer, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.proj/r.proj.html b/raster/r.proj/r.proj.html index c09ce91550a..3a4d3bb3df3 100644 --- a/raster/r.proj/r.proj.html +++ b/raster/r.proj/r.proj.html @@ -263,6 +263,7 @@

        v.in.region method

        v.in.region -d output=bounds type=area +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -270,12 +271,17 @@

        v.in.region method

        ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Now switch to the target project and import the vector bounding box # (you can run v.proj -l to get a list of vector maps in the source project): ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -291,6 +297,7 @@

        v.in.region method

        # Set the region in the target location with that of the newly-imported vector <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -302,6 +309,11 @@

        v.in.region method

        ======= >>>>>>> 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 # bounds map, and align the resolution to the desired cell resolution of the # final, reprojected raster map: @@ -356,6 +368,7 @@

        SEE ALSO

        AUTHORS

        +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -371,6 +384,12 @@

        AUTHORS

        <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -387,6 +406,9 @@

        AUTHORS

        >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.quant/read_rules.c b/raster/r.quant/read_rules.c index 0f7e6bc1195..283a635654a 100644 --- a/raster/r.quant/read_rules.c +++ b/raster/r.quant/read_rules.c @@ -90,6 +90,7 @@ int read_rules(const char *filename) "description or 'end' to exit:\n")); Rast_quant_init(&quant_struct); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for (;;) { ======= @@ -103,6 +104,11 @@ int read_rules(const char *filename) <<<<<<< HEAD for (;;) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + for (;;) { +======= >>>>>>> osgeo-main for (line = 1;; line++) { <<<<<<< HEAD @@ -119,6 +125,9 @@ int read_rules(const char *filename) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.quantile/r.quantile.html b/raster/r.quantile/r.quantile.html index 9196d2698be..050754716df 100644 --- a/raster/r.quantile/r.quantile.html +++ b/raster/r.quantile/r.quantile.html @@ -30,6 +30,7 @@

        REFERENCES

          <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -41,6 +42,10 @@

          REFERENCES

          <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main
        • Hyndman and Fan (1996) Sample Quantiles in Statistical Packages, American Statistician. American Statistical Association. 50 (4): 361-365. DOI: REFERENCES href="https://www.itl.nist.gov/div898/handbook/prc/section2/prc262.htm">Engineering <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -83,6 +91,9 @@

          REFERENCES

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.random.surface/makepp.c b/raster/r.random.surface/makepp.c index 65f93a21755..22365417258 100644 --- a/raster/r.random.surface/makepp.c +++ b/raster/r.random.surface/makepp.c @@ -2,6 +2,7 @@ #include "ransurf.h" #include "local_proto.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD double MakePP(int Row, int Col, int OutRows, int OutCols, double **Randoms, @@ -11,6 +12,8 @@ double MakePP(int Row, int Col, int OutRows, int OutCols, double **Randoms, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double MakePP(int Row, int Col, int OutRows UNUSED, int OutCols UNUSED, double **Randoms, BIGF BigF) ======= @@ -22,6 +25,9 @@ double MakePP(int Row, int Col, int OutRows, int OutCols, double **Randoms, BIGF BigF) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.recode/read_rules.c b/raster/r.recode/read_rules.c index 687b008dd41..f76894e5387 100644 --- a/raster/r.recode/read_rules.c +++ b/raster/r.recode/read_rules.c @@ -62,6 +62,7 @@ int read_rules(FILE *fp) } Rast_fpreclass_init(&rcl_struct); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for (;;) { ======= @@ -75,6 +76,11 @@ int read_rules(FILE *fp) <<<<<<< HEAD for (;;) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + for (;;) { +======= >>>>>>> osgeo-main for (line = 1;; line++) { <<<<<<< HEAD @@ -91,6 +97,9 @@ int read_rules(FILE *fp) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.recode/recode.c b/raster/r.recode/recode.c index 6ab5636b710..b90de0ea98b 100644 --- a/raster/r.recode/recode.c +++ b/raster/r.recode/recode.c @@ -9,6 +9,7 @@ static void process_row_ii(int), process_row_if(int), process_row_id(int); static void process_row_fi(int), process_row_ff(int), process_row_fd(int); static void process_row_di(int), process_row_df(int), process_row_dd(int); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static void (*process_row_FtypeOtype[3][3])(int) = { @@ -26,6 +27,12 @@ static void (*process_row_FtypeOtype[3][3])(int) = { static void (*process_row_FtypeOtype[3][3])(int) = { ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +static void (*process_row_FtypeOtype[3][3])(int) = { +======= +>>>>>>> osgeo-main static void (*process_row_FtypeOtype[3][3])() = { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -41,6 +48,9 @@ static void (*process_row_FtypeOtype[3][3])(int) = { >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.regression.line/r.regression.line.html b/raster/r.regression.line/r.regression.line.html index f9f065bd528..db63b3eafb6 100644 --- a/raster/r.regression.line/r.regression.line.html +++ b/raster/r.regression.line/r.regression.line.html @@ -21,6 +21,7 @@

          DESCRIPTION

          NOTES

          +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The results for offset/intercept (a) and gain/slope (b) are @@ -42,6 +43,13 @@

          NOTES

          ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +The results for offset/intercept (a) and gain/slope (b) are +identical to that obtained from R-stats's lm() function. +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) The results for offset/intercept (a) and gain/slope (b) are identical to that obtained from R-stats's lm() function. @@ -59,6 +67,9 @@

          NOTES

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.regression.multi/main.c b/raster/r.regression.multi/main.c index 7111b615b78..150baa17511 100644 --- a/raster/r.regression.multi/main.c +++ b/raster/r.regression.multi/main.c @@ -321,6 +321,7 @@ int main(int argc, char *argv[]) } G_percent(rows, rows, 2); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if (count < (unsigned int)n_predictors + 1) @@ -337,6 +338,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD if (count < (unsigned int)n_predictors + 1) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (count < (unsigned int)n_predictors + 1) +======= >>>>>>> osgeo-main if (count < n_predictors + 1) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -353,6 +360,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.report/format.c b/raster/r.report/format.c index d140244863e..703bb8787fd 100644 --- a/raster/r.report/format.c +++ b/raster/r.report/format.c @@ -24,6 +24,7 @@ int format_parms(double v, int *n, int *dp, int *eformat, int e_option) else scient_format(v, buf, *n, *dp); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if ((int)strlen(buf) <= *n) @@ -40,6 +41,12 @@ int format_parms(double v, int *n, int *dp, int *eformat, int e_option) <<<<<<< HEAD if ((int)strlen(buf) <= *n) ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if ((int)strlen(buf) <= *n) +======= >>>>>>> osgeo-main if (strlen(buf) <= *n) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -56,6 +63,9 @@ int format_parms(double v, int *n, int *dp, int *eformat, int e_option) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.report/header.c b/raster/r.report/header.c index 431af2c7b96..a3a246cc79c 100644 --- a/raster/r.report/header.c +++ b/raster/r.report/header.c @@ -37,6 +37,7 @@ int header(int unit1, int unit2) lcr("", "RASTER MAP CATEGORY REPORT", "", buf, page_width - 2); pbuf(buf); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD sprintf(tbuf1, "LOCATION: %s", G_location()); ======= @@ -44,6 +45,8 @@ int header(int unit1, int unit2) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sprintf(tbuf1, "PROJECT: %s", G_location()); ======= sprintf(tbuf1, "LOCATION: %s", G_location()); @@ -52,6 +55,9 @@ int header(int unit1, int unit2) sprintf(tbuf1, "LOCATION: %s", G_location()); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.report/parse.c b/raster/r.report/parse.c index 852ddb26d5d..c9476ad6853 100644 --- a/raster/r.report/parse.c +++ b/raster/r.report/parse.c @@ -45,11 +45,14 @@ int parse_command_line(int argc, char *argv[]) G_asprintf(&desc, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -57,6 +60,9 @@ int parse_command_line(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -67,8 +73,11 @@ int parse_command_line(int argc, char *argv[]) _("area in hectares"), _("number of cells"), _("percent cover")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main parms.units->descriptions = desc; parms.units->options = @@ -76,6 +85,7 @@ int parse_command_line(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD parms.units->descriptions = desc; parms.units->options = @@ -84,6 +94,8 @@ int parse_command_line(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 1dffc5dfd4 (r.report: add default units, change to full unit names (#1666)) "miles;%s;meters;%s;kilometers;%s;acres;%s;hectares;%s;cells;%s;percent;%s", _("area in square miles"), @@ -110,6 +122,9 @@ int parse_command_line(int argc, char *argv[]) "miles,meters,kilometers,acres,hectares,cells,percent"; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -296,9 +311,13 @@ int parse_units(char *s) else if (match(s, "hectares", 1)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main x = HECTARES; else if (match(s, "cells", 1)) @@ -307,12 +326,15 @@ int parse_units(char *s) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD x = HECTARES; else if (match(s, "cells", 1)) x = CELL_COUNTS; ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main x = HECTARES; else if (match(s, "cells", 1)) @@ -329,6 +351,9 @@ int parse_units(char *s) x = CELL_COUNTS; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.resamp.bspline/main.c b/raster/r.resamp.bspline/main.c index 91b25f0939c..6366f3cac03 100644 --- a/raster/r.resamp.bspline/main.c +++ b/raster/r.resamp.bspline/main.c @@ -195,6 +195,7 @@ int main(int argc, char *argv[]) | Subdividing and working with tiles: | Each original region will be divided into several subregions. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD | Each one will be overlaped by its neighbouring subregions. ======= @@ -202,6 +203,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main | Each one will be overlapped by its neighbouring subregions. ======= | Each one will be overlaped by its neighbouring subregions. @@ -210,6 +213,9 @@ int main(int argc, char *argv[]) | Each one will be overlaped by its neighbouring subregions. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -738,11 +744,14 @@ int main(int argc, char *argv[]) G_free(observ); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (observ_marked) G_free(observ_marked); ======= @@ -750,6 +759,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.resamp.bspline/resamp.c b/raster/r.resamp.bspline/resamp.c index dca5af4b385..800a2634628 100644 --- a/raster/r.resamp.bspline/resamp.c +++ b/raster/r.resamp.bspline/resamp.c @@ -21,6 +21,7 @@ #include #include "bspline.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct Point *P_Read_Raster_Region_masked( @@ -31,6 +32,8 @@ struct Point *P_Read_Raster_Region_masked( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct Point *P_Read_Raster_Region_masked(SEGMENT *mask_seg, struct Cell_head *Original, struct bound_box output_box UNUSED, @@ -48,6 +51,9 @@ struct Point *P_Read_Raster_Region_masked( struct bound_box General, int *num_points, int dim_vect, double mean) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -150,6 +156,7 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration, X = obs[i].coordX; Y = obs[i].coordY; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* X,Y are cell center cordinates, MUST be inside General box */ @@ -158,6 +165,8 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* X,Y are cell center coordinates, MUST be inside General box */ ======= /* X,Y are cell center cordinates, MUST be inside General box */ @@ -166,6 +175,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -183,11 +195,14 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -204,6 +219,9 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.resamp.filter/Makefile b/raster/r.resamp.filter/Makefile index ff212a8fc65..d64bdfa76a9 100644 --- a/raster/r.resamp.filter/Makefile +++ b/raster/r.resamp.filter/Makefile @@ -2,6 +2,7 @@ MODULE_TOPDIR = ../.. PGM = r.resamp.filter +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -16,6 +17,11 @@ PGM = r.resamp.filter >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) DEPENDENCIES = $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OPENMP_CFLAGS) @@ -24,7 +30,10 @@ EXTRA_INC = $(OPENMP_INCPATH) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OMPLIB) @@ -40,6 +49,9 @@ EXTRA_INC = $(OPENMP_INCPATH) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.resamp.filter/main.c b/raster/r.resamp.filter/main.c index c1abce26212..2441f6dadac 100644 --- a/raster/r.resamp.filter/main.c +++ b/raster/r.resamp.filter/main.c @@ -4,10 +4,15 @@ * AUTHOR(S): Glynn Clements <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main * Aaron Saw Min Sern (OpenMP parallelization) * PURPOSE: @@ -17,6 +22,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * Aaron Saw Min Sern (OpenMP parallelization) * PURPOSE: @@ -25,6 +31,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) * PURPOSE: * COPYRIGHT: (C) 2010 by Glynn Clements and the GRASS Development Team @@ -43,6 +51,9 @@ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -149,6 +160,7 @@ static const struct filter_type menu[] = { {"hamming", f_hamming, 0}, {"blackman", f_blackman, 0}, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD {NULL, NULL, 0}, ======= @@ -166,6 +178,12 @@ static const struct filter_type menu[] = { ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD + {NULL, NULL, 0}, +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) {NULL}, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -179,6 +197,9 @@ static const struct filter_type menu[] = { >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -398,6 +419,7 @@ static void filter(void) make_h_weights(); make_v_weights(); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD while (written_row < dst_w.rows) { @@ -407,6 +429,8 @@ static void filter(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD while (written_row < dst_w.rows) { int range = bufrows; @@ -494,6 +518,9 @@ static void filter(void) int range = bufrows; >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -568,11 +595,14 @@ static void filter(void) G_debug(5, "write: %d", row); } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD written_row = end; ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main num_rows = rows; @@ -667,6 +697,9 @@ static void filter(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -679,6 +712,7 @@ int main(int argc, char *argv[]) struct GModule *module; struct { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct Option *rastin, *rastout, *method, *radius, *x_radius, *y_radius, *memory, *nprocs; @@ -697,6 +731,13 @@ int main(int argc, char *argv[]) struct Option *rastin, *rastout, *method, *radius, *x_radius, *y_radius, *memory, *nprocs; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + struct Option *rastin, *rastout, *method, *radius, *x_radius, *y_radius, + *memory, *nprocs; +======= >>>>>>> osgeo-main struct Option *rastin, *rastout, *method, *radius, *x_radius, *y_radius; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -715,6 +756,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -727,17 +771,23 @@ int main(int argc, char *argv[]) int nprocs; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main size_t in_buf_size, out_buf_size; ======= >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -809,6 +859,10 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> osgeo-main ======= ======= >>>>>>> osgeo-main @@ -826,6 +880,7 @@ int main(int argc, char *argv[]) nprocs = 1; #endif <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -845,6 +900,8 @@ int main(int argc, char *argv[]) #endif ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) sscanf(parm.nprocs->answer, "%d", &nprocs); @@ -987,6 +1044,7 @@ int main(int argc, char *argv[]) /* allocate buffers for intermediate rows */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -998,6 +1056,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) >>>>>>> osgeo-main bufs = G_malloc(nprocs * sizeof(DCELL **)); for (t = 0; t < nprocs; t++) { @@ -1009,8 +1072,11 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main bufs = G_malloc(row_scale * sizeof(DCELL *)); for (i = 0; i < row_scale; i++) @@ -1035,6 +1101,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1042,6 +1111,7 @@ int main(int argc, char *argv[]) Rast_set_input_window(&src_w); Rast_set_output_window(&dst_w); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1049,6 +1119,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* memory reserved for input */ in_buf_size = dst_w.cols * sizeof(DCELL) * row_scale * nprocs; /* memory available for output buffer */ @@ -1072,6 +1144,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1082,6 +1157,7 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) @@ -1092,6 +1168,11 @@ int main(int argc, char *argv[]) >>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main inbuf = G_malloc(nprocs * sizeof(DCELL *)); diff --git a/raster/r.resamp.filter/r.resamp.filter.html b/raster/r.resamp.filter/r.resamp.filter.html index 8e98a7a9b42..bb21a8c4003 100644 --- a/raster/r.resamp.filter/r.resamp.filter.html +++ b/raster/r.resamp.filter/r.resamp.filter.html @@ -76,10 +76,13 @@

          NOTES

          attempt to implement the latter would violate the integrity of the interpolation method. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -87,6 +90,9 @@

          NOTES

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

          PERFORMANCE

          By specifying the number of parallel processes with nprocs option, @@ -117,6 +123,7 @@

          PERFORMANCE

          r.resamp.filter can run faster, see benchmarks below. >>>>>>> osgeo-main +<<<<<<< HEAD <<<<<<< HEAD
          benchmark for number of cells @@ -132,6 +139,8 @@

          PERFORMANCE

          ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) diff --git a/raster/r.resamp.interp/Makefile b/raster/r.resamp.interp/Makefile index 308effc8e61..56fc3f3ffd9 100644 --- a/raster/r.resamp.interp/Makefile +++ b/raster/r.resamp.interp/Makefile @@ -2,6 +2,7 @@ MODULE_TOPDIR = ../.. PGM = r.resamp.interp +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -15,16 +16,23 @@ PGM = r.resamp.interp <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) DEPENDENCIES = $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OPENMP_CFLAGS) EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OMPLIB) DEPENDENCIES = $(RASTERDEP) $(GISDEP) EXTRA_CFLAGS = $(OMPCFLAGS) @@ -50,6 +58,9 @@ EXTRA_INC = $(OPENMP_INCPATH) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.resamp.interp/main.c b/raster/r.resamp.interp/main.c index dbaf1c413bf..2d38cc557bc 100644 --- a/raster/r.resamp.interp/main.c +++ b/raster/r.resamp.interp/main.c @@ -134,12 +134,15 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) { G_warning(_("Parallel processing disabled due to active MASK.")); threads = 1; @@ -151,6 +154,9 @@ int main(int argc, char *argv[]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -269,11 +275,14 @@ int main(int argc, char *argv[]) Rast_set_d_null_value( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main &outbuf[(size_t)(row - start) * dst_w.cols + col], 1); @@ -285,6 +294,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -294,6 +306,7 @@ int main(int argc, char *argv[]) outbuf[(row - start) * dst_w.cols + col] = c; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -304,6 +317,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 } } @@ -345,11 +363,14 @@ int main(int argc, char *argv[]) Rast_set_d_null_value( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main &outbuf[(size_t)(row - start) * dst_w.cols + col], 1); @@ -360,6 +381,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -369,6 +393,7 @@ int main(int argc, char *argv[]) outbuf[(row - start) * dst_w.cols + col] = <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -379,6 +404,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 Rast_interp_bilinear(u, v, c00, c01, c10, c11); } @@ -451,11 +481,14 @@ int main(int argc, char *argv[]) Rast_set_d_null_value( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main &outbuf[(size_t)(row - start) * dst_w.cols + col], 1); @@ -466,6 +499,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -475,6 +511,7 @@ int main(int argc, char *argv[]) outbuf[(row - start) * dst_w.cols + col] = <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -485,6 +522,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 Rast_interp_bicubic(u, v, c00, c01, c02, c03, c10, c11, c12, c13, c20, @@ -541,6 +583,7 @@ int main(int argc, char *argv[]) if (do_lanczos) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD outbuf[(row - start) * dst_w.cols + col] = ======= @@ -548,6 +591,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main outbuf[(size_t)(row - start) * dst_w.cols + col] = ======= outbuf[(row - start) * dst_w.cols + col] = @@ -556,6 +601,9 @@ int main(int argc, char *argv[]) outbuf[(row - start) * dst_w.cols + col] = >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -573,6 +621,7 @@ int main(int argc, char *argv[]) /* write to output map */ for (row = start; row < end; row++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Rast_put_d_row(outfile, &outbuf[(row - start) * dst_w.cols]); ======= @@ -580,6 +629,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Rast_put_d_row(outfile, &outbuf[(size_t)(row - start) * dst_w.cols]); ======= @@ -589,6 +640,9 @@ int main(int argc, char *argv[]) Rast_put_d_row(outfile, &outbuf[(row - start) * dst_w.cols]); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.resamp.rst/main.c b/raster/r.resamp.rst/main.c index 564be6d7d93..5bd9243a1e4 100644 --- a/raster/r.resamp.rst/main.c +++ b/raster/r.resamp.rst/main.c @@ -546,6 +546,7 @@ static FILE *create_temp_file(const char *name, char **tmpname) for (i = 0; i < nsizr; i++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (fwrite(zero_array_cell, sizeof(FCELL), nsizc, fp) != (size_t)nsizc) { @@ -564,6 +565,13 @@ static FILE *create_temp_file(const char *name, char **tmpname) if (fwrite(zero_array_cell, sizeof(FCELL), nsizc, fp) != (size_t)nsizc) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (fwrite(zero_array_cell, sizeof(FCELL), nsizc, fp) != + (size_t)nsizc) { +======= >>>>>>> osgeo-main if (fwrite(zero_array_cell, sizeof(FCELL), nsizc, fp) != nsizc) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -582,6 +590,9 @@ static FILE *create_temp_file(const char *name, char **tmpname) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.ros/main.c b/raster/r.ros/main.c index 301af522db9..aa87425acfc 100644 --- a/raster/r.ros/main.c +++ b/raster/r.ros/main.c @@ -98,6 +98,7 @@ float SIGMA[4][14] = { {0, 0, 30, 0, 30, 0, 30, 30, 30, 30, 30, 30, 30, 30}, {0, 0, 1500, 0, 1500, 1500, 0, 1500, 0, 0, 1500, 0, 0, 0}}; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /*fuel particale surface-area-to-volume ratio, 1/ft. */ @@ -106,6 +107,8 @@ float SIGMA[4][14] = { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /*fuel particle surface-area-to-volume ratio, 1/ft. */ ======= /*fuel particale surface-area-to-volume ratio, 1/ft. */ @@ -114,6 +117,9 @@ float SIGMA[4][14] = { /*fuel particale surface-area-to-volume ratio, 1/ft. */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.ros/r.ros.html b/raster/r.ros/r.ros.html index a323ea61403..ba4500f56fa 100644 --- a/raster/r.ros/r.ros.html +++ b/raster/r.ros/r.ros.html @@ -143,12 +143,15 @@

          SEE ALSO

          Sample data download:           firedemo.sh <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (run this script within the "Fire simulation data set" location). ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main (run this script within the "Fire simulation data set" project). ======= (run this script within the "Fire simulation data set" location). @@ -157,6 +160,9 @@

          SEE ALSO

          (run this script within the "Fire simulation data set" location). >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.ros/spot_dist.c b/raster/r.ros/spot_dist.c index 113dd090227..8b933fea5e5 100644 --- a/raster/r.ros/spot_dist.c +++ b/raster/r.ros/spot_dist.c @@ -60,6 +60,7 @@ double A[14] = {0, 545, 709, 429, 301, 235, 242, /* B Coeficients in E = IA(.474U)^B (s), where U is wind at 20 ft (mi/h) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -71,6 +72,11 @@ double A[14] = {0, 545, 709, 429, 301, 235, 242, ======= >>>>>>> 8422103f4c (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 B[14] = {0, -1.21, -1.32, -1.19, -1.05, -0.92, -0.94, 0.83, 0, -1.51, -0.89, -0.81, -0.78, -0.79}; diff --git a/raster/r.series.accumulate/main.c b/raster/r.series.accumulate/main.c index 71f970d48c9..b5509e245c4 100644 --- a/raster/r.series.accumulate/main.c +++ b/raster/r.series.accumulate/main.c @@ -171,6 +171,7 @@ int main(int argc, char *argv[]) if (G_parser(argc, argv)) exit(EXIT_FAILURE); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD lo = -INFINITY; @@ -190,6 +191,13 @@ int main(int argc, char *argv[]) lo = -INFINITY; hi = INFINITY; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + lo = -INFINITY; + hi = INFINITY; +======= >>>>>>> osgeo-main lo = -1.0 / 0.0; /* -inf */ hi = 1.0 / 0.0; /* inf */ @@ -214,6 +222,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.series/Makefile b/raster/r.series/Makefile index e2af545cf9a..4583e551e28 100644 --- a/raster/r.series/Makefile +++ b/raster/r.series/Makefile @@ -13,7 +13,10 @@ EXTRA_CFLAGS = $(OPENMP_CFLAGS) EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -43,6 +46,9 @@ EXTRA_INC = $(OPENMP_INCPATH) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.series/graphics_for_description.ipynb b/raster/r.series/graphics_for_description.ipynb index 541ecfe8268..35906bc9a94 100644 --- a/raster/r.series/graphics_for_description.ipynb +++ b/raster/r.series/graphics_for_description.ipynb @@ -7,6 +7,7 @@ "# Graphics for Description of r.series\n", "\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Requires _d.explanation.plot_, _pngquant_, _optipng_ and ImageMagic _mogrify_." ======= @@ -14,6 +15,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Requires _d.explanation.plot_ (GRASS GIS addon), _pngquant_, _optipng_ and ImageMagic _mogrify_." ======= "Requires _d.explanation.plot_, _pngquant_, _optipng_ and ImageMagic _mogrify_." @@ -22,6 +25,9 @@ "Requires _d.explanation.plot_, _pngquant_, _optipng_ and ImageMagic _mogrify_." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -75,6 +81,7 @@ " label_a=\"input 1\",\n", " label_b=\"input 2\",\n", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD " label_c=\"input 1\",\n", ======= @@ -82,6 +89,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main " label_c=\"input 3\",\n", ======= " label_c=\"input 1\",\n", @@ -90,6 +99,9 @@ " label_c=\"input 1\",\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.series/main.c b/raster/r.series/main.c index 2629f4f3490..302a926144a 100644 --- a/raster/r.series/main.c +++ b/raster/r.series/main.c @@ -3,6 +3,7 @@ * MODULE: r.series <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -14,6 +15,11 @@ <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * AUTHOR(S): Glynn Clements * (original contributor) @@ -27,8 +33,11 @@ ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * AUTHOR(S): Glynn Clements (original contributor) * Hamish Bowman , @@ -50,6 +59,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -61,17 +73,23 @@ *****************************************************************************/ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -83,16 +101,22 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -106,6 +130,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -113,12 +138,17 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132,10 +162,13 @@ struct menu { <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main struct menu { stat_func *method; /* routine to compute new value */ @@ -149,6 +182,9 @@ struct menu ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -178,6 +214,7 @@ struct menu {c_skew, w_skew, DCELL_TYPE, "skewness", "skewness"}, {c_kurt, w_kurt, DCELL_TYPE, "kurtosis", "kurtosis"}, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD {NULL, NULL, 0, NULL, NULL}}; ======= @@ -191,6 +228,11 @@ struct menu <<<<<<< HEAD {NULL, NULL, 0, NULL, NULL}}; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + {NULL, NULL, 0, NULL, NULL}}; +======= >>>>>>> osgeo-main {NULL, NULL, 0, NULL, NULL} }; @@ -202,6 +244,9 @@ struct menu {NULL, NULL, 0, NULL, NULL}}; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -259,6 +304,7 @@ int main(int argc, char *argv[]) struct GModule *module; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -270,6 +316,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main struct { struct Option *input, *file, *output, *method, *weights, *quantile, @@ -280,8 +331,11 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main struct { @@ -301,6 +355,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -313,17 +370,23 @@ int main(int argc, char *argv[]) int bufrows; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main size_t in_buf_size, out_buf_size; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -338,6 +401,7 @@ int main(int argc, char *argv[]) struct History history; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -349,6 +413,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main DCELL **values = NULL, **values_tmp = NULL; @@ -358,8 +427,11 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main DCELL *values = NULL, *values_tmp = NULL; @@ -375,6 +447,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -455,17 +530,23 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -484,9 +565,12 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { G_warning(_("Parallel processing disabled due to active MASK.")); @@ -527,6 +611,9 @@ int main(int argc, char *argv[]) nprocs = 1; #endif <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -539,10 +626,13 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -570,6 +660,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -639,6 +732,7 @@ int main(int argc, char *argv[]) max_inputs += 100; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -650,6 +744,11 @@ int main(int argc, char *argv[]) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (t = 0; t < nprocs; t++) inputs[t] = @@ -695,9 +794,12 @@ int main(int argc, char *argv[]) ; num_inputs = i; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> osgeo-main ======= inputs = G_realloc(inputs, max_inputs * sizeof(struct input)); ======= @@ -853,6 +955,9 @@ int main(int argc, char *argv[]) p->buf = Rast_allocate_d_buf(); } ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (num_inputs < 1) G_fatal_error(_("Raster map not found")); @@ -907,6 +1012,7 @@ int main(int argc, char *argv[]) p->buf = Rast_allocate_d_buf(); } <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -945,6 +1051,9 @@ int main(int argc, char *argv[]) num_inputs++; ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } @@ -1313,6 +1422,98 @@ int main(int argc, char *argv[]) nrows = Rast_window_rows(); ncols = Rast_window_cols(); + bufrows = atoi(parm.memory->answer) * (((1 << 20) / sizeof(DCELL)) / ncols); + /* set the output buffer rows to be at most covering the entire map */ + if (bufrows > nrows) { + bufrows = nrows; + } + /* but at least the number of threads */ + if (bufrows < nprocs) { + bufrows = nprocs; + } + + /* set the locks for lazily opening raster files */ +#if defined(_OPENMP) + if (flag.lazy->answer && threaded) { + omp_init_lock(&fd_lock); + } +#endif + + /* process the output maps */ + for (i = 0; parm.output->answers[i]; i++) + ; + num_outputs = i; + + for (i = 0; parm.method->answers[i]; i++) + ; + if (num_outputs != i) + G_fatal_error( + _("output= and method= must have the same number of values")); + + outputs = G_calloc(num_outputs, sizeof(struct output)); + + for (i = 0; i < num_outputs; i++) { + struct output *out = &outputs[i]; + const char *output_name = parm.output->answers[i]; + const char *method_name = parm.method->answers[i]; + int method = find_method(method_name); + + out->name = output_name; + + if (have_weights) { + if (menu[method].method_w) { + out->method_fn = NULL; + out->method_fn_w = menu[method].method_w; + /* special case mode: the result of a weighed mode + * can be stored as type of input + * all other weighed versions: result as DCELL_TYPE */ + if (menu[method].outtype == CELL_TYPE) + menu[method].outtype = DCELL_TYPE; + } + else { + G_warning(_("Method %s not compatible with weights, using " + "unweighed version instead"), + method_name); + + out->method_fn = menu[method].method; + out->method_fn_w = NULL; + } + } + else { + out->method_fn = menu[method].method; + out->method_fn_w = NULL; + } + + out->quantile = (parm.quantile->answer && parm.quantile->answers[i]) + ? atof(parm.quantile->answers[i]) + : 0; + out->buf = G_calloc((size_t)bufrows * ncols, sizeof(DCELL)); + if (menu[method].outtype == -1) + out->fd = Rast_open_new(output_name, intype); + else + out->fd = Rast_open_new(output_name, menu[method].outtype); + } + + /* initialise variables */ + values = G_malloc(nprocs * sizeof *values); + values_tmp = G_malloc(nprocs * sizeof *values_tmp); + for (t = 0; t < nprocs; t++) { + values[t] = G_malloc(sizeof(DCELL) * num_inputs); + values_tmp[t] = G_malloc(sizeof(DCELL) * num_inputs); + } + values_w = NULL; + values_w_tmp = NULL; + if (have_weights) { +<<<<<<< HEAD +<<<<<<< HEAD + values_w = (DCELL(*)[2]) G_malloc(num_inputs * 2 * sizeof(DCELL)); + values_w_tmp = (DCELL(*)[2]) G_malloc(num_inputs * 2 * sizeof(DCELL)); +>>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) + } + + nrows = Rast_window_rows(); + ncols = Rast_window_cols(); + /* set the locks for lazily opening raster files */ #if defined(_OPENMP) if (flag.lazy->answer && threaded) { @@ -1408,6 +1609,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1428,6 +1632,7 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -1435,6 +1640,9 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main int computed = 0; int written = 0; @@ -1567,6 +1775,7 @@ int main(int argc, char *argv[]) if (flag.lazy->answer && nprocs > 1) { omp_destroy_lock(&fd_lock); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } ======= @@ -1584,6 +1793,20 @@ int main(int argc, char *argv[]) } } ======= +======= + for (row = 0; row < nrows; row++) { + G_percent(row, nrows, 2); +======= + values_w = G_malloc(nprocs * sizeof *values_w); + values_w_tmp = G_malloc(nprocs * sizeof *values_w_tmp); + for (t = 0; t < nprocs; t++) { + values_w[t] = (DCELL(*)[2])G_malloc(sizeof(DCELL) * num_inputs * 2); + values_w_tmp[t] = + (DCELL(*)[2])G_malloc(sizeof(DCELL) * num_inputs * 2); + } + } +>>>>>>> osgeo-main +======= ======= for (row = 0; row < nrows; row++) { G_percent(row, nrows, 2); @@ -1743,6 +1966,9 @@ int main(int argc, char *argv[]) } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1763,9 +1989,13 @@ int main(int argc, char *argv[]) if (!flag.lazy->answer) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD >>>>>>> osgeo-main for (t = 0; t < nprocs; t++) for (i = 0; i < num_inputs; i++) @@ -1774,12 +2004,15 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for (t = 0; t < nprocs; t++) for (i = 0; i < num_inputs; i++) Rast_close(inputs[t][i].fd); ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i = 0; i < num_inputs; i++) Rast_close(inputs[i].fd); @@ -1795,6 +2028,9 @@ int main(int argc, char *argv[]) Rast_close(inputs[t][i].fd); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.series/testsuite/test_r_series.py b/raster/r.series/testsuite/test_r_series.py index e47e707dbe2..0bc3d070b1a 100644 --- a/raster/r.series/testsuite/test_r_series.py +++ b/raster/r.series/testsuite/test_r_series.py @@ -6,6 +6,7 @@ class TestRSeries(TestCase): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -13,12 +14,17 @@ class TestRSeries(TestCase): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.sim/r.sim.sediment/r.sim.sediment.html b/raster/r.sim/r.sim.sediment/r.sim.sediment.html index d88eac32047..fba1c0ac20c 100644 --- a/raster/r.sim/r.sim.sediment/r.sim.sediment.html +++ b/raster/r.sim/r.sim.sediment/r.sim.sediment.html @@ -50,7 +50,7 @@

          NOTES

          REFERENCES

          - + Mitasova, H., Thaxton, C., Hofierka, J., McLaughlin, R., Moore, A., Mitas L., 2004, Path sampling method for modeling overland water flow, sediment transport and short term terrain evolution in Open Source GIS. @@ -58,9 +58,13 @@

          REFERENCES

          Proceedings of the XVth International Conference on Computational Methods in Water Resources (CMWR XV), June 13-17 2004, Chapel Hill, NC, USA, Elsevier, pp. 1479-1490.

          +<<<<<<< HEAD + +======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Mitasova H, Mitas, L., 2000, Modeling spatial processes in multiscale framework: ======= <<<<<<< HEAD @@ -76,6 +80,22 @@

          REFERENCES

          Mitasova H, Mitas, L., 2000, Modeling spatial processes in multiscale framework: ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 28bb012175 (r.horizon manual - fix typo (#2794)) +======= +<<<<<<< HEAD +>>>>>>> 33ce576706 (r.horizon manual - fix typo (#2794)) +Mitasova H, Mitas, L., 2000, Modeling spatial processes in multiscale framework: +======= +>>>>>>> osgeo-main Mitasova H, Mitas, L., 2000, Modeling spatial processes in multiscale framework: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -91,6 +111,9 @@

          REFERENCES

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -100,7 +123,7 @@

          REFERENCES

          Mitas, L., and Mitasova, H., 1998, Distributed soil erosion simulation for effective erosion prevention. Water Resources Research, 34(3), 505-516.

          - + Mitasova, H., Mitas, L., 2001, Multiscale soil erosion simulations for land use management, In: Landscape erosion and landscape evolution modeling, Harmon R. and Doe W. eds., Kluwer Academic/Plenum Publishers, pp. 321-347. diff --git a/raster/r.sim/simlib/hydro.c b/raster/r.sim/simlib/hydro.c index 6c78fe77c43..aaef244b647 100644 --- a/raster/r.sim/simlib/hydro.c +++ b/raster/r.sim/simlib/hydro.c @@ -121,6 +121,7 @@ void main_loop(void) int i, ii, l, k; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* int icoub, nmult */; ======= @@ -136,6 +137,12 @@ void main_loop(void) <<<<<<< HEAD /* int icoub, nmult */; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + /* int icoub, nmult */; +======= >>>>>>> osgeo-main int icoub /*, nmult */; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -152,6 +159,9 @@ void main_loop(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -176,6 +186,7 @@ void main_loop(void) nblock = 1; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* icoub = 0; */ ======= @@ -189,6 +200,11 @@ void main_loop(void) <<<<<<< HEAD /* icoub = 0; */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + /* icoub = 0; */ +======= >>>>>>> osgeo-main icoub = 0; <<<<<<< HEAD @@ -205,6 +221,9 @@ void main_loop(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -224,6 +243,7 @@ void main_loop(void) for (iblock = 1; iblock <= nblock; iblock++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* ++icoub; */ ======= @@ -239,6 +259,12 @@ void main_loop(void) <<<<<<< HEAD /* ++icoub; */ ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + /* ++icoub; */ +======= >>>>>>> osgeo-main ++icoub; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -255,6 +281,9 @@ void main_loop(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -406,6 +435,7 @@ void main_loop(void) if (zz[k][l] != UNDEF) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (infil != NULL) { /* infiltration part */ ======= @@ -413,6 +443,8 @@ void main_loop(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (inf[k][l] != UNDEF) { /* infiltration part */ ======= if (infil != NULL) { /* infiltration part */ @@ -421,6 +453,9 @@ void main_loop(void) if (infil != NULL) { /* infiltration part */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.sim/simlib/input.c b/raster/r.sim/simlib/input.c index 78628450edf..aa7d8fba48f 100644 --- a/raster/r.sim/simlib/input.c +++ b/raster/r.sim/simlib/input.c @@ -303,6 +303,7 @@ int input_data(void) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -312,6 +313,10 @@ int input_data(void) <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main int if_rain = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -345,11 +350,14 @@ int input_data(void) si = read_double_raster_map(rows, cols, rain, unitconv); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main } else if (rain_val >= 0.0) { /* If no value set its set to -999.99 */ si = create_double_matrix(rows, cols, rain_val * unitconv); @@ -360,6 +368,9 @@ int input_data(void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -374,6 +385,7 @@ int input_data(void) if_rain = 0; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -384,6 +396,11 @@ int input_data(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 } @@ -421,6 +438,7 @@ int input_data(void) trap = create_float_matrix(rows, cols, (double)UNDEF); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -431,6 +449,11 @@ int input_data(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 } @@ -664,6 +687,7 @@ int grad_check(void) } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /*! compute transport capacity limted erosion/deposition et @@ -672,6 +696,8 @@ int grad_check(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /*! compute transport capacity limited erosion/deposition et ======= /*! compute transport capacity limted erosion/deposition et @@ -680,6 +706,9 @@ int grad_check(void) /*! compute transport capacity limted erosion/deposition et >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.sim/simlib/observation_points.c b/raster/r.sim/simlib/observation_points.c index 02d6c2ee6f1..34e1f8e8d3e 100644 --- a/raster/r.sim/simlib/observation_points.c +++ b/raster/r.sim/simlib/observation_points.c @@ -68,6 +68,7 @@ void create_observation_points(void) y = pts->y[0]; cat = cts->cat[0]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* Check region bounds befor inserting point */ @@ -76,6 +77,8 @@ void create_observation_points(void) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Check region bounds before inserting point */ ======= /* Check region bounds befor inserting point */ @@ -84,6 +87,9 @@ void create_observation_points(void) /* Check region bounds befor inserting point */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.sim/simlib/output.c b/raster/r.sim/simlib/output.c index 30597d51776..f1481abdfbb 100644 --- a/raster/r.sim/simlib/output.c +++ b/raster/r.sim/simlib/output.c @@ -607,6 +607,7 @@ int output_data(int tt, double ft UNUSED) return 1; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -614,11 +615,16 @@ int output_data(int tt, double ft UNUSED) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int output_et(void) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.slope.aspect/Makefile b/raster/r.slope.aspect/Makefile index 46cee035caf..c00813a9dd7 100644 --- a/raster/r.slope.aspect/Makefile +++ b/raster/r.slope.aspect/Makefile @@ -13,7 +13,10 @@ EXTRA_CFLAGS = $(OPENMP_CFLAGS) EXTRA_INC = $(OPENMP_INCPATH) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -43,6 +46,9 @@ EXTRA_INC = $(OPENMP_INCPATH) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py b/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py index 8a4be8629de..279b92aa4bd 100644 --- a/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py +++ b/raster/r.slope.aspect/benchmark/benchmark_r_slope_aspect_memory.py @@ -30,6 +30,7 @@ def main(): def benchmark(memory, label, results, reference): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -37,12 +38,17 @@ def benchmark(memory, label, results, reference): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.slope.aspect/main.c b/raster/r.slope.aspect/main.c index 2cba7fb6721..589ff1a9017 100644 --- a/raster/r.slope.aspect/main.c +++ b/raster/r.slope.aspect/main.c @@ -307,11 +307,14 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { G_warning(_("Parallel processing disabled due to active MASK.")); nprocs = 1; @@ -320,6 +323,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.slope.aspect/r.slope.aspect.html b/raster/r.slope.aspect/r.slope.aspect.html index b0f49d54314..9038affdf16 100644 --- a/raster/r.slope.aspect/r.slope.aspect.html +++ b/raster/r.slope.aspect/r.slope.aspect.html @@ -181,6 +181,7 @@

          PERFORMANCE

          used with the nprocs parameter (default 1). The memory parameter <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (default 300) can also be provided to determine the size of the buffer for ======= <<<<<<< HEAD @@ -196,6 +197,12 @@

          PERFORMANCE

          (default 300) can also be provided to determine the size of the buffer for ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +(default 300) can also be provided to determine the size of the buffer for +======= +>>>>>>> osgeo-main (default 300) can also be provided to determine the size of the buffer for >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -211,6 +218,9 @@

          PERFORMANCE

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.solute.transport/main.c b/raster/r.solute.transport/main.c index 975a3e12b73..875a9746297 100644 --- a/raster/r.solute.transport/main.c +++ b/raster/r.solute.transport/main.c @@ -41,6 +41,7 @@ paramType param; /*Parameters */ /*- prototypes --------------------------------------------------------------*/ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void set_params(void); /*Fill the paramType structure */ ======= <<<<<<< HEAD @@ -56,6 +57,12 @@ void set_params(void); /*Fill the paramType structure */ void set_params(void); /*Fill the paramType structure */ ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +void set_params(void); /*Fill the paramType structure */ +======= +>>>>>>> osgeo-main void set_params(); /*Fill the paramType structure */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -71,6 +78,9 @@ void set_params(void); /*Fill the paramType structure */ >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -275,6 +285,7 @@ int main(int argc, char *argv[]) /* Make sure that the current projection is not lat/long */ if ((G_projection() == PROJECTION_LL)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Lat/Long location is not supported by %s. Please " ======= @@ -282,6 +293,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Lat/Long project is not supported by %s. Please " ======= G_fatal_error(_("Lat/Long location is not supported by %s. Please " @@ -290,6 +303,9 @@ 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)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.solute.transport/r.solute.transport.html b/raster/r.solute.transport/r.solute.transport.html index 232c157d4d9..c145c379af1 100644 --- a/raster/r.solute.transport/r.solute.transport.html +++ b/raster/r.solute.transport/r.solute.transport.html @@ -158,11 +158,14 @@

          AUTHOR

          at Technical University Berlin in Germany. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -178,6 +181,9 @@

          AUTHOR

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.spread/collect_ori.c b/raster/r.spread/collect_ori.c index 8d462ea94b6..4c259c193f9 100644 --- a/raster/r.spread/collect_ori.c +++ b/raster/r.spread/collect_ori.c @@ -3,6 +3,7 @@ * collect_ori.c in ~/r.spread2 * <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * functin to collect the spread origins from the source map and ======= @@ -10,6 +11,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * function to collect the spread origins from the source map and ======= * functin to collect the spread origins from the source map and @@ -18,6 +21,9 @@ * functin to collect the spread origins from the source map and >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.spread/deleteHa.c b/raster/r.spread/deleteHa.c index 17d50ca7fa4..68f60bd61ea 100644 --- a/raster/r.spread/deleteHa.c +++ b/raster/r.spread/deleteHa.c @@ -22,6 +22,7 @@ void deleteHa(float old_min_cost, int row, int col, struct costHa *heap, if (*heap_len < 1) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD printf("programming ERROR: can't delete a cell from an ampty list"); ======= @@ -29,6 +30,8 @@ void deleteHa(float old_min_cost, int row, int col, struct costHa *heap, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main printf("programming ERROR: can't delete a cell from an empty list"); ======= printf("programming ERROR: can't delete a cell from an ampty list"); @@ -37,6 +40,9 @@ void deleteHa(float old_min_cost, int row, int col, struct costHa *heap, printf("programming ERROR: can't delete a cell from an ampty list"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.spread/pick_dist.c b/raster/r.spread/pick_dist.c index 36b1a6d0108..ceb99090839 100644 --- a/raster/r.spread/pick_dist.c +++ b/raster/r.spread/pick_dist.c @@ -9,6 +9,7 @@ * generator: * applying it once gets an UNIFORM distribution in the range of 0-max_num; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * doing it twice gets a SIMPLE INVERSE distribuion in that range; ======= @@ -16,6 +17,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * doing it twice gets a SIMPLE INVERSE distribution in that range; ======= * doing it twice gets a SIMPLE INVERSE distribuion in that range; @@ -24,6 +27,9 @@ * doing it twice gets a SIMPLE INVERSE distribuion in that range; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.spread/r.spread.html b/raster/r.spread/r.spread.html index d1a76f8d496..fcd8223e95c 100644 --- a/raster/r.spread/r.spread.html +++ b/raster/r.spread/r.spread.html @@ -134,12 +134,15 @@

          SEE ALSO

          Sample data download: firedemo.sh <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (run this script within the "Fire simulation data set" location). ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main (run this script within the "Fire simulation data set" project). ======= (run this script within the "Fire simulation data set" location). @@ -148,6 +151,9 @@

          SEE ALSO

          (run this script within the "Fire simulation data set" location). >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.spread/spread.c b/raster/r.spread/spread.c index 4f1122ba991..cf9aad4aa9b 100644 --- a/raster/r.spread/spread.c +++ b/raster/r.spread/spread.c @@ -10,6 +10,7 @@ * spread cell and stored in a linked list of type * cell_ptrHa - select() ; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * A) caculates the cumulative cost (time) of the ======= @@ -17,6 +18,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * A) calculates the cumulative cost (time) of the ======= * A) caculates the cumulative cost (time) of the @@ -25,6 +28,9 @@ * A) caculates the cumulative cost (time) of the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.spreadpath/r.spreadpath.html b/raster/r.spreadpath/r.spreadpath.html index fd03e85c013..885fbe19697 100644 --- a/raster/r.spreadpath/r.spreadpath.html +++ b/raster/r.spreadpath/r.spreadpath.html @@ -61,12 +61,15 @@

          SEE ALSO

          Sample data download: firedemo.sh <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (run this script within the "Fire simulation data set" location). ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main (run this script within the "Fire simulation data set" project). ======= (run this script within the "Fire simulation data set" location). @@ -75,6 +78,9 @@

          SEE ALSO

          (run this script within the "Fire simulation data set" location). >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/raster/r.stats.quantile/r.stats.quantile.html b/raster/r.stats.quantile/r.stats.quantile.html index 91d10b8f3f5..604cc4009af 100644 --- a/raster/r.stats.quantile/r.stats.quantile.html +++ b/raster/r.stats.quantile/r.stats.quantile.html @@ -46,6 +46,7 @@

          REFERENCES

          +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD In the example above, raster cells with a rounded value of 1 are part of @@ -489,6 +568,13 @@

          Handling of floating-point maps

          the MASK, while raster cells with a rounded value of 0 are converted to NULL ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +In the example above, raster cells with a rounded value of 1 are part of +the MASK, while raster cells with a rounded value of 0 are converted to NULL +======= +>>>>>>> osgeo-main In the example above, raster cells with a rounded value of 1 are part of the MASK, while raster cells with a rounded value of 0 are converted to NULL >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -509,6 +595,9 @@

          Handling of floating-point maps

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/scripts/r.semantic.label/r.semantic.label.py b/scripts/r.semantic.label/r.semantic.label.py index fc14872b65a..e93ba4387ff 100644 --- a/scripts/r.semantic.label/r.semantic.label.py +++ b/scripts/r.semantic.label/r.semantic.label.py @@ -58,6 +58,7 @@ def print_map_semantic_label(name, label_reader): try: with RasterRow(name) as rast: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD semantic_label = rast.info.semantic_label if semantic_label: @@ -67,6 +68,8 @@ def print_map_semantic_label(name, label_reader): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD:scripts/r.semantic.label/r.semantic.label.py semantic_label = rast.info.semantic_label if semantic_label: @@ -88,6 +91,9 @@ def print_map_semantic_label(name, label_reader): label_reader.print_info(semantic_label) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -122,6 +128,7 @@ def manage_map_semantic_label(name, semantic_label): ) try: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rast.info.semantic_label = semantic_label ======= @@ -135,6 +142,11 @@ def manage_map_semantic_label(name, semantic_label): <<<<<<< HEAD:scripts/r.semantic.label/r.semantic.label.py rast.info.semantic_label = semantic_label ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD:scripts/r.semantic.label/r.semantic.label.py + rast.info.semantic_label = semantic_label +======= >>>>>>> osgeo-main rast.info.bandref = band_ref >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711)):scripts/i.band/i.band.py @@ -145,6 +157,9 @@ def manage_map_semantic_label(name, semantic_label): rast.info.semantic_label = semantic_label >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/scripts/r.semantic.label/testsuite/test_r_semantic_label.py b/scripts/r.semantic.label/testsuite/test_r_semantic_label.py index 7dba0e45b15..5328201ab1d 100644 --- a/scripts/r.semantic.label/testsuite/test_r_semantic_label.py +++ b/scripts/r.semantic.label/testsuite/test_r_semantic_label.py @@ -2,12 +2,15 @@ from grass.gunittest.main import test <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD from grass.gunittest.gmodules import SimpleModule, call_module ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main from grass.gunittest.gmodules import SimpleModule ======= from grass.gunittest.gmodules import SimpleModule, call_module @@ -16,6 +19,9 @@ from grass.gunittest.gmodules import SimpleModule, call_module >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -64,6 +70,7 @@ def test_semantic_label_assign(self): # check also using pygrass self.assertEqual(self.read_semantic_label(), self.semantic_label) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -71,6 +78,8 @@ def test_semantic_label_assign(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def test_semantic_label_print(self): semantic_label = "S2_1" semantic_label_desc = "S2 Visible (Coastal/Aerosol)" @@ -91,6 +100,9 @@ def test_semantic_label_print(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/scripts/v.db.reconnect.all/v.db.reconnect.all.html b/scripts/v.db.reconnect.all/v.db.reconnect.all.html index 323df823023..2de498272e9 100644 --- a/scripts/v.db.reconnect.all/v.db.reconnect.all.html +++ b/scripts/v.db.reconnect.all/v.db.reconnect.all.html @@ -1,5 +1,6 @@

          DESCRIPTION

          +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -15,6 +16,12 @@

          DESCRIPTION

          <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -31,6 +38,9 @@

          DESCRIPTION

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -54,6 +64,7 @@

          DESCRIPTION

          NOTES

          +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -69,6 +80,12 @@

          NOTES

          <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -85,6 +102,9 @@

          NOTES

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/scripts/v.dissolve/v.dissolve.html b/scripts/v.dissolve/v.dissolve.html index 31e3b6bddb0..029f9024d56 100644 --- a/scripts/v.dissolve/v.dissolve.html +++ b/scripts/v.dissolve/v.dissolve.html @@ -4,6 +4,7 @@

          DESCRIPTION

          features in a vector map that share the same category value. The resulting merged feature(s) retain this category value. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11,6 +12,8 @@

          DESCRIPTION

          ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main
          @@ -166,6 +169,9 @@

          Defining the aggregation method

          ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -195,6 +201,10 @@

          NOTES

          adds a call to v.reclass before. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -235,6 +245,7 @@

          Dissolving adjacent SHAPE files to remove tile boundaries

          v.dissolve input=clc2000_clean output=clc2000_final col=CODE_00 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -242,6 +253,8 @@

          Dissolving adjacent SHAPE files to remove tile boundaries

          ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

          Attribute aggregation

          While dissolving, we can aggregate attribute values of the original features. @@ -399,6 +412,9 @@

          Aggregating using SQL syntax

          ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -426,6 +442,7 @@

          AUTHORS

          help page: Trevor Wiens <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -437,3 +454,8 @@

          AUTHORS

          ======= >>>>>>> 8422103f4c (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/scripts/v.import/v.import.html b/scripts/v.import/v.import.html index c2534bb0202..7f46cf16c9a 100644 --- a/scripts/v.import/v.import.html +++ b/scripts/v.import/v.import.html @@ -79,11 +79,14 @@

          AUTHORS

          Improvements: Martin Landa, Anna Petrasova <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -99,6 +102,9 @@

          AUTHORS

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/scripts/v.what.vect/v.what.vect.html b/scripts/v.what.vect/v.what.vect.html index f555f6fccd1..03c311d561b 100644 --- a/scripts/v.what.vect/v.what.vect.html +++ b/scripts/v.what.vect/v.what.vect.html @@ -26,6 +26,7 @@

          NOTES

          is in meters for latitude-longitude locations. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -37,6 +38,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

          In case that one or both input vector maps are 3D, features need to touch also in the 3rd dimension (z coordinate) in order to transfer attributes. diff --git a/singularity/debian/README_debian.md b/singularity/debian/README_debian.md index 79bc15d6c94..6c3cfb05737 100644 --- a/singularity/debian/README_debian.md +++ b/singularity/debian/README_debian.md @@ -18,12 +18,15 @@ __Build the singularity with__: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD sudo singularity build grass_development.simg singularity/debian/singularity_debian ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sudo singularity build grass_gis.simg singularity/debian/singularity_debian ======= sudo singularity build grass_development.simg singularity/debian/singularity_debian @@ -32,6 +35,9 @@ sudo singularity build grass_development.simg singularity/debian/singularity_deb sudo singularity build grass_development.simg singularity/debian/singularity_debian >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -44,12 +50,15 @@ change to the releasebranch or tag you want to build: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD git checkout remotes/origin/releasebranch_8_2 ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main git checkout {tag or branch} ======= git checkout remotes/origin/releasebranch_8_2 @@ -58,6 +67,9 @@ git checkout remotes/origin/releasebranch_8_2 git checkout remotes/origin/releasebranch_8_2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -68,12 +80,15 @@ and build and enter with: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD sudo singularity build grass_8_2.simg singularity/debian/singularity_debian ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sudo singularity build grass_gis.simg singularity/debian/singularity_debian ======= sudo singularity build grass_8_2.simg singularity/debian/singularity_debian @@ -82,6 +97,9 @@ sudo singularity build grass_8_2.simg singularity/debian/singularity_debian sudo singularity build grass_8_2.simg singularity/debian/singularity_debian >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -92,12 +110,15 @@ The image can be used as: ```bash <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD singularity exec containers/grass_8.2.simg grass --version ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main singularity exec containers/grass_gis.simg grass --version ======= singularity exec containers/grass_8.2.simg grass --version @@ -106,6 +127,9 @@ singularity exec containers/grass_8.2.simg grass --version singularity exec containers/grass_8.2.simg grass --version >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.copy/t.copy.html b/temporal/t.copy/t.copy.html index 118b83612ad..9e8ad32f4a1 100644 --- a/temporal/t.copy/t.copy.html +++ b/temporal/t.copy/t.copy.html @@ -45,11 +45,14 @@

          AUTHOR

          --> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -66,6 +69,9 @@

          AUTHOR

          >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.accumulate/t.rast.accumulate.html b/temporal/t.rast.accumulate/t.rast.accumulate.html index 260f74236ff..a220d982e39 100644 --- a/temporal/t.rast.accumulate/t.rast.accumulate.html +++ b/temporal/t.rast.accumulate/t.rast.accumulate.html @@ -71,6 +71,7 @@

          EXAMPLE

          # Start GRASS and create a new location with PERMANENT mapset <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -82,6 +83,11 @@

          EXAMPLE

          ======= >>>>>>> 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 grass -c EPSG:4326 /tmp/grassdata/LL/PERMANENT # Import the temperature data @@ -294,6 +300,7 @@

          REFERENCES

          • Jones, G.V., Duff, A.A., Hall, A., Myers, J.W., 2010. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Spatial Analysis of Climate in Winegrape Growing Regions in the ======= @@ -309,6 +316,12 @@

            REFERENCES

            <<<<<<< HEAD Spatial Analysis of Climate in Winegrape Growing Regions in the ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + Spatial Analysis of Climate in Winegrape Growing Regions in the +======= >>>>>>> osgeo-main Spatial Analysis of Climate in Winegrape Growing Regions in the >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -325,6 +338,9 @@

            REFERENCES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.algebra/t.rast.algebra.html b/temporal/t.rast.algebra/t.rast.algebra.html index d9abcaf6598..8703c379cf5 100644 --- a/temporal/t.rast.algebra/t.rast.algebra.html +++ b/temporal/t.rast.algebra/t.rast.algebra.html @@ -5,6 +5,7 @@

            DESCRIPTION

            <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD The module expects an expression as input parameter in the ======= <<<<<<< HEAD @@ -21,6 +22,12 @@

            DESCRIPTION

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +The module expects an expression as input parameter in the +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) The module expects an expression as input parameter in the >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34,6 +41,9 @@

            DESCRIPTION

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -485,17 +495,23 @@

            Temporal neighbourhood modifier

            where t is the temporal offset, r is the row offset and c is the column <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main offset. A single neighborhood modifier is interpreted as temporal offset [t], while two neighborhood modifiers are interpreted as row and column offsets [r,c]. ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -615,6 +631,7 @@

            Computation with time intervals with temporal topology relation

            C = if({equal}, B {#,contain} A > 1, (B {+,contain,l} A {-,equal,l} B) {equal,=/} (B {#,contain} A), A) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -622,6 +639,8 @@

            Computation with time intervals with temporal topology relation

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

            Compute DOY for spatio-temporal conditions

            Compute the DOY for all maps from STRDS A where conditions are met at three consecutive time intervals (e.g. temperature > 0): @@ -635,6 +654,9 @@

            Compute DOY for spatio-temporal conditions

            ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.list/t.rast.list.py b/temporal/t.rast.list/t.rast.list.py index 9c82f4ac45b..1d2c28611c4 100755 --- a/temporal/t.rast.list/t.rast.list.py +++ b/temporal/t.rast.list/t.rast.list.py @@ -156,6 +156,7 @@ def main(): excluded_option_value=separator, reason=_( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "A standard CSV separator (delimiter) is only one character long" ======= @@ -163,6 +164,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "A standard CSV separator (delimiter) is only one character " "long" ======= @@ -172,6 +175,9 @@ def main(): "A standard CSV separator (delimiter) is only one character long" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -182,6 +188,7 @@ def main(): # We use comma as the default for separator, so we override the pipe. # This does not allow for users to generate CSV with pipe, but unlike <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # the C API, the Python interface specs does not allow reseting the default ======= @@ -189,6 +196,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # the C API, the Python interface specs does not allow resetting the default ======= # the C API, the Python interface specs does not allow reseting the default @@ -197,6 +206,9 @@ def main(): # the C API, the Python interface specs does not allow reseting the default >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -259,6 +271,7 @@ def main(): excluded_option_value=columns, reason=_( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Column '{name}' is not available with the method '{method}'" ======= @@ -266,6 +279,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Column '{name}' is not available with the method " "'{method}'" ======= @@ -275,6 +290,9 @@ def main(): "Column '{name}' is not available with the method '{method}'" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -293,6 +311,7 @@ def main(): excluded_option_value=columns, reason=_( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Column '{name}' is not available with the method '{method}'" ======= @@ -300,6 +319,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Column '{name}' is not available with the method " "'{method}'" ======= @@ -309,6 +330,9 @@ def main(): "Column '{name}' is not available with the method '{method}'" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.list/testsuite/test_t_rast_list.sh b/temporal/t.rast.list/testsuite/test_t_rast_list.sh index 35cb86f793c..6e6fa30c492 100755 --- a/temporal/t.rast.list/testsuite/test_t_rast_list.sh +++ b/temporal/t.rast.list/testsuite/test_t_rast_list.sh @@ -17,6 +17,7 @@ r.mapcalc expr="prec_4 = rand(0, 510)" -s r.mapcalc expr="prec_5 = rand(0, 300)" -s r.mapcalc expr="prec_6 = rand(0, 650)" -s +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD n1=`g.tempfile pid=1 -d` @@ -34,6 +35,12 @@ n1=`g.tempfile pid=1 -d` n1=`g.tempfile pid=1 -d` ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +n1=`g.tempfile pid=1 -d` +======= +>>>>>>> osgeo-main n1=`g.tempfile pid=1 -d` >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -49,6 +56,9 @@ n1=`g.tempfile pid=1 -d` >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.series/t.rast.series.html b/temporal/t.rast.series/t.rast.series.html index 4841b7a6f76..f7f97d27a27 100644 --- a/temporal/t.rast.series/t.rast.series.html +++ b/temporal/t.rast.series/t.rast.series.html @@ -32,12 +32,15 @@

            Performance

            To take advantage of the parallelization, GRASS GIS needs to be compiled with OpenMP enabled. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

            NOTES

            @@ -83,6 +86,9 @@

            Performance

            needs to be compiled with OpenMP enabled. <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.series/t.rast.series.py b/temporal/t.rast.series/t.rast.series.py index 9bb3bfb5004..d38037a0d24 100755 --- a/temporal/t.rast.series/t.rast.series.py +++ b/temporal/t.rast.series/t.rast.series.py @@ -149,6 +149,7 @@ def main(): grass.warning( _( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Processing over {} maps: activating -z flag of r.series which slows down processing.".format( max_files_open @@ -158,6 +159,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "Processing over {} maps: activating -z flag of r.series which " "slows down processing.".format(max_files_open) ======= @@ -171,6 +174,9 @@ def main(): ) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.univar/t.rast.univar.html b/temporal/t.rast.univar/t.rast.univar.html index 53cab754e4b..7eb272441b0 100644 --- a/temporal/t.rast.univar/t.rast.univar.html +++ b/temporal/t.rast.univar/t.rast.univar.html @@ -16,6 +16,7 @@

            DESCRIPTION

            cells, total number of cells. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27,6 +28,11 @@

            DESCRIPTION

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

            Using the e flag it can calculate also extended statistics: first quartile, median value, third quartile and percentile 90. @@ -35,6 +41,7 @@

            DESCRIPTION

            each zone (category) in that input raster map. The zones option <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD does not support Spatio-Temporal-Raster-Datasets (STRDS) but only a single, static raster map. ======= @@ -42,6 +49,8 @@

            DESCRIPTION

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main does not support space time raster datasets (STRDS) but only a single, static raster map.

            @@ -67,6 +76,9 @@

            DESCRIPTION

            static raster map. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -99,12 +111,15 @@

            AUTHOR

            Sören Gebbert, Thünen Institute of Climate-Smart Agriculture <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Stefan Blumentrath, (Support for zones) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Stefan Blumentrath, (Support for zones, parallel processing, and spatial relations) ======= Stefan Blumentrath, (Support for zones) @@ -113,6 +128,9 @@

            AUTHOR

            Stefan Blumentrath, (Support for zones) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast.univar/t.rast.univar.py b/temporal/t.rast.univar/t.rast.univar.py index 23b54eb351c..ac7c63b435a 100755 --- a/temporal/t.rast.univar/t.rast.univar.py +++ b/temporal/t.rast.univar/t.rast.univar.py @@ -89,6 +89,7 @@ # % guisection: Formatting # %end +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -96,6 +97,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # %rules # % requires: percentile,-e # % exclusive: zones,-r @@ -106,6 +109,9 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -134,11 +140,14 @@ def main(): separator = gs.separator(options["separator"]) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main percentile = None if options["percentile"]: try: @@ -153,6 +162,9 @@ def main(): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -179,11 +191,14 @@ def main(): extended, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main percentile=percentile, no_header=no_header, fs=separator, @@ -194,6 +209,9 @@ def main(): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -203,6 +221,7 @@ def main(): zones=zones, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -213,6 +232,11 @@ def main(): >>>>>>> 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 nprocs=nprocs, ) diff --git a/temporal/t.rast.univar/testsuite/test_t_rast_univar.py b/temporal/t.rast.univar/testsuite/test_t_rast_univar.py index db12d17bfaf..8ed688ac1f8 100644 --- a/temporal/t.rast.univar/testsuite/test_t_rast_univar.py +++ b/temporal/t.rast.univar/testsuite/test_t_rast_univar.py @@ -61,6 +61,7 @@ def setUpClass(cls): overwrite=True, ) +<<<<<<< HEAD <<<<<<< HEAD cls.runModule( "r.mapcalc", @@ -68,6 +69,8 @@ def setUpClass(cls): overwrite=True, ) +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main cls.runModule("r.mapcalc", expression="a_1 = 100", overwrite=True) @@ -116,11 +119,14 @@ def setUpClass(cls): cls.runModule( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "t.create", type="strds", temporaltype="absolute", @@ -135,6 +141,9 @@ def setUpClass(cls): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -169,11 +178,14 @@ def setUpClass(cls): ) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main cls.runModule( "t.register", flags="i", @@ -189,6 +201,9 @@ def setUpClass(cls): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -199,8 +214,11 @@ def tearDownClass(cls): cls.runModule("t.remove", flags="df", type="strds", inputs="A") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD cls.runModule("t.remove", flags="df", type="strds", inputs="B") cls.runModule("g.remove", flags="f", type="raster", name="zones") @@ -214,6 +232,9 @@ def test_with_all_maps(self): cls.runModule("t.remove", flags="df", type="strds", inputs="B") cls.runModule("g.remove", flags="f", type="raster", name="zones") ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.runModule("t.remove", flags="df", type="strds", inputs="B") cls.runModule("g.remove", flags="f", type="raster", name="zones") @@ -222,6 +243,7 @@ def test_with_all_maps(self): def test_with_all_maps(self): <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -247,6 +269,8 @@ def test_with_all_maps(self): def test_with_all_maps(self): ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cls.del_temp_region() @@ -283,6 +307,7 @@ def test_with_subset_of_maps(self): <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -293,6 +318,10 @@ def test_with_subset_of_maps(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) t_rast_univar = SimpleModule( @@ -323,6 +352,7 @@ def test_coarser_resolution(self): <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -333,6 +363,10 @@ def test_coarser_resolution(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) t_rast_univar = SimpleModule( @@ -362,17 +396,23 @@ def test_coarser_resolution(self): def test_subset_with_output(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main self.runModule("g.region", **self.default_region, res=10) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -400,6 +440,7 @@ def test_subset_with_output(self): res_line = res.split("|", 1)[1] self.assertLooksLike(ref_line, res_line) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -407,11 +448,16 @@ def test_subset_with_output(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def test_subset_with_extended_statistics_and_output(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -494,11 +540,14 @@ def test_with_zones(self): ) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main self.runModule("g.region", **self.default_region, res=1) self.assertModule(t_rast_univar) @@ -506,6 +555,9 @@ def test_with_zones(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -514,6 +566,7 @@ def test_with_zones(self): print(t_rast_univar.outputs.stdout.split("\n")) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -526,6 +579,11 @@ def test_with_zones(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 univar_text = """id|semantic_label|start|end|zone|mean|min|max|mean_of_abs|stddev|variance|coeff_var|sum|null_cells|cells|non_null_cells a_1@PERMANENT||2001-01-01 00:00:00|2001-04-01 00:00:00|1|100|100|100|100|0|0|0|60000|0|600|600 @@ -560,6 +618,7 @@ def test_with_semantic_label(self): verbose=True, ) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD self.runModule("g.region", res=1) ======= @@ -567,6 +626,8 @@ def test_with_semantic_label(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main self.runModule("g.region", **self.default_region, res=1) ======= self.runModule("g.region", res=1) @@ -575,6 +636,9 @@ def test_with_semantic_label(self): self.runModule("g.region", res=1) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -605,6 +669,7 @@ def test_with_semantic_label_parallel(self): verbose=True, ) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD self.runModule("g.region", res=1) ======= @@ -612,6 +677,8 @@ def test_with_semantic_label_parallel(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main self.runModule("g.region", **self.default_region, res=1) ======= self.runModule("g.region", res=1) @@ -620,6 +687,9 @@ def test_with_semantic_label_parallel(self): self.runModule("g.region", res=1) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -639,6 +709,7 @@ def test_with_semantic_label_parallel(self): res_line = res.split("|", 1)[1] self.assertLooksLike(ref_line, res_line) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -646,6 +717,8 @@ def test_with_semantic_label_parallel(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def test_with_spatial_filter_intersects(self): """Test spatial filter overlaps""" t_rast_univar = SimpleModule( @@ -730,6 +803,9 @@ def test_with_spatial_filter_is_contained(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast3d.univar/t.rast3d.univar.py b/temporal/t.rast3d.univar/t.rast3d.univar.py index 17e67877450..441129065c7 100755 --- a/temporal/t.rast3d.univar/t.rast3d.univar.py +++ b/temporal/t.rast3d.univar/t.rast3d.univar.py @@ -38,6 +38,7 @@ # % key: zones <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # % label: Raster map withh zones to compute statistics for # % description: Raster map withh zones to compute statistics for (needs to be CELL) ======= @@ -45,6 +46,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # % label: Raster map with zones to compute statistics for # % description: Raster map with zones to compute statistics for (needs to be CELL) ======= @@ -56,6 +59,9 @@ # % description: Raster map withh zones to compute statistics for (needs to be CELL) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.rast3d.univar/testsuite/test_t_rast3d_univar.py b/temporal/t.rast3d.univar/testsuite/test_t_rast3d_univar.py index ae1ac86aaa8..738f5f5ad38 100644 --- a/temporal/t.rast3d.univar/testsuite/test_t_rast3d_univar.py +++ b/temporal/t.rast3d.univar/testsuite/test_t_rast3d_univar.py @@ -56,8 +56,11 @@ def tearDownClass(cls): cls.runModule("t.remove", flags="df", type="str3ds", inputs="A") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD cls.runModule("g.remove", flags="f", type="raster_3d", name="zones") ======= @@ -69,12 +72,16 @@ def test_with_all_maps(self): cls.runModule("g.remove", flags="f", type="raster_3d", name="zones") cls.del_temp_region() ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.runModule("g.remove", flags="f", type="raster_3d", name="zones") cls.del_temp_region() def test_with_all_maps(self): <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -96,6 +103,8 @@ def test_with_all_maps(self): def test_with_all_maps(self): ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) def test_with_all_maps(self): @@ -129,6 +138,7 @@ def test_with_subset_of_maps(self): <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -139,6 +149,10 @@ def test_with_subset_of_maps(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) t_rast3d_univar = SimpleModule( @@ -168,6 +182,7 @@ def test_subset_with_output(self): <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -178,6 +193,10 @@ def test_subset_with_output(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) self.assertModule( @@ -207,6 +226,7 @@ def test_subset_with_output_no_header(self): <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -217,6 +237,10 @@ def test_subset_with_output_no_header(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) self.assertModule( @@ -241,6 +265,7 @@ def test_subset_with_output_no_header(self): res_line = res.split("|", 1)[1] self.assertLooksLike(ref_line, res_line) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def test_error_handling_empty_strds(self): @@ -249,6 +274,8 @@ def test_error_handling_empty_strds(self): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def test_handling_empty_strds(self): ======= def test_error_handling_empty_strds(self): @@ -257,6 +284,9 @@ def test_error_handling_empty_strds(self): def test_error_handling_empty_strds(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.register/t.register.html b/temporal/t.register/t.register.html index 635bb79ae7d..644f03042be 100644 --- a/temporal/t.register/t.register.html +++ b/temporal/t.register/t.register.html @@ -120,6 +120,7 @@

            INPUT FILE FORMAT

            prec_6|2002-04-01|2002-07-01 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

            Support for semantic labels

            @@ -129,6 +130,8 @@

            Support for semantic labels

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

            Same as above but with fully qualified map names (no support for increment option nor -i flag): @@ -152,6 +155,9 @@

            Support for semantic labels

            >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.remove/t.remove.html b/temporal/t.remove/t.remove.html index 67fbc47c60a..ee1e8a736bd 100644 --- a/temporal/t.remove/t.remove.html +++ b/temporal/t.remove/t.remove.html @@ -60,11 +60,14 @@

            AUTHOR

            Sören Gebbert, Thünen Institute of Climate-Smart Agriculture <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -78,6 +81,9 @@

            AUTHOR

            ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/temporal/t.shift/t.shift.html b/temporal/t.shift/t.shift.html index 54d2936132e..aa271ce83f0 100644 --- a/temporal/t.shift/t.shift.html +++ b/temporal/t.shift/t.shift.html @@ -13,6 +13,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -20,11 +21,16 @@

            NOTES

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -39,7 +45,10 @@

            NOTES

            ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -69,6 +78,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/testsuite/README.md b/testsuite/README.md index bd7c22a36be..b393ce3ddaf 100644 --- a/testsuite/README.md +++ b/testsuite/README.md @@ -2,6 +2,7 @@ This directory contains scripts to check some functionality of GRASS GIS. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD GRASS GIS testsuite documentation: @@ -19,6 +20,12 @@ GRASS GIS testsuite documentation: ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +GRASS GIS testsuite documentation: +======= +>>>>>>> osgeo-main GRASS GIS testsuite documentation: https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -31,6 +38,9 @@ GRASS GIS testsuite documentation: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -60,11 +70,14 @@ Until 2019: For a more advanced test suite, see <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -80,6 +93,9 @@ Until 2019: For a more advanced test suite, see >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/testsuite/examples/test_framework_GRASS_GIS_with_NC.sh b/testsuite/examples/test_framework_GRASS_GIS_with_NC.sh index 9a75dd47da9..92260871ce4 100755 --- a/testsuite/examples/test_framework_GRASS_GIS_with_NC.sh +++ b/testsuite/examples/test_framework_GRASS_GIS_with_NC.sh @@ -8,6 +8,7 @@ # https://trac.osgeo.org/grass/wiki/GSoC/2014/TestingFrameworkForGRASS <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job ======= <<<<<<< HEAD @@ -23,6 +24,12 @@ # https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +# https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job +======= +>>>>>>> osgeo-main # https://grass.osgeo.org/grass80/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -35,6 +42,9 @@ # https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/utils/generate_release_notes.py b/utils/generate_release_notes.py index 07ae71c2f68..f99717574ef 100755 --- a/utils/generate_release_notes.py +++ b/utils/generate_release_notes.py @@ -64,6 +64,7 @@ def split_to_categories(changes, categories): return by_category +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -71,6 +72,8 @@ def split_to_categories(changes, categories): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def print_section_heading_2(text, file=None): print(f"### {text}\n", file=file) @@ -84,6 +87,9 @@ def print_section_heading_3(text, file=None): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -96,6 +102,7 @@ def print_category(category, changes, file=None): if not items: return <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD print(f"### {category}", file=file) ======= @@ -103,6 +110,8 @@ def print_category(category, changes, file=None): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main print_section_heading_3(category, file=file) ======= print(f"### {category}", file=file) @@ -111,6 +120,9 @@ def print_category(category, changes, file=None): print(f"### {category}", file=file) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -151,6 +163,7 @@ def print_notes( if before: print(before) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD print("## What's Changed", file=file) ======= @@ -158,6 +171,8 @@ def print_notes( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main print_section_heading_2("What's Changed", file=file) ======= print("## What's Changed", file=file) @@ -166,6 +181,9 @@ def print_notes( print("## What's Changed", file=file) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/utils/grass_indent.sh b/utils/grass_indent.sh index 129fba62a95..02632544561 100755 --- a/utils/grass_indent.sh +++ b/utils/grass_indent.sh @@ -20,17 +20,23 @@ case "$(uname)" in ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD case "$(uname)" in ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$(uname)" in ======= case "$(uname)" in >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/utils/mkhtml.py b/utils/mkhtml.py index 7360ede8410..9601408339b 100644 --- a/utils/mkhtml.py +++ b/utils/mkhtml.py @@ -9,6 +9,7 @@ # PURPOSE: Create HTML manual page snippets <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2007-2023 by Glynn Clements ======= <<<<<<< HEAD @@ -16,6 +17,9 @@ >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD # COPYRIGHT: (C) 2007-2024 by Glynn Clements ======= @@ -31,6 +35,9 @@ # COPYRIGHT: (C) 2007-2023 by Glynn Clements >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -73,6 +80,7 @@ HTTP_STATUS_CODES = list(http.HTTPStatus) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -80,6 +88,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def get_version_branch(major_version, addons_git_repo_url): """Check if version branch for the current GRASS version exists, if not, take branch for the previous version @@ -124,6 +134,9 @@ def get_version_branch(major_version, addons_git_repo_url): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -133,11 +146,14 @@ def get_version_branch(major_version, addons_git_repo_url): grass_git_branch = "main" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main major, minor, patch = None, None, None if grass_version != "unknown": major, minor, patch = grass_version.split(".") @@ -162,6 +178,9 @@ def get_version_branch(major_version, addons_git_repo_url): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -175,6 +194,7 @@ def get_version_branch(major_version, addons_git_repo_url): base_url=base_url, major=major <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -185,6 +205,11 @@ def get_version_branch(major_version, addons_git_repo_url): >>>>>>> 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 ) @@ -282,6 +307,7 @@ def get_default_git_log(src_dir, datetime_format="%A %b %d %H:%M:%S %Y"): """Get default Git commit and commit date, when getting commit from local Git, local JSON file and remote GitHub REST API server wasn't <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD successfull. ======= @@ -289,6 +315,8 @@ def get_default_git_log(src_dir, datetime_format="%A %b %d %H:%M:%S %Y"): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main successful. ======= successfull. @@ -297,6 +325,9 @@ def get_default_git_log(src_dir, datetime_format="%A %b %d %H:%M:%S %Y"): successfull. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -351,6 +382,7 @@ def get_git_commit_from_file( :return dict git_log: dict which store last commit and commnit date """ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Accessed date time if getting commit from JSON file wasn't successfull ======= @@ -358,6 +390,8 @@ def get_git_commit_from_file( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Accessed date time if getting commit from JSON file wasn't successful ======= # Accessed date time if getting commit from JSON file wasn't successfull @@ -366,6 +400,9 @@ def get_git_commit_from_file( # Accessed date time if getting commit from JSON file wasn't successfull >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -402,11 +439,14 @@ def get_git_commit_from_rest_api_for_addon_repo( """ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Accessed date time if getting commit from GitHub REST API wasn't successful if not git_log: git_log = get_default_git_log(src_dir=src_dir) @@ -434,6 +474,9 @@ def get_git_commit_from_rest_api_for_addon_repo( ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -461,6 +504,7 @@ def get_git_commit_from_rest_api_for_addon_repo( ) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -471,6 +515,11 @@ def get_git_commit_from_rest_api_for_addon_repo( >>>>>>> 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 git_log @@ -535,6 +584,7 @@ def has_src_code_git(src_dir, is_addon): try: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -542,12 +592,17 @@ def has_src_code_git(src_dir, is_addon): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -702,16 +757,22 @@ def read_file(name): return s <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main except OSError: ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -884,6 +945,7 @@ def update_toc(data): def get_addon_path(): """Check if pgm is in the addons list and get addon path +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD return: pgm path if pgm is addon else None @@ -892,6 +954,8 @@ def get_addon_path(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Make or update list of the official addons source code paths g.extension prefix parameter plus /grass-addons directory using Git repository @@ -904,6 +968,9 @@ def get_addon_path(): return: pgm path if pgm is addon else None >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -980,11 +1047,14 @@ def get_addon_path(): if addon_base: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main """'addons_paths.json' is file created during install extension check get_addons_paths() function in the g.extension.py file """ @@ -1003,6 +1073,9 @@ def get_addon_path(): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1029,6 +1102,7 @@ def get_addon_path(): return addon["path"] <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1040,6 +1114,11 @@ def get_addon_path(): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # process header @@ -1195,6 +1274,7 @@ def to_title(name): if sys.platform == "win32": url_source = url_source.replace(os.path.sep, "/") +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if index_name: @@ -1207,6 +1287,8 @@ def to_title(name): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # Process Source code section branches = "branches" tree = "tree" @@ -1242,6 +1324,9 @@ def to_title(name): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/utils/release.yml b/utils/release.yml index 3e2b83a2842..78b8bb91bbe 100644 --- a/utils/release.yml +++ b/utils/release.yml @@ -1,10 +1,13 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main --- notes: categories: @@ -14,6 +17,9 @@ notes: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -23,6 +29,7 @@ notes: regexp: '(d|db|g|i|m|ps|r|r3|t|v)\.[^ ]*: |(modules|tools): ' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33,6 +40,11 @@ notes: >>>>>>> 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 - title: Graphical User Interface @@ -52,6 +64,7 @@ notes: - title: Translations, Internationalization, and Localization <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD regexp: '(i18n|i18N|L10n|L10N|t9n|translations?): ' ======= @@ -59,6 +72,8 @@ notes: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main regexp: '(i18n|i18N|L10n|L10N|t9n|translations?): |Translations update from ' ======= regexp: '(i18n|i18N|L10n|L10N|t9n|translations?): ' @@ -67,6 +82,9 @@ notes: regexp: '(i18n|i18N|L10n|L10N|t9n|translations?): ' >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -77,11 +95,14 @@ notes: - title: Packaging, Configuration, Portability, and Compilation <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main regexp: '(packaging|pkg|rpm|deb|pkg-config|configure|config|[Mm]ake|build): ' - title: Docker @@ -90,6 +111,9 @@ notes: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -99,6 +123,7 @@ notes: regexp: '[Dd]ocker: ' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -109,6 +134,11 @@ notes: >>>>>>> 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 - title: Singularity @@ -116,6 +146,7 @@ notes: - title: Continuous Integration, Tests, Code Quality, and Checks <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD regexp: '(CI|ci|CI\(deps\)|ci\(deps\)|[Tt]ests|[Cc]hecks|pytest): ' @@ -126,6 +157,9 @@ notes: >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD regexp: '(CI|ci|CI\(deps\)|ci\(deps\)|[Tt]ests|[Cc]hecks|pytest): ' @@ -153,6 +187,9 @@ notes: - title: Contributing and Management <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -165,6 +202,7 @@ notes: - "RFC: " <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -176,3 +214,8 @@ notes: ======= >>>>>>> 8422103f4c (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/utils/update_version.md b/utils/update_version.md index 59c635a1f37..026fa5cc2a1 100644 --- a/utils/update_version.md +++ b/utils/update_version.md @@ -1,5 +1,6 @@ # Updating Version File +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Version file (`include/VERSION`) can be updated using the _update_version.md_ script. @@ -8,6 +9,8 @@ Version file (`include/VERSION`) can be updated using the _update_version.md_ sc ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Version file (`include/VERSION`) can be updated using the _update_version.py_ script. ======= Version file (`include/VERSION`) can be updated using the _update_version.md_ script. @@ -16,6 +19,9 @@ Version file (`include/VERSION`) can be updated using the _update_version.md_ sc Version file (`include/VERSION`) can be updated using the _update_version.md_ script. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -72,6 +78,7 @@ echo $VERSION ### Updating Minor Version +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Let's say we are at development-only version 3.1.dev and just created @@ -82,6 +89,8 @@ to the next minor version: ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Let's say we are at the main branch, version 3.2.0dev, and just created a new branch for 3.2 release, so we want to update the minor version on the main branch to the next minor version: @@ -96,6 +105,9 @@ a new branch for 3.2 release, so we want to update the minor version to the next minor version: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -107,11 +119,14 @@ to the next minor version: Separately, or as part of other changes, now is the time to commit, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main so the script suggests a commit message in the output, e.g.: ```yaml @@ -123,6 +138,9 @@ use: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -133,6 +151,7 @@ message: Use the provided title as a commit message title: 'version: Start 3.2.0dev' <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -144,6 +163,11 @@ title: 'version: Start 3.2.0dev' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ``` ### Error Handling @@ -166,6 +190,7 @@ Already dev with micro '0dev'. Release first before update. <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -176,6 +201,10 @@ Already dev with micro '0dev'. Release first before update. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ### Updating Development-only Version @@ -189,6 +218,7 @@ the _minor_ command twice or by using the `minor --dev`: ``` <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -200,3 +230,8 @@ the _minor_ command twice or by using the `minor --dev`: ======= >>>>>>> 8422103f4c (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/utils/update_version.py b/utils/update_version.py index 2f7bd7b4c06..0d69d1b4775 100755 --- a/utils/update_version.py +++ b/utils/update_version.py @@ -145,11 +145,14 @@ def update_minor(args): minor = int(version_file.minor) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main minor += 1 if micro.endswith("dev"): micro = "0dev" @@ -157,6 +160,9 @@ def update_minor(args): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -178,6 +184,7 @@ def update_minor(args): micro = "0dev" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -188,6 +195,11 @@ def update_minor(args): >>>>>>> 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: sys.exit("Updating version from a non-dev VERSION file is not possible") @@ -279,6 +291,7 @@ def status(args): status_as_yaml(version_info=version_info, today=today, version=version, tag=tag) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -286,6 +299,8 @@ def status(args): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main def suggest_message(args): """Print suggestion for a commit message @@ -313,6 +328,9 @@ def suggest_message(args): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -351,6 +369,7 @@ def main(): "minor", help="increase minor (x.Y.z) version (uses dev in micro)" ) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD subparser.add_argument( "--dev", action="store_true", help="increase development-only version" @@ -360,6 +379,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= subparser.add_argument( "--dev", action="store_true", help="increase development-only version" @@ -371,6 +392,9 @@ def main(): ) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -389,6 +413,7 @@ def main(): ) subparser.set_defaults(func=status) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -396,6 +421,8 @@ def main(): ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main subparser = subparsers.add_parser( "suggest", help="suggest a commit message for new version" ) @@ -406,6 +433,9 @@ def main(): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.buffer/main.c b/vector/v.buffer/main.c index be296673150..db0c5dc8aa2 100644 --- a/vector/v.buffer/main.c +++ b/vector/v.buffer/main.c @@ -352,6 +352,7 @@ int main(int argc, char *argv[]) if (bufcol_opt->answer && field == -1) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("The column option requires a valid layer.")); ======= @@ -367,6 +368,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD G_fatal_error(_("The column option requires a valid layer.")); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + G_fatal_error(_("The column option requires a valid layer.")); +======= >>>>>>> osgeo-main G_fatal_error(_("The bufcol option requires a valid layer.")); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -383,6 +390,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.build.polylines/v.build.polylines.html b/vector/v.build.polylines/v.build.polylines.html index 97cb2453de7..7a31b9d2c0d 100644 --- a/vector/v.build.polylines/v.build.polylines.html +++ b/vector/v.build.polylines/v.build.polylines.html @@ -80,6 +80,7 @@

            SEE ALSO

            AUTHORS

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Mark Lake, Institute of Archaeology, University College London.
            @@ -98,6 +99,12 @@

            AUTHORS

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Mark Lake, Institute of Archaeology, University College London.
            +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Mark Lake, Institute of Archaeology, University College London.
            >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -111,6 +118,9 @@

            AUTHORS

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.class/main.c b/vector/v.class/main.c index d26b5d559e4..ce9b9062c19 100644 --- a/vector/v.class/main.c +++ b/vector/v.class/main.c @@ -149,6 +149,7 @@ int main(int argc, char *argv[]) nbclass = atoi(nbclass_opt->answer); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD nbreaks = nbclass - @@ -158,6 +159,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main nbreaks = nbclass - 1; /* we need one less classbreaks (min and max excluded) than classes */ ======= @@ -171,6 +174,9 @@ int main(int argc, char *argv[]) 1; /* we need one less classbreaks (min and max exluded) than classes */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.clean/split.c b/vector/v.clean/split.c index 98b4a58c247..3d0a95a34b4 100644 --- a/vector/v.clean/split.c +++ b/vector/v.clean/split.c @@ -92,6 +92,7 @@ int split_lines(struct Map_info *Map, int otype, struct Map_info *Err) * returns number of split points */ int split_line(struct Map_info *Map, int otype, struct line_pnts *Points, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct line_cats *Cats, struct Map_info *Err, ======= @@ -99,6 +100,8 @@ int split_line(struct Map_info *Map, int otype, struct line_pnts *Points, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct line_cats *Cats, struct Map_info *Err UNUSED, ======= struct line_cats *Cats, struct Map_info *Err, @@ -107,6 +110,9 @@ int split_line(struct Map_info *Map, int otype, struct line_pnts *Points, struct line_cats *Cats, struct Map_info *Err, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.clean/v.clean.html b/vector/v.clean/v.clean.html index 64c8968b17f..11c3b13cfe5 100644 --- a/vector/v.clean/v.clean.html +++ b/vector/v.clean/v.clean.html @@ -51,16 +51,22 @@

            Remove dangles or change boundary dangles to type line

            Threshold has to be given as maximum line/boundary length in map units; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for latitude-longitude projects in degrees. Dangles shorter than ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -125,12 +131,15 @@

            Snap lines to vertex in threshold

            Threshold gives maximum distance to another vertex in map units, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for latitude-longitude locations in degree. ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main for latitude-longitude projects in degrees. ======= for latitude-longitude locations in degree. @@ -139,6 +148,9 @@

            Snap lines to vertex in threshold

            for latitude-longitude locations in degree. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -197,16 +209,22 @@

            Remove small areas

            Threshold must always be in square meters, also for latitude-longitude <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main projects or projects with units other than meters. ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.cluster/main.c b/vector/v.cluster/main.c index fb822a5e764..24ad5e5f51a 100644 --- a/vector/v.cluster/main.c +++ b/vector/v.cluster/main.c @@ -257,6 +257,7 @@ int main(int argc, char *argv[]) n = 0; sum = sumsq = 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD min = INFINITY; ======= @@ -272,6 +273,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD min = INFINITY; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + min = INFINITY; +======= >>>>>>> osgeo-main min = 1.0 / 0.0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -288,6 +295,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -498,6 +508,7 @@ int main(int argc, char *argv[]) n = 0; sum = sumsq = 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD min = INFINITY; ======= @@ -513,6 +524,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD min = INFINITY; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + min = INFINITY; +======= >>>>>>> osgeo-main min = 1.0 / 0.0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -529,6 +546,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.colors/local_proto.h b/vector/v.colors/local_proto.h index 18aeab11989..c6f1f31d0a4 100644 --- a/vector/v.colors/local_proto.h +++ b/vector/v.colors/local_proto.h @@ -21,6 +21,7 @@ int scan_attr(const struct Map_info *, int, const char *, const char *, struct Colors *, int); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32,6 +33,11 @@ int scan_attr(const struct Map_info *, int, const char *, const char *, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* scan_z.c */ void scan_z(struct Map_info *, int, const char *, const char *, @@ -51,6 +57,7 @@ void write_rgb_values(const struct Map_info *, int, const char *, struct Colors *); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -62,5 +69,10 @@ void write_rgb_values(const struct Map_info *, int, const char *, ======= >>>>>>> 8422103f4c (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_rgb.c */ void rgb2colr(struct Map_info *, int, const char *, struct Colors *); diff --git a/vector/v.colors/read_rgb.c b/vector/v.colors/read_rgb.c index 5effe6a9fe8..e259ce65ac8 100644 --- a/vector/v.colors/read_rgb.c +++ b/vector/v.colors/read_rgb.c @@ -11,6 +11,7 @@ void rgb2colr(struct Map_info *Map, int layer, const char *rgb_column, void rgb2colr(const struct Map_info *Map, int layer, const char *rgb_column, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21,6 +22,11 @@ void rgb2colr(const struct Map_info *Map, int layer, const char *rgb_column, >>>>>>> 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 struct Colors *colors) { diff --git a/vector/v.colors/scan_attr.c b/vector/v.colors/scan_attr.c index b1ad5339a12..04fe6612c44 100644 --- a/vector/v.colors/scan_attr.c +++ b/vector/v.colors/scan_attr.c @@ -11,6 +11,7 @@ int scan_attr(struct Map_info *Map, int layer, const char *column_name, int scan_attr(const struct Map_info *Map, int layer, const char *column_name, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21,6 +22,11 @@ int scan_attr(const struct Map_info *Map, int layer, const char *column_name, >>>>>>> 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 char *style, const char *rules, const struct FPRange *range, struct Colors *colors, struct Colors *rcolors, int invert) diff --git a/vector/v.colors/scan_cats.c b/vector/v.colors/scan_cats.c index 37067d23c45..a14f94cdeed 100644 --- a/vector/v.colors/scan_cats.c +++ b/vector/v.colors/scan_cats.c @@ -6,6 +6,7 @@ static void scan_layer(int, const struct line_cats *, int *, int *); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void scan_cats(const struct Map_info *Map, int field, const char *style, @@ -14,6 +15,8 @@ void scan_cats(const struct Map_info *Map, int field, const char *style, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void scan_cats(struct Map_info *Map, int field, const char *style, ======= void scan_cats(const struct Map_info *Map, int field, const char *style, @@ -22,6 +25,9 @@ void scan_cats(const struct Map_info *Map, int field, const char *style, void scan_cats(const struct Map_info *Map, int field, const char *style, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.colors/write_rgb.c b/vector/v.colors/write_rgb.c index a2c4d7bb112..148fb471c2a 100644 --- a/vector/v.colors/write_rgb.c +++ b/vector/v.colors/write_rgb.c @@ -12,6 +12,7 @@ void write_rgb_values(const struct Map_info *Map, int layer, const char *column_name, struct Colors *colors) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23,6 +24,11 @@ void write_rgb_values(const struct Map_info *Map, int layer, ======= >>>>>>> 8422103f4c (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 ctype, nrec, i; int red, grn, blu; diff --git a/vector/v.db.connect/main.c b/vector/v.db.connect/main.c index 76926a369de..86aeeb5c184 100644 --- a/vector/v.db.connect/main.c +++ b/vector/v.db.connect/main.c @@ -36,16 +36,22 @@ int main(int argc, char **argv) *sep_opt; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct Flag *print, *columns, *delete, *shell_print; ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -291,6 +297,7 @@ int main(int argc, char **argv) if (ret == 1) { /* field already defined */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (!overwrite->answer) G_fatal_error(_("Use -o to overwrite existing link " @@ -300,6 +307,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main if (!G_get_overwrite()) G_fatal_error(_("Use --overwrite to overwrite " "existing link for layer <%d>"), @@ -314,6 +323,9 @@ int main(int argc, char **argv) "for layer <%d>"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.db.select/main.c b/vector/v.db.select/main.c index 838ce2c9305..be96f87ef57 100644 --- a/vector/v.db.select/main.c +++ b/vector/v.db.select/main.c @@ -29,6 +29,7 @@ #include #include +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD enum OutputFormat { PLAIN, JSON, CSV, VERTICAL }; @@ -47,6 +48,12 @@ enum OutputFormat { PLAIN, JSON, CSV, VERTICAL }; ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +enum OutputFormat { PLAIN, JSON, CSV, VERTICAL }; +======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) enum OutputFormat { PLAIN, @@ -65,6 +72,9 @@ enum OutputFormat { PLAIN, JSON, CSV, VERTICAL }; enum OutputFormat { PLAIN, JSON, CSV, VERTICAL }; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -157,18 +167,13 @@ int main(int argc, char **argv) _("GROUP BY conditions of SQL statement without 'group by' keyword"); options.group->guisection = _("Selection"); - options.format = G_define_option(); - options.format->key = "format"; - options.format->type = TYPE_STRING; - options.format->required = YES; - options.format->label = _("Output format"); + options.format = G_define_standard_option(G_OPT_F_FORMAT); options.format->options = "plain,csv,json,vertical"; options.format->descriptions = "plain;Configurable plain text output;" "csv;CSV (Comma Separated Values);" "json;JSON (JavaScript Object Notation);" "vertical;Plain text vertical output (instead of horizontal)"; - options.format->answer = "plain"; options.format->guisection = _("Format"); options.fsep = G_define_standard_option(G_OPT_F_SEP); @@ -236,11 +241,14 @@ int main(int argc, char **argv) if (format == JSON) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -248,6 +256,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -263,12 +274,15 @@ int main(int argc, char **argv) _("Null value is part of the format")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main ======= <<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } if (format != VERTICAL) { @@ -277,10 +291,13 @@ int main(int argc, char **argv) _("Only vertical output can use vertical separator")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) fatal_error_option_value_excludes_flag(options.format, flags.escape, @@ -314,6 +331,9 @@ int main(int argc, char **argv) _("Only vertical output can use vertical separator")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -345,16 +365,22 @@ int main(int argc, char **argv) if (flags.region->answer) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -368,10 +394,13 @@ int main(int argc, char **argv) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) fsep = G_store("="); ======= @@ -393,6 +422,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -474,6 +506,7 @@ int main(int argc, char **argv) /* column names if horizontal output (ignore for -r, -c, JSON, vertical) */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (!flags.region->answer && !flags.colnames->answer && format != JSON && format != VERTICAL) { @@ -492,6 +525,13 @@ int main(int argc, char **argv) if (!flags.region->answer && !flags.colnames->answer && format != JSON && format != VERTICAL) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (!flags.region->answer && !flags.colnames->answer && format != JSON && + format != VERTICAL) { +======= >>>>>>> osgeo-main if (!flags.region->answer && !flags.colnames->answer && format != JSON && format != VERTICAL) { @@ -509,6 +549,9 @@ int main(int argc, char **argv) format != VERTICAL) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -528,6 +571,7 @@ int main(int argc, char **argv) if (flags.region->answer) fprintf(stdout, "{\"extent\":\n"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else fprintf(stdout, "{\"records\":[\n"); @@ -536,6 +580,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else { fprintf(stdout, "{\"info\":\n{\"columns\":[\n"); for (col = 0; col < ncols; col++) { @@ -571,6 +617,9 @@ int main(int argc, char **argv) fprintf(stdout, "{\"records\":[\n"); >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -635,6 +684,7 @@ int main(int argc, char **argv) else { char *str = db_get_string(&value_string); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* Escaped charcters in different formats @@ -643,6 +693,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Escaped characters in different formats ======= /* Escaped charcters in different formats @@ -651,6 +703,9 @@ int main(int argc, char **argv) /* Escaped charcters in different formats >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -671,16 +726,22 @@ int main(int argc, char **argv) str = G_str_replace(str, "\"", "\\\""); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -696,10 +757,13 @@ int main(int argc, char **argv) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) if (strchr(str, '\f')) /* form feed, somewhat unlikely */ ======= @@ -724,6 +788,9 @@ int main(int argc, char **argv) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.db.select/testsuite/test_v_db_select.py b/vector/v.db.select/testsuite/test_v_db_select.py index aee3cc98100..489d8bf63e9 100644 --- a/vector/v.db.select/testsuite/test_v_db_select.py +++ b/vector/v.db.select/testsuite/test_v_db_select.py @@ -163,6 +163,7 @@ 1290,63600420,109186.835938,1291,1290,Zwe,63600422.4739,109186.832069 """ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD out_json = """{"records":[ @@ -171,6 +172,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main out_json = """\ {"info": {"columns":[ @@ -191,6 +194,9 @@ out_json = """{"records":[ >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.db.select/testsuite/test_v_db_select_json_csv.py b/vector/v.db.select/testsuite/test_v_db_select_json_csv.py index 1938d0bc616..3b42c8c7c77 100644 --- a/vector/v.db.select/testsuite/test_v_db_select_json_csv.py +++ b/vector/v.db.select/testsuite/test_v_db_select_json_csv.py @@ -5,12 +5,15 @@ # PURPOSE: Test parsing and structure of CSV and JSON outputs <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2021 by Vaclav Petras the GRASS Development Team ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main # COPYRIGHT: (C) 2021-2023 by Vaclav Petras the GRASS Development Team ======= # COPYRIGHT: (C) 2021 by Vaclav Petras the GRASS Development Team @@ -19,6 +22,9 @@ # COPYRIGHT: (C) 2021 by Vaclav Petras the GRASS Development Team >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -193,11 +199,14 @@ def test_json_loads(self): data = json.loads(text) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main column_info = data["info"]["columns"] self.assertEqual(column_info[0]["name"], "cat") @@ -218,6 +227,9 @@ def test_json_loads(self): ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.db.select/v.db.select.html b/vector/v.db.select/v.db.select.html index 106a053435b..4d337a1ece9 100644 --- a/vector/v.db.select/v.db.select.html +++ b/vector/v.db.select/v.db.select.html @@ -107,11 +107,14 @@

            JSON

            <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main The JSON also contains information about columns stored under key info. Column names and types are under key columns. Each colum has SQL data type under sql_type in all caps. @@ -160,6 +163,9 @@

            JSON

            ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -175,6 +181,7 @@

            JSON

            "multilane": "no", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) @@ -185,6 +192,11 @@

            JSON

            >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +>>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main "year": 2001, "length": 4825.369405 @@ -192,17 +204,23 @@

            JSON

            { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "road_name": "NC-50", "year": 2001, ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -212,6 +230,7 @@

            JSON

            "year": 2002, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) @@ -222,6 +241,11 @@

            JSON

            >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +>>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main "length": 14392.589058 } @@ -443,11 +467,14 @@

            AUTHORS

            Vaclav Petras (true CSV output, format option and documentation) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -464,6 +491,9 @@

            AUTHORS

            ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.decimate/grid_decimation.c b/vector/v.decimate/grid_decimation.c index fd79aac7f19..a846aa12b2a 100644 --- a/vector/v.decimate/grid_decimation.c +++ b/vector/v.decimate/grid_decimation.c @@ -80,6 +80,7 @@ void grid_decimation_set_region(struct GridDecimation *grid_decimation, void grid_decimation_create_list_with_point( struct GridDecimation *grid_decimation, size_t index, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct DecimationPoint *point, size_t npoints) ======= @@ -87,6 +88,8 @@ void grid_decimation_create_list_with_point( ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct DecimationPoint *point, size_t npoints UNUSED) ======= struct DecimationPoint *point, size_t npoints) @@ -95,6 +98,9 @@ void grid_decimation_create_list_with_point( struct DecimationPoint *point, size_t npoints) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.decimate/main.c b/vector/v.decimate/main.c index 616d80cdefb..f211aba9cfa 100644 --- a/vector/v.decimate/main.c +++ b/vector/v.decimate/main.c @@ -30,6 +30,7 @@ struct DecimationContext { int unique_cats; /*!< TRUE or FALSE */ }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -37,11 +38,16 @@ struct DecimationContext { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static int if_add_point(struct DecimationPoint *point, void *point_data UNUSED, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -72,6 +78,7 @@ struct WriteContext { int write_cats; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -79,11 +86,16 @@ struct WriteContext { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static void write_point(struct WriteContext *context, int cat UNUSED, double x, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.delaunay/in_out.c b/vector/v.delaunay/in_out.c index a5360697a32..526a0963b88 100644 --- a/vector/v.delaunay/in_out.c +++ b/vector/v.delaunay/in_out.c @@ -74,6 +74,7 @@ int cmp(const void *a, const void *b) return 0; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void output_edges(unsigned int n, int mode3d, int type, struct Map_info *Out) @@ -82,6 +83,8 @@ void output_edges(unsigned int n, int mode3d, int type, struct Map_info *Out) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void output_edges(unsigned int n, int mode3d UNUSED, int type, struct Map_info *Out) ======= @@ -91,6 +94,9 @@ void output_edges(unsigned int n, int mode3d, int type, struct Map_info *Out) void output_edges(unsigned int n, int mode3d, int type, struct Map_info *Out) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -137,6 +143,7 @@ void output_edges(unsigned int n, int mode3d, int type, struct Map_info *Out) /* Print the ring of triangles about each vertex. */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void output_triangles(unsigned int n, int mode3d, int type, @@ -145,6 +152,8 @@ void output_triangles(unsigned int n, int mode3d, int type, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void output_triangles(unsigned int n, int mode3d UNUSED, int type, ======= void output_triangles(unsigned int n, int mode3d, int type, @@ -153,6 +162,9 @@ void output_triangles(unsigned int n, int mode3d, int type, void output_triangles(unsigned int n, int mode3d, int type, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.delaunay/memory.c b/vector/v.delaunay/memory.c index 193df0c38e0..069f4e68ce1 100644 --- a/vector/v.delaunay/memory.c +++ b/vector/v.delaunay/memory.c @@ -110,6 +110,7 @@ void alloc_edges(unsigned int n) free_list_e[i] = e; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void free_memory(void) @@ -128,6 +129,12 @@ void free_memory(void) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +void free_memory(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) void free_memory() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -141,6 +148,9 @@ void free_memory(void) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.delaunay/v.delaunay.html b/vector/v.delaunay/v.delaunay.html index a68561c5126..6e7047fc2ca 100644 --- a/vector/v.delaunay/v.delaunay.html +++ b/vector/v.delaunay/v.delaunay.html @@ -18,6 +18,7 @@

            EXAMPLE

            REFERENCES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Leonid Guibas and Jorge Stolfi, (1985). Primitives for the @@ -36,6 +37,12 @@

            REFERENCES

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Leonid Guibas and Jorge Stolfi, (1985). Primitives for the +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Leonid Guibas and Jorge Stolfi, (1985). Primitives for the >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -49,6 +56,9 @@

            REFERENCES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.distance/distance.c b/vector/v.distance/distance.c index 7fe2005cc64..48ef8fb260b 100644 --- a/vector/v.distance/distance.c +++ b/vector/v.distance/distance.c @@ -12,6 +12,7 @@ int get_line_box(const struct line_pnts *Points, struct bound_box *box) if (Points->n_points == 0) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD box->E = box->W = box->N = box->S = box->T = box->B = NAN; ======= @@ -27,6 +28,12 @@ int get_line_box(const struct line_pnts *Points, struct bound_box *box) <<<<<<< HEAD box->E = box->W = box->N = box->S = box->T = box->B = NAN; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + box->E = box->W = box->N = box->S = box->T = box->B = NAN; +======= >>>>>>> osgeo-main box->E = box->W = box->N = box->S = box->T = box->B = 0.0 / 0.0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -43,6 +50,9 @@ int get_line_box(const struct line_pnts *Points, struct bound_box *box) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -258,11 +268,14 @@ int line2line(struct line_pnts *FPoints, int ftype, struct line_pnts *TPoints, * return 3 outside area */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int line2area(struct Map_info *To, struct line_pnts *Points, int type, int area, const struct bound_box *abox, double *fx, double *fy, double *fz, double *falong, double *fangle, double *tx, double *ty, @@ -272,6 +285,9 @@ int line2area(struct Map_info *To, struct line_pnts *Points, int type, int area, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -282,6 +298,7 @@ int line2area(const struct Map_info *To, struct line_pnts *Points, int type, double *dist, int with_z) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -293,6 +310,11 @@ int line2area(const struct Map_info *To, struct line_pnts *Points, int 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 { int i, j; double tmp_dist; diff --git a/vector/v.distance/local_proto.h b/vector/v.distance/local_proto.h index eb6490c71d0..bab8ee8922c 100644 --- a/vector/v.distance/local_proto.h +++ b/vector/v.distance/local_proto.h @@ -61,11 +61,14 @@ int line2line(struct line_pnts *FPoints, int ftype, struct line_pnts *TPoints, double *talong, double *tangle, double *dist, int with_z); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int line2area(struct Map_info *To, struct line_pnts *Points, int type, int area, const struct bound_box *abox, double *fx, double *fy, double *fz, double *falong, double *fangle, double *tx, double *ty, @@ -75,6 +78,9 @@ int line2area(struct Map_info *To, struct line_pnts *Points, int type, int area, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -85,6 +91,7 @@ int line2area(const struct Map_info *To, struct line_pnts *Points, int type, double *dist, int with_z); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -96,6 +103,11 @@ int line2area(const struct Map_info *To, struct line_pnts *Points, int 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 /* print.c */ int print_upload(NEAR *, UPLOAD *, int, dbCatValArray *, dbCatVal *, char *); diff --git a/vector/v.edit/snap.c b/vector/v.edit/snap.c index 8bf02995663..0f8a9aa243d 100644 --- a/vector/v.edit/snap.c +++ b/vector/v.edit/snap.c @@ -75,6 +75,7 @@ int snap_line2(struct Map_info *Map, int line1, int line2, double thresh) /* find mininal distance and its indexes */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -85,6 +86,11 @@ int snap_line2(struct Map_info *Map, int line1, int line2, double thresh) >>>>>>> 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 mindist = Vedit_get_min_distance(Points1, Points2, 0, /* TODO 3D */ &mindistidx); diff --git a/vector/v.external/args.c b/vector/v.external/args.c index 0c4582ea7dc..d9a1f05ac0a 100644 --- a/vector/v.external/args.c +++ b/vector/v.external/args.c @@ -47,6 +47,7 @@ void parse_args(int argc, char **argv, struct _options *options, flags->override->key = 'o'; flags->override->label = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Override projection check (use current location's projection)"); flags->override->description = _("Assume that the dataset has the same " @@ -56,6 +57,8 @@ void parse_args(int argc, char **argv, struct _options *options, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Override projection check (use current project's CRS)"); flags->override->description = _("Assume that the dataset has the same " @@ -71,6 +74,9 @@ void parse_args(int argc, char **argv, struct _options *options, "projection as the current location"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.external/list.c b/vector/v.external/list.c index 84947651c12..94a126ecb36 100644 --- a/vector/v.external/list.c +++ b/vector/v.external/list.c @@ -294,6 +294,7 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -301,6 +302,9 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) <<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (i = 0; i < nlayers; i++) { @@ -308,9 +312,12 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) Ogr_featuredefn = OGR_L_GetLayerDefn(Ogr_layer); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main layer_name = (char *)OGR_FD_GetName(Ogr_featuredefn); @@ -322,6 +329,9 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -330,6 +340,7 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) #endif layer_name = (char *)OGR_FD_GetName(Ogr_featuredefn); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -342,12 +353,18 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) >>>>>>> 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 (fd) { if (print_types) { int proj_same, igeom; OGRSpatialReferenceH Ogr_projection; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #if GDAL_VERSION_NUM >= 1110000 @@ -356,6 +373,9 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) ======= <<<<<<< HEAD OGRGeomFieldDefnH Ogr_geomdefn; +======= + OGRGeomFieldDefnH Ogr_geomdefn; +>>>>>>> osgeo-main ======= #if GDAL_VERSION_NUM >= 1110000 OGRGeomFieldDefnH Ogr_geomdefn; @@ -366,6 +386,9 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) OGRGeomFieldDefnH Ogr_geomdefn; #endif >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* projection check */ Ogr_projection = OGR_L_GetSpatialRef(Ogr_layer); @@ -389,6 +412,7 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) } G_suppress_warnings(FALSE); <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM >= 1110000 ======= <<<<<<< HEAD @@ -428,6 +452,8 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= #if GDAL_VERSION_NUM >= 1110000 @@ -436,6 +462,9 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) #if GDAL_VERSION_NUM >= 1110000 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -463,6 +492,7 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -473,6 +503,11 @@ int list_layers_ogr(FILE *fd, const char *dsn, char **layer, int print_types) >>>>>>> 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/vector/v.external/local_proto.h b/vector/v.external/local_proto.h index 32e8b14a07a..c554638cdc9 100644 --- a/vector/v.external/local_proto.h +++ b/vector/v.external/local_proto.h @@ -45,6 +45,7 @@ void get_table_name(const char *, char **, char **); /* proj.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void check_projection(struct Cell_head *, ds_t, int, char *, char *, int, int, int); ======= @@ -52,6 +53,8 @@ void check_projection(struct Cell_head *, ds_t, int, char *, char *, int, int, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void check_projection(struct Cell_head *, GDALDatasetH, int, char *, char *, int, int, int); ======= @@ -63,6 +66,9 @@ void check_projection(struct Cell_head *, ds_t, int, char *, char *, int, int, int); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.external/main.c b/vector/v.external/main.c index 9df95a58307..aa42be29636 100644 --- a/vector/v.external/main.c +++ b/vector/v.external/main.c @@ -49,6 +49,7 @@ int main(int argc, char *argv[]) ds_t Ogr_ds; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -59,6 +60,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_gisinit(argv[0]); @@ -200,6 +206,7 @@ int main(int argc, char *argv[]) ds_close(Ogr_ds); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -210,6 +217,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 /* create new vector map */ diff --git a/vector/v.external/proj.c b/vector/v.external/proj.c index 01f021e8f40..52e59fe1fc5 100644 --- a/vector/v.external/proj.c +++ b/vector/v.external/proj.c @@ -135,12 +135,15 @@ int get_layer_proj(OGRLayerH Ogr_layer, struct Cell_head *cellhd, /* keep in sync with r.in.gdal, r.external, v.in.ogr */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int layer, ======= void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, @@ -149,6 +152,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -188,6 +194,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, * real SRS has not been recognized or is missing */ if (proj_trouble) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to convert input map projection to GRASS " "format; cannot create new location.")); @@ -196,6 +203,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to convert input map CRS to GRASS " "format; cannot create new project.")); ======= @@ -207,6 +216,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, "format; cannot create new location.")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -215,6 +227,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to create new location <%s>"), outloc); } @@ -224,6 +237,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create new project <%s>"), outloc); } G_message(_("Project <%s> created"), outloc); @@ -238,6 +253,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, G_message(_("Location <%s> created"), outloc); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -249,6 +267,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, /* If create only, clean up and exit here */ if (create_only) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(hDS); ======= @@ -256,6 +275,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(hDS); ======= ds_close(hDS); @@ -264,6 +285,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -289,6 +313,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, else { msg_fn = G_fatal_error; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(hDS); ======= @@ -296,6 +321,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(hDS); ======= ds_close(hDS); @@ -304,6 +331,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -337,6 +367,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, proj_info, proj_units)) != 1) { int i_value; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -346,6 +377,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); @@ -358,6 +391,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -367,6 +403,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, /* error in proj_info */ if (loc_proj_info != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, _("Location PROJ_INFO is:\n")); ======= @@ -374,6 +411,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); ======= strcat(error_msg, _("Location PROJ_INFO is:\n")); @@ -382,6 +421,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, strcat(error_msg, _("Location PROJ_INFO is:\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -395,11 +437,14 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); if (loc_wind.proj == PROJECTION_XY) sprintf(error_msg + strlen(error_msg), @@ -420,6 +465,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -441,6 +489,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, "Location proj = %d (unknown), zone = %d\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -451,6 +500,11 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 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); } @@ -526,6 +580,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, /* error in proj_units */ if (loc_proj_units != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, "Location PROJ_UNITS is:\n"); ======= @@ -533,6 +588,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, "Project PROJ_UNITS is:\n"); ======= strcat(error_msg, "Location PROJ_UNITS is:\n"); @@ -541,6 +598,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, strcat(error_msg, "Location PROJ_UNITS is:\n"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -563,11 +623,14 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, if (!check_only) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("\nIn case of no significant differences " "in the coordinate reference system definitions," @@ -580,6 +643,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -592,6 +658,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, "the 'location' parameter.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -602,6 +669,11 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 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 } @@ -612,6 +684,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, msg_fn("%s", error_msg); if (check_only) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(hDS); ======= @@ -619,6 +692,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(hDS); ======= ds_close(hDS); @@ -627,6 +702,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -640,11 +718,14 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, msg_fn = G_verbose_message; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msg_fn(_("Coordinate reference system of input dataset and current " "project appear to match")); if (check_only) { @@ -653,6 +734,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -662,6 +746,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -672,6 +757,11 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 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); } diff --git a/vector/v.extract/copy_tab.c b/vector/v.extract/copy_tab.c index a25147e18ea..942600e0d53 100644 --- a/vector/v.extract/copy_tab.c +++ b/vector/v.extract/copy_tab.c @@ -11,6 +11,7 @@ void copy_tabs(struct Map_info *In, int field, int new_cat, void copy_tabs(const struct Map_info *In, int field, int new_cat, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21,6 +22,11 @@ void copy_tabs(const struct Map_info *In, int field, int new_cat, >>>>>>> 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 struct Map_info *Out) { diff --git a/vector/v.extract/local_proto.h b/vector/v.extract/local_proto.h index 1b9c90a395a..7e1685b3247 100644 --- a/vector/v.extract/local_proto.h +++ b/vector/v.extract/local_proto.h @@ -1,12 +1,15 @@ /* copy_tab.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void copy_tabs(const struct Map_info *, int, int, struct Map_info *); ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void copy_tabs(struct Map_info *, int, int, struct Map_info *); ======= void copy_tabs(const struct Map_info *, int, int, struct Map_info *); @@ -15,6 +18,9 @@ void copy_tabs(const struct Map_info *, int, int, struct Map_info *); void copy_tabs(const struct Map_info *, int, int, struct Map_info *); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.extrude/main.c b/vector/v.extrude/main.c index 5bab3882fb6..1459c262c91 100644 --- a/vector/v.extrude/main.c +++ b/vector/v.extrude/main.c @@ -153,7 +153,10 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main if (G_parser(argc, argv)) @@ -161,6 +164,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.generalize/displacement.c b/vector/v.generalize/displacement.c index 1a470d87062..cd2484f5f7c 100644 --- a/vector/v.generalize/displacement.c +++ b/vector/v.generalize/displacement.c @@ -202,6 +202,7 @@ int snakes_displacement(struct Map_info *In, struct Map_info *Out, for (iter = 0; iter < iterations; iter++) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -212,6 +213,10 @@ int snakes_displacement(struct Map_info *In, struct Map_info *Out, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main G_percent(iter, iterations, 1); @@ -278,6 +283,7 @@ int snakes_displacement(struct Map_info *In, struct Map_info *Out, matrix_add(&dx, &fx, &fx); matrix_add(&dy, &fy, &fy); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD matrix_mult(&kinv, &fx, &dx); @@ -287,6 +293,8 @@ int snakes_displacement(struct Map_info *In, struct Map_info *Out, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) int conflicts = 0; @@ -506,6 +514,9 @@ int snakes_displacement(struct Map_info *In, struct Map_info *Out, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.generalize/v.generalize.html b/vector/v.generalize/v.generalize.html index bb012f52ea6..0ab6113e307 100644 --- a/vector/v.generalize/v.generalize.html +++ b/vector/v.generalize/v.generalize.html @@ -17,6 +17,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -24,6 +25,10 @@

            NOTES

            <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main (Line) simplification is a process of reducing the complexity of vector features. The module transforms a line into another line consisting of fewer vertices, that still approximate the original line. Most of the @@ -33,6 +38,7 @@

            NOTES

            <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD (Line) simplification is a process of reducing the complexity of vector features. The module transforms a line into another line consisting of fewer vertices, that still approximate the original line. Most of the @@ -40,6 +46,8 @@

            NOTES

            ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) (Line) simplification is a process of reducing the complexity of vector features. The module transforms a line into another line consisting of @@ -60,6 +68,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -320,6 +331,7 @@

            NETWORK GENERALIZATION

            All three parameters above can be presented at the same time. In that case, the algorithm selects only the lines which meet each criterion. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

            Also, the outputed network may not be connected if the value of @@ -328,6 +340,8 @@

            NETWORK GENERALIZATION

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

            Also, the outputted network may not be connected if the value of =======

            Also, the outputed network may not be connected if the value of @@ -336,6 +350,9 @@

            NETWORK GENERALIZATION

            Also, the outputed network may not be connected if the value of >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.ascii/v.in.ascii.html b/vector/v.in.ascii/v.in.ascii.html index f7d21902154..5bbd340e5d7 100644 --- a/vector/v.in.ascii/v.in.ascii.html +++ b/vector/v.in.ascii/v.in.ascii.html @@ -20,6 +20,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -35,6 +36,12 @@

            NOTES

            <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + ======= >>>>>>> osgeo-main ======= @@ -51,6 +58,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.dwg/global.h b/vector/v.in.dwg/global.h index d8409f2d0fc..70c1f38593d 100644 --- a/vector/v.in.dwg/global.h +++ b/vector/v.in.dwg/global.h @@ -28,6 +28,7 @@ /* transformation, first level is 0 ( called from main ) and transformation * for this level is 0,0,0, 1,1,1, 0 so that no transformation is done on first <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * level (not efective but better readable?) */ ======= @@ -35,6 +36,8 @@ ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * level (not effective but better readable?) */ ======= * level (not efective but better readable?) */ @@ -43,6 +46,9 @@ * level (not efective but better readable?) */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.dxf/dxf_to_vect.c b/vector/v.in.dxf/dxf_to_vect.c index c2fa4a31909..a2b5b92ca4d 100644 --- a/vector/v.in.dxf/dxf_to_vect.c +++ b/vector/v.in.dxf/dxf_to_vect.c @@ -78,17 +78,23 @@ int dxf_to_vect(struct dxf_file *dxf, struct Map_info *Map) bounds++; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main FALLTHROUGH; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.lidar/main.c b/vector/v.in.lidar/main.c index 097d7ee471d..0ee4141dcd1 100644 --- a/vector/v.in.lidar/main.c +++ b/vector/v.in.lidar/main.c @@ -320,6 +320,7 @@ int main(int argc, char *argv[]) over_flag->key = 'o'; over_flag->label = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Override projection check (use current location's projection)"); over_flag->description = _( @@ -335,6 +336,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Override projection check (use current project's CRS)"); over_flag->description = _("Assume that the dataset has the same coordinate reference system as " @@ -368,6 +371,9 @@ int main(int argc, char *argv[]) " Do not import the vector data."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -556,6 +562,7 @@ int main(int argc, char *argv[]) if (GPJ_wkt_to_grass(&cellhd, &proj_info, &proj_units, projstr, 0) < 0) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to convert input map projection to GRASS " "format; cannot create new location.")); @@ -564,6 +571,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to convert input map CRS to GRASS " "format; cannot create new project.")); ======= @@ -575,6 +584,9 @@ int main(int argc, char *argv[]) "format; cannot create new location.")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -584,11 +596,14 @@ int main(int argc, char *argv[]) proj_units)) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create new project <%s>"), outloc_opt->answer); } @@ -597,6 +612,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -606,6 +624,7 @@ int main(int argc, char *argv[]) G_message(_("Location <%s> created"), outloc_opt->answer); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -616,6 +635,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 } @@ -625,6 +649,7 @@ int main(int argc, char *argv[]) /* TODO: */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning("Import into new location not yet implemented"); ======= @@ -632,6 +657,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning("Import into new project not yet implemented"); ======= G_warning("Import into new location not yet implemented"); @@ -640,6 +667,9 @@ int main(int argc, char *argv[]) G_warning("Import into new location not yet implemented"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.lidar/projection.c b/vector/v.in.lidar/projection.c index 1eb8845cd19..9bfd51776e5 100644 --- a/vector/v.in.lidar/projection.c +++ b/vector/v.in.lidar/projection.c @@ -27,6 +27,7 @@ void projection_mismatch_report(struct Cell_head cellhd, int i_value; char error_msg[8192]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -36,6 +37,8 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); ======= @@ -47,6 +50,9 @@ void projection_mismatch_report(struct Cell_head cellhd, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -107,11 +113,14 @@ void projection_mismatch_report(struct Cell_head cellhd, sprintf(error_msg + strlen(error_msg), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("\nIn case of no significant differences" " in the coordinate reference system definitions," " use the -o flag to ignore them and use" @@ -120,6 +129,9 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -129,6 +141,7 @@ void projection_mismatch_report(struct Cell_head cellhd, " current location definition.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -139,6 +152,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/vector/v.in.lidar/v.in.lidar.html b/vector/v.in.lidar/v.in.lidar.html index 40c6c7fda02..b68597a459e 100644 --- a/vector/v.in.lidar/v.in.lidar.html +++ b/vector/v.in.lidar/v.in.lidar.html @@ -73,6 +73,7 @@

            Decimation

            1/6skip=6 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -80,6 +81,8 @@

            Decimation

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

            Project Creation

            v.in.lidar attempts to preserve coordinate reference system (CRS) @@ -93,6 +96,9 @@

            Project Creation

            ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -127,6 +133,7 @@

            Location Creation

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The typical file extensions for the LAS format are .las and .laz (compressed). @@ -138,6 +145,9 @@

            NOTES

            >>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> osgeo-main <<<<<<< HEAD The typical file extensions for the LAS format are .las and .laz (compressed). The compressed LAS (.laz) format can be imported only if libLAS has been compiled @@ -161,6 +171,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.ogr/geom.c b/vector/v.in.ogr/geom.c index d9cd7249424..d1946c62305 100644 --- a/vector/v.in.ogr/geom.c +++ b/vector/v.in.ogr/geom.c @@ -356,6 +356,7 @@ int geom(OGRGeometryH hGeomAny, struct Map_info *Map, int field, int cat, } Vect_line_prune(Points); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* Degenerate is not ignored because it may be useful to see where it @@ -478,6 +479,8 @@ int geom(OGRGeometryH hGeomAny, struct Map_info *Map, int field, int cat, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main lastidx = Points->n_points - 1; if (Points->x[0] != Points->x[lastidx] || Points->y[0] != Points->y[lastidx] || @@ -867,6 +870,9 @@ int geom(OGRGeometryH hGeomAny, struct Map_info *Map, int field, int cat, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.ogr/main.c b/vector/v.in.ogr/main.c index 6879f2e8dea..84041c51bec 100644 --- a/vector/v.in.ogr/main.c +++ b/vector/v.in.ogr/main.c @@ -86,6 +86,7 @@ struct OGR_iterator { int done; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, @@ -95,6 +96,8 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void OGR_iterator_init(struct OGR_iterator *OGR_iter, GDALDatasetH Ogr_ds, char *dsn, int nlayers, int ogr_interleaved_reading); ======= @@ -106,6 +109,9 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, int nlayers, int ogr_interleaved_reading); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -254,6 +260,7 @@ int main(int argc, char *argv[]) G_add_keyword(_("create location")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -264,6 +271,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 module->description = _("Imports vector data into a GRASS vector map using OGR library."); @@ -429,6 +441,7 @@ int main(int argc, char *argv[]) flag.over->key = 'o'; flag.over->label = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Override projection check (use current location's projection)"); flag.over->description = _("Assume that the dataset has the same " @@ -438,6 +451,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Override projection check (use current project's CRS)"); flag.over->description = _("Assume that the dataset has the same " @@ -453,6 +468,9 @@ int main(int argc, char *argv[]) "projection as the current location"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -483,6 +501,7 @@ int main(int argc, char *argv[]) flag.no_import = G_define_flag(); flag.no_import->key = 'i'; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD flag.no_import->description = _( "Create the location specified by the \"location\" parameter and exit." @@ -492,6 +511,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main flag.no_import->description = _("Create the project specified by the \"project\" parameter and exit." " Do not import the vector data."); @@ -506,6 +527,9 @@ int main(int argc, char *argv[]) " Do not import the vector data."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -534,6 +558,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 2000000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -544,6 +569,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 for (iDriver = 0; iDriver < GDALGetDriverCount(); iDriver++) { GDALDriverH hDriver = GDALGetDriver(iDriver); @@ -566,6 +596,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -576,6 +607,10 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #else for (iDriver = 0; iDriver < OGRGetDriverCount(); iDriver++) { @@ -593,6 +628,7 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -603,6 +639,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); } @@ -716,6 +757,7 @@ int main(int argc, char *argv[]) if (Ogr_ds == NULL) G_fatal_error(_("Unable to open data source <%s>"), dsn); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -723,11 +765,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* driver name */ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -747,6 +794,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -757,6 +805,10 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #if GDAL_VERSION_NUM < 2020000 CPLSetConfigOption("OGR_INTERLEAVED_READING", "YES"); OGR_DS_Destroy(Ogr_ds); @@ -764,6 +816,7 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -774,6 +827,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 ogr_interleaved_reading = 1; } @@ -789,6 +847,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 2020000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -799,6 +858,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 (!GDALDatasetTestCapability(Ogr_ds, ODsCCreateGeomFieldAfterCreateLayer)) { @@ -850,6 +914,7 @@ int main(int argc, char *argv[]) } for (i = 0; i < navailable_layers; i++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, i); @@ -859,6 +924,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, i); available_layer_names[i] = G_store((char *)OGR_L_GetName(Ogr_layer)); @@ -888,6 +955,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -898,6 +968,7 @@ int main(int argc, char *argv[]) if (flag.list->answer) { fflush(stdout); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(Ogr_ds); ======= @@ -905,6 +976,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(Ogr_ds); ======= ds_close(Ogr_ds); @@ -913,6 +986,9 @@ int main(int argc, char *argv[]) ds_close(Ogr_ds); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -954,6 +1030,7 @@ int main(int argc, char *argv[]) if (cmp_layer_srs(Ogr_ds, nlayers, layers, layer_names, param.geom->answer)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(Ogr_ds); ======= @@ -961,6 +1038,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(Ogr_ds); ======= ds_close(Ogr_ds); @@ -969,6 +1048,9 @@ int main(int argc, char *argv[]) ds_close(Ogr_ds); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1011,6 +1093,7 @@ int main(int argc, char *argv[]) /* check output name */ if (Vect_legal_filename(output) != 1) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(Ogr_ds); ======= @@ -1018,6 +1101,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(Ogr_ds); ======= ds_close(Ogr_ds); @@ -1026,6 +1111,9 @@ int main(int argc, char *argv[]) ds_close(Ogr_ds); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1035,6 +1123,7 @@ int main(int argc, char *argv[]) /* Check if the output map exists */ if (G_find_vector2(output, G_mapset()) && !overwrite) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(Ogr_ds); ======= @@ -1042,6 +1131,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(Ogr_ds); ======= ds_close(Ogr_ds); @@ -1050,6 +1141,9 @@ int main(int argc, char *argv[]) ds_close(Ogr_ds); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1078,6 +1172,7 @@ int main(int argc, char *argv[]) /* create spatial filters */ if (param.outloc->answer && flag.region->answer) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("When creating a new location, the current region " ======= @@ -1085,6 +1180,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("When creating a new project, the current region " ======= G_warning(_("When creating a new location, the current region " @@ -1093,6 +1190,9 @@ int main(int argc, char *argv[]) G_warning(_("When creating a new location, the current region " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1111,6 +1211,7 @@ int main(int argc, char *argv[]) for (layer = 0; layer < nlayers; layer++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); #if GDAL_VERSION_NUM >= 1110000 @@ -1119,6 +1220,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layers[layer]); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); @@ -1129,6 +1232,9 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 1110000 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1149,6 +1255,7 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #else OGR_L_SetSpatialFilter(Ogr_layer, poSpatialFilter[layer]); #endif @@ -1158,6 +1265,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #else OGR_L_SetSpatialFilter(Ogr_layer, poSpatialFilter[layer]); #endif @@ -1168,6 +1277,9 @@ int main(int argc, char *argv[]) #endif >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1206,6 +1318,7 @@ int main(int argc, char *argv[]) n_features[layer] = 0; layer_id = layers[layer]; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); ======= @@ -1213,6 +1326,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layer_id); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); @@ -1221,6 +1336,9 @@ int main(int argc, char *argv[]) Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1239,6 +1357,7 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1249,6 +1368,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 feature_count = 0; @@ -1271,6 +1395,7 @@ int main(int argc, char *argv[]) if (ogr_feature_count <= 0) n_features[layer]++; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1278,11 +1403,16 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Geometry */ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1305,6 +1435,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 2000000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1315,6 +1446,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 Ogr_geometry = OGR_G_GetLinearGeometry(Ogr_geometry, 0, NULL); @@ -1335,6 +1471,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 1110000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1345,6 +1482,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 } OGR_F_Destroy(Ogr_feature); @@ -1425,6 +1567,7 @@ int main(int argc, char *argv[]) key_idx[layer] = -2; /* -1 for fid column */ layer_id = layers[layer]; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); ======= @@ -1432,6 +1575,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layer_id); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); @@ -1440,6 +1585,9 @@ int main(int argc, char *argv[]) Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1478,6 +1626,7 @@ int main(int argc, char *argv[]) )) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1488,6 +1637,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( _("Key column '%s' in input layer <%s> is not integer"), @@ -1597,6 +1751,7 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM >= 2000000 ======= <<<<<<< HEAD @@ -1604,12 +1759,17 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #if GDAL_VERSION_NUM >= 2000000 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= #if GDAL_VERSION_NUM >= 2000000 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1636,6 +1796,7 @@ int main(int argc, char *argv[]) ) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1646,6 +1807,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 /* hack: treat as string */ sprintf(buf, "varchar ( %d )", OFTIntegerListlength); @@ -1658,6 +1824,7 @@ int main(int argc, char *argv[]) col_info[i_out].type = "double precision"; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM >= 1320 ======= <<<<<<< HEAD @@ -1665,12 +1832,17 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #if GDAL_VERSION_NUM >= 1320 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= #if GDAL_VERSION_NUM >= 1320 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1686,6 +1858,7 @@ int main(int argc, char *argv[]) col_info[i_out].type = G_store(buf); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #endif ======= <<<<<<< HEAD @@ -1693,12 +1866,17 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #endif >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= #endif >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1774,6 +1952,7 @@ int main(int argc, char *argv[]) /* Create table */ i = 0; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD sprintf(buf, "create table %s (%s %s", Fi->table, col_info[i].name, col_info[i].type); @@ -1783,6 +1962,8 @@ int main(int argc, char *argv[]) sprintf(buf, ", %s %s", col_info[i].name, col_info[i].type); ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main sprintf(buf, "create table %s (\"%s\" %s", Fi->table, col_info[i].name, col_info[i].type); db_set_string(&sql, buf); @@ -1797,6 +1978,9 @@ int main(int argc, char *argv[]) for (i = 1; i < ncols_out; i++) { sprintf(buf, ", %s %s", col_info[i].name, col_info[i].type); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main db_append_string(&sql, buf); } @@ -1826,6 +2010,7 @@ int main(int argc, char *argv[]) ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD sprintf(buf, "create table %s (\"%s\" %s", Fi->table, col_info[i].name, col_info[i].type); @@ -1868,6 +2053,8 @@ int main(int argc, char *argv[]) ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sprintf(buf, "create table %s (%s %s", Fi->table, col_info[i].name, col_info[i].type); @@ -1902,6 +2089,9 @@ int main(int argc, char *argv[]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1944,6 +2134,7 @@ int main(int argc, char *argv[]) db_begin_transaction(driver); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); @@ -1952,6 +2143,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layer_id); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); @@ -1960,6 +2153,9 @@ int main(int argc, char *argv[]) Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1973,6 +2169,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -1983,6 +2180,10 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #endif >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2034,6 +2235,7 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM >= 1110000 } #endif @@ -2045,6 +2247,9 @@ int main(int argc, char *argv[]) <<<<<<< HEAD } >>>>>>> osgeo-main +======= + } +>>>>>>> osgeo-main ======= #if GDAL_VERSION_NUM >= 1110000 } @@ -2056,6 +2261,9 @@ int main(int argc, char *argv[]) #endif >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2079,11 +2287,14 @@ int main(int argc, char *argv[]) if (Ogr_ftype == OFTInteger || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_ftype == OFTInteger64 || Ogr_ftype == OFTReal) { G_rasprintf(&sqlbuf, &sqlbufsize, ", %s", Ogr_fstring); @@ -2092,6 +2303,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2105,6 +2319,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 1320 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2115,6 +2330,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 /* should we use OGR_F_GetFieldAsDateTime() here ? */ else if (Ogr_ftype == OFTDate || Ogr_ftype == OFTTime || @@ -2133,11 +2353,14 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else if (Ogr_ftype == OFTString || Ogr_ftype == OFTStringList || Ogr_ftype == OFTIntegerList || @@ -2146,6 +2369,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2159,6 +2385,7 @@ int main(int argc, char *argv[]) ) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2169,6 +2396,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 db_set_string(&strval, (char *)Ogr_fstring); db_double_quote_string(&strval); @@ -2186,11 +2418,14 @@ int main(int argc, char *argv[]) if (Ogr_ftype == OFTInteger || <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_ftype == OFTInteger64 || Ogr_ftype == OFTReal) { G_rasprintf(&sqlbuf, &sqlbufsize, ", NULL"); } @@ -2198,6 +2433,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2210,6 +2448,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 1320 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2220,6 +2459,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 else if (Ogr_ftype == OFTDate || Ogr_ftype == OFTTime || Ogr_ftype == OFTDateTime) { @@ -2227,11 +2471,14 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else if (Ogr_ftype == OFTString || Ogr_ftype == OFTStringList || Ogr_ftype == OFTIntegerList || @@ -2240,6 +2487,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2253,6 +2503,7 @@ int main(int argc, char *argv[]) ) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2263,6 +2514,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_rasprintf(&sqlbuf, &sqlbufsize, ", NULL"); } @@ -2489,6 +2745,7 @@ int main(int argc, char *argv[]) layer_names[layer]); layer_id = layers[layer]; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layer_id); Ogr_featuredefn = OGR_L_GetLayerDefn(Ogr_layer); @@ -2499,6 +2756,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layer_id); Ogr_featuredefn = OGR_L_GetLayerDefn(Ogr_layer); @@ -2518,6 +2777,9 @@ int main(int argc, char *argv[]) igeom = -1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2568,6 +2830,7 @@ int main(int argc, char *argv[]) /* Geometry */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM >= 1110000 ======= <<<<<<< HEAD @@ -2575,12 +2838,17 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #if GDAL_VERSION_NUM >= 1110000 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= #if GDAL_VERSION_NUM >= 1110000 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2591,11 +2859,14 @@ int main(int argc, char *argv[]) continue; /* use only geometry defined via param.geom */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_geometry = OGR_F_GetGeomFieldRef(Ogr_feature, i); if (Ogr_geometry != NULL) { @@ -2666,6 +2937,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2740,6 +3014,7 @@ int main(int argc, char *argv[]) G_message(_("%d input polygons"), n_polygons); Vect_hist_write(&Map, buf); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -2752,6 +3027,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 sprintf(buf, _("Total area: %G (%d areas)\n"), total_area, ncentr); G_message(_("Total area: %G (%d areas)"), total_area, ncentr); @@ -3056,6 +3336,7 @@ int main(int argc, char *argv[]) if (strcmp(G_mapset(), "PERMANENT") == 0) { G_put_element_window(&cur_wind, "", "DEFAULT_WIND"); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Default region for this location updated")); ======= @@ -3063,6 +3344,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_message(_("Default region for this project updated")); ======= G_message(_("Default region for this location updated")); @@ -3071,6 +3354,9 @@ int main(int argc, char *argv[]) G_message(_("Default region for this location updated")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3087,6 +3373,7 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, @@ -3096,6 +3383,8 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void OGR_iterator_init(struct OGR_iterator *OGR_iter, GDALDatasetH Ogr_ds, char *dsn, int nlayers, int ogr_interleaved_reading) ======= @@ -3107,6 +3396,9 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, int nlayers, int ogr_interleaved_reading) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3127,6 +3419,7 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, #if GDAL_VERSION_NUM >= 2020000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3137,6 +3430,11 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, >>>>>>> 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_verbose_message(_("Using GDAL 2.2+ style interleaved reading for " "GDAL version %d.%d.%d"), @@ -3146,6 +3444,7 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -3156,6 +3455,10 @@ void OGR_iterator_init(struct OGR_iterator *OGR_iter, ds_t Ogr_ds, char *dsn, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #else G_verbose_message(_("Using GDAL 1.x style interleaved reading for GDAL " "version %d.%d.%d"), @@ -3187,6 +3490,7 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, OGR_iter->curr_layer = layer; OGR_iter->Ogr_layer = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_getlayerbyindex(OGR_iter->Ogr_ds, OGR_iter->curr_layer); ======= @@ -3194,6 +3498,8 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALDatasetGetLayer(OGR_iter->Ogr_ds, OGR_iter->curr_layer); ======= ds_getlayerbyindex(OGR_iter->Ogr_ds, OGR_iter->curr_layer); @@ -3202,6 +3508,9 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, ds_getlayerbyindex(OGR_iter->Ogr_ds, OGR_iter->curr_layer); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3214,6 +3523,7 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, /* clear filters */ for (i = 0; i < OGR_iter->nlayers; i++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD OGR_iter->Ogr_layer = ds_getlayerbyindex(OGR_iter->Ogr_ds, i); ======= @@ -3221,6 +3531,8 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main OGR_iter->Ogr_layer = GDALDatasetGetLayer(OGR_iter->Ogr_ds, i); ======= OGR_iter->Ogr_layer = ds_getlayerbyindex(OGR_iter->Ogr_ds, i); @@ -3229,6 +3541,9 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, OGR_iter->Ogr_layer = ds_getlayerbyindex(OGR_iter->Ogr_ds, i); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3257,6 +3572,7 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, OGR_iter->Ogr_layer = ds_getlayerbyindex(OGR_iter->Ogr_ds, layer); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3267,6 +3583,11 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, >>>>>>> 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 OGR_iter->Ogr_featuredefn = OGR_L_GetLayerDefn(OGR_iter->Ogr_layer); OGR_L_SetSpatialFilter(OGR_iter->Ogr_layer, poSpatialFilter); @@ -3278,6 +3599,7 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -3288,12 +3610,17 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #if GDAL_VERSION_NUM < 2020000 OGR_iter->Ogr_layer = OGR_DS_GetLayer(OGR_iter->Ogr_ds, OGR_iter->curr_layer); #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3304,6 +3631,11 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, >>>>>>> 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 } OGR_iter->requested_layer = layer; @@ -3330,6 +3662,7 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, /* fetch next feature */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #if GDAL_VERSION_NUM >= 2020000 ======= <<<<<<< HEAD @@ -3337,12 +3670,17 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= #if GDAL_VERSION_NUM >= 2020000 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= #if GDAL_VERSION_NUM >= 2020000 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3363,11 +3701,14 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, if (ln && *ln && strcmp(ln, layer_name) == 0) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main return Ogr_feature; } @@ -3379,6 +3720,9 @@ OGRFeatureH ogr_getnextfeature(struct OGR_iterator *OGR_iter, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3450,6 +3794,7 @@ int create_spatial_filter(GDALDatasetH Ogr_ds, OGRGeometryH *poSpatialFilter, for (layer = 0; layer < nlayers; layer++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); ======= @@ -3457,6 +3802,8 @@ int create_spatial_filter(GDALDatasetH Ogr_ds, OGRGeometryH *poSpatialFilter, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layers[layer]); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); @@ -3465,6 +3812,9 @@ int create_spatial_filter(GDALDatasetH Ogr_ds, OGRGeometryH *poSpatialFilter, Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3504,16 +3854,22 @@ int create_spatial_filter(GDALDatasetH Ogr_ds, OGRGeometryH *poSpatialFilter, * the read cursor of the layer. */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALDatasetResetReading(Ogr_ds); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.ogr/proj.c b/vector/v.in.ogr/proj.c index db0984c485a..a458be8eaeb 100644 --- a/vector/v.in.ogr/proj.c +++ b/vector/v.in.ogr/proj.c @@ -137,6 +137,7 @@ int get_layer_proj(OGRLayerH Ogr_layer, struct Cell_head *cellhd, * return 1 if layer projections differ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, char *geom_col) ======= @@ -144,6 +145,8 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int cmp_layer_srs(GDALDatasetH Ogr_ds, int nlayers, int *layers, char **layer_names, char *geom_col) ======= @@ -155,6 +158,9 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, char *geom_col) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -180,6 +186,7 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, do { /* Get first SRS */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); ======= @@ -187,6 +194,8 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layers[layer]); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); @@ -195,6 +204,9 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -243,6 +255,7 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, for (layer = 1; layer < nlayers; layer++) { /* Get SRS of other layer(s) */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); ======= @@ -250,6 +263,8 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_layer = GDALDatasetGetLayer(Ogr_ds, layers[layer]); ======= Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); @@ -258,6 +273,9 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, Ogr_layer = ds_getlayerbyindex(Ogr_ds, layers[layer]); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -326,12 +344,15 @@ int cmp_layer_srs(ds_t Ogr_ds, int nlayers, int *layers, char **layer_names, /* keep in sync with r.in.gdal, r.external, v.external */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, int layer, ======= void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, @@ -340,6 +361,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -380,6 +404,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, if (proj_trouble) { G_fatal_error(_("Unable to convert input map projection to GRASS " <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "format; cannot create new location.")); ======= @@ -387,6 +412,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main "format; cannot create new project.")); ======= "format; cannot create new location.")); @@ -395,6 +422,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, "format; cannot create new location.")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -403,6 +433,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, if (0 != G_make_location_crs(outloc, cellhd, proj_info, proj_units, srid, wkt)) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Unable to create new location <%s>"), outloc); } @@ -412,6 +443,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Unable to create new project <%s>"), outloc); } G_message(_("Project <%s> created"), outloc); @@ -426,6 +459,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, G_message(_("Location <%s> created"), outloc); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -437,6 +473,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, /* If create only, clean up and exit here */ if (create_only) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(hDS); ======= @@ -444,6 +481,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(hDS); ======= ds_close(hDS); @@ -452,6 +491,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -477,6 +519,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, else { msg_fn = G_fatal_error; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(hDS); ======= @@ -484,6 +527,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(hDS); ======= ds_close(hDS); @@ -492,6 +537,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -523,6 +571,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, proj_info, proj_units)) != 1) { int i_value; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -532,6 +581,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of dataset does not" " appear to match current project.\n\n")); @@ -544,6 +595,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -553,6 +607,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, /* error in proj_info */ if (loc_proj_info != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, _("Location PROJ_INFO is:\n")); ======= @@ -560,6 +615,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); ======= strcat(error_msg, _("Location PROJ_INFO is:\n")); @@ -568,6 +625,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, strcat(error_msg, _("Location PROJ_INFO is:\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -581,11 +641,14 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, else { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("Project PROJ_INFO is:\n")); if (loc_wind.proj == PROJECTION_XY) sprintf(error_msg + strlen(error_msg), @@ -606,6 +669,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -627,6 +693,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, "Location proj = %d (unknown), zone = %d\n", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -637,6 +704,11 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 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); } @@ -712,6 +784,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, /* error in proj_units */ if (loc_proj_units != NULL) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD strcat(error_msg, "Location PROJ_UNITS is:\n"); ======= @@ -719,6 +792,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, "Project PROJ_UNITS is:\n"); ======= strcat(error_msg, "Location PROJ_UNITS is:\n"); @@ -727,6 +802,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, strcat(error_msg, "Location PROJ_UNITS is:\n"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -749,11 +827,14 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, if (!check_only) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcat(error_msg, _("\nIn case of no significant differences " "in the coordinate reference system definitions," @@ -766,6 +847,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -778,6 +862,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, "the 'location' parameter.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -788,6 +873,11 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 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 } @@ -798,6 +888,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, msg_fn("%s", error_msg); if (check_only) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ds_close(hDS); ======= @@ -805,6 +896,8 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main GDALClose(hDS); ======= ds_close(hDS); @@ -813,6 +906,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -826,11 +922,14 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, msg_fn = G_verbose_message; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main msg_fn(_("Coordinate reference system of input dataset and current " "project appear to match")); @@ -840,6 +939,9 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -849,6 +951,7 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, ds_close(hDS); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -859,6 +962,11 @@ void check_projection(struct Cell_head *cellhd, ds_t hDS, int layer, >>>>>>> 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); } diff --git a/vector/v.in.ogr/testsuite/data/precip_30ynormals_3d.prj b/vector/v.in.ogr/testsuite/data/precip_30ynormals_3d.prj index a52c1cefdd2..bb42ad8605e 100644 --- a/vector/v.in.ogr/testsuite/data/precip_30ynormals_3d.prj +++ b/vector/v.in.ogr/testsuite/data/precip_30ynormals_3d.prj @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",609601.22],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-79.0],PARAMETER["Standard_Parallel_1",36.1666666666667],PARAMETER["Standard_Parallel_2",34.3333333333333],PARAMETER["Latitude_Of_Origin",33.75],UNIT["Meter",1.0]] ======= <<<<<<< HEAD @@ -15,6 +16,12 @@ PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200",GEOGCS["GCS_North_Ame PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",609601.22],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-79.0],PARAMETER["Standard_Parallel_1",36.1666666666667],PARAMETER["Standard_Parallel_2",34.3333333333333],PARAMETER["Latitude_Of_Origin",33.75],UNIT["Meter",1.0]] ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",609601.22],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-79.0],PARAMETER["Standard_Parallel_1",36.1666666666667],PARAMETER["Standard_Parallel_2",34.3333333333333],PARAMETER["Latitude_Of_Origin",33.75],UNIT["Meter",1.0]] +======= +>>>>>>> osgeo-main PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200",GEOGCS["GCS_North_American_1983_HARN",DATUM["D_North_American_1983_HARN",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",609601.22],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-79.0],PARAMETER["Standard_Parallel_1",36.1666666666667],PARAMETER["Standard_Parallel_2",34.3333333333333],PARAMETER["Latitude_Of_Origin",33.75],UNIT["Meter",1.0]] >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -30,6 +37,9 @@ PROJCS["NAD_1983_HARN_StatePlane_North_Carolina_FIPS_3200",GEOGCS["GCS_North_Ame >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.ogr/testsuite/test_v_in_ogr.py b/vector/v.in.ogr/testsuite/test_v_in_ogr.py index 8fa2bd979e8..e954a809e03 100644 --- a/vector/v.in.ogr/testsuite/test_v_in_ogr.py +++ b/vector/v.in.ogr/testsuite/test_v_in_ogr.py @@ -4,17 +4,23 @@ """ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -41,6 +47,7 @@ def tearDown(self): def test_1(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -48,12 +55,17 @@ def test_1(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -94,6 +106,7 @@ def test_1(self): def test_2(self): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -101,12 +114,17 @@ def test_2(self): >>>>>>> osgeo-main <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.pdal/main.cpp b/vector/v.in.pdal/main.cpp index 9389c5f14ec..d11f140c54b 100644 --- a/vector/v.in.pdal/main.cpp +++ b/vector/v.in.pdal/main.cpp @@ -223,6 +223,7 @@ int main(int argc, char *argv[]) over_flag->key = 'o'; over_flag->label = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Override projection check (use current location's projection)"); over_flag->description = _( @@ -232,6 +233,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Override projection check (use current project's CRS)"); over_flag->description = _("Assume that the dataset has the same coordinate reference system as " @@ -247,6 +250,9 @@ int main(int argc, char *argv[]) "Assume that the dataset has same projection as the current location"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.in.pdal/projection.c b/vector/v.in.pdal/projection.c index 90bd6abcea0..df72e936602 100644 --- a/vector/v.in.pdal/projection.c +++ b/vector/v.in.pdal/projection.c @@ -27,6 +27,7 @@ void projection_mismatch_report(struct Cell_head cellhd, int i_value; char error_msg[8192]; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD strcpy(error_msg, _("Projection of dataset does not" @@ -36,6 +37,8 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main strcpy(error_msg, _("Coordinate reference system of the dataset does not" " appear to match current project.\n\n")); ======= @@ -47,6 +50,9 @@ void projection_mismatch_report(struct Cell_head cellhd, " appear to match current location.\n\n")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -107,11 +113,14 @@ void projection_mismatch_report(struct Cell_head cellhd, sprintf(error_msg + strlen(error_msg), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("\nIn case of no significant differences" " in the coordinate reference system definitions," " use the -o flag to ignore them and use" @@ -120,6 +129,9 @@ void projection_mismatch_report(struct Cell_head cellhd, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -129,6 +141,7 @@ void projection_mismatch_report(struct Cell_head cellhd, " current location definition.\n")); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -139,6 +152,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/vector/v.in.region/v.in.region.html b/vector/v.in.region/v.in.region.html index 0af3d8ddc82..106850753b1 100644 --- a/vector/v.in.region/v.in.region.html +++ b/vector/v.in.region/v.in.region.html @@ -17,6 +17,7 @@

            EXAMPLE

            The example is based on the North Carolina sample data location. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -28,6 +29,11 @@

            EXAMPLE

            ======= >>>>>>> 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 To create a bounding box vector map based on a raster map, the computational region is first set to the raster map. Then a vector bounding box is created based on the actual computational diff --git a/vector/v.info/print.c b/vector/v.info/print.c index 272197e2f38..e9c8a68bfd8 100644 --- a/vector/v.info/print.c +++ b/vector/v.info/print.c @@ -123,6 +123,7 @@ void print_topo(struct Map_info *Map) fflush(stdout); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void print_columns(const struct Map_info *Map, const char *input_opt, @@ -131,6 +132,8 @@ void print_columns(const struct Map_info *Map, const char *input_opt, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void print_columns(struct Map_info *Map, const char *input_opt, ======= void print_columns(const struct Map_info *Map, const char *input_opt, @@ -139,6 +142,9 @@ void print_columns(const struct Map_info *Map, const char *input_opt, void print_columns(const struct Map_info *Map, const char *input_opt, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -220,17 +226,23 @@ void print_shell(struct Map_info *Map, const char *field_opt) fprintf(stdout, "location=%s\n", G_location()); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main fprintf(stdout, "project=%s\n", G_location()); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -336,6 +348,7 @@ void print_info(struct Map_info *Map) G_saprintf(line, "%-17s%s", _("Mapset:"), Vect_get_mapset(Map)); printline(line); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_saprintf(line, "%-17s%s", _("Location:"), G_location()); @@ -344,6 +357,8 @@ void print_info(struct Map_info *Map) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_saprintf(line, "%-17s%s", _("Project:"), G_location()); ======= G_saprintf(line, "%-17s%s", _("Location:"), G_location()); @@ -352,6 +367,9 @@ void print_info(struct Map_info *Map) G_saprintf(line, "%-17s%s", _("Location:"), G_location()); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.info/v.info.html b/vector/v.info/v.info.html index 0b769f54fa1..fc941ef2b2a 100644 --- a/vector/v.info/v.info.html +++ b/vector/v.info/v.info.html @@ -138,6 +138,7 @@

            Basic metadata information in shell script style

            PYTHON

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD See Python @@ -155,6 +156,12 @@

            PYTHON

            See             Python ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +See Python +======= +>>>>>>> osgeo-main See Python >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -167,6 +174,9 @@

            PYTHON

            See             Python >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.kernel/global.h b/vector/v.kernel/global.h index bb0108bf62f..c11c5c85d49 100644 --- a/vector/v.kernel/global.h +++ b/vector/v.kernel/global.h @@ -27,6 +27,7 @@ double invGaussian2d(double sigma, double prob); double gaussian2dByTerms(double d, double term1, double term2); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD double brent_iterate(double (*f)(double), double x_lower, double x_upper, ======= <<<<<<< HEAD @@ -42,6 +43,12 @@ double brent_iterate(double (*f)(double), double x_lower, double x_upper, double brent_iterate(double (*f)(double), double x_lower, double x_upper, ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +double brent_iterate(double (*f)(double), double x_lower, double x_upper, +======= +>>>>>>> osgeo-main double brent_iterate(double (*f)(), double x_lower, double x_upper, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -57,6 +64,9 @@ double brent_iterate(double (*f)(double), double x_lower, double x_upper, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.kernel/v.kernel.html b/vector/v.kernel/v.kernel.html index 40ac7529da0..f44120a6331 100644 --- a/vector/v.kernel/v.kernel.html +++ b/vector/v.kernel/v.kernel.html @@ -44,6 +44,7 @@

            EXAMPLES

            KNOWN ISSUES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD The module only considers the presence of points, but not @@ -62,6 +63,12 @@

            KNOWN ISSUES

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +The module only considers the presence of points, but not +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) The module only considers the presence of points, but not >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -75,6 +82,9 @@

            KNOWN ISSUES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.label.sa/annealing.c b/vector/v.label.sa/annealing.c index 0df22b4b1ea..fa703b063f7 100644 --- a/vector/v.label.sa/annealing.c +++ b/vector/v.label.sa/annealing.c @@ -50,12 +50,15 @@ static unsigned int overlaps_removed = 0; */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void simulate_annealing(label_t *labels, int n_labels, struct params *p) ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void simulate_annealing(label_t *labels, int n_labels, struct params *p UNUSED) ======= void simulate_annealing(label_t *labels, int n_labels, struct params *p) @@ -64,6 +67,9 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) void simulate_annealing(label_t *labels, int n_labels, struct params *p) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -116,11 +122,14 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) consec_successes++; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -137,6 +146,9 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -154,6 +166,7 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) successes++; consec_successes++; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD } else { @@ -174,6 +187,13 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD + } + else { +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -197,6 +217,9 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -205,6 +228,7 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) } /* decrease immediately */ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (consec_successes > (unsigned int)(5 * n_labels)) { ======= @@ -220,6 +244,12 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) <<<<<<< HEAD if (consec_successes > (unsigned int)(5 * n_labels)) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + if (consec_successes > (unsigned int)(5 * n_labels)) { +======= >>>>>>> osgeo-main if (consec_successes > (5 * n_labels)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -236,6 +266,9 @@ void simulate_annealing(label_t *labels, int n_labels, struct params *p) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.label.sa/labels.c b/vector/v.label.sa/labels.c index 50d62a95b1f..48ae8a647ab 100644 --- a/vector/v.label.sa/labels.c +++ b/vector/v.label.sa/labels.c @@ -64,16 +64,22 @@ label_t *labels_init(struct params *p, int *n_labels) labels = (label_t *)G_malloc(sizeof(label_t) * label_sz); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_debug(1, "labels=%p", (void *)labels); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -240,11 +246,14 @@ label_t *labels_init(struct params *p, int *n_labels) * structure. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * @param face The opened FT library face to use. * @param The charset to use [unused] * @param The label to which we want to create a skyline @@ -255,6 +264,9 @@ static int label_skyline(FT_Face face, const char *charset UNUSED, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -265,6 +277,7 @@ static int label_skyline(FT_Face face, const char *charset UNUSED, static int label_skyline(FT_Face face, const char *charset, label_t *label) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -276,6 +289,11 @@ static int label_skyline(FT_Face face, const char *charset, label_t *label) ======= >>>>>>> 8422103f4c (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 i, len; double advance = 0.0; @@ -1139,6 +1157,7 @@ static double label_lineover(label_t *label, label_candidate_t *candidate, * @param skyline The skyline to investigate. * @param swathline The swath line to investigate. <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * @param p The point on the skyline which is neares to the swath line is stored * in this structure. @@ -1147,6 +1166,8 @@ static double label_lineover(label_t *label, label_candidate_t *candidate, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * @param p The point on the skyline which is nearest to the swath line is * stored in this structure. ======= @@ -1158,6 +1179,9 @@ static double label_lineover(label_t *label, label_candidate_t *candidate, * in this structure. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.label.sa/labels.h b/vector/v.label.sa/labels.h index 7da2896a415..ef5109721b7 100644 --- a/vector/v.label.sa/labels.h +++ b/vector/v.label.sa/labels.h @@ -41,6 +41,7 @@ struct _label_point { * This structure represents a label for a vector feature */ struct _label { +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD struct line_pnts *skyline; /**< The skyline of the text, as an offest @@ -49,6 +50,8 @@ struct _label { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main struct line_pnts *skyline; /**< The skyline of the text, as an offset ======= struct line_pnts *skyline; /**< The skyline of the text, as an offest @@ -57,6 +60,9 @@ struct _label { struct line_pnts *skyline; /**< The skyline of the text, as an offest >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -77,6 +83,7 @@ struct _label { int cat; /**< the cat of the feature */ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD int type; /**< The feture type (point, line, area) */ @@ -85,6 +92,8 @@ struct _label { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int type; /**< The feature type (point, line, area) */ ======= int type; /**< The feture type (point, line, area) */ @@ -93,6 +102,9 @@ struct _label { int type; /**< The feture type (point, line, area) */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.label/main.c b/vector/v.label/main.c index c48755b1046..aebbbb00a03 100644 --- a/vector/v.label/main.c +++ b/vector/v.label/main.c @@ -225,6 +225,7 @@ int main(int argc, char **argv) if (FontSize->answer) { fontsize = atoi(FontSize->answer); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* figure out space param dynamically from current dispay */ @@ -233,6 +234,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* figure out space param dynamically from current display */ ======= /* figure out space param dynamically from current dispay */ @@ -241,6 +244,9 @@ int main(int argc, char **argv) /* figure out space param dynamically from current dispay */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.lidar.correction/correction.c b/vector/v.lidar.correction/correction.c index a1e7c66d92f..f1ad237dc55 100644 --- a/vector/v.lidar.correction/correction.c +++ b/vector/v.lidar.correction/correction.c @@ -23,6 +23,7 @@ #include #include "correction.h" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD void P_Sparse_Correction(struct Map_info *In, struct Map_info *Out, @@ -31,6 +32,8 @@ void P_Sparse_Correction(struct Map_info *In, struct Map_info *Out, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void P_Sparse_Correction(struct Map_info *In UNUSED, struct Map_info *Out, ======= void P_Sparse_Correction(struct Map_info *In, struct Map_info *Out, @@ -39,6 +42,9 @@ void P_Sparse_Correction(struct Map_info *In, struct Map_info *Out, void P_Sparse_Correction(struct Map_info *In, struct Map_info *Out, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.lidar.correction/v.lidar.correction.html b/vector/v.lidar.correction/v.lidar.correction.html index 585a1fb993e..80124fd524f 100644 --- a/vector/v.lidar.correction/v.lidar.correction.html +++ b/vector/v.lidar.correction/v.lidar.correction.html @@ -66,6 +66,7 @@

            Second correction procedure

            REFERENCES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -73,6 +74,8 @@

            REFERENCES

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD Antolin, R. et al., 2006. Digital terrain models determination by LiDAR technology: Po basin experimentation. Bolletino di Geodesia e Scienze @@ -132,6 +135,9 @@

            REFERENCES

            ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -157,6 +163,11 @@

            REFERENCES

            Brovelli M. A., Cannata M. and Longoni U.M., 2002. DTM LIDAR in area urbana, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) @@ -171,6 +182,7 @@

            REFERENCES

            Performances of the filter can be seen in the <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD             ISPRS WG III/3 Comparison of Filters report by Sithole, G. and Vosselman, G., 2003. ======= @@ -187,6 +199,12 @@

            REFERENCES

            report by Sithole, G. and Vosselman, G., 2003. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +ISPRS WG III/3 Comparison of Filters +report by Sithole, G. and Vosselman, G., 2003. +======= +>>>>>>> osgeo-main ISPRS WG III/3 Comparison of Filters report by Sithole, G. and Vosselman, G., 2003. >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -203,6 +221,9 @@

            REFERENCES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.lidar.growing/ConvexHull.c b/vector/v.lidar.growing/ConvexHull.c index 59ba8ad7e56..802e29e0453 100644 --- a/vector/v.lidar.growing/ConvexHull.c +++ b/vector/v.lidar.growing/ConvexHull.c @@ -189,6 +189,7 @@ int checkHull(int cR, int cC, double **oldHull, int lungOld) /*---------------------------------------------------------------------------*/ double pianOriz(double **punti, int obsNum, double *minNS, double *minEW, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD double *maxNS, double *maxEW, struct element_grow **mat, int CBordo) @@ -197,6 +198,8 @@ double pianOriz(double **punti, int obsNum, double *minNS, double *minEW, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main double *maxNS, double *maxEW, struct element_grow **mat UNUSED, int CBordo UNUSED) ======= @@ -208,6 +211,9 @@ double pianOriz(double **punti, int obsNum, double *minNS, double *minEW, int CBordo) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -336,6 +342,7 @@ void free_structmatrix(struct element_grow **m, long nrl, long nrh, long ncl, long nch) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -347,6 +354,11 @@ void free_structmatrix(struct element_grow **m, long nrl, long nrh, long ncl, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { free((FREE_ARG)(m[nrl] + ncl - NR_END)); free((FREE_ARG)(m + nrl - NR_END)); diff --git a/vector/v.lidar.growing/growing.c b/vector/v.lidar.growing/growing.c index 5abb2496edf..b0b57766538 100644 --- a/vector/v.lidar.growing/growing.c +++ b/vector/v.lidar.growing/growing.c @@ -5,6 +5,7 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD FILE *fsite) ======= @@ -12,6 +13,8 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main FILE *fsite UNUSED) ======= FILE *fsite) @@ -20,6 +23,9 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, FILE *fsite) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47,6 +53,7 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, while (db_fetch(&cursor, DB_NEXT, &more) == DB_OK && more) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -57,6 +64,10 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main table = db_get_cursor_table(&cursor); @@ -86,7 +97,10 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -185,6 +199,9 @@ void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out, dbDriver *driver, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.lidar.growing/main.c b/vector/v.lidar.growing/main.c index f4be49c5ea3..00bfd74e89a 100644 --- a/vector/v.lidar.growing/main.c +++ b/vector/v.lidar.growing/main.c @@ -178,6 +178,7 @@ int main(int argc, char *argv[]) Cats = Vect_new_cats_struct(); Vect_rewind(&In); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD while (Vect_read_next_line(&In, points, Cats) > 0) ; @@ -194,6 +195,12 @@ int main(int argc, char *argv[]) while (Vect_read_next_line(&In, points, Cats) > 0) ; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + while (Vect_read_next_line(&In, points, Cats) > 0) + ; +======= >>>>>>> osgeo-main while (Vect_read_next_line(&In, points, Cats) > 0) { nlines++; @@ -213,6 +220,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -223,6 +233,7 @@ int main(int argc, char *argv[]) Cats_first = Vect_new_cats_struct(); Vect_rewind(&First); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD while (Vect_read_next_line(&First, points_first, Cats_first) > 0) ; @@ -239,6 +250,12 @@ int main(int argc, char *argv[]) while (Vect_read_next_line(&First, points_first, Cats_first) > 0) ; ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD + while (Vect_read_next_line(&First, points_first, Cats_first) > 0) + ; +======= >>>>>>> osgeo-main while (Vect_read_next_line(&First, points_first, Cats_first) > 0) { nlines_first++; @@ -258,6 +275,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.lidar.growing/v.lidar.growing.html b/vector/v.lidar.growing/v.lidar.growing.html index b6f6dd9046d..d4eb25d2e0b 100644 --- a/vector/v.lidar.growing/v.lidar.growing.html +++ b/vector/v.lidar.growing/v.lidar.growing.html @@ -49,6 +49,7 @@

            Basic region growing procedure

            REFERENCES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -56,6 +57,8 @@

            REFERENCES

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD Antolin, R. et al., 2006. Digital terrain models determination by LiDAR technology: Po basin experimentation. Bolletino di Geodesia e Scienze @@ -118,6 +121,9 @@

            REFERENCES

            ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -143,6 +149,11 @@

            REFERENCES

            ISPRS WG III/3 Comparison of Filters <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) diff --git a/vector/v.lrs/v.lrs.create/main.c b/vector/v.lrs/v.lrs.create/main.c index 9b31e167488..d8030039c92 100644 --- a/vector/v.lrs/v.lrs.create/main.c +++ b/vector/v.lrs/v.lrs.create/main.c @@ -278,6 +278,7 @@ int main(int argc, char **argv) /* Because the line feature identified by one id (lidcol) may be split * to more line parts, and milepost may be in threshold for more such <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * parts, so that if each line part would be processed separetely, it could ======= @@ -285,6 +286,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * parts, so that if each line part would be processed separately, it could ======= * parts, so that if each line part would be processed separetely, it could @@ -293,6 +296,9 @@ int main(int argc, char **argv) * parts, so that if each line part would be processed separetely, it could >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -629,6 +635,7 @@ int main(int argc, char **argv) } G_debug(debug, " %d mileposts attached to line(s)", nmposts); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* Go thourough all attached MPs and fill in info about MPs to 'lines' @@ -637,6 +644,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Go thorough all attached MPs and fill in info about MPs to 'lines' ======= /* Go thourough all attached MPs and fill in info about MPs to 'lines' @@ -645,6 +654,9 @@ int main(int argc, char **argv) /* Go thourough all attached MPs and fill in info about MPs to 'lines' >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.mkgrid/v.mkgrid.html b/vector/v.mkgrid/v.mkgrid.html index cce3bbae895..a8e89f64e02 100644 --- a/vector/v.mkgrid/v.mkgrid.html +++ b/vector/v.mkgrid/v.mkgrid.html @@ -191,6 +191,7 @@

            AUTHORS

            <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Update for new vectors Radim Blazek 10/2004 ======= <<<<<<< HEAD @@ -206,6 +207,12 @@

            AUTHORS

            Update for new vectors Radim Blazek 10/2004 ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +Update for new vectors Radim Blazek 10/2004 +======= +>>>>>>> osgeo-main Update for new vectors Radim Blazek 10/2004 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -221,6 +228,9 @@

            AUTHORS

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.alloc/alloc.h b/vector/v.net.alloc/alloc.h index ca5e3cf6f29..e1df47b4b15 100644 --- a/vector/v.net.alloc/alloc.h +++ b/vector/v.net.alloc/alloc.h @@ -5,6 +5,7 @@ typedef struct { typedef struct { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int center; /* neares center, initially -1 */ ======= @@ -12,6 +13,8 @@ typedef struct { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int center; /* nearest center, initially -1 */ ======= int center; /* neares center, initially -1 */ @@ -20,6 +23,9 @@ typedef struct { int center; /* neares center, initially -1 */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.alloc/main.c b/vector/v.net.alloc/main.c index 7ab9858ec90..aa22afda35b 100644 --- a/vector/v.net.alloc/main.c +++ b/vector/v.net.alloc/main.c @@ -144,6 +144,7 @@ int main(int argc, char **argv) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -151,6 +152,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -159,6 +162,9 @@ int main(int argc, char **argv) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.allpairs/main.c b/vector/v.net.allpairs/main.c index 1f5da616ef2..cb89224dcd0 100644 --- a/vector/v.net.allpairs/main.c +++ b/vector/v.net.allpairs/main.c @@ -110,6 +110,7 @@ int main(int argc, char *argv[]) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -117,6 +118,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -125,6 +128,9 @@ int main(int argc, char *argv[]) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.bridge/v.net.bridge.html b/vector/v.net.bridge/v.net.bridge.html index bd02e59281e..fd3f061a380 100644 --- a/vector/v.net.bridge/v.net.bridge.html +++ b/vector/v.net.bridge/v.net.bridge.html @@ -4,6 +4,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -11,6 +12,10 @@

            NOTES

            <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main Bridge in a network is an edge/line whose removal would disconnect the (sub-)network. A node is an articulation point if its removal would disconnect the (sub-)network. For more information and formal @@ -20,6 +25,7 @@

            NOTES

            <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Bridge in a network is an edge/line whose removal would disconnect the (sub-)network. A node is an articulation point if its removal would disconnect the (sub-)network. For more information and formal @@ -27,6 +33,8 @@

            NOTES

            ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Bridge in a network is an edge/line whose removal would disconnect the (sub-)network. A node is an articulation point if its removal @@ -47,6 +55,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.centrality/main.c b/vector/v.net.centrality/main.c index 7e71157d179..679c1dad066 100644 --- a/vector/v.net.centrality/main.c +++ b/vector/v.net.centrality/main.c @@ -186,6 +186,7 @@ int main(int argc, char *argv[]) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -193,6 +194,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -201,6 +204,9 @@ int main(int argc, char *argv[]) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.centrality/v.net.centrality.html b/vector/v.net.centrality/v.net.centrality.html index 975ef95bb2a..b4e04f7ae1f 100644 --- a/vector/v.net.centrality/v.net.centrality.html +++ b/vector/v.net.centrality/v.net.centrality.html @@ -27,6 +27,7 @@

            NOTES

            EXAMPLES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Compute closeness and betweenness centrality measures for each node @@ -48,6 +49,13 @@

            EXAMPLES

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Compute closeness and betweenness centrality measures for each node +and produce a map containing not only points already present in the +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Compute closeness and betweenness centrality measures for each node and produce a map containing not only points already present in the @@ -65,6 +73,9 @@

            EXAMPLES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.components/v.net.components.html b/vector/v.net.components/v.net.components.html index 1a3eee64c79..12e19e3a133 100644 --- a/vector/v.net.components/v.net.components.html +++ b/vector/v.net.components/v.net.components.html @@ -5,6 +5,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -12,11 +13,16 @@

            NOTES

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -28,7 +34,10 @@

            NOTES

            ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -52,6 +61,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.connectivity/v.net.connectivity.html b/vector/v.net.connectivity/v.net.connectivity.html index 25ef0ed4526..4bce4fa3ca3 100644 --- a/vector/v.net.connectivity/v.net.connectivity.html +++ b/vector/v.net.connectivity/v.net.connectivity.html @@ -19,6 +19,7 @@

            EXAMPLE

            The following command finds the minimum number of intersections separating <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD roads on the left bank from roads on the right bank. ======= <<<<<<< HEAD @@ -32,6 +33,11 @@

            EXAMPLE

            roads on the left bank from roads on the right bank. ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +roads on the left bank from roads on the right bank. +======= +>>>>>>> osgeo-main roads on the left bank from roads on the right bank. <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -47,6 +53,9 @@

            EXAMPLE

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.distance/main.c b/vector/v.net.distance/main.c index e60bd030c51..86d069ee5bd 100644 --- a/vector/v.net.distance/main.c +++ b/vector/v.net.distance/main.c @@ -159,6 +159,7 @@ int main(int argc, char *argv[]) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -166,6 +167,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -174,6 +177,9 @@ int main(int argc, char *argv[]) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.distance/v.net.distance.html b/vector/v.net.distance/v.net.distance.html index 95f7b99d95b..a7a4fcb2628 100644 --- a/vector/v.net.distance/v.net.distance.html +++ b/vector/v.net.distance/v.net.distance.html @@ -17,12 +17,15 @@

            NOTES

            <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Furthemore, the output map contains the shortest path between ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Furthermore, the output map contains the shortest path between ======= Furthemore, the output map contains the shortest path between @@ -31,6 +34,9 @@

            NOTES

            Furthemore, the output map contains the shortest path between >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.flow/v.net.flow.html b/vector/v.net.flow/v.net.flow.html index 23e5bc02ff3..cb3bb6a0998 100644 --- a/vector/v.net.flow/v.net.flow.html +++ b/vector/v.net.flow/v.net.flow.html @@ -5,6 +5,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -12,11 +13,16 @@

            NOTES

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -40,7 +46,10 @@

            NOTES

            ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -88,6 +97,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.iso/alloc.h b/vector/v.net.iso/alloc.h index ca5e3cf6f29..e1df47b4b15 100644 --- a/vector/v.net.iso/alloc.h +++ b/vector/v.net.iso/alloc.h @@ -5,6 +5,7 @@ typedef struct { typedef struct { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int center; /* neares center, initially -1 */ ======= @@ -12,6 +13,8 @@ typedef struct { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int center; /* nearest center, initially -1 */ ======= int center; /* neares center, initially -1 */ @@ -20,6 +23,9 @@ typedef struct { int center; /* neares center, initially -1 */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.iso/main.c b/vector/v.net.iso/main.c index 1ae0b6d45f2..242b2a2a8ca 100644 --- a/vector/v.net.iso/main.c +++ b/vector/v.net.iso/main.c @@ -167,6 +167,7 @@ int main(int argc, char **argv) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -174,6 +175,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -182,6 +185,9 @@ int main(int argc, char **argv) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.path/main.c b/vector/v.net.path/main.c index 0195c73a901..b207696cb1a 100644 --- a/vector/v.net.path/main.c +++ b/vector/v.net.path/main.c @@ -129,6 +129,7 @@ int main(int argc, char **argv) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -136,6 +137,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -144,6 +147,9 @@ int main(int argc, char **argv) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.path/v.net.path.html b/vector/v.net.path/v.net.path.html index 96a228353f1..d92b6dc31d5 100644 --- a/vector/v.net.path/v.net.path.html +++ b/vector/v.net.path/v.net.path.html @@ -84,6 +84,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Nodes and arcs can be closed using cost = -1. @@ -102,6 +103,12 @@

            NOTES

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Nodes and arcs can be closed using cost = -1. +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Nodes and arcs can be closed using cost = -1. >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -115,6 +122,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.salesman/main.c b/vector/v.net.salesman/main.c index 1de68c1766f..8a94c6bb0a9 100644 --- a/vector/v.net.salesman/main.c +++ b/vector/v.net.salesman/main.c @@ -207,6 +207,7 @@ int main(int argc, char **argv) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -214,6 +215,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -222,6 +225,9 @@ int main(int argc, char **argv) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.salesman/v.net.salesman.html b/vector/v.net.salesman/v.net.salesman.html index 148098b750c..61b8795c098 100644 --- a/vector/v.net.salesman/v.net.salesman.html +++ b/vector/v.net.salesman/v.net.salesman.html @@ -35,6 +35,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Arcs can be closed using cost = -1. @@ -53,6 +54,12 @@

            NOTES

            ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Arcs can be closed using cost = -1. +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Arcs can be closed using cost = -1. >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -66,6 +73,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -197,6 +207,7 @@

            TURNS SUPPORT

            The turns support was implemnented as part of GRASS GIS turns cost project <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD at Czech Technical University in Prague, Czech Republic.
            ======= <<<<<<< HEAD @@ -212,6 +223,12 @@

            TURNS SUPPORT

            at Czech Technical University in Prague, Czech Republic.
            ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +at Czech Technical University in Prague, Czech Republic.
            +======= +>>>>>>> osgeo-main at Czech Technical University in Prague, Czech Republic.
            >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -227,6 +244,9 @@

            TURNS SUPPORT

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.spanningtree/main.c b/vector/v.net.spanningtree/main.c index 161d3a2a8f1..c13e58dbcde 100644 --- a/vector/v.net.spanningtree/main.c +++ b/vector/v.net.spanningtree/main.c @@ -81,6 +81,7 @@ int main(int argc, char *argv[]) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -88,6 +89,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -96,6 +99,9 @@ int main(int argc, char *argv[]) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.spanningtree/v.net.spanningtree.html b/vector/v.net.spanningtree/v.net.spanningtree.html index 9f6b25b8407..85f85005845 100644 --- a/vector/v.net.spanningtree/v.net.spanningtree.html +++ b/vector/v.net.spanningtree/v.net.spanningtree.html @@ -5,6 +5,7 @@

            DESCRIPTION

            NOTES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -12,11 +13,16 @@

            NOTES

            ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -33,7 +39,10 @@

            NOTES

            ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -67,6 +76,9 @@

            NOTES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.steiner/main.c b/vector/v.net.steiner/main.c index f27a3618846..6709a69f457 100644 --- a/vector/v.net.steiner/main.c +++ b/vector/v.net.steiner/main.c @@ -404,6 +404,7 @@ int main(int argc, char **argv) geo_f->key = 'g'; geo_f->description = <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Use geodesic calculation for longitude-latitude locations"); ======= @@ -411,6 +412,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Use geodesic calculation for longitude-latitude projects"); ======= _("Use geodesic calculation for longitude-latitude locations"); @@ -419,6 +422,9 @@ int main(int argc, char **argv) _("Use geodesic calculation for longitude-latitude locations"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -654,8 +660,11 @@ int main(int argc, char **argv) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -671,6 +680,9 @@ int main(int argc, char **argv) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_debug(1, "Nodes' categories (layer %d, %d nodes):", tfield, @@ -724,11 +736,14 @@ int main(int argc, char **argv) G_debug(1, "node cat = %d", cat); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -745,6 +760,9 @@ int main(int argc, char **argv) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.timetable/v.net.timetable.html b/vector/v.net.timetable/v.net.timetable.html index 4f838731205..fc35949c88c 100644 --- a/vector/v.net.timetable/v.net.timetable.html +++ b/vector/v.net.timetable/v.net.timetable.html @@ -107,12 +107,15 @@

            NOTES

            Note that stop_time is an integer and so you can use any <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD units and offest to specify arrival times.
            Also, walking ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main units and offset to specify arrival times.
            Also, walking ======= units and offest to specify arrival times.
            Also, walking @@ -121,6 +124,9 @@

            NOTES

            units and offest to specify arrival times.
            Also, walking >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.visibility/data_structures.c b/vector/v.net.visibility/data_structures.c index f0c44cec47b..5d901176a22 100644 --- a/vector/v.net.visibility/data_structures.c +++ b/vector/v.net.visibility/data_structures.c @@ -54,16 +54,22 @@ void init_stack(int size) */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int cmp_points(const void *v1, const void *v2, void *param UNUSED) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.visibility/v.net.visibility.html b/vector/v.net.visibility/v.net.visibility.html index 0ae2340adc8..e0b951d2549 100644 --- a/vector/v.net.visibility/v.net.visibility.html +++ b/vector/v.net.visibility/v.net.visibility.html @@ -70,6 +70,7 @@

            Example 1

            d.vect areas_7_11_25 color=red type=boundary +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

            Example 2

            @@ -87,6 +88,12 @@

            Example 2

            Example 2

            ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +

            Example 2

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

            Example 2

            >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -102,6 +109,9 @@

            Example 2

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -228,6 +238,7 @@

            Example 6

            KNOWN ISSUES

            +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -235,6 +246,10 @@

            KNOWN ISSUES

            <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main In some cases when 3 points or nodes are collinear, some wrong edges are added. This happens only really rarly and shouldn't be a big problem. When two points have the exact same x coordinate and are @@ -244,6 +259,7 @@

            KNOWN ISSUES

            <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD In some cases when 3 points or nodes are collinear, some wrong edges are added. This happens only really rarly and shouldn't be a big problem. When two points have the exact same x coordinate and are @@ -251,6 +267,8 @@

            KNOWN ISSUES

            ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) In some cases when 3 points or nodes are collinear, some wrong edges are added. This happens only really rarly and shouldn't be a big @@ -271,6 +289,9 @@

            KNOWN ISSUES

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net.visibility/visibility.c b/vector/v.net.visibility/visibility.c index 20a6ad9cafe..de611790f40 100644 --- a/vector/v.net.visibility/visibility.c +++ b/vector/v.net.visibility/visibility.c @@ -21,6 +21,7 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void init_vis(struct Point *points, int num_points, struct Line *lines, int num_lines) ======= @@ -28,6 +29,8 @@ void init_vis(struct Point *points, int num_points, struct Line *lines, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void init_vis(struct Point *points, int num_points, struct Line *lines UNUSED, int num_lines UNUSED) ======= @@ -39,6 +42,9 @@ void init_vis(struct Point *points, int num_points, struct Line *lines, int num_lines) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.net/v.net.html b/vector/v.net/v.net.html index f09df31aab1..201ce986b76 100644 --- a/vector/v.net/v.net.html +++ b/vector/v.net/v.net.html @@ -94,6 +94,7 @@

            DESCRIPTION

            Turntable name consists of output vector map name + "_turntable_" + "t" + "_" + turn_layer + "_" + "tuc" + "_" + turn_cat_layer + "_" + "a" + "_" + arc_layer e. g. roads_turntable_t_3_tuc_4_a_1 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

            These modules are able to work with the turntable: @@ -109,6 +110,11 @@

            DESCRIPTION

            These modules are able to work with the turntable: ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +

            These modules are able to work with the turntable: +======= +>>>>>>> osgeo-main

            These modules are able to work with the turntable: <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -124,6 +130,9 @@

            DESCRIPTION

            >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -158,11 +167,14 @@

            DESCRIPTION

            In addition to the modules listed above, the GRASS vector networking suite <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD includes numerous other modules for analysis of network costs and ======= @@ -212,6 +224,9 @@

            DESCRIPTION

            ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -233,6 +248,11 @@

            DESCRIPTION

            <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 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)) diff --git a/vector/v.out.ogr/attrb.c b/vector/v.out.ogr/attrb.c index dead6e1c759..ebe16871d0d 100644 --- a/vector/v.out.ogr/attrb.c +++ b/vector/v.out.ogr/attrb.c @@ -100,16 +100,22 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol, * the '-s' flag was NOT given */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main OGR_F_SetFieldNull(Ogr_feature, ogrfieldnum); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -120,6 +126,7 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol, #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -130,6 +137,11 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol, >>>>>>> 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 } @@ -165,17 +177,23 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else OGR_F_SetFieldNull(Ogr_feature, ogrfieldnum); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -185,6 +203,7 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol, #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -195,6 +214,11 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol, >>>>>>> 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/vector/v.out.ogr/list.c b/vector/v.out.ogr/list.c index f8b598ac3fe..e17484ea930 100644 --- a/vector/v.out.ogr/list.c +++ b/vector/v.out.ogr/list.c @@ -14,6 +14,7 @@ char *OGR_list_write_drivers(void) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -24,6 +25,10 @@ char *OGR_list_write_drivers(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #if GDAL_VERSION_NUM >= 2000000 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) GDALDriverH hDriver; @@ -38,6 +43,7 @@ char *OGR_list_write_drivers(void) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -48,6 +54,10 @@ char *OGR_list_write_drivers(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #if GDAL_VERSION_NUM >= 2000000 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) /* get GDAL driver names */ @@ -137,6 +147,7 @@ char *default_driver(void) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -147,6 +158,11 @@ char *default_driver(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 return G_store("GPKG"); } diff --git a/vector/v.out.ogr/main.c b/vector/v.out.ogr/main.c index 5f348573bd5..3c4c6b73576 100644 --- a/vector/v.out.ogr/main.c +++ b/vector/v.out.ogr/main.c @@ -559,6 +559,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 2020000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -569,6 +570,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 hDS = GDALOpenEx(dsn, GDAL_OF_VECTOR | GDAL_OF_UPDATE, NULL, NULL, NULL); @@ -579,17 +585,23 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main } else { ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -606,6 +618,7 @@ int main(int argc, char *argv[]) #if GDAL_VERSION_NUM >= 2020000 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -616,6 +629,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 (flags.update->answer) { G_debug(1, "Update OGR data source"); @@ -630,6 +648,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -640,6 +659,10 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #else if (flags.update->answer) { G_debug(1, "Update OGR data source"); @@ -665,11 +688,14 @@ int main(int argc, char *argv[]) Ogr_layer = GDALDatasetGetLayer(hDS, i); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main Ogr_field = OGR_L_GetLayerDefn(Ogr_layer); if (G_strcasecmp(OGR_FD_GetName(Ogr_field), options.layer->answer)) continue; @@ -678,6 +704,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -690,6 +719,7 @@ int main(int argc, char *argv[]) if (G_strcasecmp(OGR_FD_GetName(Ogr_field), options.layer->answer)) continue; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -702,6 +732,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 found = TRUE; if (!overwrite && !flags.append->answer) { @@ -711,11 +746,14 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main else if (overwrite && !flags.append->answer) { G_warning( _("OGR layer <%s> already exists and will be overwritten"), @@ -725,6 +763,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -739,6 +780,7 @@ int main(int argc, char *argv[]) #endif <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -749,6 +791,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; } @@ -839,6 +886,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -849,6 +897,10 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #else if (flags.append->answer) Ogr_layer = OGR_DS_GetLayerByName(hDS, options.layer->answer); @@ -930,11 +982,14 @@ int main(int argc, char *argv[]) colname[i], colsqltype, colctype[i], colwidth); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main switch (colctype[i]) { case DB_C_TYPE_INT: @@ -987,6 +1042,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1042,6 +1100,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Unable to create column <%s>"), colname[i]); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1054,6 +1113,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 OGR_Fld_Destroy(Ogr_field); } diff --git a/vector/v.out.postgis/create.c b/vector/v.out.postgis/create.c index 8dee6da0753..fdbedb53cb6 100644 --- a/vector/v.out.postgis/create.c +++ b/vector/v.out.postgis/create.c @@ -76,6 +76,7 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink, if (strcmp(tokens[0], "srid") == 0 && (epsg && strcmp(tokens[1], epsg) != 0)) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("EPSG code defined for current location (%s) is " ======= @@ -83,6 +84,8 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("EPSG code defined for current project (%s) is " ======= G_warning(_("EPSG code defined for current location (%s) is " @@ -91,6 +94,9 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink, G_warning(_("EPSG code defined for current location (%s) is " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.out.postgis/local_proto.h b/vector/v.out.postgis/local_proto.h index 2ba822950af..ee1f980f1ab 100644 --- a/vector/v.out.postgis/local_proto.h +++ b/vector/v.out.postgis/local_proto.h @@ -21,6 +21,7 @@ char *create_pgfile(const char *, const char *, const char *, char **, int, /* table.c */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void check_columns(const struct Map_info *, const char *, const char *, const char *); ======= @@ -28,6 +29,8 @@ void check_columns(const struct Map_info *, const char *, const char *, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void check_columns(struct Map_info *, const char *, const char *, const char *); ======= void check_columns(const struct Map_info *, const char *, const char *, @@ -38,6 +41,9 @@ void check_columns(const struct Map_info *, const char *, const char *, const char *); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.out.postgis/table.c b/vector/v.out.postgis/table.c index 4b7294c969e..354d3041af1 100644 --- a/vector/v.out.postgis/table.c +++ b/vector/v.out.postgis/table.c @@ -14,12 +14,15 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void check_columns(const struct Map_info *Map, const char *layer, ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main void check_columns(struct Map_info *Map, const char *layer, ======= void check_columns(const struct Map_info *Map, const char *layer, @@ -28,6 +31,9 @@ void check_columns(const struct Map_info *Map, const char *layer, void check_columns(const struct Map_info *Map, const char *layer, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.out.svg/v.out.svg.html b/vector/v.out.svg/v.out.svg.html index 8bbdfdad0c4..d8a6819d463 100644 --- a/vector/v.out.svg/v.out.svg.html +++ b/vector/v.out.svg/v.out.svg.html @@ -36,12 +36,15 @@

            REFERENCES

              <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
            • Modul v.out.svg at svg.cc
              • ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main
            • Module v.out.svg at svg.cc
              • =======
            • Modul v.out.svg at svg.cc
              • @@ -50,6 +53,9 @@

              REFERENCES

            • Modul v.out.svg at svg.cc
              • >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.out.vtk/writeVTK.c b/vector/v.out.vtk/writeVTK.c index 023db4b881c..2019977d404 100644 --- a/vector/v.out.vtk/writeVTK.c +++ b/vector/v.out.vtk/writeVTK.c @@ -453,6 +453,7 @@ int write_vtk_cells(FILE *ascii, struct Map_info *Map, VTKInfo *info, /* ************************************************************************* */ int write_vtk_cat_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int layer, int *types, int typenum, int dp) ======= @@ -460,6 +461,8 @@ int write_vtk_cat_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int layer, int *types, int typenum, int dp UNUSED) ======= int layer, int *types, int typenum, int dp) @@ -468,6 +471,9 @@ int write_vtk_cat_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, int layer, int *types, int typenum, int dp) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -575,6 +581,7 @@ int write_vtk_cat_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, */ char *get_att(char *name, int cat, struct field_info *Fi, dbDriver *Driver, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int ncol) ======= @@ -582,6 +589,8 @@ char *get_att(char *name, int cat, struct field_info *Fi, dbDriver *Driver, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int ncol UNUSED) ======= int ncol) @@ -590,6 +599,9 @@ char *get_att(char *name, int cat, struct field_info *Fi, dbDriver *Driver, int ncol) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -642,6 +654,7 @@ char *get_att(char *name, int cat, struct field_info *Fi, dbDriver *Driver, /* ************************************************************************* */ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int layer, int *types, int typenum, int dp) ======= @@ -649,6 +662,8 @@ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int layer, int *types, int typenum, int dp UNUSED) ======= int layer, int *types, int typenum, int dp) @@ -657,6 +672,9 @@ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, int layer, int *types, int typenum, int dp) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -759,11 +777,14 @@ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, fprintf(ascii, "LOOKUP_TABLE default\n"); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD ======= @@ -780,6 +801,9 @@ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -921,6 +945,7 @@ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, return 1; } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -928,12 +953,17 @@ int write_vtk_db_data(FILE *ascii, struct Map_info *Map, VTKInfo *info, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main #if 0 ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -952,6 +982,7 @@ int write_vtk_db_labels(FILE *ascii, struct Map_info *Map, VTKInfo *info, /* ************************************************************************* */ int write_vtk(FILE *ascii, struct Map_info *Map, int layer, int *types, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int typenum, int dp, double scale, int numatts, int labels) ======= @@ -959,6 +990,8 @@ int write_vtk(FILE *ascii, struct Map_info *Map, int layer, int *types, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int typenum, int dp, double scale, int numatts, int labels UNUSED) ======= int typenum, int dp, double scale, int numatts, int labels) @@ -967,6 +1000,9 @@ int write_vtk(FILE *ascii, struct Map_info *Map, int layer, int *types, int typenum, int dp, double scale, int numatts, int labels) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.out.vtk/writeVTK.h b/vector/v.out.vtk/writeVTK.h index bd19d3d595c..0e2bdd47b3f 100644 --- a/vector/v.out.vtk/writeVTK.h +++ b/vector/v.out.vtk/writeVTK.h @@ -27,6 +27,7 @@ typedef struct { int numpolygons; /* The number of polygons */ int polygonoffset; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int generatedata; /* If 0 the categorie data is not complete */ ======= @@ -34,6 +35,8 @@ typedef struct { ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main int generatedata; /* If 0 the category data is not complete */ ======= int generatedata; /* If 0 the categorie data is not complete */ @@ -42,6 +45,9 @@ typedef struct { int generatedata; /* If 0 the categorie data is not complete */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.overlay/line_area.c b/vector/v.overlay/line_area.c index b7cfc14bafc..85c895941e1 100644 --- a/vector/v.overlay/line_area.c +++ b/vector/v.overlay/line_area.c @@ -57,6 +57,7 @@ static int merge_line(struct Map_info *Map, int line, struct line_pnts *MPoints, { int i, first, last, next_line, curr_line; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int merged = 0; ======= @@ -74,6 +75,12 @@ static int merge_line(struct Map_info *Map, int line, struct line_pnts *MPoints, ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD + int merged = 0; +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) int merged = 0, newl = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -87,6 +94,9 @@ static int merge_line(struct Map_info *Map, int line, struct line_pnts *MPoints, >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -145,6 +155,7 @@ static int merge_line(struct Map_info *Map, int line, struct line_pnts *MPoints, if (abs(curr_line) != abs(first)) { Vect_read_line(Map, NULL, Cats, abs(curr_line)); +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /* catgories must be identical */ @@ -153,6 +164,8 @@ static int merge_line(struct Map_info *Map, int line, struct line_pnts *MPoints, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* categories must be identical */ ======= /* catgories must be identical */ @@ -161,6 +174,9 @@ static int merge_line(struct Map_info *Map, int line, struct line_pnts *MPoints, /* catgories must be identical */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.overlay/main.c b/vector/v.overlay/main.c index bec4c917ae6..2c74a4310f6 100644 --- a/vector/v.overlay/main.c +++ b/vector/v.overlay/main.c @@ -220,6 +220,7 @@ int main(int argc, char *argv[]) mostly because I'am not sure if they make enouhg sense */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -230,6 +231,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 (type[0] == GV_LINE && (operator== OP_OR || operator== OP_XOR)) G_fatal_error(_("Operator '%s' is not supported for type line"), diff --git a/vector/v.overlay/v.overlay.html b/vector/v.overlay/v.overlay.html index 5ffd6407402..19eb568ed62 100644 --- a/vector/v.overlay/v.overlay.html +++ b/vector/v.overlay/v.overlay.html @@ -33,6 +33,7 @@

              DESCRIPTION

              NOTES

              +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Currently only areas in ainput are supported for the operators @@ -51,6 +52,12 @@

              NOTES

              ======= >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +Currently only areas in ainput are supported for the operators +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Currently only areas in ainput are supported for the operators >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64,6 +71,9 @@

              NOTES

              >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.patch/main.c b/vector/v.patch/main.c index 75b6a00246f..7828b770ab5 100644 --- a/vector/v.patch/main.c +++ b/vector/v.patch/main.c @@ -10,16 +10,22 @@ * PURPOSE: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main * COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -433,6 +439,7 @@ int main(int argc, char *argv[]) if (do_table) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD add_cat = maxcat + 1; ======= @@ -440,6 +447,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main add_cat = maxcat; ======= add_cat = maxcat + 1; @@ -448,6 +457,9 @@ int main(int argc, char *argv[]) add_cat = maxcat + 1; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.perturb/main.c b/vector/v.perturb/main.c index 0f4e2d87958..4ed585720d1 100644 --- a/vector/v.perturb/main.c +++ b/vector/v.perturb/main.c @@ -37,6 +37,7 @@ int main(int argc, char **argv) { double p1, p2, numbers[1000], numbers2[1000]; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int (*rng)(int, double *); ======= @@ -52,6 +53,12 @@ int main(int argc, char **argv) <<<<<<< HEAD int (*rng)(int, double *); ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + int (*rng)(int, double *); +======= >>>>>>> osgeo-main int (*rng)(); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -68,6 +75,9 @@ int main(int argc, char **argv) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.profile/main.c b/vector/v.profile/main.c index e9bd9da2e25..058ef9de095 100644 --- a/vector/v.profile/main.c +++ b/vector/v.profile/main.c @@ -87,6 +87,7 @@ static int ring2pts(const GEOSGeometry *geom, struct line_pnts *Points) /* Helper for converting multipoligons to GRASS poligons */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -98,6 +99,11 @@ static int ring2pts(const GEOSGeometry *geom, struct line_pnts *Points) ======= >>>>>>> 8422103f4c (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 void add_poly(const GEOSGeometry *OGeom, struct line_pnts *Buffer) { const GEOSGeometry *geom2; @@ -723,16 +729,22 @@ int main(int argc, char *argv[]) DB_OK) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Unable to get attribute data for cat %d"), ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -747,6 +759,7 @@ int main(int argc, char *argv[]) if (nrows > 0) { if (db_fetch(&cursor, DB_NEXT, &more) != DB_OK) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("Error while retreiving database record " ======= @@ -754,6 +767,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("Error while retrieving database record " ======= G_warning(_("Error while retreiving database record " @@ -762,6 +777,9 @@ int main(int argc, char *argv[]) G_warning(_("Error while retreiving database record " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -771,6 +789,7 @@ int main(int argc, char *argv[]) else { for (col = 0; col < ncols; col++) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* Column description retreiving is fast, as they ======= @@ -778,6 +797,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main /* Column description retrieving is fast, as they ======= /* Column description retreiving is fast, as they @@ -786,6 +807,9 @@ int main(int argc, char *argv[]) /* Column description retreiving is fast, as they >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.proj/main.c b/vector/v.proj/main.c index c05676b5e62..c24cd25b7f4 100644 --- a/vector/v.proj/main.c +++ b/vector/v.proj/main.c @@ -75,6 +75,7 @@ int main(int argc, char *argv[]) G_add_keyword(_("transformation")); G_add_keyword(_("import")); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD module->description = _( "Re-projects a vector map from one location to the current location."); @@ -83,6 +84,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main module->description = _("Re-projects a vector map from one project to the current project."); ======= @@ -94,6 +97,9 @@ int main(int argc, char *argv[]) "Re-projects a vector map from one location to the current location."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -198,6 +204,7 @@ int main(int argc, char *argv[]) if (!ibaseopt->answer && strcmp(iloc_name, G_location()) == 0) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_fatal_error(_("Input and output locations can not be the same")); ======= @@ -205,6 +212,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_fatal_error(_("Input and output projects can not be the same")); ======= G_fatal_error(_("Input and output locations can not be the same")); @@ -213,6 +222,9 @@ int main(int argc, char *argv[]) G_fatal_error(_("Input and output locations can not be the same")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -267,6 +279,7 @@ int main(int argc, char *argv[]) if (flag.list->answer) { char **list; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD G_verbose_message(_("Checking location <%s> mapset <%s>"), @@ -276,6 +289,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_verbose_message(_("Checking project <%s> mapset <%s>"), iloc_name, iset_name); ======= @@ -287,6 +302,9 @@ int main(int argc, char *argv[]) iloc_name, iset_name); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -314,6 +332,7 @@ int main(int argc, char *argv[]) if (mapset == NULL) G_fatal_error( <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Vector map <%s> in location <%s> mapset <%s> not found"), ======= @@ -321,6 +340,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Vector map <%s> in project <%s> mapset <%s> not found"), ======= _("Vector map <%s> in location <%s> mapset <%s> not found"), @@ -329,6 +350,9 @@ int main(int argc, char *argv[]) _("Vector map <%s> in location <%s> mapset <%s> not found"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -445,11 +469,14 @@ int main(int argc, char *argv[]) G_fatal_error( <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main _("Mapset <%s> in input project <%s> - permission denied"), iset_name, iloc_name); else @@ -458,6 +485,9 @@ int main(int argc, char *argv[]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -467,6 +497,7 @@ int main(int argc, char *argv[]) G_fatal_error(_("Mapset <%s> in input location <%s> not found"), <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -477,6 +508,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 iset_name, iloc_name); } diff --git a/vector/v.proj/v.proj.html b/vector/v.proj/v.proj.html index 4235abf48ed..04e96e84b5e 100644 --- a/vector/v.proj/v.proj.html +++ b/vector/v.proj/v.proj.html @@ -33,6 +33,7 @@

              NOTES

              v.proj supports general datum transformations, making use of the PROJ co-ordinate system translation library. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

              When projecting into a latlon location, east coordinates are wrapped @@ -41,6 +42,8 @@

              NOTES

              ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

              When projecting into a latlon project, east coordinates are wrapped =======

              When projecting into a latlon location, east coordinates are wrapped @@ -49,6 +52,9 @@

              NOTES

              When projecting into a latlon location, east coordinates are wrapped >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.qcount/findquads.c b/vector/v.qcount/findquads.c index 40cc44b4cf6..a832da5dc40 100644 --- a/vector/v.qcount/findquads.c +++ b/vector/v.qcount/findquads.c @@ -57,6 +57,7 @@ COOR *find_quadrats(int n, double r, struct Cell_head window) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -67,6 +68,10 @@ COOR *find_quadrats(int n, double r, struct Cell_head window) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main if (k == (unsigned int)n * n) G_warning("Having difficulties fitting that many circles with " @@ -74,10 +79,13 @@ COOR *find_quadrats(int n, double r, struct Cell_head window) if (k == (unsigned int)2 * n * n) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -104,6 +112,9 @@ COOR *find_quadrats(int n, double r, struct Cell_head window) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.random/main.c b/vector/v.random/main.c index 0464045bcd0..9106b7660f2 100644 --- a/vector/v.random/main.c +++ b/vector/v.random/main.c @@ -79,17 +79,23 @@ int main(int argc, char *argv[]) struct GModule *module; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main char xname[GNAME_MAX], xmapset[GNAME_MAX]; ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -241,17 +247,23 @@ int main(int argc, char *argv[]) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_unqualified_name(parm.input->answer, G_mapset(), xname, xmapset); ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -393,6 +405,7 @@ int main(int argc, char *argv[]) count = 0; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD for (i = 1; i <= (unsigned int)nareas; i++) { @@ -409,6 +422,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD for (i = 1; i <= (unsigned int)nareas; i++) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + for (i = 1; i <= (unsigned int)nareas; i++) { +======= >>>>>>> osgeo-main for (i = 1; i <= nareas; i++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -425,6 +444,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -550,6 +572,7 @@ int main(int argc, char *argv[]) if (field > 0) { if (cat_list) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for (i = 0; i < (unsigned int)Cats->n_cats; i++) { ======= @@ -565,6 +588,12 @@ int main(int argc, char *argv[]) <<<<<<< HEAD for (i = 0; i < (unsigned int)Cats->n_cats; i++) { ======= +>>>>>>> osgeo-main +======= +<<<<<<< HEAD +<<<<<<< HEAD + for (i = 0; i < (unsigned int)Cats->n_cats; i++) { +======= >>>>>>> osgeo-main for (i = 0; i < Cats->n_cats; i++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -581,6 +610,9 @@ int main(int argc, char *argv[]) >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -634,17 +666,23 @@ int main(int argc, char *argv[]) if (!notable) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main snprintf(buf, DB_SQL_MAX, "insert into %s (%s", Fi->table, Fi->key); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -804,6 +842,7 @@ int main(int argc, char *argv[]) Vect_reset_cats(Cats); } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -811,12 +850,17 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main snprintf(buf, DB_SQL_MAX, "insert into %s (%s", Fi->table, Fi->key); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.random/v.random.html b/vector/v.random/v.random.html index 2070707008d..a3bec5332b6 100644 --- a/vector/v.random/v.random.html +++ b/vector/v.random/v.random.html @@ -276,6 +276,7 @@

              AUTHOR

              <darrell@mccauley-usa.com>, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
              when he was at: ======= <<<<<<< HEAD @@ -289,6 +290,11 @@

              AUTHOR


              when he was at: ======= >>>>>>> osgeo-main +======= +<<<<<<< HEAD +
              when he was at: +======= +>>>>>>> osgeo-main
              when he was at: <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -304,6 +310,9 @@

              AUTHOR

              >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.reclass/reclass.c b/vector/v.reclass/reclass.c index f6676326ba0..1316bd343b4 100644 --- a/vector/v.reclass/reclass.c +++ b/vector/v.reclass/reclass.c @@ -24,6 +24,7 @@ int reclass(struct Map_info *In, struct Map_info *Out, int type, int field, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dbCatValArray *cvarr, int dissolve) ======= @@ -31,6 +32,8 @@ int reclass(struct Map_info *In, struct Map_info *Out, int type, int field, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main dbCatValArray *cvarr, int dissolve UNUSED) ======= dbCatValArray *cvarr, int dissolve) @@ -39,6 +42,9 @@ int reclass(struct Map_info *In, struct Map_info *Out, int type, int field, dbCatValArray *cvarr, int dissolve) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.reclass/v.reclass.html b/vector/v.reclass/v.reclass.html index 2911ddec473..dc2715f462b 100644 --- a/vector/v.reclass/v.reclass.html +++ b/vector/v.reclass/v.reclass.html @@ -27,6 +27,7 @@

              NOTES

              For dissolving common boundaries, see v.dissolve. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -34,6 +35,8 @@

              NOTES

              ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main

              Either the rules or column option must be specified. ======= @@ -41,6 +44,9 @@

              NOTES

              ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -94,6 +100,7 @@

              KNOWN ISSUES

              No table is created for reclassed layer if rules option is used. <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -105,6 +112,11 @@

              KNOWN ISSUES

              ======= >>>>>>> 8422103f4c (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/vector/v.rectify/cp.c b/vector/v.rectify/cp.c index a8bc43f1179..2ab980e2e04 100644 --- a/vector/v.rectify/cp.c +++ b/vector/v.rectify/cp.c @@ -14,6 +14,7 @@ struct Stats { double sum2, rms; }; +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD static void update_stats(struct Stats *st, int n, double dx, double dy, @@ -22,6 +23,8 @@ static void update_stats(struct Stats *st, int n, double dx, double dy, ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main static void update_stats(struct Stats *st, int n UNUSED, double dx, double dy, ======= static void update_stats(struct Stats *st, int n, double dx, double dy, @@ -30,6 +33,9 @@ static void update_stats(struct Stats *st, int n, double dx, double dy, static void update_stats(struct Stats *st, int n, double dx, double dy, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.rectify/env.c b/vector/v.rectify/env.c index f9ad7ad064b..0315745b165 100644 --- a/vector/v.rectify/env.c +++ b/vector/v.rectify/env.c @@ -41,6 +41,7 @@ int show_env(void) fprintf(stderr, "env(%d) switch to LOCATION %s, MAPSET %s\n", which_env, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -51,6 +52,11 @@ int show_env(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_getenv_nofatal("LOCATION_NAME") == NULL ? "?" diff --git a/vector/v.rectify/main.c b/vector/v.rectify/main.c index da699c972ab..a5ef0349c16 100644 --- a/vector/v.rectify/main.c +++ b/vector/v.rectify/main.c @@ -203,6 +203,7 @@ int main(int argc, char *argv[]) G_warning(_("The vector map <%s> already exists in"), out_opt->answer); <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_warning(_("target LOCATION %s, MAPSET %s:"), G_location(), ======= @@ -210,6 +211,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main G_warning(_("target project %s, mapset %s:"), G_location(), ======= G_warning(_("target LOCATION %s, MAPSET %s:"), G_location(), @@ -218,6 +221,9 @@ int main(int argc, char *argv[]) G_warning(_("target LOCATION %s, MAPSET %s:"), G_location(), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.rectify/target.c b/vector/v.rectify/target.c index 5799d8ef3cc..85e532b1fdd 100644 --- a/vector/v.rectify/target.c +++ b/vector/v.rectify/target.c @@ -27,6 +27,7 @@ int get_target(char *group) sprintf(buf, "%s/%s", G_gisdbase(), location); if (access(buf, 0) != 0) { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD sprintf(buf, _("Target location <%s> not found"), location); ======= @@ -34,6 +35,8 @@ int get_target(char *group) ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main sprintf(buf, _("Target project <%s> not found"), location); ======= sprintf(buf, _("Target location <%s> not found"), location); @@ -42,6 +45,9 @@ int get_target(char *group) sprintf(buf, _("Target location <%s> not found"), location); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.rectify/v.rectify.html b/vector/v.rectify/v.rectify.html index ea52937e837..b0045e2c34e 100644 --- a/vector/v.rectify/v.rectify.html +++ b/vector/v.rectify/v.rectify.html @@ -42,16 +42,22 @@

              DESCRIPTION

              set for this group with i.target, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD +======= +>>>>>>> osgeo-main the rectified vector will be written to the target project and mapset. ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/vector/v.select/v.select.html b/vector/v.select/v.select.html index 06aa6e242c0..a6cb64e96b1 100644 --- a/vector/v.select/v.select.html +++ b/vector/v.select/v.select.html @@ -283,6 +283,7 @@

              Extraction of areas overlapping with a line